From f88d1db904927adfb46fe82fe302143d10ebabc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Jun 2022 21:53:52 +0900 Subject: [PATCH 01/38] Bump rubocop from 1.30.0 to 1.30.1 (#18613) Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.30.0 to 1.30.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.30.0...v1.30.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d42b0cb33a..82cd36124b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -568,7 +568,7 @@ GEM rspec-support (3.11.0) rspec_junit_formatter (0.5.1) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.30.0) + rubocop (1.30.1) parallel (~> 1.10) parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) From 2d818d9c979abeaec62be2479b3f157f1e59542a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Jun 2022 21:54:45 +0900 Subject: [PATCH 02/38] Bump bootsnap from 1.11.1 to 1.12.0 (#18575) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.11.1 to 1.12.0. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.11.1...v1.12.0) --- updated-dependencies: - dependency-name: bootsnap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 778036a290..e0005faba7 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem 'blurhash', '~> 0.1' gem 'active_model_serializers', '~> 0.10' gem 'addressable', '~> 2.8' -gem 'bootsnap', '~> 1.11.1', require: false +gem 'bootsnap', '~> 1.12.0', require: false gem 'browser' gem 'charlock_holmes', '~> 0.7.7' gem 'chewy', '~> 7.2' diff --git a/Gemfile.lock b/Gemfile.lock index 82cd36124b..e5b665a8a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,7 +114,7 @@ GEM debug_inspector (>= 0.0.1) blurhash (0.1.6) ffi (~> 1.14) - bootsnap (1.11.1) + bootsnap (1.12.0) msgpack (~> 1.2) brakeman (5.2.3) browser (4.2.0) @@ -396,7 +396,7 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) - msgpack (1.5.1) + msgpack (1.5.2) multi_json (1.15.0) multipart-post (2.1.1) net-ldap (0.17.0) @@ -733,7 +733,7 @@ DEPENDENCIES better_errors (~> 2.9) binding_of_caller (~> 1.0) blurhash (~> 0.1) - bootsnap (~> 1.11.1) + bootsnap (~> 1.12.0) brakeman (~> 5.2) browser bullet (~> 7.0) From 32c83d76a08be9fcfe6920586a382d3ebb7e2069 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Jun 2022 21:55:17 +0900 Subject: [PATCH 03/38] Bump sass from 1.52.1 to 1.52.2 (#18616) Bumps [sass](https://github.com/sass/dart-sass) from 1.52.1 to 1.52.2. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.52.1...1.52.2) --- updated-dependencies: - dependency-name: sass dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index b92123549b..c4e51e5a00 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "requestidlecallback": "^0.3.0", "reselect": "^4.1.5", "rimraf": "^3.0.2", - "sass": "^1.52.1", + "sass": "^1.52.2", "sass-loader": "^10.2.0", "stacktrace-js": "^2.0.2", "stringz": "^2.1.0", diff --git a/yarn.lock b/yarn.lock index 8bb49bc7b4..e5a8573a63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9794,10 +9794,10 @@ sass-loader@^10.2.0: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.52.1: - version "1.52.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.1.tgz#554693da808543031f9423911d62c60a1acf7889" - integrity sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q== +sass@^1.52.2: + version "1.52.2" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.2.tgz#cd1f03e0e7be5bb2cebcf1c34d735f087d790936" + integrity sha512-mfHB2VSeFS7sZlPv9YohB9GB7yWIgQNTGniQwfQ04EoQN0wsQEv7SwpCwy/x48Af+Z3vDeFXz+iuXM3HK/phZQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -10142,21 +10142,16 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -"source-map-js@>=0.6.2 <2.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" - integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA== +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== source-map-js@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== -source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== - source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" From e3cebfa457cb5e645ac69162391a4153a3c6c4ad Mon Sep 17 00:00:00 2001 From: Markus Petzsch Date: Sat, 11 Jun 2022 15:34:58 +0200 Subject: [PATCH 04/38] chore: bump elasticsearch version in docker-compose.yml file; closes #18189 (#18637) --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5c2c0c5dfe..b324a65b09 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,7 @@ services: # es: # restart: always - # image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2 + # image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.17.4 # environment: # - "ES_JAVA_OPTS=-Xms512m -Xmx512m" # - "cluster.name=es-mastodon" From fe2d6fe1057677a1060fe1d882aac744456deff4 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 11 Jun 2022 20:32:02 +0200 Subject: [PATCH 05/38] Fix wrong aspect ratio of logo in icons (#18639) --- app/helpers/branding_helper.rb | 2 +- app/javascript/icons/favicon-16x16.png | Bin 650 -> 639 bytes app/javascript/icons/favicon-32x32.png | Bin 1248 -> 1250 bytes app/javascript/icons/favicon-48x48.png | Bin 1798 -> 1899 bytes app/javascript/images/logo-symbol-icon.svg | 2 +- app/javascript/images/logo.svg | 2 +- app/javascript/images/mailer/logo.png | Bin 1745 -> 1673 bytes app/javascript/images/mailer/wordmark.png | Bin 8942 -> 8991 bytes lib/assets/wordmark.dark.png | Bin 8942 -> 8991 bytes lib/assets/wordmark.light.png | Bin 8576 -> 8625 bytes lib/tasks/branding.rake | 21 ++++++++++----------- public/badge.png | Bin 4248 -> 4058 bytes public/favicon.ico | Bin 15086 -> 15086 bytes 13 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/helpers/branding_helper.rb b/app/helpers/branding_helper.rb index c91661e561..ad7702aea7 100644 --- a/app/helpers/branding_helper.rb +++ b/app/helpers/branding_helper.rb @@ -15,7 +15,7 @@ module BrandingHelper end def _logo_as_symbol_icon - content_tag(:svg, tag(:use, href: '#logo-symbol-icon'), viewBox: '0 0 79 75', class: 'logo logo--icon') + content_tag(:svg, tag(:use, href: '#logo-symbol-icon'), viewBox: '0 0 79 79', class: 'logo logo--icon') end def render_logo diff --git a/app/javascript/icons/favicon-16x16.png b/app/javascript/icons/favicon-16x16.png index e7037f4cf1d839538e52f6839d3a6d8030b64dbe..33ef3bb8c05d3b3c0dcb1b302a04979aff8c3abb 100644 GIT binary patch delta 596 zcmV-a0;~Os1^)z)Hh(lpL_t(Ijg68^NL5i7g};B_bMC!TibbgCpobbbsYVSVkdhu^ z)F3D-GL&8up-}@zO`1sr4H|?YK}iM)f*8#TB5WcQSoX4g^ypo;ZC z2}QWlKajjHJw2KVGP&=FdH~{J!g!+2J^t5CChsH5^E86G<^D9SH zv=(67cEk1F6crT$z|dfUAW*t4rVxQb0dDu@ct2?YQliq~skJ**qSW?|B2YfbE8it3K z0cbnyQ(I@ig;5ns(!<)KmI90c8!Boo0J)sv`L4{vqLMID<_gwR=K`f%OeB;Hr~>jA z*HyX*1<$DsBIBw77a4BdoW~f-oM^nv9h&i67zU*m@PBzKPb&TA#)Y|fFv6Fq0voGL zS$7FDE@zK?-HR~3_OJX83L}HhcAW5v`Rt^h^rPL^hb3UZBili&bq7rD&#le!4p>Y0{g`P00001d0WaHh(`!L_t(Ijg^v1YZO5gg}I@DH?zjP!oq|0So*BHGc&*Unn?zgM-Q_5OwZM zcpbRF|6$lGraGLnr!VFZxq=9Y(9{IYEef#~Z`Ohc4GqxJqR`qhJ5$jR*^qKf+7&V9 zk&5NP_7tbO(7vsWW10c9hHPgwep$HH>(kh%IiAfB zhQi~afa&*!lYd>SID9n4qX#~vk^rpL*r*yCQMbmD$td2w33)bLCV#hxSFpH_qQ7sB z(UCGQ#{wJ&>gxq;1U5>$VoV6Qafd{qAjSYN?+fX)V515T0}FswHpwxr7~=s|nAkxU z4J6(Zj>N+{teFGqMbx5!tz5Wv=?6-)z$G>iv44r?xnisb!h9Jf$9+D12o@^- z{GPN`!Pn0Llj9CWFG_Nrs}qN&^9prrMPFw*e1Y9sn`k1Q=t`HtnkP0gd-{hqy>hLQ zVU%6!Tvl4PiPf7CsZ*L-5mf>^XK}t%nbN!7r#ohnWChUKHu(@m#}e^!ZNa~K tjiMFU2spquluQWv&eoCb13iDe_YZ5wK#*&@>^A@a002ovPDHLkV1iKnAZGvo diff --git a/app/javascript/icons/favicon-32x32.png b/app/javascript/icons/favicon-32x32.png index a91b024631ac83fd1f29cbc10171de7c967c7e14..7b9a37403f78afb31f702955ad3f20347bfc9983 100644 GIT binary patch delta 1212 zcmV;t1Vj7a3E~NmHh-5%L_t(og|(MkY*b|s$A5Fq>2AdqyC8-KB$QB~LZBEDgJ2~J zDv3`dMIabKi19%ZLp0GBgNcbIM13H}OXQ-GC=wIp1xZ>U2ndbbTu>CDfnt-UT)J(y zrF)t2VY|0;c1r=7s_04Mu4Suyyz znbn#Z_jtKxe1Exer9}WdfR|s4&o$GfrRau2(74cJdc8wsrEvY4(RwV+nP|G`yV}VP z3!ZQp_mH4zxNt$)zb{Q+uaz=8uF@M=2W;{HRAm_iKO8$&c;oF##*Z&Ps|y-k_BE&Y zW_tpF#m{=ISQSDFKAY9xviKQ~k2Vd`c2NVi4SOEgIu^Q=@=3+rDG6Al}G`(RUHCU;Nk2!ABmo#bTKM4OYDSI9VAJbe_BRJo9D-~Ws8*m# z;fh4^A?di1=5kvyhqe8az-O^Uj!sGA!Vze+i&3L!8re3%Cyg`UFlM%cvw09Yd_aI zGtKD6jiA06KjsNoy4^pWoobD9s`a*f7D@DYoapf~pm4hGvD&@t$wh!RliLgNT}Yp! z^3ukQqL8Zs{j=0{dJp7^C`~(>>vDss2Y=vroYa&l1tZ%3EAls@+f#|u=3NJ7^c5l5 zhZT#?MS+=RO$f^{>oJqrh)qExf>{knjbwUZ45Jq$4$^53Z4R_0Ep=vB^Nh>o?B?z~ zA^n4ylqFy$6TfY#{}9+a(tVFaav}H3*=%apO*383zf^TqQ`6bdaK`S6z}GGH*MG#) zYf;s}{AP-nHaK0nyJ_LsDZ?3Dz3^ns3ysnGkrD`;{pF3(wI=o{P*FxlfkVJKpc|+` z>;W?wBQOn^h|#k1;H*V=L;zs<{1bD{alYry|0T8T{H0+;1WK0OcZVPS%}d;D5Yx9X z?JSj&^2;s?`q@aC-m?8HS#myH6*cRbFT&FXa|N3OGJ&CqMxfJ-bBILE*t6@%oTD)E aw)!7sBjgnuiF2<20000ExH delta 1210 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 + diff --git a/app/javascript/images/logo.svg b/app/javascript/images/logo.svg index 6ffc988e57..11d0c30c56 100644 --- a/app/javascript/images/logo.svg +++ b/app/javascript/images/logo.svg @@ -1,4 +1,4 @@ - + diff --git a/app/javascript/images/mailer/logo.png b/app/javascript/images/mailer/logo.png index 54c8afd6a32b94476b3401ee5d35fe98edf0fbf8..77d0ef849f34621453100937105e5e068d3c76a4 100644 GIT binary patch literal 1673 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 diff --git a/app/javascript/images/mailer/wordmark.png b/app/javascript/images/mailer/wordmark.png index f3d714d3aae3ea8a9991fe15a4f134112b8261a5..defe50178180a8e2db9c3b5fd26d0c8f4c042d38 100644 GIT binary patch literal 8991 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 literal 8942 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 AKL7v# diff --git a/lib/assets/wordmark.dark.png b/lib/assets/wordmark.dark.png index f3d714d3aae3ea8a9991fe15a4f134112b8261a5..defe50178180a8e2db9c3b5fd26d0c8f4c042d38 100644 GIT binary patch literal 8991 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 literal 8942 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 AKL7v# diff --git a/lib/assets/wordmark.light.png b/lib/assets/wordmark.light.png index 50bbb6bd37fe47541b3dc3479c9be6344e324082..d4485c0fb276fc079c89b4ad8d609699e5e2af03 100644 GIT binary patch literal 8625 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 m^IBcr{r6(MsTIbYy_T! diff --git a/lib/tasks/branding.rake b/lib/tasks/branding.rake index d513465ed9..2eec7c9e14 100644 --- a/lib/tasks/branding.rake +++ b/lib/tasks/branding.rake @@ -9,28 +9,28 @@ namespace :branding do desc 'Generate PNG icons and logos for e-mail templates' task generate_mailer_assets: :environment do - rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '-w :w -h :h :input -o :output') + rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '-h :size --keep-aspect-ratio :input -o :output') output_dest = Rails.root.join('app', 'javascript', 'images', 'mailer') # Displayed size is 64px, at 3x it's 192px Dir[Rails.root.join('app', 'javascript', 'images', 'icons', '*.svg')].each do |path| - rsvg_convert.run(input: path, w: 192, h: 192, output: output_dest.join("#{File.basename(path, '.svg')}.png")) + rsvg_convert.run(input: path, size: 192, output: output_dest.join("#{File.basename(path, '.svg')}.png")) end # Displayed size is 34px, at 3x it's 102px - rsvg_convert.run(input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-wordmark.svg'), w: (102 * (261.0 / 66)).ceil, h: 102, output: output_dest.join('wordmark.png')) + rsvg_convert.run(input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-wordmark.svg'), size: 102, output: output_dest.join('wordmark.png')) # Displayed size is 24px, at 3x it's 72px - rsvg_convert.run(input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-icon.svg'), w: (72 * (79.0 / 75)).ceil, h: 72, output: output_dest.join('logo.png')) + rsvg_convert.run(input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-icon.svg'), size: 72, output: output_dest.join('logo.png')) end desc 'Generate light/dark logotypes for GitHub' task generate_github_assets: :environment do - rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '--stylesheet :stylesheet -w :w -h :h :input -o :output') + rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '--stylesheet :stylesheet -h :size --keep-aspect-ratio :input -o :output') output_dest = Rails.root.join('lib', 'assets') - rsvg_convert.run(stylesheet: Rails.root.join('lib', 'assets', 'wordmark.dark.css'), input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-wordmark.svg'), w: (102 * (261.0 / 66)).ceil, h: 102, output: output_dest.join('wordmark.dark.png')) - rsvg_convert.run(stylesheet: Rails.root.join('lib', 'assets', 'wordmark.light.css'), input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-wordmark.svg'), w: (102 * (261.0 / 66)).ceil, h: 102, output: output_dest.join('wordmark.light.png')) + rsvg_convert.run(stylesheet: Rails.root.join('lib', 'assets', 'wordmark.dark.css'), input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-wordmark.svg'), size: 102, output: output_dest.join('wordmark.dark.png')) + rsvg_convert.run(stylesheet: Rails.root.join('lib', 'assets', 'wordmark.light.css'), input: Rails.root.join('app', 'javascript', 'images', 'logo-symbol-wordmark.svg'), size: 102, output: output_dest.join('wordmark.light.png')) end desc 'Generate favicons and app icons from SVG source files' @@ -39,7 +39,7 @@ namespace :branding do app_icon_source = Rails.root.join('app', 'javascript', 'images', 'app-icon.svg') output_dest = Rails.root.join('app', 'javascript', 'icons') - rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '-w :size -h :size :input -o :output') + rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '-w :size -h :size --keep-aspect-ratio :input -o :output') convert = Terrapin::CommandLine.new('convert', ':input :output') favicon_sizes = [16, 32, 48] @@ -67,12 +67,11 @@ namespace :branding do desc 'Generate badge icon from SVG source files' task generate_app_badge: :environment do - rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '--stylesheet :stylesheet -w :w -h :h :input -o :output') + rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '--stylesheet :stylesheet -w :size -h :size --keep-aspect-ratio :input -o :output') badge_source = Rails.root.join('app', 'javascript', 'images', 'logo-symbol-icon.svg') - source_ratio = 79.0 / 75 output_dest = Rails.root.join('public') stylesheet = Rails.root.join('lib', 'assets', 'wordmark.light.css') - rsvg_convert.run(stylesheet: stylesheet, input: badge_source, w: (192 * source_ratio).ceil, h: 192, output: output_dest.join('badge.png')) + rsvg_convert.run(stylesheet: stylesheet, input: badge_source, size: 192, output: output_dest.join('badge.png')) end end diff --git a/public/badge.png b/public/badge.png index 0449e92921efc08cb7c8ef102ca6fd0eb0d95141..bd618c7290b7ada8fac698c65d025f575679e34f 100644 GIT binary patch literal 4058 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 From 620b70c41e4b5d93f2268fd0318bd48e9823a8e1 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 12 Jun 2022 02:48:03 +0200 Subject: [PATCH 06/38] Remove item titles from RSS feeds (#18640) --- app/views/accounts/show.rss.ruby | 1 - app/views/tags/show.rss.ruby | 1 - 2 files changed, 2 deletions(-) diff --git a/app/views/accounts/show.rss.ruby b/app/views/accounts/show.rss.ruby index 5e1c3a5183..fd45a8b2b0 100644 --- a/app/views/accounts/show.rss.ruby +++ b/app/views/accounts/show.rss.ruby @@ -9,7 +9,6 @@ RSS::Builder.build do |doc| @statuses.each do |status| doc.item do |item| - item.title(l(status.created_at)) item.link(ActivityPub::TagManager.instance.url_for(status)) item.pub_date(status.created_at) item.description(rss_status_content_format(status)) diff --git a/app/views/tags/show.rss.ruby b/app/views/tags/show.rss.ruby index 12f5609041..9ce71be74c 100644 --- a/app/views/tags/show.rss.ruby +++ b/app/views/tags/show.rss.ruby @@ -7,7 +7,6 @@ RSS::Builder.build do |doc| @statuses.each do |status| doc.item do |item| - item.title(l(status.created_at)) item.link(ActivityPub::TagManager.instance.url_for(status)) item.pub_date(status.created_at) item.description(rss_status_content_format(status)) From ea2640e76f70b874c1b5482392d12f47a2efef00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jun 2022 14:51:48 +0900 Subject: [PATCH 07/38] Bump @babel/core from 7.18.2 to 7.18.5 (#18650) Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.18.2 to 7.18.5. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.18.5/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 51 ++++++++++++++++++++++----------------------------- 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index c4e51e5a00..14d208fb29 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ }, "private": true, "dependencies": { - "@babel/core": "^7.18.2", + "@babel/core": "^7.18.5", "@babel/plugin-proposal-decorators": "^7.18.2", "@babel/plugin-transform-react-inline-elements": "^7.16.7", "@babel/plugin-transform-runtime": "^7.18.2", diff --git a/yarn.lock b/yarn.lock index e5a8573a63..6367d2473d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28,10 +28,10 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab" integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw== -"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.18.2", "@babel/core@^7.7.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.2.tgz#87b2fcd7cce9becaa7f5acebdc4f09f3dd19d876" - integrity sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ== +"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.18.5", "@babel/core@^7.7.2": + version "7.18.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.5.tgz#c597fa680e58d571c28dda9827669c78cdd7f000" + integrity sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.16.7" @@ -39,10 +39,10 @@ "@babel/helper-compilation-targets" "^7.18.2" "@babel/helper-module-transforms" "^7.18.0" "@babel/helpers" "^7.18.2" - "@babel/parser" "^7.18.0" + "@babel/parser" "^7.18.5" "@babel/template" "^7.16.7" - "@babel/traverse" "^7.18.2" - "@babel/types" "^7.18.2" + "@babel/traverse" "^7.18.5" + "@babel/types" "^7.18.4" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -347,10 +347,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.18.0": - version "7.18.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.0.tgz#10a8d4e656bc01128d299a787aa006ce1a91e112" - integrity sha512-AqDccGC+m5O/iUStSJy3DGRIUFu7WbY/CppZYwrEUB4N0tZlnI8CSTsgL7v5fHVFmUbRv2sd+yy27o8Ydt4MGg== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.18.5": + version "7.18.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.5.tgz#337062363436a893a2d22faa60be5bb37091c83c" + integrity sha512-YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12": version "7.17.12" @@ -1095,10 +1095,10 @@ "@babel/parser" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2", "@babel/traverse@^7.7.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.2.tgz#b77a52604b5cc836a9e1e08dca01cba67a12d2e8" - integrity sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA== +"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2", "@babel/traverse@^7.18.5", "@babel/traverse@^7.7.2": + version "7.18.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.5.tgz#94a8195ad9642801837988ab77f36e992d9a20cd" + integrity sha512-aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA== dependencies: "@babel/code-frame" "^7.16.7" "@babel/generator" "^7.18.2" @@ -1106,15 +1106,15 @@ "@babel/helper-function-name" "^7.17.9" "@babel/helper-hoist-variables" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.18.0" - "@babel/types" "^7.18.2" + "@babel/parser" "^7.18.5" + "@babel/types" "^7.18.4" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.17.12", "@babel/types@^7.18.0", "@babel/types@^7.18.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.2.tgz#191abfed79ebe6f4242f643a9a5cbaa36b10b091" - integrity sha512-0On6B8A4/+mFUto5WERt3EEuG1NznDirvwca1O8UwXQHVY8g3R7OzYgxXdOfMwLO08UrpUD/2+3Bclyq+/C94Q== +"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.17.12", "@babel/types@^7.18.0", "@babel/types@^7.18.2", "@babel/types@^7.18.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.18.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz#27eae9b9fd18e9dccc3f9d6ad051336f307be354" + integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw== dependencies: "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" @@ -9885,14 +9885,7 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.2, semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.4: +semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.7" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== From 6427e039b7c12de07c6b27891be99b04315bc717 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jun 2022 14:52:21 +0900 Subject: [PATCH 08/38] Bump sidekiq-unique-jobs from 7.1.23 to 7.1.24 (#18651) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 7.1.23 to 7.1.24. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.23...v7.1.24) --- updated-dependencies: - dependency-name: sidekiq-unique-jobs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e5b665a8a6..ef9bc02b55 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -611,7 +611,7 @@ GEM rufus-scheduler (~> 3.2) sidekiq (>= 4) tilt (>= 1.4.0) - sidekiq-unique-jobs (7.1.23) + sidekiq-unique-jobs (7.1.24) brpoplpush-redis_script (> 0.1.1, <= 2.0.0) concurrent-ruby (~> 1.0, >= 1.0.5) sidekiq (>= 5.0, < 8.0) From 152a4dc68156e88ab899b719050f1ceb2e201daa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jun 2022 14:53:20 +0900 Subject: [PATCH 09/38] Bump sass from 1.52.2 to 1.52.3 (#18645) Bumps [sass](https://github.com/sass/dart-sass) from 1.52.2 to 1.52.3. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.52.2...1.52.3) --- updated-dependencies: - dependency-name: sass dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 14d208fb29..625d920f97 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "requestidlecallback": "^0.3.0", "reselect": "^4.1.5", "rimraf": "^3.0.2", - "sass": "^1.52.2", + "sass": "^1.52.3", "sass-loader": "^10.2.0", "stacktrace-js": "^2.0.2", "stringz": "^2.1.0", diff --git a/yarn.lock b/yarn.lock index 6367d2473d..85547ee8fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9794,10 +9794,10 @@ sass-loader@^10.2.0: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.52.2: - version "1.52.2" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.2.tgz#cd1f03e0e7be5bb2cebcf1c34d735f087d790936" - integrity sha512-mfHB2VSeFS7sZlPv9YohB9GB7yWIgQNTGniQwfQ04EoQN0wsQEv7SwpCwy/x48Af+Z3vDeFXz+iuXM3HK/phZQ== +sass@^1.52.3: + version "1.52.3" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.3.tgz#b7cc7ffea2341ccc9a0c4fd372bf1b3f9be1b6cb" + integrity sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From af9d7a208a4e9d1dfde48deec5334b97cc3d8a3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jun 2022 14:53:49 +0900 Subject: [PATCH 10/38] Bump oj from 3.13.13 to 3.13.14 (#18615) Bumps [oj](https://github.com/ohler55/oj) from 3.13.13 to 3.13.14. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.13.13...v3.13.14) --- updated-dependencies: - dependency-name: oj dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ef9bc02b55..9790df2c9a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -412,7 +412,7 @@ GEM concurrent-ruby (~> 1.0, >= 1.0.2) sidekiq (>= 3.5) statsd-ruby (~> 1.4, >= 1.4.0) - oj (3.13.13) + oj (3.13.14) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) From cc7cebb79a2a9ed284e027b76d1038afb4f2a6ef Mon Sep 17 00:00:00 2001 From: Shlee Date: Wed, 15 Jun 2022 14:35:36 +0000 Subject: [PATCH 11/38] Fix for #18637 - Migrate from elasticsearch-oss to elasticsearch basic (#18643) * Update docker-compose.yml * Update docker-compose.yml * Update docker-compose.yml --- docker-compose.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b324a65b09..d86cb55d21 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,13 +25,20 @@ services: # es: # restart: always - # image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.17.4 + # image: docker.elastic.co/elasticsearch/elasticsearch:7.17.4 # environment: - # - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + # - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Des.enforce.bootstrap.checks=true" + # - "xpack.license.self_generated.type=basic" + # - "xpack.security.enabled=false" + # - "xpack.watcher.enabled=false" + # - "xpack.graph.enabled=false" + # - "xpack.ml.enabled=false" + # - "bootstrap.memory_lock=true" # - "cluster.name=es-mastodon" # - "discovery.type=single-node" - # - "bootstrap.memory_lock=true" + # - "thread_pool.write.queue_size=1000" # networks: + # - external_network # - internal_network # healthcheck: # test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"] @@ -41,6 +48,11 @@ services: # memlock: # soft: -1 # hard: -1 + # nofile: + # soft: 65536 + # hard: 65536 + # ports: + # - '127.0.0.1:9200:9200' web: build: . From 3f02157a94cdced0faefc6982c4c6108356d3240 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 16 Jun 2022 06:31:19 +0200 Subject: [PATCH 12/38] New Crowdin updates (#18605) * New translations doorkeeper.en.yml (Indonesian) * New translations simple_form.en.yml (Persian) * New translations activerecord.en.yml (Persian) * New translations doorkeeper.en.yml (Persian) * New translations simple_form.en.yml (Tamil) * New translations doorkeeper.en.yml (Tamil) * New translations activerecord.en.yml (Marathi) * New translations simple_form.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Spanish, Argentina) * New translations doorkeeper.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Mexico) * New translations activerecord.en.yml (Spanish, Mexico) * New translations doorkeeper.en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Bengali) * New translations activerecord.en.yml (Bengali) * New translations activerecord.en.yml (Asturian) * New translations simple_form.en.yml (Scottish Gaelic) * New translations activerecord.en.yml (Scottish Gaelic) * New translations doorkeeper.en.yml (Scottish Gaelic) * New translations simple_form.en.yml (Asturian) * New translations doorkeeper.en.yml (Asturian) * New translations doorkeeper.en.yml (Sinhala) * New translations simple_form.en.yml (Occitan) * New translations activerecord.en.yml (Occitan) * New translations doorkeeper.en.yml (Occitan) * New translations simple_form.en.yml (Serbian (Latin)) * New translations activerecord.en.yml (Serbian (Latin)) * New translations doorkeeper.en.yml (Serbian (Latin)) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations doorkeeper.en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Sorani (Kurdish)) * New translations activerecord.en.yml (Sinhala) * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (English, United Kingdom) * New translations activerecord.en.yml (English, United Kingdom) * New translations simple_form.en.yml (Welsh) * New translations activerecord.en.yml (Welsh) * New translations doorkeeper.en.yml (Welsh) * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Sinhala) * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) * New translations simple_form.en.yml (Tatar) * New translations activerecord.en.yml (Tatar) * New translations doorkeeper.en.yml (Tatar) * New translations simple_form.en.yml (Malayalam) * New translations activerecord.en.yml (Malayalam) * New translations doorkeeper.en.yml (Malayalam) * New translations simple_form.en.yml (Breton) * New translations activerecord.en.yml (Breton) * New translations doorkeeper.en.yml (Breton) * New translations activerecord.en.yml (Sorani (Kurdish)) * New translations doorkeeper.en.yml (Sorani (Kurdish)) * New translations simple_form.en.yml (Ido) * New translations activerecord.en.yml (Standard Moroccan Tamazight) * New translations simple_form.en.yml (Standard Moroccan Tamazight) * New translations doorkeeper.en.yml (Ido) * New translations activerecord.en.yml (Ido) * New translations doorkeeper.en.yml (Kabyle) * New translations simple_form.en.yml (Corsican) * New translations activerecord.en.yml (Kabyle) * New translations simple_form.en.yml (Kabyle) * New translations doorkeeper.en.yml (Sardinian) * New translations activerecord.en.yml (Sardinian) * New translations simple_form.en.yml (Sardinian) * New translations doorkeeper.en.yml (Corsican) * New translations activerecord.en.yml (Corsican) * New translations doorkeeper.en.yml (Standard Moroccan Tamazight) * New translations en.yml (Korean) * New translations en.yml (Portuguese) * New translations en.yml (Hungarian) * New translations en.yml (Armenian) * New translations en.yml (Dutch) * New translations en.yml (Norwegian) * New translations en.yml (Polish) * New translations en.yml (Albanian) * New translations en.yml (Basque) * New translations en.yml (Turkish) * New translations en.yml (Ukrainian) * New translations en.yml (Chinese Traditional) * New translations en.yml (Icelandic) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Indonesian) * New translations en.yml (Tamil) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Finnish) * New translations en.yml (Greek) * New translations en.yml (Galician) * New translations en.yml (Slovak) * New translations en.yml (Chinese Simplified) * New translations en.yml (Swedish) * New translations en.yml (Arabic) * New translations en.yml (French) * New translations en.yml (Spanish) * New translations en.yml (Catalan) * New translations en.yml (Hebrew) * New translations en.yml (Italian) * New translations en.yml (Japanese) * New translations en.yml (Russian) * New translations en.yml (Slovenian) * New translations en.yml (German) * New translations en.yml (Vietnamese) * New translations en.yml (Thai) * New translations en.yml (Scottish Gaelic) * New translations en.yml (Occitan) * New translations en.yml (Persian) * New translations en.yml (Romanian) * New translations en.yml (Bulgarian) * New translations en.yml (Czech) * New translations en.yml (Danish) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Bengali) * New translations en.yml (Corsican) * New translations en.yml (Sardinian) * New translations en.yml (Kabyle) * New translations en.yml (Ido) * New translations en.yml (Kurmanji (Kurdish)) * New translations simple_form.en.yml (Russian) * New translations activerecord.en.yml (Russian) * New translations simple_form.en.yml (Slovenian) * New translations activerecord.en.yml (Slovenian) * New translations simple_form.en.yml (Ukrainian) * New translations activerecord.en.yml (Ukrainian) * New translations en.yml (Sorani (Kurdish)) * New translations en.yml (Welsh) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Kazakh) * New translations en.yml (Estonian) * New translations en.yml (Latvian) * New translations en.yml (Malay) * New translations en.yml (Esperanto) * New translations en.yml (Asturian) * New translations en.yml (Chinese Traditional, Hong Kong) * New translations en.yml (Malayalam) * New translations activerecord.en.yml (Asturian) * New translations en.yml (Catalan) * New translations activerecord.en.yml (Catalan) * New translations en.yml (Chinese Simplified) * New translations en.yml (Danish) * New translations en.yml (Ido) * New translations simple_form.en.yml (Danish) * New translations activerecord.en.yml (Danish) * New translations activerecord.en.yml (Italian) * New translations activerecord.en.yml (Chinese Simplified) * New translations simple_form.en.yml (Ido) * New translations activerecord.en.yml (Ido) * New translations en.yml (Korean) * New translations en.yml (Chinese Traditional) * New translations en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Chinese Traditional) * New translations activerecord.en.yml (Chinese Traditional) * New translations en.yml (Chinese Simplified) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Spanish, Mexico) * New translations simple_form.en.yml (Spanish, Argentina) * New translations activerecord.en.yml (Spanish, Argentina) * New translations en.yml (Galician) * New translations simple_form.en.yml (Galician) * New translations activerecord.en.yml (Galician) * New translations en.yml (Greek) * New translations en.yml (Catalan) * New translations en.yml (Afrikaans) * New translations en.yml (Polish) * New translations simple_form.en.yml (Afrikaans) * New translations activerecord.en.yml (Afrikaans) * New translations simple_form.en.yml (Polish) * New translations activerecord.en.yml (Polish) * New translations en.yml (Portuguese) * New translations en.json (German) * New translations simple_form.en.yml (Portuguese) * New translations activerecord.en.yml (Portuguese) * New translations en.yml (Italian) * New translations en.yml (Russian) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Turkish) * New translations activerecord.en.yml (Turkish) * New translations en.yml (Russian) * New translations en.yml (Hungarian) * New translations simple_form.en.yml (Hungarian) * New translations activerecord.en.yml (Hungarian) * New translations en.yml (French) * New translations en.yml (Galician) * New translations en.yml (French) * New translations en.yml (Icelandic) * New translations simple_form.en.yml (Galician) * New translations simple_form.en.yml (French) * New translations activerecord.en.yml (French) * New translations en.yml (Italian) * New translations simple_form.en.yml (Italian) * New translations en.yml (Latvian) * New translations en.json (Latvian) * New translations simple_form.en.yml (Latvian) * New translations activerecord.en.yml (Latvian) * New translations en.yml (Kurmanji (Kurdish)) * New translations en.json (Latvian) * New translations simple_form.en.yml (Kurmanji (Kurdish)) * New translations activerecord.en.yml (Kurmanji (Kurdish)) * New translations en.yml (Catalan) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Chinese Traditional) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.yml (Vietnamese) * New translations en.yml (Vietnamese) * New translations simple_form.en.yml (Vietnamese) * New translations activerecord.en.yml (Vietnamese) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Japanese) * New translations activerecord.en.yml (Japanese) * New translations en.yml (Czech) * New translations en.yml (French) * New translations en.yml (Czech) * New translations en.json (Arabic) * New translations en.yml (Slovak) * New translations en.json (Slovak) * New translations en.yml (Indonesian) * New translations en.yml (Czech) * New translations en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations activerecord.en.yml (Czech) * New translations en.yml (Spanish, Argentina) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Hebrew) * New translations en.json (Hebrew) * New translations simple_form.en.yml (Hebrew) * New translations en.yml (Albanian) * New translations en.json (Albanian) * New translations simple_form.en.yml (Albanian) * New translations activerecord.en.yml (Albanian) * New translations devise.en.yml (Albanian) * New translations en.yml (German) * New translations en.json (German) * New translations simple_form.en.yml (German) * New translations activerecord.en.yml (German) * New translations en.json (German) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations simple_form.en.yml (Spanish) * New translations activerecord.en.yml (Spanish) * New translations en.json (Ido) * New translations en.yml (Chinese Simplified) * New translations en.json (Occitan) * New translations en.json (Occitan) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` * New translations en.yml (Albanian) * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi --- app/javascript/mastodon/locales/af.json | 2 +- app/javascript/mastodon/locales/ar.json | 10 +- app/javascript/mastodon/locales/de.json | 8 +- app/javascript/mastodon/locales/eo.json | 40 ++--- app/javascript/mastodon/locales/es-MX.json | 2 +- app/javascript/mastodon/locales/ga.json | 66 ++++----- app/javascript/mastodon/locales/gd.json | 2 +- app/javascript/mastodon/locales/he.json | 156 ++++++++++---------- app/javascript/mastodon/locales/id.json | 2 +- app/javascript/mastodon/locales/io.json | 2 +- app/javascript/mastodon/locales/ku.json | 2 +- app/javascript/mastodon/locales/lv.json | 40 ++--- app/javascript/mastodon/locales/oc.json | 18 +-- app/javascript/mastodon/locales/pt-BR.json | 4 +- app/javascript/mastodon/locales/sk.json | 18 +-- app/javascript/mastodon/locales/sq.json | 74 +++++----- config/locales/activerecord.af.yml | 8 + config/locales/activerecord.ast.yml | 10 ++ config/locales/activerecord.ca.yml | 8 + config/locales/activerecord.cs.yml | 8 + config/locales/activerecord.da.yml | 8 + config/locales/activerecord.de.yml | 8 + config/locales/activerecord.en-GB.yml | 1 + config/locales/activerecord.es-AR.yml | 8 + config/locales/activerecord.es.yml | 8 + config/locales/activerecord.fr.yml | 8 + config/locales/activerecord.gl.yml | 8 + config/locales/activerecord.hu.yml | 8 + config/locales/activerecord.io.yml | 8 + config/locales/activerecord.it.yml | 8 + config/locales/activerecord.ja.yml | 8 + config/locales/activerecord.ku.yml | 8 + config/locales/activerecord.lv.yml | 8 + config/locales/activerecord.pl.yml | 8 + config/locales/activerecord.pt-PT.yml | 8 + config/locales/activerecord.ru.yml | 8 + config/locales/activerecord.sl.yml | 8 + config/locales/activerecord.sq.yml | 8 + config/locales/activerecord.tr.yml | 8 + config/locales/activerecord.uk.yml | 8 + config/locales/activerecord.vi.yml | 8 + config/locales/activerecord.zh-CN.yml | 4 + config/locales/activerecord.zh-TW.yml | 8 + config/locales/af.yml | 18 +++ config/locales/ar.yml | 2 - config/locales/ast.yml | 4 +- config/locales/bg.yml | 3 - config/locales/bn.yml | 1 - config/locales/ca.yml | 23 ++- config/locales/ckb.yml | 2 - config/locales/co.yml | 2 - config/locales/cs.yml | 27 +++- config/locales/cy.yml | 2 - config/locales/da.yml | 23 ++- config/locales/de.yml | 24 ++- config/locales/doorkeeper.af.yml | 163 +++++++++++++++++++++ config/locales/doorkeeper.pt-BR.yml | 17 ++- config/locales/el.yml | 9 +- config/locales/eo.yml | 18 +-- config/locales/es-AR.yml | 23 ++- config/locales/es-MX.yml | 4 +- config/locales/es.yml | 23 ++- config/locales/et.yml | 2 - config/locales/eu.yml | 2 - config/locales/fa.yml | 2 - config/locales/fi.yml | 2 - config/locales/fr.yml | 28 +++- config/locales/gd.yml | 3 +- config/locales/gl.yml | 29 +++- config/locales/he.yml | 12 +- config/locales/hr.yml | 2 - config/locales/hu.yml | 23 ++- config/locales/hy.yml | 2 - config/locales/id.yml | 18 ++- config/locales/io.yml | 23 ++- config/locales/is.yml | 11 +- config/locales/it.yml | 23 ++- config/locales/ja.yml | 15 +- config/locales/ka.yml | 1 - config/locales/kab.yml | 1 - config/locales/kk.yml | 2 - config/locales/ko.yml | 11 +- config/locales/ku.yml | 23 ++- config/locales/lt.yml | 1 - config/locales/lv.yml | 30 +++- config/locales/ml.yml | 1 - config/locales/ms.yml | 1 - config/locales/nl.yml | 3 +- config/locales/nn.yml | 2 - config/locales/no.yml | 2 - config/locales/oc.yml | 2 - config/locales/pl.yml | 24 ++- config/locales/pt-BR.yml | 11 +- config/locales/pt-PT.yml | 23 ++- config/locales/ro.yml | 2 - config/locales/ru.yml | 40 ++++- config/locales/sc.yml | 2 - config/locales/simple_form.af.yml | 10 ++ config/locales/simple_form.ca.yml | 6 + config/locales/simple_form.cs.yml | 6 + config/locales/simple_form.da.yml | 6 + config/locales/simple_form.de.yml | 6 + config/locales/simple_form.en-GB.yml | 1 + config/locales/simple_form.es-AR.yml | 6 + config/locales/simple_form.es-MX.yml | 2 + config/locales/simple_form.es.yml | 6 + config/locales/simple_form.fr.yml | 6 + config/locales/simple_form.gl.yml | 6 + config/locales/simple_form.he.yml | 2 + config/locales/simple_form.hu.yml | 6 + config/locales/simple_form.io.yml | 6 + config/locales/simple_form.it.yml | 6 + config/locales/simple_form.ja.yml | 3 + config/locales/simple_form.ku.yml | 6 + config/locales/simple_form.lv.yml | 6 + config/locales/simple_form.pl.yml | 6 + config/locales/simple_form.pt-PT.yml | 6 + config/locales/simple_form.ru.yml | 6 + config/locales/simple_form.sk.yml | 3 +- config/locales/simple_form.sl.yml | 6 + config/locales/simple_form.sq.yml | 6 + config/locales/simple_form.tr.yml | 6 + config/locales/simple_form.uk.yml | 6 + config/locales/simple_form.vi.yml | 6 + config/locales/simple_form.zh-TW.yml | 6 + config/locales/sk.yml | 3 +- config/locales/sl.yml | 20 ++- config/locales/sq.yml | 111 +++++++++++++- config/locales/sr-Latn.yml | 1 - config/locales/sr.yml | 1 - config/locales/sv.yml | 2 - config/locales/ta.yml | 1 - config/locales/th.yml | 2 - config/locales/tr.yml | 21 ++- config/locales/uk.yml | 25 +++- config/locales/vi.yml | 23 ++- config/locales/zh-CN.yml | 12 +- config/locales/zh-HK.yml | 2 - config/locales/zh-TW.yml | 22 ++- 139 files changed, 1450 insertions(+), 369 deletions(-) create mode 100644 config/locales/activerecord.en-GB.yml create mode 100644 config/locales/simple_form.en-GB.yml diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json index 8d261dbbc5..52cb08217b 100644 --- a/app/javascript/mastodon/locales/af.json +++ b/app/javascript/mastodon/locales/af.json @@ -106,7 +106,7 @@ "compose_form.poll.remove_option": "Verwyder hierdie keuse", "compose_form.poll.switch_to_multiple": "Verander die peiling na verskeie keuses", "compose_form.poll.switch_to_single": "Verander die peiling na 'n enkel keuse", - "compose_form.publish": "Publish", + "compose_form.publish": "Publisheer", "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "Stoor veranderinge", "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}", diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index f655b694c4..406868d650 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -17,7 +17,7 @@ "account.follow": "متابعة", "account.followers": "مُتابِعون", "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.", - "account.followers_counter": "{count, plural, zero{لا مُتابع} one {مُتابعٌ واحِد} two{مُتابعانِ اِثنان} few{{counter} مُتابِعين} many{{counter} مُتابِعًا} other {{counter} مُتابع}}", + "account.followers_counter": "{count, plural, zero{لا مُتابع} one {مُتابعٌ واحِد} two {مُتابعانِ اِثنان} few {{counter} مُتابِعين} many {{counter} مُتابِعًا} other {{counter} مُتابع}}", "account.following": "الإشتراكات", "account.following_counter": "{count, plural, zero{لا يُتابِع} one {يُتابِعُ واحد} two{يُتابِعُ اِثنان} few{يُتابِعُ {counter}} many{يُتابِعُ {counter}} other {يُتابِعُ {counter}}}", "account.follows.empty": "لا يُتابع هذا المُستخدمُ أيَّ أحدٍ حتى الآن.", @@ -95,7 +95,7 @@ "compose.language.change": "تغيير اللغة", "compose.language.search": "البحث عن لغة…", "compose_form.direct_message_warning_learn_more": "تَعَلَّم المَزيد", - "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", + "compose_form.encryption_warning": "إنّ المنشورات على ماستدون ليست مشفرة من النهاية إلى النهاية. لا تشارك أي معلومات حساسة عبر ماستدون.", "compose_form.hashtag_warning": "لن يُدرَج هذا المنشور تحت أي وسم بما أنَّه غير مُدرَج. فقط المنشورات العامة يُمكن البحث عنها بواسطة الوسم.", "compose_form.lock_disclaimer": "حسابُك غير {locked}. يُمكن لأي شخص مُتابعتك لرؤية (منشورات المتابعين فقط).", "compose_form.lock_disclaimer.lock": "مُقفَل", @@ -106,7 +106,7 @@ "compose_form.poll.remove_option": "إزالة هذا الخيار", "compose_form.poll.switch_to_multiple": "تغيِير الاستطلاع للسماح باِخيارات مُتعدِّدة", "compose_form.poll.switch_to_single": "تغيِير الاستطلاع للسماح باِخيار واحد فقط", - "compose_form.publish": "Publish", + "compose_form.publish": "انشر", "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "احفظ التعديلات", "compose_form.sensitive.hide": "{count, plural, one {الإشارة إلى الوَسط كمُحتوى حسّاس} two{الإشارة إلى الوسطان كمُحتويان حسّاسان} other {الإشارة إلى الوسائط كمُحتويات حسّاسة}}", @@ -512,8 +512,8 @@ "trends.trending_now": "المتداولة الآن", "ui.beforeunload": "سوف تفقد مسودتك إن تركت ماستدون.", "units.short.billion": "{count} مليار", - "units.short.million": "{count} مليون", - "units.short.thousand": "{count} ألف", + "units.short.million": "{count} مليون", + "units.short.thousand": "{count} ألف", "upload_area.title": "اسحب ثم أفلت للرفع", "upload_button.label": "إضافة وسائط", "upload_error.limit": "لقد تم بلوغ الحد الأقصى المسموح به لإرسال الملفات.", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 8a77b212cc..aaf552a1e3 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -70,7 +70,7 @@ "column.blocks": "Blockierte Profile", "column.bookmarks": "Lesezeichen", "column.community": "Lokale Zeitleiste", - "column.direct": "Mensaxes directas", + "column.direct": "Direktnachrichten", "column.directory": "Profile durchsuchen", "column.domain_blocks": "Blockierte Domains", "column.favourites": "Favoriten", @@ -95,7 +95,7 @@ "compose.language.change": "Sprache ändern", "compose.language.search": "Sprachen durchsuchen...", "compose_form.direct_message_warning_learn_more": "Mehr erfahren", - "compose_form.encryption_warning": "Beiträge von Mastodon sind nicht Ende-zu-Ende verschlüsselt. Teile keine senible Infomartionen über Mastodon.", + "compose_form.encryption_warning": "Beiträge von Mastodon sind nicht Ende-zu-Ende verschlüsselt. Teile keine senible Informationen über Mastodon.", "compose_form.hashtag_warning": "Dieser Beitrag wird nicht durch Hashtags entdeckbar sein, weil er ungelistet ist. Nur öffentliche Beiträge tauchen in Hashtag-Zeitleisten auf.", "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.", "compose_form.lock_disclaimer.lock": "gesperrt", @@ -106,7 +106,7 @@ "compose_form.poll.remove_option": "Wahl entfernen", "compose_form.poll.switch_to_multiple": "Umfrage ändern, um mehrere Optionen zu erlauben", "compose_form.poll.switch_to_single": "Umfrage ändern, um eine einzige Wahl zu erlauben", - "compose_form.publish": "Publish", + "compose_form.publish": "Veröffentlichen", "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "Änderungen speichern", "compose_form.sensitive.hide": "Medien als NSFW markieren", @@ -351,7 +351,7 @@ "notifications.filter.mentions": "Erwähnungen", "notifications.filter.polls": "Ergebnisse der Umfrage", "notifications.filter.statuses": "Updates von Personen, denen du folgst", - "notifications.grant_permission": "Zugriff gewährt.", + "notifications.grant_permission": "Berechtigung erteilen.", "notifications.group": "{count} Benachrichtigungen", "notifications.mark_as_read": "Alle Benachrichtigungen als gelesen markieren", "notifications.permission_denied": "Desktop-Benachrichtigungen können nicht aktiviert werden, da die Berechtigung verweigert wurde.", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 9abba0bfa7..236d254969 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -6,7 +6,7 @@ "account.block": "Bloki @{name}", "account.block_domain": "Bloki domajnon {domain}", "account.blocked": "Blokita", - "account.browse_more_on_origin_server": "Rigardi pli al la originala profilo", + "account.browse_more_on_origin_server": "Vidi pli ĉe la originala profilo", "account.cancel_follow_request": "Nuligi peton de sekvado", "account.direct": "Rekte mesaĝi @{name}", "account.disable_notifications": "Ĉesu sciigi min kiam @{name} mesaĝi", @@ -22,7 +22,7 @@ "account.following_counter": "{count, plural, one {{counter} Sekvato} other {{counter} Sekvatoj}}", "account.follows.empty": "Tiu uzanto ankoraŭ ne sekvas iun.", "account.follows_you": "Sekvas vin", - "account.hide_reblogs": "Kaŝi diskonigojn de @{name}", + "account.hide_reblogs": "Kaŝi plusendojn de @{name}", "account.joined": "Kuniĝis {date}", "account.link_verified_on": "La posedanto de tiu ligilo estis kontrolita je {date}", "account.locked_info": "La privateco de tiu konto estas elektita kiel fermita. La posedanto povas mane akcepti tiun, kiu povas sekvi rin.", @@ -30,14 +30,14 @@ "account.mention": "Mencii @{name}", "account.moved_to": "{name} moviĝis al:", "account.mute": "Silentigi @{name}", - "account.mute_notifications": "Silentigi sciigojn de @{name}", + "account.mute_notifications": "Silentigi la sciigojn de @{name}", "account.muted": "Silentigita", "account.posts": "Mesaĝoj", - "account.posts_with_replies": "Kun respondoj", + "account.posts_with_replies": "Mesaĝoj kaj respondoj", "account.report": "Signali @{name}", "account.requested": "Atendo de aprobo. Alklaku por nuligi peton de sekvado", - "account.share": "Diskonigi la profilon de @{name}", - "account.show_reblogs": "Montri diskonigojn de @{name}", + "account.share": "Kundividi la profilon de @{name}", + "account.show_reblogs": "Montri la plusendojn de @{name}", "account.statuses_counter": "{count, plural, one {{counter} Mesaĝo} other {{counter} Mesaĝoj}}", "account.unblock": "Malbloki @{name}", "account.unblock_domain": "Malbloki {domain}", @@ -74,7 +74,7 @@ "column.directory": "Trarigardi profilojn", "column.domain_blocks": "Blokitaj domajnoj", "column.favourites": "Stelumoj", - "column.follow_requests": "Petoj de sekvado", + "column.follow_requests": "Demandoj de sekvado", "column.home": "Hejmo", "column.lists": "Listoj", "column.mutes": "Silentigitaj uzantoj", @@ -99,7 +99,7 @@ "compose_form.hashtag_warning": "Ĉi tiu mesaĝo ne estos listigita per ajna kradvorto. Nur publikaj mesaĝoj estas serĉeblaj per kradvortoj.", "compose_form.lock_disclaimer": "Via konta ne estas {locked}. Iu ajn povas sekvi vin por vidi viajn mesaĝojn, kiuj estas nur por sekvantoj.", "compose_form.lock_disclaimer.lock": "ŝlosita", - "compose_form.placeholder": "Pri kio vi pensas?", + "compose_form.placeholder": "Kion vi pensas?", "compose_form.poll.add_option": "Aldoni elekteblon", "compose_form.poll.duration": "Balotenketa daŭro", "compose_form.poll.option_placeholder": "Elekteblo {number}", @@ -198,10 +198,10 @@ "explore.trending_tags": "Kradvortoj", "follow_recommendations.done": "Farita", "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.", - "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!", + "follow_recommendations.lead": "La mesaĝoj de personoj kiujn vi sekvas, aperos kronologie en via abonfluo. Ne timu erari, vi povas ĉesi sekvi facile iam ajn!", "follow_request.authorize": "Rajtigi", "follow_request.reject": "Rifuzi", - "follow_requests.unlocked_explanation": "Kvankam via konto ne estas ŝlosita, la dungitaro de {domain} opiniis, ke vi eble volus revizii petojn de sekvadon el ĉi tiuj kontoj permane.", + "follow_requests.unlocked_explanation": "Kvankam via konto ne estas ŝlosita, la teamo de {domain} pensis ke vi eble volas kontroli la demandojn de sekvado de ĉi tiuj kontoj permane.", "generic.saved": "Konservita", "getting_started.developers": "Programistoj", "getting_started.directory": "Profilujo", @@ -221,7 +221,7 @@ "hashtag.column_settings.tag_mode.none": "Neniu", "hashtag.column_settings.tag_toggle": "Aldoni pliajn etikedojn por ĉi tiu kolumno", "home.column_settings.basic": "Bazaj agordoj", - "home.column_settings.show_reblogs": "Montri diskonigojn", + "home.column_settings.show_reblogs": "Montri plusendojn", "home.column_settings.show_replies": "Montri respondojn", "home.hide_announcements": "Kaŝi anoncojn", "home.show_announcements": "Montri anoncojn", @@ -230,7 +230,7 @@ "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutoj}}", "keyboard_shortcuts.back": "reveni", "keyboard_shortcuts.blocked": "malfermi la liston de blokitaj uzantoj", - "keyboard_shortcuts.boost": "diskonigi", + "keyboard_shortcuts.boost": "Plusendi", "keyboard_shortcuts.column": "fokusi mesaĝon en unu el la kolumnoj", "keyboard_shortcuts.compose": "enfokusigi la tekstujon", "keyboard_shortcuts.description": "Priskribo", @@ -259,7 +259,7 @@ "keyboard_shortcuts.start": "malfermi la kolumnon «por komenci»", "keyboard_shortcuts.toggle_hidden": "montri/kaŝi tekston malantaŭ enhava averto", "keyboard_shortcuts.toggle_sensitivity": "montri/kaŝi aŭdovidaĵojn", - "keyboard_shortcuts.toot": "komenci tute novan mesaĝon", + "keyboard_shortcuts.toot": "Krei novan mesaĝon", "keyboard_shortcuts.unfocus": "malenfokusigi la tekstujon aŭ la serĉilon", "keyboard_shortcuts.up": "iri supren en la listo", "lightbox.close": "Fermi", @@ -321,7 +321,7 @@ "notification.mention": "{name} menciis vin", "notification.own_poll": "Via balotenketo finiĝitis", "notification.poll": "Partoprenita balotenketo finiĝis", - "notification.reblog": "{name} diskonigis vian mesaĝon", + "notification.reblog": "{name} plusendis vian mesaĝon", "notification.status": "{name} ĵus afiŝita", "notification.update": "{name} redaktis afiŝon", "notifications.clear": "Forviŝi sciigojn", @@ -337,7 +337,7 @@ "notifications.column_settings.mention": "Mencioj:", "notifications.column_settings.poll": "Balotenketaj rezultoj:", "notifications.column_settings.push": "Puŝsciigoj", - "notifications.column_settings.reblog": "Diskonigoj:", + "notifications.column_settings.reblog": "Plusendoj:", "notifications.column_settings.show": "Montri en kolumno", "notifications.column_settings.sound": "Eligi sonon", "notifications.column_settings.status": "Novaj mesaĝoj:", @@ -345,7 +345,7 @@ "notifications.column_settings.unread_notifications.highlight": "Marki nelegitajn sciigojn", "notifications.column_settings.update": "Redaktoj:", "notifications.filter.all": "Ĉiuj", - "notifications.filter.boosts": "Diskonigoj", + "notifications.filter.boosts": "Plusendoj", "notifications.filter.favourites": "Stelumoj", "notifications.filter.follows": "Sekvoj", "notifications.filter.mentions": "Mencioj", @@ -449,8 +449,8 @@ "status.admin_status": "Malfermi ĉi tiun mesaĝon en la kontrola interfaco", "status.block": "Bloki @{name}", "status.bookmark": "Aldoni al la legosignoj", - "status.cancel_reblog_private": "Ne plu diskonigi", - "status.cannot_reblog": "Ĉi tiu mesaĝo ne diskonigeblas", + "status.cancel_reblog_private": "Malfari la plusendon", + "status.cannot_reblog": "Ĉi tiu mesaĝo ne povas esti plusendita", "status.copy": "Kopii la ligilon al la mesaĝo", "status.delete": "Forigi", "status.detailed_status": "Detala konversacia vido", @@ -475,8 +475,8 @@ "status.read_more": "Legi pli", "status.reblog": "Plusendi", "status.reblog_private": "Plusendi kiel la originala videbleco", - "status.reblogged_by": "{name} diskonigis", - "status.reblogs.empty": "Ankoraŭ neniu diskonigis tiun mesaĝon. Kiam iu faros tion, tiu aperos ĉi tie.", + "status.reblogged_by": "{name} plusendis", + "status.reblogs.empty": "Neniu ankoraŭ plusendis la mesaĝon. Kiam iu faros tion, ili aperos ĉi tie.", "status.redraft": "Forigi kaj reskribi", "status.remove_bookmark": "Forigi legosignon", "status.reply": "Respondi", diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json index 4e8a3c4c6f..570a031865 100644 --- a/app/javascript/mastodon/locales/es-MX.json +++ b/app/javascript/mastodon/locales/es-MX.json @@ -106,7 +106,7 @@ "compose_form.poll.remove_option": "Eliminar esta opción", "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones", "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción", - "compose_form.publish": "Publish", + "compose_form.publish": "Publicar", "compose_form.publish_loud": "¡{publish}!", "compose_form.save_changes": "Guardar cambios", "compose_form.sensitive.hide": "Marcar multimedia como sensible", diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json index bb9c4ac1f3..2d2551845a 100644 --- a/app/javascript/mastodon/locales/ga.json +++ b/app/javascript/mastodon/locales/ga.json @@ -60,7 +60,7 @@ "announcement.announcement": "Fógra", "attachments_list.unprocessed": "(unprocessed)", "autosuggest_hashtag.per_week": "{count} per week", - "boost_modal.combo": "You can press {combo} to skip this next time", + "boost_modal.combo": "Is féidir leat brúigh {combo} chun é seo a scipeáil an chéad uair eile", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Bain triail as arís", "bundle_column_error.title": "Network error", @@ -73,7 +73,7 @@ "column.direct": "Direct messages", "column.directory": "Brabhsáil próifílí", "column.domain_blocks": "Blocked domains", - "column.favourites": "Favourites", + "column.favourites": "Roghanna", "column.follow_requests": "Follow requests", "column.home": "Baile", "column.lists": "Liostaí", @@ -120,7 +120,7 @@ "confirmations.block.confirm": "Block", "confirmations.block.message": "Are you sure you want to block {name}?", "confirmations.delete.confirm": "Delete", - "confirmations.delete.message": "Are you sure you want to delete this status?", + "confirmations.delete.message": "An bhfuil tú cinnte gur mhaith leat an phostáil seo a scriosadh?", "confirmations.delete_list.confirm": "Delete", "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?", "confirmations.discard_edit_media.confirm": "Faigh réidh de", @@ -133,7 +133,7 @@ "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.", "confirmations.mute.message": "An bhfuil tú cinnte gur mhaith leat {name} a bhalbhú?", "confirmations.redraft.confirm": "Delete & redraft", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", + "confirmations.redraft.message": "An bhfuil tú cinnte gur mhaith leat an phostáil sin a scriosadh agus athdhréachtú? Beidh roghanna agus treisithe caillte, agus beidh freagraí ar an bpostáil bhunúsach ina ndílleachtaí.", "confirmations.reply.confirm": "Reply", "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?", "confirmations.unfollow.confirm": "Ná lean", @@ -164,7 +164,7 @@ "emoji_button.symbols": "Symbols", "emoji_button.travel": "Taisteal ⁊ Áiteanna", "empty_column.account_suspended": "Account suspended", - "empty_column.account_timeline": "No posts found", + "empty_column.account_timeline": "Níl postálacha ar bith anseo!", "empty_column.account_unavailable": "Níl an phróifíl ar fáil", "empty_column.blocks": "You haven't blocked any users yet.", "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.", @@ -172,8 +172,8 @@ "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.", "empty_column.domain_blocks": "There are no blocked domains yet.", "empty_column.explore_statuses": "Nothing is trending right now. Check back later!", - "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.", + "empty_column.favourited_statuses": "Níor roghnaigh tú postáil ar bith fós. Nuair a roghnaigh tú ceann, beidh sí le feiceáil anseo.", + "empty_column.favourites": "Níor roghnaigh éinne an phostáil seo fós. Nuair a roghnaigh duine éigin, beidh siad le feiceáil anseo.", "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.", "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.", "empty_column.hashtag": "There is nothing in this hashtag yet.", @@ -221,7 +221,7 @@ "hashtag.column_settings.tag_mode.none": "None of these", "hashtag.column_settings.tag_toggle": "Include additional tags in this column", "home.column_settings.basic": "Basic", - "home.column_settings.show_reblogs": "Show boosts", + "home.column_settings.show_reblogs": "Taispeáin treisithe", "home.column_settings.show_replies": "Show replies", "home.hide_announcements": "Hide announcements", "home.show_announcements": "Show announcements", @@ -230,15 +230,15 @@ "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}", "keyboard_shortcuts.back": "to navigate back", "keyboard_shortcuts.blocked": "to open blocked users list", - "keyboard_shortcuts.boost": "to boost", + "keyboard_shortcuts.boost": "Treisigh postáil", "keyboard_shortcuts.column": "to focus a status in one of the columns", "keyboard_shortcuts.compose": "to focus the compose textarea", "keyboard_shortcuts.description": "Description", "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", - "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", + "keyboard_shortcuts.enter": "Oscail postáil", + "keyboard_shortcuts.favourite": "Roghnaigh postáil", + "keyboard_shortcuts.favourites": "Oscail liosta roghanna", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -252,14 +252,14 @@ "keyboard_shortcuts.open_media": "to open media", "keyboard_shortcuts.pinned": "to open pinned posts list", "keyboard_shortcuts.profile": "Oscail próifíl an t-údar", - "keyboard_shortcuts.reply": "to reply", + "keyboard_shortcuts.reply": "Freagair ar phostáil", "keyboard_shortcuts.requests": "to open follow requests list", "keyboard_shortcuts.search": "to focus search", "keyboard_shortcuts.spoilers": "to show/hide CW field", "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", "keyboard_shortcuts.toggle_sensitivity": "to show/hide media", - "keyboard_shortcuts.toot": "to start a brand new post", + "keyboard_shortcuts.toot": "Cuir tús le postáil nua", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", "keyboard_shortcuts.up": "to move up in the list", "lightbox.close": "Close", @@ -294,13 +294,13 @@ "navigation_bar.blocks": "Blocked users", "navigation_bar.bookmarks": "Bookmarks", "navigation_bar.community_timeline": "Local timeline", - "navigation_bar.compose": "Compose new post", + "navigation_bar.compose": "Cum postáil nua", "navigation_bar.direct": "Direct messages", "navigation_bar.discover": "Discover", "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.edit_profile": "Cuir an phróifíl in eagar", "navigation_bar.explore": "Explore", - "navigation_bar.favourites": "Favourites", + "navigation_bar.favourites": "Roghanna", "navigation_bar.filters": "Focail bhalbhaithe", "navigation_bar.follow_requests": "Follow requests", "navigation_bar.follows_and_followers": "Ag leanúint agus do do leanúint", @@ -315,20 +315,20 @@ "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "notification.admin.sign_up": "{name} signed up", - "notification.favourite": "{name} favourited your status", + "notification.favourite": "Roghnaigh {name} do phostáil", "notification.follow": "Lean {name} thú", "notification.follow_request": "D'iarr {name} ort do chuntas a leanúint", "notification.mention": "{name} mentioned you", "notification.own_poll": "Your poll has ended", "notification.poll": "A poll you have voted in has ended", - "notification.reblog": "{name} boosted your status", - "notification.status": "{name} just posted", + "notification.reblog": "Threisigh {name} do phostáil", + "notification.status": "Phostáil {name} díreach", "notification.update": "Chuir {name} postáil in eagar", "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", "notifications.column_settings.admin.sign_up": "New sign-ups:", "notifications.column_settings.alert": "Desktop notifications", - "notifications.column_settings.favourite": "Favourites:", + "notifications.column_settings.favourite": "Roghanna:", "notifications.column_settings.filter_bar.advanced": "Display all categories", "notifications.column_settings.filter_bar.category": "Quick filter bar", "notifications.column_settings.filter_bar.show_bar": "Show filter bar", @@ -337,16 +337,16 @@ "notifications.column_settings.mention": "Mentions:", "notifications.column_settings.poll": "Poll results:", "notifications.column_settings.push": "Push notifications", - "notifications.column_settings.reblog": "Boosts:", + "notifications.column_settings.reblog": "Treisithe:", "notifications.column_settings.show": "Show in column", "notifications.column_settings.sound": "Play sound", - "notifications.column_settings.status": "New posts:", + "notifications.column_settings.status": "Postálacha nua:", "notifications.column_settings.unread_notifications.category": "Unread notifications", "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications", "notifications.column_settings.update": "Eagair:", "notifications.filter.all": "All", - "notifications.filter.boosts": "Boosts", - "notifications.filter.favourites": "Favourites", + "notifications.filter.boosts": "Treisithe", + "notifications.filter.favourites": "Roghanna", "notifications.filter.follows": "Follows", "notifications.filter.mentions": "Mentions", "notifications.filter.polls": "Poll results", @@ -402,7 +402,7 @@ "report.category.subtitle": "Choose the best match", "report.category.title": "Tell us what's going on with this {type}", "report.category.title_account": "próifíl", - "report.category.title_status": "post", + "report.category.title_status": "postáil", "report.close": "Déanta", "report.comment.title": "Is there anything else you think we should know?", "report.forward": "Forward to {target}", @@ -435,7 +435,7 @@ "search_popout.search_format": "Advanced search format", "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.", "search_popout.tips.hashtag": "haischlib", - "search_popout.tips.status": "status", + "search_popout.tips.status": "postáil", "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags", "search_popout.tips.user": "user", "search_results.accounts": "Daoine", @@ -449,8 +449,8 @@ "status.admin_status": "Open this status in the moderation interface", "status.block": "Block @{name}", "status.bookmark": "Bookmark", - "status.cancel_reblog_private": "Unboost", - "status.cannot_reblog": "This post cannot be boosted", + "status.cancel_reblog_private": "Díthreisigh", + "status.cannot_reblog": "Ní féidir an phostáil seo a threisiú", "status.copy": "Copy link to status", "status.delete": "Scrios", "status.detailed_status": "Detailed conversation view", @@ -459,7 +459,7 @@ "status.edited": "Curtha in eagar in {date}", "status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}", "status.embed": "Embed", - "status.favourite": "Favourite", + "status.favourite": "Rogha", "status.filtered": "Filtered", "status.history.created": "{name} created {date}", "status.history.edited": "Curtha in eagar ag {name} in {date}", @@ -473,10 +473,10 @@ "status.pin": "Pionnáil ar do phróifíl", "status.pinned": "Pinned post", "status.read_more": "Read more", - "status.reblog": "Boost", - "status.reblog_private": "Boost with original visibility", - "status.reblogged_by": "{name} boosted", - "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.", + "status.reblog": "Treisigh", + "status.reblog_private": "Treisigh le léargas bunúsach", + "status.reblogged_by": "Treisithe ag {name}", + "status.reblogs.empty": "Níor threisigh éinne an phostáil seo fós. Nuair a threisigh duine éigin, beidh siad le feiceáil anseo.", "status.redraft": "Delete & re-draft", "status.remove_bookmark": "Remove bookmark", "status.reply": "Reply", diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json index 1910e1037e..bdfc02af75 100644 --- a/app/javascript/mastodon/locales/gd.json +++ b/app/javascript/mastodon/locales/gd.json @@ -106,7 +106,7 @@ "compose_form.poll.remove_option": "Thoir an roghainn seo air falbh", "compose_form.poll.switch_to_multiple": "Atharraich an cunntas-bheachd ach an gabh iomadh roghainn a thaghadh", "compose_form.poll.switch_to_single": "Atharraich an cunntas-bheachd gus nach gabh ach aon roghainn a thaghadh", - "compose_form.publish": "Publish", + "compose_form.publish": "Foillsich", "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "Sàbhail na h-atharraichean", "compose_form.sensitive.hide": "{count, plural, one {Cuir comharra gu bheil am meadhan frionasach} two {Cuir comharra gu bheil na meadhanan frionasach} few {Cuir comharra gu bheil na meadhanan frionasach} other {Cuir comharra gu bheil na meadhanan frionasach}}", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index bc2485c6f8..ecbc373c62 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -4,7 +4,7 @@ "account.badges.bot": "בוט", "account.badges.group": "קבוצה", "account.block": "חסמי את @{name}", - "account.block_domain": "חסמו את שם המתחם (דומיין) {domain}", + "account.block_domain": "חסמו את קהילת {domain}", "account.blocked": "חסום", "account.browse_more_on_origin_server": "ראה יותר בפרופיל המקורי", "account.cancel_follow_request": "בטל בקשת מעקב", @@ -32,20 +32,20 @@ "account.mute": "להשתיק את @{name}", "account.mute_notifications": "להסתיר התראות מ @{name}", "account.muted": "מושתק", - "account.posts": "חצרוצים", - "account.posts_with_replies": "חצרוצים ותגובות", + "account.posts": "פוסטים", + "account.posts_with_replies": "פוסטים ותגובות", "account.report": "דווח על @{name}", "account.requested": "בהמתנה לאישור. לחצי כדי לבטל בקשת מעקב", "account.share": "שתף את הפרופיל של @{name}", "account.show_reblogs": "הצג הדהודים מאת @{name}", "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}", "account.unblock": "הסר את החסימה של @{name}", - "account.unblock_domain": "הסראת שם המתחם {domain}", + "account.unblock_domain": "הסירי את החסימה של קהילת {domain}", "account.unblock_short": "הסר חסימה", "account.unendorse": "אל תקדם בפרופיל", "account.unfollow": "הפסקת מעקב", "account.unmute": "הפסקת השתקת @{name}", - "account.unmute_notifications": "להפסיק השתקת הודעות מ @{name}", + "account.unmute_notifications": "להפסיק השתקת התראות מ @{name}", "account.unmute_short": "ביטול השתקה", "account_note.placeholder": "יש ללחוץ כדי להוסיף הערות", "admin.dashboard.daily_retention": "קצב שימור משתמשים (פר יום) אחרי ההרשמה", @@ -54,49 +54,49 @@ "admin.dashboard.retention.cohort": "חודש רישום", "admin.dashboard.retention.cohort_size": "משתמשים חדשים", "alert.rate_limited.message": "נא לנסות אחרי {retry_time, time, medium}.", - "alert.rate_limited.title": "מגבלות מיכסה", + "alert.rate_limited.title": "חלה הגבלת קצב", "alert.unexpected.message": "אירעה שגיאה בלתי צפויה.", "alert.unexpected.title": "אופס!", - "announcement.announcement": "הודעה", + "announcement.announcement": "הכרזה", "attachments_list.unprocessed": "(לא מעובד)", "autosuggest_hashtag.per_week": "{count} לשבוע", "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה", - "bundle_column_error.body": "משהו השתבש בעת הצגת הרכיב הזה.", + "bundle_column_error.body": "משהו השתבש בעת טעינת הרכיב הזה.", "bundle_column_error.retry": "לנסות שוב", "bundle_column_error.title": "שגיאת רשת", "bundle_modal_error.close": "לסגור", "bundle_modal_error.message": "משהו השתבש בעת טעינת הרכיב הזה.", "bundle_modal_error.retry": "לנסות שוב", - "column.blocks": "חסימות", + "column.blocks": "משתמשים חסומים", "column.bookmarks": "סימניות", - "column.community": "ציר זמן מקומי", + "column.community": "פיד שרת מקומי", "column.direct": "הודעות ישירות", - "column.directory": "גלוש פרופילים", - "column.domain_blocks": "Hidden domains", + "column.directory": "עיין בפרופילים", + "column.domain_blocks": "קהילות (שמות מתחם) מוסתרות", "column.favourites": "חיבובים", "column.follow_requests": "בקשות מעקב", - "column.home": "בבית", + "column.home": "פיד הבית", "column.lists": "רשימות", "column.mutes": "השתקות", "column.notifications": "התראות", - "column.pins": "Pinned toot", - "column.public": "בפרהסיה", - "column_back_button.label": "חזרה", - "column_header.hide_settings": "הסתרת העדפות", - "column_header.moveLeft_settings": "הזחת טור לשמאל", - "column_header.moveRight_settings": "הזחת טור לימין", - "column_header.pin": "קיבוע", + "column.pins": "פווסטים נעוצים", + "column.public": "פיד כללי (כל השרתים)", + "column_back_button.label": "בחזרה", + "column_header.hide_settings": "הסתרת הגדרות", + "column_header.moveLeft_settings": "הזזת טור לשמאל", + "column_header.moveRight_settings": "הזזת טור לימין", + "column_header.pin": "הצמדה", "column_header.show_settings": "הצגת העדפות", - "column_header.unpin": "שחרור קיבוע", + "column_header.unpin": "שחרור הצמדה", "column_subheading.settings": "אפשרויות", "community.column_settings.local_only": "מקומי בלבד", - "community.column_settings.media_only": "Media only", - "community.column_settings.remote_only": "מרחוק בלבד", - "compose.language.change": "Change language", - "compose.language.search": "Search languages...", + "community.column_settings.media_only": "מדיה בלבד", + "community.column_settings.remote_only": "מרוחק בלבד", + "compose.language.change": "שינוי שפת הפוסט", + "compose.language.search": "חיפוש שפות...", "compose_form.direct_message_warning_learn_more": "מידע נוסף", - "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", - "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", + "compose_form.encryption_warning": "פוסטים במסטודון לא מוצפנים מקצה לקצה. אל תשתפו מידע רגיש במסטודון.", + "compose_form.hashtag_warning": "פוסט זה לא יירשם תחת תגי הקבצה (האשטאגים) היות והנראות שלו היא 'לא רשום'. רק פוסטים ציבוריים יכולים להימצא באמצעות תגי הקבצה.", "compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.", "compose_form.lock_disclaimer.lock": "נעול", "compose_form.placeholder": "מה עובר לך בראש?", @@ -106,36 +106,36 @@ "compose_form.poll.remove_option": "הסר בחירה זו", "compose_form.poll.switch_to_multiple": "אפשרו בחירה מרובה בסקר", "compose_form.poll.switch_to_single": "אפשרו בחירה בודדת בסקר", - "compose_form.publish": "Publish", + "compose_form.publish": "פרסום", "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "שמירת שינויים", "compose_form.sensitive.hide": "{count, plural, one {סימון מידע כרגיש} other {סימון מידע כרגיש}}", "compose_form.sensitive.marked": "{count, plural, one {מידע מסומן כרגיש} other {מידע מסומן כרגיש}}", "compose_form.sensitive.unmarked": "{count, plural, one {מידע לא מסומן כרגיש} other {מידע לא מסומן כרגיש}}", - "compose_form.spoiler.marked": "Text is hidden behind warning", - "compose_form.spoiler.unmarked": "Text is not hidden", - "compose_form.spoiler_placeholder": "אזהרת תוכן", + "compose_form.spoiler.marked": "הסר אזהרת תוכן", + "compose_form.spoiler.unmarked": "הוסף אזהרת תוכן", + "compose_form.spoiler_placeholder": "כתוב את האזהרה שלך כאן", "confirmation_modal.cancel": "ביטול", "confirmations.block.block_and_report": "לחסום ולדווח", "confirmations.block.confirm": "לחסום", - "confirmations.block.message": "לחסום את {name}?", + "confirmations.block.message": "האם את/ה בטוח/ה שברצונך למחוק את \"{name}\"?", "confirmations.delete.confirm": "למחוק", - "confirmations.delete.message": "למחוק את ההודעה?", + "confirmations.delete.message": "בטוח/ה שאת/ה רוצה למחוק את ההודעה?", "confirmations.delete_list.confirm": "למחוק", "confirmations.delete_list.message": "האם אתם בטוחים שאתם רוצים למחוק את הרשימה לצמיתות?", "confirmations.discard_edit_media.confirm": "השלך", "confirmations.discard_edit_media.message": "יש לך שינויים לא שמורים לתיאור המדיה. להשליך אותם בכל זאת?", - "confirmations.domain_block.confirm": "הסתר קהילה שלמה", - "confirmations.domain_block.message": "באמת באמת לחסום את כל קהילת {domain}? ברב המקרים השתקות נבחרות של מספר משתמשים מסויימים צריכה להספיק.", + "confirmations.domain_block.confirm": "חסמו לגמרי את שם המתחם (דומיין)", + "confirmations.domain_block.message": "בטוחה שברצונך באמת לחסום את קהילת {domain}? ברב המקרים השתקה וחסימה של מספר משתמשים עשוייה להספיק. לא תראי תוכל מכלל שם המתחם בפידים הציבוריים או בהתראות שלך. העוקבים שלך מהקהילה הזאת יוסרו", "confirmations.logout.confirm": "להתנתק", "confirmations.logout.message": "האם אתם בטוחים שאתם רוצים להתנתק?", "confirmations.mute.confirm": "להשתיק", - "confirmations.mute.explanation": "זה יסתיר חצרוצים שלהם וחצרוצים המזכירים אותם, אבל עדיין יתיר להם לראות פוסטים שלך ולעקוב אחריך.", + "confirmations.mute.explanation": "זה יסתיר פוסטים שלהם ופוסטים שמאזכרים אותם, אבל עדיין יתיר להם לראות פוסטים שלך ולעקוב אחריך.", "confirmations.mute.message": "להשתיק את {name}?", "confirmations.redraft.confirm": "מחק וערוך מחדש", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", + "confirmations.redraft.message": "בטוחה שאת רוצה למחוק ולהתחיל טיוטה חדשה? חיבובים והדהודים יאבדו, ותגובות לפוסט המקורי ישארו יתומות.", "confirmations.reply.confirm": "הגב", - "confirmations.reply.message": "הגבה עכשיו ידרוס את ההודעה שאתם כותבים כעת. האם אתם בטוחים שברצונכם להמשיך?", + "confirmations.reply.message": "תגובה עכשיו תדרוס את ההודעה שכבר התחלתים לכתוב. האם אתם בטוחים שברצונכם להמשיך?", "confirmations.unfollow.confirm": "להפסיק מעקב", "confirmations.unfollow.message": "להפסיק מעקב אחרי {name}?", "conversation.delete": "מחיקת שיחה", @@ -149,7 +149,7 @@ "embed.instructions": "ניתן להטמיע את ההודעה באתרך ע\"י העתקת הקוד שלהלן.", "embed.preview": "דוגמא כיצד זה יראה:", "emoji_button.activity": "פעילות", - "emoji_button.clear": "Clear", + "emoji_button.clear": "ניקוי", "emoji_button.custom": "מיוחדים", "emoji_button.flags": "דגלים", "emoji_button.food": "אוכל ושתיה", @@ -164,22 +164,22 @@ "emoji_button.symbols": "סמלים", "emoji_button.travel": "טיולים ואתרים", "empty_column.account_suspended": "חשבון מושהה", - "empty_column.account_timeline": "No toots here!", + "empty_column.account_timeline": "אין עדיין אף פוסט!", "empty_column.account_unavailable": "פרופיל לא זמין", "empty_column.blocks": "עדיין לא חסמתם משתמשים אחרים.", "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", - "empty_column.community": "טור הסביבה ריק. יש לפרסם משהו כדי שדברים יתרחילו להתגלגל!", + "empty_column.community": "פיד השרת המקומי ריק. יש לפרסם משהו כדי שדברים יתרחילו להתגלגל!", "empty_column.direct": "אין לך שום הודעות פרטיות עדיין. כשתשלחו או תקבלו אחת, היא תופיע כאן.", - "empty_column.domain_blocks": "There are no hidden domains yet.", + "empty_column.domain_blocks": "אין עדיין קהילות מוסתרות.", "empty_column.explore_statuses": "אין נושאים חמים כרגע. אולי אחר כך!", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", + "empty_column.favourited_statuses": "אין עדיין פוסטים שחיבבת. כשתחבב את הראשון, הוא יופיע כאן.", + "empty_column.favourites": "עוד לא חיבבו את הפוסט הזה. כאשר זה יקרה, החיבובים יופיעו כאן.", "empty_column.follow_recommendations": "נראה שלא ניתן לייצר המלצות עבורך. נסה/י להשתמש בחיפוש כדי למצוא אנשים מוכרים או לבדוק את הנושאים החמים.", "empty_column.follow_requests": "אין לך שום בקשות מעקב עדיין. לכשיתקבלו כאלה, הן תופענה כאן.", "empty_column.hashtag": "אין כלום בהאשתג הזה עדיין.", "empty_column.home": "אף אחד לא במעקב עדיין. אפשר לבקר ב{public} או להשתמש בחיפוש כדי להתחיל ולהכיר חצוצרנים אחרים. {suggestions}", "empty_column.home.suggestions": "ראה/י כמה הצעות", - "empty_column.list": "אין עדיין מאום ברשימה.", + "empty_column.list": "אין עדיין פריטים ברשימה. כאשר חברים ברשימה הזאת יפרסמו פוסטים חדשים, הם יופיעו פה.", "empty_column.lists": "אין לך שום רשימות עדיין. לכשיהיו, הן תופענה כאן.", "empty_column.mutes": "עוד לא השתקת שום משתמש.", "empty_column.notifications": "אין התראות עדיין. יאללה, הגיע הזמן להתחיל להתערבב.", @@ -194,22 +194,22 @@ "explore.suggested_follows": "עבורך", "explore.title": "סיור", "explore.trending_links": "חדשות", - "explore.trending_statuses": "חצרוצים", + "explore.trending_statuses": "פוסטים", "explore.trending_tags": "האשטאגים", "follow_recommendations.done": "בוצע", "follow_recommendations.heading": "עקב/י אחרי אנשים שתרצה/י לראות את חצרוציהם! הנה כמה הצעות.", "follow_recommendations.lead": "חצרוצים מאנשים במעקב יופיעו בסדר כרונולוגי בפיד הבית. אל תחששו מטעויות, אפשר להסיר מעקב באותה הקלות ובכל זמן!", - "follow_request.authorize": "קבלה", + "follow_request.authorize": "הרשאה", "follow_request.reject": "דחיה", "follow_requests.unlocked_explanation": "למרות שחשבונך אינו נעול, צוות {domain} חושב שאולי כדאי לוודא את בקשות המעקב האלה ידנית.", "generic.saved": "נשמר", "getting_started.developers": "מפתחות", - "getting_started.directory": "ספריית פרופילים", + "getting_started.directory": "מדריך פרופילים", "getting_started.documentation": "תיעוד", "getting_started.heading": "בואו נתחיל", "getting_started.invite": "להזמין אנשים", "getting_started.open_source_notice": "מסטודון היא תוכנה חופשית (בקוד פתוח). ניתן לתרום או לדווח על בעיות בגיטהאב: {github}.", - "getting_started.security": "Security", + "getting_started.security": "הגדרות חשבון", "getting_started.terms": "תנאי שימוש", "hashtag.column_header.tag_mode.all": "ו- {additional}", "hashtag.column_header.tag_mode.any": "או {additional}", @@ -218,8 +218,8 @@ "hashtag.column_settings.select.placeholder": "הזן תגי הקבצה…", "hashtag.column_settings.tag_mode.all": "כל אלה", "hashtag.column_settings.tag_mode.any": "כל אלה", - "hashtag.column_settings.tag_mode.none": "אפאחד מאלה", - "hashtag.column_settings.tag_toggle": "Include additional tags in this column", + "hashtag.column_settings.tag_mode.none": "אף אחד מאלה", + "hashtag.column_settings.tag_toggle": "כלול תגיות נוספות בטור זה", "home.column_settings.basic": "למתחילים", "home.column_settings.show_reblogs": "הצגת הדהודים", "home.column_settings.show_replies": "הצגת תגובות", @@ -259,7 +259,7 @@ "keyboard_shortcuts.start": "to open \"get started\" column", "keyboard_shortcuts.toggle_hidden": "הצגת/הסתרת טקסט מוסתר מאחורי אזהרת תוכן", "keyboard_shortcuts.toggle_sensitivity": "הצגת/הסתרת מדיה", - "keyboard_shortcuts.toot": "להתחיל חיצרוץ חדש", + "keyboard_shortcuts.toot": "להתחיל פוסט חדש", "keyboard_shortcuts.unfocus": "לצאת מתיבת חיבור/חיפוש", "keyboard_shortcuts.up": "לנוע במעלה הרשימה", "lightbox.close": "סגירה", @@ -267,8 +267,8 @@ "lightbox.expand": "הרחבת קופסת צפייה בתמונה", "lightbox.next": "הלאה", "lightbox.previous": "הקודם", - "limited_account_hint.action": "Show profile anyway", - "limited_account_hint.title": "This profile has been hidden by the moderators of your server.", + "limited_account_hint.action": "הצג חשבון בכל זאת", + "limited_account_hint.title": "פרופיל זה הוסתר ע\"י מנהלי השרת שלך.", "lists.account.add": "הוסף לרשימה", "lists.account.remove": "הסר מרשימה", "lists.delete": "מחיקת רשימה", @@ -288,32 +288,32 @@ "missing_indicator.label": "לא נמצא", "missing_indicator.sublabel": "לא ניתן היה למצוא את המשאב", "mute_modal.duration": "משך הזמן", - "mute_modal.hide_notifications": "להסתיר הודעות מחשבון זה?", + "mute_modal.hide_notifications": "להסתיר התראות מחשבון זה?", "mute_modal.indefinite": "ללא תאריך סיום", "navigation_bar.apps": "יישומונים לנייד", - "navigation_bar.blocks": "חסימות", + "navigation_bar.blocks": "משתמשים חסומים", "navigation_bar.bookmarks": "סימניות", - "navigation_bar.community_timeline": "ציר זמן מקומי", - "navigation_bar.compose": "Compose new toot", + "navigation_bar.community_timeline": "פיד שרת מקומי", + "navigation_bar.compose": "צור פוסט חדש", "navigation_bar.direct": "הודעות ישירות", "navigation_bar.discover": "גלה", - "navigation_bar.domain_blocks": "Hidden domains", + "navigation_bar.domain_blocks": "קהילות (שמות מתחם) חסומות", "navigation_bar.edit_profile": "עריכת פרופיל", - "navigation_bar.explore": "חקור", + "navigation_bar.explore": "סיור", "navigation_bar.favourites": "חיבובים", "navigation_bar.filters": "מילים מושתקות", "navigation_bar.follow_requests": "בקשות מעקב", "navigation_bar.follows_and_followers": "נעקבים ועוקבים", - "navigation_bar.info": "מידע נוסף", + "navigation_bar.info": "אודות שרת זה", "navigation_bar.keyboard_shortcuts": "קיצורי מקלדת", "navigation_bar.lists": "רשימות", - "navigation_bar.logout": "יציאה", + "navigation_bar.logout": "התנתקות", "navigation_bar.mutes": "השתקות", "navigation_bar.personal": "אישי", - "navigation_bar.pins": "חיצרוצים מקובעים", + "navigation_bar.pins": "פוסטים נעוצים", "navigation_bar.preferences": "העדפות", "navigation_bar.public_timeline": "ציר זמן בין-קהילתי", - "navigation_bar.security": "בטיחות", + "navigation_bar.security": "אבטחה", "notification.admin.sign_up": "{name} נרשמו", "notification.favourite": "חצרוצך חובב על ידי {name}", "notification.follow": "{name} במעקב אחרייך", @@ -365,20 +365,20 @@ "poll.refresh": "רענון", "poll.total_people": "{count, plural, one {# איש/אישה} other {# אנשים}}", "poll.total_votes": "{count, plural, one {# קול} other {# קולות}}", - "poll.vote": "קול", + "poll.vote": "הצבעה", "poll.voted": "הצבעת לתשובה זו", "poll.votes": "{votes, plural, one {# קול} other {# קולות}}", "poll_button.add_poll": "הוספת סקר", "poll_button.remove_poll": "הסרת סקר", "privacy.change": "שינוי פרטיות ההודעה", - "privacy.direct.long": "הצג רק למי שהודעה זו פונה אליו", - "privacy.direct.short": "אנשים מוזכרים בלבד", + "privacy.direct.long": "רק למשתמשים מאוזכרים (mentioned)", + "privacy.direct.short": "למאוזכרים בלבד", "privacy.private.long": "הצג לעוקבים בלבד", - "privacy.private.short": "עוקבים בלבד", + "privacy.private.short": "לעוקבים בלבד", "privacy.public.long": "גלוי לכל", "privacy.public.short": "פומבי", "privacy.unlisted.long": "גלוי לכל, אבל מוסתר מאמצעי גילוי", - "privacy.unlisted.short": "לא לפיד הכללי", + "privacy.unlisted.short": "לא רשום (לא לפיד הכללי)", "refresh": "רענון", "regeneration_indicator.label": "טוען…", "regeneration_indicator.sublabel": "פיד הבית שלך בהכנה!", @@ -395,7 +395,7 @@ "relative_time.today": "היום", "reply_indicator.cancel": "ביטול", "report.block": "לחסום", - "report.block_explanation": "לא ניתן יהיה לראות את חצרוציהם. הם לא יוכלו לראות את חצרוציך או לעקוב אחריך. הם יוכלו לדעת שהם חסומים.", + "report.block_explanation": "לא ניתן יהיה לראות את הפוסטים שלהן. הן לא יוכלו לראות את הפוסטים שלך או לעקוב אחריך. הם יוכלו לדעת שהם חסומים.", "report.categories.other": "אחר", "report.categories.spam": "ספאם", "report.categories.violation": "התוכן מפר אחד או יותר מחוקי השרת", @@ -451,7 +451,7 @@ "status.bookmark": "סימניה", "status.cancel_reblog_private": "הסרת הדהוד", "status.cannot_reblog": "לא ניתן להדהד הודעה זו", - "status.copy": "Copy link to status", + "status.copy": "העתק/י קישור לפוסט זה", "status.delete": "מחיקה", "status.detailed_status": "תצוגת שיחה מפורטת", "status.direct": "הודעה ישירה ל@{name}", @@ -469,8 +469,8 @@ "status.more": "עוד", "status.mute": "להשתיק את @{name}", "status.mute_conversation": "השתקת שיחה", - "status.open": "הרחבת הודעה", - "status.pin": "לקבע באודות", + "status.open": "הרחבת פוסט זה", + "status.pin": "הצמדה לפרופיל שלי", "status.pinned": "Pinned toot", "status.read_more": "לקרוא עוד", "status.reblog": "הדהוד", @@ -480,7 +480,7 @@ "status.redraft": "מחיקה ועריכה מחדש", "status.remove_bookmark": "הסרת סימניה", "status.reply": "תגובה", - "status.replyAll": "תגובה לכולם", + "status.replyAll": "תגובה לפתיל", "status.report": "דיווח על @{name}", "status.sensitive_warning": "תוכן רגיש", "status.share": "שיתוף", @@ -488,15 +488,15 @@ "status.show_less_all": "להציג פחות מהכל", "status.show_more": "הראה יותר", "status.show_more_all": "להציג יותר מהכל", - "status.show_thread": "להציג סיב", + "status.show_thread": "הצג כחלק מפתיל", "status.uncached_media_warning": "לא זמין", "status.unmute_conversation": "הסרת השתקת שיחה", "status.unpin": "לשחרר מקיבוע באודות", "suggestions.dismiss": "להתעלם מהצעה", "suggestions.header": "ייתכן שזה יעניין אותך…", - "tabs_bar.federated_timeline": "ציר זמן בין-קהילתי", - "tabs_bar.home": "בבית", - "tabs_bar.local_timeline": "ציר זמן מקומי", + "tabs_bar.federated_timeline": "פיד כללי (בין-קהילתי)", + "tabs_bar.home": "פיד הבית", + "tabs_bar.local_timeline": "פיד שרת מקומי", "tabs_bar.notifications": "התראות", "tabs_bar.search": "חיפוש", "time_remaining.days": "נותרו {number, plural, one {# יום} other {# ימים}}", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 9b8b6f5fed..10f80ee616 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -95,7 +95,7 @@ "compose.language.change": "Ganti bahasa", "compose.language.search": "Telusuri bahasa...", "compose_form.direct_message_warning_learn_more": "Pelajari selengkapnya", - "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", + "compose_form.encryption_warning": "Kiriman di Mastodon tidak dienkripsi end-to-end. Jangan bagikan informasi sensitif melalui Mastodon.", "compose_form.hashtag_warning": "Toot ini tidak akan ada dalam daftar tagar manapun karena telah diatur sebagai tidak terdaftar. Hanya postingan publik yang bisa dicari dengan tagar.", "compose_form.lock_disclaimer": "Akun anda tidak {locked}. Semua orang dapat mengikuti anda untuk melihat postingan khusus untuk pengikut anda.", "compose_form.lock_disclaimer.lock": "terkunci", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index 4c609edb7f..3eea9dcca8 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -442,7 +442,7 @@ "search_results.all": "Omna", "search_results.hashtags": "Hashtagi", "search_results.nothing_found": "Ne povas ganar irgo per ca trovvorti", - "search_results.statuses": "Toots", + "search_results.statuses": "Posti", "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, number} {count, plural, one {rezulto} other {rezulti}}", "status.admin_account": "Apertez jerintervizajo por @{name}", diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json index 12c15e3897..a38f18fa34 100644 --- a/app/javascript/mastodon/locales/ku.json +++ b/app/javascript/mastodon/locales/ku.json @@ -106,7 +106,7 @@ "compose_form.poll.remove_option": "Vê hilbijarê rake", "compose_form.poll.switch_to_multiple": "Rapirsî yê biguherînin da ku destûr bidin vebijarkên pirjimar", "compose_form.poll.switch_to_single": "Rapirsîyê biguherîne da ku mafê bidî tenê vebijêrkek", - "compose_form.publish": "Publish", + "compose_form.publish": "Biweşîne", "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "Guhertinan tomar bike", "compose_form.sensitive.hide": "{count, plural, one {Medya wekî hestiyar nîşan bide} other {Medya wekî hestiyar nîşan bide}}", diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json index 1a981ea0e4..b889948cf5 100644 --- a/app/javascript/mastodon/locales/lv.json +++ b/app/javascript/mastodon/locales/lv.json @@ -26,7 +26,7 @@ "account.joined": "Pievienojās {date}", "account.link_verified_on": "Šīs saites piederība ir pārbaudīta {date}", "account.locked_info": "Šī konta privātuma statuss ir slēgts. Īpašnieks izskatīs, kurš viņam drīkst sekot.", - "account.media": "Mediji", + "account.media": "Multivide", "account.mention": "Piemin @{name}", "account.moved_to": "{name} ir pārcelts uz:", "account.mute": "Apklusināt @{name}", @@ -90,7 +90,7 @@ "column_header.unpin": "Atspraust", "column_subheading.settings": "Iestatījumi", "community.column_settings.local_only": "Tikai vietējie", - "community.column_settings.media_only": "Tikai mediji", + "community.column_settings.media_only": "Tikai multivide", "community.column_settings.remote_only": "Tikai attālinātie", "compose.language.change": "Mainīt valodu", "compose.language.search": "Meklēt valodas...", @@ -109,9 +109,9 @@ "compose_form.publish": "Publicēt", "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "Saglabāt izmaiņas", - "compose_form.sensitive.hide": "{count, plural, one {Atzīmēt mediju kā sensitīvu} other {Atzīmēt medijus kā sensitīvus}}", - "compose_form.sensitive.marked": "{count, plural, one {Medijs ir atzīmēts kā sensitīvs} other {Mediji ir atzīmēti kā sensitīvi}}", - "compose_form.sensitive.unmarked": "{count, plural, one {Medijs nav atzīmēts kā sensitīvs} other {Mediji nav atzīmēti kā sensitīvi}}", + "compose_form.sensitive.hide": "{count, plural, one {Atzīmēt multividi kā sensitīvu} other {Atzīmēt multivides kā sensitīvas}}", + "compose_form.sensitive.marked": "{count, plural, one {Multivide ir atzīmēta kā sensitīva} other {Multivides ir atzīmētas kā sensitīvas}}", + "compose_form.sensitive.unmarked": "{count, plural, one {Multivide nav atzīmēts kā sensitīva} other {Multivides nav atzīmētas kā sensitīvas}}", "compose_form.spoiler.marked": "Noņemt satura brīdinājumu", "compose_form.spoiler.unmarked": "Pievienot satura brīdinājumu", "compose_form.spoiler_placeholder": "Ieraksti savu brīdinājumu šeit", @@ -124,7 +124,7 @@ "confirmations.delete_list.confirm": "Dzēst", "confirmations.delete_list.message": "Vai tiešam vēlies neatgriezeniski dzēst šo sarakstu?", "confirmations.discard_edit_media.confirm": "Izmest", - "confirmations.discard_edit_media.message": "Vai tev ir nesaglabātas izmaiņas mediju aprakstā vai priekšskatījumā, vai tomēr atmest tās?", + "confirmations.discard_edit_media.message": "Vai tev ir nesaglabātas izmaiņas multivides aprakstā vai priekšskatījumā, vai tomēr atmest tās?", "confirmations.domain_block.confirm": "Bloķēt visu domēnu", "confirmations.domain_block.message": "Vai tu tiešām, tiešam vēlies bloķēt visu domēnu {domain}? Lielākajā daļā gadījumu pietiek ja nobloķē vai apklusini kādu. Tu neredzēsi saturu vai paziņojumus no šī domēna nevienā laika līnijā. Tavi sekotāji no šī domēna tiks noņemti.", "confirmations.logout.confirm": "Iziet", @@ -171,7 +171,7 @@ "empty_column.community": "Vietējā ziņu lenta ir tukša. Uzraksti kaut ko publiski, lai viss notiktu!", "empty_column.direct": "Patrez tev nav privātu ziņu. Tiklīdz tādu nosūtīsi vai saņemsi, tās parādīsies šeit.", "empty_column.domain_blocks": "Vēl nav neviena bloķēta domēna.", - "empty_column.explore_statuses": "Pašlaik nekas nav tendēts. Pārbaudiet vēlāk!", + "empty_column.explore_statuses": "Pašlaik nekā aktuāla nav. Pārbaudi vēlāk!", "empty_column.favourited_statuses": "Patreiz tev nav neviena izceltā ieraksta. Kad kādu izcelsi, tas parādīsies šeit.", "empty_column.favourites": "Neviens šo ziņojumu vel nav izcēlis. Kad būs, tie parādīsies šeit.", "empty_column.follow_recommendations": "Šķiet, ka tev nevarēja ģenerēt ieteikumus. Vari mēģināt izmantot meklēšanu, lai meklētu cilvēkus, kurus tu varētu pazīt, vai izpētīt populārākās atsauces.", @@ -188,7 +188,7 @@ "error.unexpected_crash.explanation_addons": "Šo lapu nevarēja parādīt pareizi. Šo kļūdu, iespējams, izraisīja pārlūkprogrammas papildinājums vai automātiskās tulkošanas rīki.", "error.unexpected_crash.next_steps": "Mēģini atsvaidzināt lapu. Ja tas nepalīdz, iespējams, varēsi lietot Mastodon, izmantojot citu pārlūkprogrammu vai vietējo lietotni.", "error.unexpected_crash.next_steps_addons": "Mēģini tos atspējot un atsvaidzināt lapu. Ja tas nepalīdz, iespējams, varēsi lietot Mastodon, izmantojot citu pārlūkprogrammu vai vietējo lietotni.", - "errors.unexpected_crash.copy_stacktrace": "Iekopēt starpliktuvē", + "errors.unexpected_crash.copy_stacktrace": "Kopēt stacktrace uz starpliktuvi", "errors.unexpected_crash.report_issue": "Ziņot par problēmu", "explore.search_results": "Meklēšanas rezultāti", "explore.suggested_follows": "Tev", @@ -207,7 +207,7 @@ "getting_started.directory": "Profila direktorija", "getting_started.documentation": "Dokumentācija", "getting_started.heading": "Darba sākšana", - "getting_started.invite": "Uzaiciniet cilvēkus", + "getting_started.invite": "Uzaicini cilvēkus", "getting_started.open_source_notice": "Mastodon ir atvērtā koda programmatūra. Tu vari dot savu ieguldījumu vai arī ziņot par problēmām {github}.", "getting_started.security": "Konta iestatījumi", "getting_started.terms": "Pakalpojuma noteikumi", @@ -230,7 +230,7 @@ "intervals.full.minutes": "{number, plural, one {# minūte} other {# minūtes}}", "keyboard_shortcuts.back": "Pāriet atpakaļ", "keyboard_shortcuts.blocked": "Atvērt bloķēto lietotāju sarakstu", - "keyboard_shortcuts.boost": "Palielināt ziņu", + "keyboard_shortcuts.boost": "Atbalstīt ziņu", "keyboard_shortcuts.column": "Fokusēt kolonnu", "keyboard_shortcuts.compose": "Fokusēt veidojamā teksta lauku", "keyboard_shortcuts.description": "Apraksts", @@ -245,11 +245,11 @@ "keyboard_shortcuts.hotkey": "Ātrais taustiņš", "keyboard_shortcuts.legend": "Parādīt šo leģendu", "keyboard_shortcuts.local": "Atvērt vietējo ziņu lenti", - "keyboard_shortcuts.mention": "Minējuma autors", + "keyboard_shortcuts.mention": "Pieminēt autoru", "keyboard_shortcuts.muted": "Atvērt apklusināto lietotāju sarakstu", - "keyboard_shortcuts.my_profile": "Atvērt manu profilu", + "keyboard_shortcuts.my_profile": "Atvērt savu profilu", "keyboard_shortcuts.notifications": "Atvērt paziņojumu kolonnu", - "keyboard_shortcuts.open_media": "Atvērt mediju", + "keyboard_shortcuts.open_media": "Atvērt multividi", "keyboard_shortcuts.pinned": "Atvērt piesprausto ziņu sarakstu", "keyboard_shortcuts.profile": "Atvērt autora profilu", "keyboard_shortcuts.reply": "Atbildēt", @@ -258,15 +258,15 @@ "keyboard_shortcuts.spoilers": "Rādīt/slēpt CW lauku", "keyboard_shortcuts.start": "Atvērt kolonnu “Darba sākšana”", "keyboard_shortcuts.toggle_hidden": "Rādīt/slēpt tekstu aiz CW", - "keyboard_shortcuts.toggle_sensitivity": "Rādīt/slēpt mediju", - "keyboard_shortcuts.toot": "Sākt jaunu ziņu", + "keyboard_shortcuts.toggle_sensitivity": "Rādīt/slēpt multividi", + "keyboard_shortcuts.toot": "Sāc jaunu ziņu", "keyboard_shortcuts.unfocus": "Atfokusēt teksta veidošanu/meklēšanu", "keyboard_shortcuts.up": "Pārvietot sarakstā uz augšu", "lightbox.close": "Aizvērt", - "lightbox.compress": "Saspiest attēla ietvaru", - "lightbox.expand": "Paplašināt attēla ietvaru", + "lightbox.compress": "Saspiest attēla skata lodziņu", + "lightbox.expand": "Izvērst attēla skata lodziņu", "lightbox.next": "Tālāk", - "lightbox.previous": "Iepriekš", + "lightbox.previous": "Iepriekšējais", "limited_account_hint.action": "Tik un tā rādīt profilu", "limited_account_hint.title": "Tava servera moderatori ir paslēpuši šo profilu.", "lists.account.add": "Pievienot sarakstam", @@ -276,10 +276,10 @@ "lists.edit.submit": "Mainīt virsrakstu", "lists.new.create": "Pievienot sarakstu", "lists.new.title_placeholder": "Jaunais saraksta nosaukums", - "lists.replies_policy.followed": "Jebkuram lietotājam, kuram seko", + "lists.replies_policy.followed": "Jebkurš sekots lietotājs", "lists.replies_policy.list": "Saraksta dalībnieki", "lists.replies_policy.none": "Nevienam", - "lists.replies_policy.title": "Rādīt atbildes:", + "lists.replies_policy.title": "Rādīt atbildes uz:", "lists.search": "Meklēt starp cilvēkiem, kuriem tu seko", "lists.subheading": "Tavi saraksti", "load_pending": "{count, plural, one {# jauna lieta} other {# jaunas lietas}}", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index 62c64aceca..3a57a5c3fd 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -106,7 +106,7 @@ "compose_form.poll.remove_option": "Levar aquesta opcion", "compose_form.poll.switch_to_multiple": "Cambiar lo sondatge per permetre de causidas multiplas", "compose_form.poll.switch_to_single": "Cambiar lo sondatge per permetre una sola causida", - "compose_form.publish": "Publish", + "compose_form.publish": "Publicar", "compose_form.publish_loud": "{publish} !", "compose_form.save_changes": "Salvar los cambiaments", "compose_form.sensitive.hide": "Marcar coma sensible", @@ -396,7 +396,7 @@ "reply_indicator.cancel": "Anullar", "report.block": "Blocar", "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.", - "report.categories.other": "Other", + "report.categories.other": "Autre", "report.categories.spam": "Spam", "report.categories.violation": "Content violates one or more server rules", "report.category.subtitle": "Choose the best match", @@ -427,9 +427,9 @@ "report.target": "Senhalar {target}", "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:", "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:", - "report.thanks.title": "Don't want to see this?", + "report.thanks.title": "Volètz pas veire aquò ?", "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.", - "report.unfollow": "Unfollow @{name}", + "report.unfollow": "Quitar de sègre {name}", "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.", "search.placeholder": "Recercar", "search_popout.search_format": "Format recèrca avançada", @@ -439,7 +439,7 @@ "search_popout.tips.text": "Lo tèxte brut tòrna escais, noms d’utilizaire e etiquetas correspondents", "search_popout.tips.user": "utilizaire", "search_results.accounts": "Gents", - "search_results.all": "All", + "search_results.all": "Tot", "search_results.hashtags": "Etiquetas", "search_results.nothing_found": "Could not find anything for these search terms", "search_results.statuses": "Tuts", @@ -457,12 +457,12 @@ "status.direct": "Messatge per @{name}", "status.edit": "Modificar", "status.edited": "Edited {date}", - "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}", + "status.edited_x_times": "Modificat {count, plural, un {{count} còp} other {{count} còps}}", "status.embed": "Embarcar", "status.favourite": "Apondre als favorits", "status.filtered": "Filtrat", - "status.history.created": "{name} created {date}", - "status.history.edited": "{name} edited {date}", + "status.history.created": "{name} o creèt lo {date}", + "status.history.edited": "{name} o modifiquèt lo {date}", "status.load_more": "Cargar mai", "status.media_hidden": "Mèdia rescondut", "status.mention": "Mencionar", @@ -520,7 +520,7 @@ "upload_error.poll": "Lo mandadís de fichièr es pas autorizat pels sondatges.", "upload_form.audio_description": "Descriure per las personas amb pèrdas auditivas", "upload_form.description": "Descripcion pels mal vesents", - "upload_form.description_missing": "No description added", + "upload_form.description_missing": "Cap de descripcion pas aponduda", "upload_form.edit": "Modificar", "upload_form.thumbnail": "Cambiar la vinheta", "upload_form.undo": "Suprimir", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index 71a57bcb45..bdf973e040 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -95,7 +95,7 @@ "compose.language.change": "Alterar idioma", "compose.language.search": "Pesquisar idiomas...", "compose_form.direct_message_warning_learn_more": "Saiba mais", - "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", + "compose_form.encryption_warning": "Postagens no Mastodon não são criptografadas de ponta-a-ponta. Não compartilhe nenhuma informação sensível no Mastodon.", "compose_form.hashtag_warning": "Este toot não aparecerá em nenhuma hashtag porque está como não-listado. Somente toots públicos podem ser pesquisados por hashtag.", "compose_form.lock_disclaimer": "Seu perfil não está {locked}. Qualquer um pode te seguir e ver os toots privados.", "compose_form.lock_disclaimer.lock": "trancado", @@ -106,7 +106,7 @@ "compose_form.poll.remove_option": "Remover opção", "compose_form.poll.switch_to_multiple": "Permitir múltiplas escolhas", "compose_form.poll.switch_to_single": "Opção única", - "compose_form.publish": "Publish", + "compose_form.publish": "Publicar", "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "Salvar alterações", "compose_form.sensitive.hide": "{count, plural, one {Marcar mídia como sensível} other {Marcar mídias como sensível}}", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index bec2fae642..861722c2fc 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -32,7 +32,7 @@ "account.mute": "Nevšímaj si @{name}", "account.mute_notifications": "Stĺm oboznámenia od @{name}", "account.muted": "Nevšímaný/á", - "account.posts": "Príspevky", + "account.posts": "Príspevky/ov", "account.posts_with_replies": "Príspevky, aj s odpoveďami", "account.report": "Nahlás @{name}", "account.requested": "Čaká na schválenie. Klikni pre zrušenie žiadosti", @@ -93,7 +93,7 @@ "community.column_settings.media_only": "Iba médiá", "community.column_settings.remote_only": "Iba odľahlé", "compose.language.change": "Zmeň jazyk", - "compose.language.search": "Search languages...", + "compose.language.search": "Hľadaj medzi jazykmi...", "compose_form.direct_message_warning_learn_more": "Zisti viac", "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", "compose_form.hashtag_warning": "Tento toot nebude zobrazený pod žiadným haštagom lebo nieje listovaný. Iba verejné tooty môžu byť nájdené podľa haštagu.", @@ -106,7 +106,7 @@ "compose_form.poll.remove_option": "Odstráň túto voľbu", "compose_form.poll.switch_to_multiple": "Zmeň anketu pre povolenie viacerých možností", "compose_form.poll.switch_to_single": "Zmeň anketu na takú s jedinou voľbou", - "compose_form.publish": "Publish", + "compose_form.publish": "Zverejni", "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "Ulož zmeny", "compose_form.sensitive.hide": "Označ médiá ako chúlostivé", @@ -149,7 +149,7 @@ "embed.instructions": "Umiestni kód uvedený nižšie pre pridanie tohto statusu na tvoju web stránku.", "embed.preview": "Tu je ako to bude vyzerať:", "emoji_button.activity": "Aktivita", - "emoji_button.clear": "Clear", + "emoji_button.clear": "Vyčisti", "emoji_button.custom": "Vlastné", "emoji_button.flags": "Vlajky", "emoji_button.food": "Jedlá a nápoje", @@ -169,7 +169,7 @@ "empty_column.blocks": "Ešte si nikoho nezablokoval/a.", "empty_column.bookmarked_statuses": "Ešte nemáš žiadné záložky. Keď si pridáš príspevok k záložkám, zobrazí sa tu.", "empty_column.community": "Lokálna časová os je prázdna. Napíšte niečo, aby sa to tu začalo hýbať!", - "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.", + "empty_column.direct": "Ešte nemáš žiadne priame správy. Keď nejakú pošleš, alebo dostaneš, ukáže sa tu.", "empty_column.domain_blocks": "Žiadne domény ešte niesú skryté.", "empty_column.explore_statuses": "Nothing is trending right now. Check back later!", "empty_column.favourited_statuses": "Nemáš obľúbené ešte žiadne príspevky. Keď si nejaký obľúbiš, bude zobrazený práve tu.", @@ -267,7 +267,7 @@ "lightbox.expand": "Rozšíriť náhľad obrázku", "lightbox.next": "Ďalšie", "lightbox.previous": "Predchádzajúci", - "limited_account_hint.action": "Show profile anyway", + "limited_account_hint.action": "Ukáž profil aj tak", "limited_account_hint.title": "This profile has been hidden by the moderators of your server.", "lists.account.add": "Pridaj do zoznamu", "lists.account.remove": "Odober zo zoznamu", @@ -372,10 +372,10 @@ "poll_button.remove_poll": "Odstráň anketu", "privacy.change": "Uprav súkromie príspevku", "privacy.direct.long": "Pošli iba spomenutým užívateľom", - "privacy.direct.short": "Direct", + "privacy.direct.short": "Iba spomenutým ľudom", "privacy.private.long": "Pošli iba následovateľom", - "privacy.private.short": "Followers-only", - "privacy.public.long": "Visible for all", + "privacy.private.short": "Iba pre sledujúcich", + "privacy.public.long": "Viditeľné pre všetkých", "privacy.public.short": "Verejné", "privacy.unlisted.long": "Visible for all, but opted-out of discovery features", "privacy.unlisted.short": "Verejne, ale nezobraziť v osi", diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json index 5aa5d5ef36..ba354e98b1 100644 --- a/app/javascript/mastodon/locales/sq.json +++ b/app/javascript/mastodon/locales/sq.json @@ -92,10 +92,10 @@ "community.column_settings.local_only": "Vetëm vendore", "community.column_settings.media_only": "Vetëm Media", "community.column_settings.remote_only": "Vetëm të largëta", - "compose.language.change": "Change language", - "compose.language.search": "Search languages...", + "compose.language.change": "Ndryshoni gjuhën", + "compose.language.search": "Kërkoni te gjuhët…", "compose_form.direct_message_warning_learn_more": "Mësoni më tepër", - "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", + "compose_form.encryption_warning": "Postimet në Mastodon nuk fshehtëzohen skaj-më-skaj. Mos ndani me të tjerë gjëra me spec në Mastodon.", "compose_form.hashtag_warning": "Ky mesazh s’do të paraqitet nën ndonjë hashtag, ngaqë s’i është caktuar ndonjë. Vetëm mesazhet publike mund të kërkohen sipas hashtagësh.", "compose_form.lock_disclaimer": "Llogaria juaj s’është {locked}. Mund ta ndjekë cilido, për të parë postimet tuaja vetëm për ndjekësit.", "compose_form.lock_disclaimer.lock": "e kyçur", @@ -106,7 +106,7 @@ "compose_form.poll.remove_option": "Hiqe këtë zgjedhje", "compose_form.poll.switch_to_multiple": "Ndrysho votimin për të lejuar shumë zgjedhje", "compose_form.poll.switch_to_single": "Ndrysho votimin për të lejuar vetëm një zgjedhje", - "compose_form.publish": "Publish", + "compose_form.publish": "Botoje", "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "Ruaji ndryshimet", "compose_form.sensitive.hide": "{count, plural, one {Vëri shenjë medias si rezervat} other {Vëru shenjë mediave si rezervat}}", @@ -149,7 +149,7 @@ "embed.instructions": "Trupëzojeni këtë gjendje në sajtin tuaj duke kopjuar kodin më poshtë.", "embed.preview": "Ja si do të duket:", "emoji_button.activity": "Veprimtari", - "emoji_button.clear": "Clear", + "emoji_button.clear": "Spastroje", "emoji_button.custom": "Vetjak", "emoji_button.flags": "Flamuj", "emoji_button.food": "Ushqim & Pije", @@ -228,47 +228,47 @@ "intervals.full.days": "{number, plural, one {# ditë} other {# ditë}}", "intervals.full.hours": "{number, plural, one {# orë} other {# orë}}", "intervals.full.minutes": "{number, plural, one {# minutë} other {# minuta}}", - "keyboard_shortcuts.back": "për shkuarje mbrapsht", - "keyboard_shortcuts.blocked": "për hapje liste përdoruesish të bllokuar", - "keyboard_shortcuts.boost": "për përforcim", - "keyboard_shortcuts.column": "për kalim fokusi mbi një gjendje te një nga shtyllat", - "keyboard_shortcuts.compose": "për kalim fokusi te fusha e hartimit të mesazheve", + "keyboard_shortcuts.back": "Për shkuarje mbrapsht", + "keyboard_shortcuts.blocked": "Për hapje liste përdoruesish të bllokuar", + "keyboard_shortcuts.boost": "Përforcim postimi", + "keyboard_shortcuts.column": "Fokusi mbi një shtyllë", + "keyboard_shortcuts.compose": "Fokusi te fusha e hartimit të mesazheve", "keyboard_shortcuts.description": "Përshkrim", "keyboard_shortcuts.direct": "për hapje shtylle mesazhesh të drejtpërdrejtë", - "keyboard_shortcuts.down": "për zbritje poshtë nëpër listë", - "keyboard_shortcuts.enter": "për hapje gjendjeje", - "keyboard_shortcuts.favourite": "për t’i vënë shenjë si të parapëlqyer", - "keyboard_shortcuts.favourites": "për hapje liste të parapëlqyerish", - "keyboard_shortcuts.federated": "për hapje rrjedhe kohore të të federuarve", + "keyboard_shortcuts.down": "Për zbritje poshtë nëpër listë", + "keyboard_shortcuts.enter": "Për hapje postimi", + "keyboard_shortcuts.favourite": "Për t’i vënë shenjë si të parapëlqyer një postimi", + "keyboard_shortcuts.favourites": "Për hapje liste të parapëlqyerish", + "keyboard_shortcuts.federated": "Për hapje rrjedhe kohore të të federuarve", "keyboard_shortcuts.heading": "Shkurtore tastiere", - "keyboard_shortcuts.home": "për hapje rrjedhe kohore vetjake", + "keyboard_shortcuts.home": "Për hapje rrjedhe kohore vetjake", "keyboard_shortcuts.hotkey": "Tast përkatës", - "keyboard_shortcuts.legend": "për shfaqje të kësaj legjende", - "keyboard_shortcuts.local": "për hapje rrjedhe kohore vendore", - "keyboard_shortcuts.mention": "për përmendje të autorit", - "keyboard_shortcuts.muted": "për hapje liste përdoruesish të heshtuar", - "keyboard_shortcuts.my_profile": "për hapjen e profilit tuaj", - "keyboard_shortcuts.notifications": "për hapje shtylle njoftimesh", - "keyboard_shortcuts.open_media": "për hapje mediash", - "keyboard_shortcuts.pinned": "për hapje liste mesazhesh të fiksuar", - "keyboard_shortcuts.profile": "për hapje të profilit të autorit", - "keyboard_shortcuts.reply": "për t’u përgjigjur", - "keyboard_shortcuts.requests": "për hapje liste kërkesash për ndjekje", - "keyboard_shortcuts.search": "për kalim fokusi te kërkimi", - "keyboard_shortcuts.spoilers": "për shfaqje/fshehje fushe CW", - "keyboard_shortcuts.start": "për hapjen e shtyllës “fillojani”", - "keyboard_shortcuts.toggle_hidden": "për shfaqje/fshehje teksti pas CW", - "keyboard_shortcuts.toggle_sensitivity": "për shfaqje/fshehje mediash", - "keyboard_shortcuts.toot": "për të filluar një mesazh fringo të ri", - "keyboard_shortcuts.unfocus": "për heqjen e fokusit nga fusha e hartimit të mesazheve apo kërkimeve", - "keyboard_shortcuts.up": "për ngjitje sipër nëpër listë", + "keyboard_shortcuts.legend": "Për shfaqje të kësaj legjende", + "keyboard_shortcuts.local": "Për hapje rrjedhe kohore vendore", + "keyboard_shortcuts.mention": "Për përmendje të autorit", + "keyboard_shortcuts.muted": "Për hapje liste përdoruesish të heshtuar", + "keyboard_shortcuts.my_profile": "Për hapjen e profilit tuaj", + "keyboard_shortcuts.notifications": "Për hapje shtylle njoftimesh", + "keyboard_shortcuts.open_media": "Për hapje mediash", + "keyboard_shortcuts.pinned": "Për hapje liste mesazhesh të fiksuar", + "keyboard_shortcuts.profile": "Për hapje të profilit të autorit", + "keyboard_shortcuts.reply": "Për t’iu përgjigjur një postimi", + "keyboard_shortcuts.requests": "Për hapje liste kërkesash për ndjekje", + "keyboard_shortcuts.search": "Për kalim fokusi te kërkimi", + "keyboard_shortcuts.spoilers": "Për shfaqje/fshehje fushe CW", + "keyboard_shortcuts.start": "Për hapjen e shtyllës “fillojani”", + "keyboard_shortcuts.toggle_hidden": "Për shfaqje/fshehje teksti pas CW", + "keyboard_shortcuts.toggle_sensitivity": "Për shfaqje/fshehje mediash", + "keyboard_shortcuts.toot": "Për të filluar një mesazh të ri", + "keyboard_shortcuts.unfocus": "Për heqjen e fokusit nga fusha e hartimit të mesazheve apo kërkimeve", + "keyboard_shortcuts.up": "Për ngjitje sipër nëpër listë", "lightbox.close": "Mbylle", "lightbox.compress": "Ngjeshe kuadratin e parjes së figurave", "lightbox.expand": "Zgjeroje kuadratin e parjes së figurave", "lightbox.next": "Pasuesja", "lightbox.previous": "E mëparshmja", - "limited_account_hint.action": "Show profile anyway", - "limited_account_hint.title": "This profile has been hidden by the moderators of your server.", + "limited_account_hint.action": "Shfaqe profilin sido qoftë", + "limited_account_hint.title": "Ky profil është fshehur nga moderatorët e shërbyesit tuaj.", "lists.account.add": "Shto në listë", "lists.account.remove": "Hiqe nga lista", "lists.delete": "Fshije listën", diff --git a/config/locales/activerecord.af.yml b/config/locales/activerecord.af.yml index 8882df613e..c41e2341d0 100644 --- a/config/locales/activerecord.af.yml +++ b/config/locales/activerecord.af.yml @@ -21,6 +21,14 @@ af: username: invalid: moet slegs letters, nommers en onderstrepe bevat reserved: is gereserveer + admin/webhook: + attributes: + url: + invalid: is nie 'n geldige URL nie + doorkeeper/application: + attributes: + website: + invalid: is nie 'n geldige URL nie status: attributes: reblog: diff --git a/config/locales/activerecord.ast.yml b/config/locales/activerecord.ast.yml index 4f7c734d90..d35b95dfc2 100644 --- a/config/locales/activerecord.ast.yml +++ b/config/locales/activerecord.ast.yml @@ -9,3 +9,13 @@ ast: username: Nome d'usuariu user/invite_request: text: Motivu + errors: + models: + admin/webhook: + attributes: + url: + invalid: nun ye una URL válida + doorkeeper/application: + attributes: + website: + invalid: nun ye una URL válida diff --git a/config/locales/activerecord.ca.yml b/config/locales/activerecord.ca.yml index 03b594c0a0..056137276a 100644 --- a/config/locales/activerecord.ca.yml +++ b/config/locales/activerecord.ca.yml @@ -21,6 +21,14 @@ ca: username: invalid: només pot contenir lletres, números i guions baixos reserved: està reservat + admin/webhook: + attributes: + url: + invalid: no és una URL vàlida + doorkeeper/application: + attributes: + website: + invalid: no és una URL vàlida status: attributes: reblog: diff --git a/config/locales/activerecord.cs.yml b/config/locales/activerecord.cs.yml index bd0b28efb3..d306fe627a 100644 --- a/config/locales/activerecord.cs.yml +++ b/config/locales/activerecord.cs.yml @@ -21,6 +21,14 @@ cs: username: invalid: musí obsahovat pouze písmena, číslice a podtržítka reserved: je vyhrazeno + admin/webhook: + attributes: + url: + invalid: není platná URL + doorkeeper/application: + attributes: + website: + invalid: není platná URL status: attributes: reblog: diff --git a/config/locales/activerecord.da.yml b/config/locales/activerecord.da.yml index 081f4af76f..3566abf439 100644 --- a/config/locales/activerecord.da.yml +++ b/config/locales/activerecord.da.yml @@ -21,6 +21,14 @@ da: username: invalid: må kun indeholde cifre, bogstaver og understreger reserved: er reserveret + admin/webhook: + attributes: + url: + invalid: "'er ikke en gyldig URL" + doorkeeper/application: + attributes: + website: + invalid: "'er ikke en gyldig URL" status: attributes: reblog: diff --git a/config/locales/activerecord.de.yml b/config/locales/activerecord.de.yml index 31c410fa35..a24862a705 100644 --- a/config/locales/activerecord.de.yml +++ b/config/locales/activerecord.de.yml @@ -21,6 +21,14 @@ de: username: invalid: nur Buchstaben, Ziffern und Unterstriche reserved: ist reserviert + admin/webhook: + attributes: + url: + invalid: ist keine gültige URL + doorkeeper/application: + attributes: + website: + invalid: ist keine gültige URL status: attributes: reblog: diff --git a/config/locales/activerecord.en-GB.yml b/config/locales/activerecord.en-GB.yml new file mode 100644 index 0000000000..ef03d18104 --- /dev/null +++ b/config/locales/activerecord.en-GB.yml @@ -0,0 +1 @@ +en-GB: diff --git a/config/locales/activerecord.es-AR.yml b/config/locales/activerecord.es-AR.yml index 9d6a479a72..8a9b75a8c7 100644 --- a/config/locales/activerecord.es-AR.yml +++ b/config/locales/activerecord.es-AR.yml @@ -21,6 +21,14 @@ es-AR: username: invalid: sólo letras, números y subguiones ("_") reserved: está reservado + admin/webhook: + attributes: + url: + invalid: no es una dirección web válida + doorkeeper/application: + attributes: + website: + invalid: no es una dirección web válida status: attributes: reblog: diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml index 0c4d6e5cf6..805e6b9204 100644 --- a/config/locales/activerecord.es.yml +++ b/config/locales/activerecord.es.yml @@ -21,6 +21,14 @@ es: username: invalid: solo puede contener letras, números y guiones bajos reserved: está reservado + admin/webhook: + attributes: + url: + invalid: no es una URL válida + doorkeeper/application: + attributes: + website: + invalid: no es una URL válida status: attributes: reblog: diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml index 34cf0b837a..4ab8f6a919 100644 --- a/config/locales/activerecord.fr.yml +++ b/config/locales/activerecord.fr.yml @@ -21,6 +21,14 @@ fr: username: invalid: seulement des lettres, des nombres et des tirets bas reserved: est réservé + admin/webhook: + attributes: + url: + invalid: n’est pas une URL valide + doorkeeper/application: + attributes: + website: + invalid: n’est pas une URL valide status: attributes: reblog: diff --git a/config/locales/activerecord.gl.yml b/config/locales/activerecord.gl.yml index cbdd801e5a..4b039f5afe 100644 --- a/config/locales/activerecord.gl.yml +++ b/config/locales/activerecord.gl.yml @@ -21,6 +21,14 @@ gl: username: invalid: só letras, números e trazo baixo reserved: está reservado + admin/webhook: + attributes: + url: + invalid: non é un URL válido + doorkeeper/application: + attributes: + website: + invalid: non é un URL válido status: attributes: reblog: diff --git a/config/locales/activerecord.hu.yml b/config/locales/activerecord.hu.yml index ac8cfd7731..442bf38581 100644 --- a/config/locales/activerecord.hu.yml +++ b/config/locales/activerecord.hu.yml @@ -21,6 +21,14 @@ hu: username: invalid: csak betűket, számokat vagy alávonást tartalmazhat reserved: fenntartott + admin/webhook: + attributes: + url: + invalid: nem érvényes URL + doorkeeper/application: + attributes: + website: + invalid: nem érvényes URL status: attributes: reblog: diff --git a/config/locales/activerecord.io.yml b/config/locales/activerecord.io.yml index 38304ef935..9779cbdd11 100644 --- a/config/locales/activerecord.io.yml +++ b/config/locales/activerecord.io.yml @@ -21,6 +21,14 @@ io: username: invalid: mustas konsistar nur literi, nombri e sublinei reserved: rezervitas + admin/webhook: + attributes: + url: + invalid: ne esas valida URL + doorkeeper/application: + attributes: + website: + invalid: ne esas valida URL status: attributes: reblog: diff --git a/config/locales/activerecord.it.yml b/config/locales/activerecord.it.yml index c6587f1fd8..307bd801e8 100644 --- a/config/locales/activerecord.it.yml +++ b/config/locales/activerecord.it.yml @@ -21,6 +21,14 @@ it: username: invalid: solo lettere, numeri e trattini bassi reserved: è riservato + admin/webhook: + attributes: + url: + invalid: non è un URL valido + doorkeeper/application: + attributes: + website: + invalid: non è un URL valido status: attributes: reblog: diff --git a/config/locales/activerecord.ja.yml b/config/locales/activerecord.ja.yml index ab13dce6cb..52b1b37fd9 100644 --- a/config/locales/activerecord.ja.yml +++ b/config/locales/activerecord.ja.yml @@ -21,6 +21,14 @@ ja: username: invalid: アルファベット・数字・アンダーバーの組み合わせで入力してください reserved: は予約されています + admin/webhook: + attributes: + url: + invalid: は無効なURLです + doorkeeper/application: + attributes: + website: + invalid: は無効なURLです status: attributes: reblog: diff --git a/config/locales/activerecord.ku.yml b/config/locales/activerecord.ku.yml index 340b7a777c..b440181d80 100644 --- a/config/locales/activerecord.ku.yml +++ b/config/locales/activerecord.ku.yml @@ -21,6 +21,14 @@ ku: username: invalid: pêdivî ye ku tenê tîp, hejmar û xêzikên jêrîn hebin reserved: hatiye bikaranîn + admin/webhook: + attributes: + url: + invalid: ev girêdaneke nederbasdar e + doorkeeper/application: + attributes: + website: + invalid: ev girêdaneke nederbasdar e status: attributes: reblog: diff --git a/config/locales/activerecord.lv.yml b/config/locales/activerecord.lv.yml index ad9fa66045..89a1fb0943 100644 --- a/config/locales/activerecord.lv.yml +++ b/config/locales/activerecord.lv.yml @@ -21,6 +21,14 @@ lv: username: invalid: drīkst saturēt tikai burtus, ciparus un pasvītras reserved: ir rezervēts + admin/webhook: + attributes: + url: + invalid: nav derīgs URL + doorkeeper/application: + attributes: + website: + invalid: nav derīgs URL status: attributes: reblog: diff --git a/config/locales/activerecord.pl.yml b/config/locales/activerecord.pl.yml index c7b1e7faba..e9af762449 100644 --- a/config/locales/activerecord.pl.yml +++ b/config/locales/activerecord.pl.yml @@ -21,6 +21,14 @@ pl: username: invalid: może składać się tylko z liter, cyfr i podkreślników reserved: jest zarezerwowana + admin/webhook: + attributes: + url: + invalid: nie jest poprawnym adresem URL + doorkeeper/application: + attributes: + website: + invalid: nie jest poprawnym adresem URL status: attributes: reblog: diff --git a/config/locales/activerecord.pt-PT.yml b/config/locales/activerecord.pt-PT.yml index 17c199ea87..5b89ee5a2d 100644 --- a/config/locales/activerecord.pt-PT.yml +++ b/config/locales/activerecord.pt-PT.yml @@ -21,6 +21,14 @@ pt-PT: username: invalid: apenas letras, números e underscores reserved: está reservado + admin/webhook: + attributes: + url: + invalid: não é um URL válido + doorkeeper/application: + attributes: + website: + invalid: não é um URL válido status: attributes: reblog: diff --git a/config/locales/activerecord.ru.yml b/config/locales/activerecord.ru.yml index 2f92105195..758fe7dd4d 100644 --- a/config/locales/activerecord.ru.yml +++ b/config/locales/activerecord.ru.yml @@ -21,6 +21,14 @@ ru: username: invalid: только буквы, цифры и символ подчёркивания reserved: зарезервировано + admin/webhook: + attributes: + url: + invalid: не является допустимым URL + doorkeeper/application: + attributes: + website: + invalid: не является допустимым URL status: attributes: reblog: diff --git a/config/locales/activerecord.sl.yml b/config/locales/activerecord.sl.yml index d7fbb446de..7927cb4fc3 100644 --- a/config/locales/activerecord.sl.yml +++ b/config/locales/activerecord.sl.yml @@ -21,6 +21,14 @@ sl: username: invalid: samo črke, številke in podčrtaji reserved: je rezerviran + admin/webhook: + attributes: + url: + invalid: ni veljaven URL + doorkeeper/application: + attributes: + website: + invalid: ni veljaven URL status: attributes: reblog: diff --git a/config/locales/activerecord.sq.yml b/config/locales/activerecord.sq.yml index 920b73e7a1..57de9d3cb8 100644 --- a/config/locales/activerecord.sq.yml +++ b/config/locales/activerecord.sq.yml @@ -21,6 +21,14 @@ sq: username: invalid: duhet të përmbajë vetëm shkronja, numra dhe nënvija reserved: është i rezervuar + admin/webhook: + attributes: + url: + invalid: s’është URL e vlefshme + doorkeeper/application: + attributes: + website: + invalid: s’është URL status: attributes: reblog: diff --git a/config/locales/activerecord.tr.yml b/config/locales/activerecord.tr.yml index 890f065b1e..ac40e06159 100644 --- a/config/locales/activerecord.tr.yml +++ b/config/locales/activerecord.tr.yml @@ -21,6 +21,14 @@ tr: username: invalid: sadece harfler, sayılar ve alt çizgiler reserved: kullanılamaz + admin/webhook: + attributes: + url: + invalid: geçerli bir URL değil + doorkeeper/application: + attributes: + website: + invalid: geçerli bir URL değil status: attributes: reblog: diff --git a/config/locales/activerecord.uk.yml b/config/locales/activerecord.uk.yml index 38d4771b33..06967ddc77 100644 --- a/config/locales/activerecord.uk.yml +++ b/config/locales/activerecord.uk.yml @@ -21,6 +21,14 @@ uk: username: invalid: тільки літери, цифри та підкреслення reserved: зарезервовано + admin/webhook: + attributes: + url: + invalid: не є дійсною URL-адресою + doorkeeper/application: + attributes: + website: + invalid: не є дійсною URL-адресою status: attributes: reblog: diff --git a/config/locales/activerecord.vi.yml b/config/locales/activerecord.vi.yml index c0e989563b..6c7c419035 100644 --- a/config/locales/activerecord.vi.yml +++ b/config/locales/activerecord.vi.yml @@ -21,6 +21,14 @@ vi: username: invalid: chỉ chấp nhận ký tự, số và dấu gạch dưới reserved: bị cấm sử dụng + admin/webhook: + attributes: + url: + invalid: không phải là một URL hợp lệ + doorkeeper/application: + attributes: + website: + invalid: không phải là một URL hợp lệ status: attributes: reblog: diff --git a/config/locales/activerecord.zh-CN.yml b/config/locales/activerecord.zh-CN.yml index 946e81893c..855e79de6c 100644 --- a/config/locales/activerecord.zh-CN.yml +++ b/config/locales/activerecord.zh-CN.yml @@ -21,6 +21,10 @@ zh-CN: username: invalid: 只能使用字母、数字和下划线 reserved: 是保留关键字 + admin/webhook: + attributes: + url: + invalid: 不是有效的 URL。 status: attributes: reblog: diff --git a/config/locales/activerecord.zh-TW.yml b/config/locales/activerecord.zh-TW.yml index c6856c386a..bea950ed68 100644 --- a/config/locales/activerecord.zh-TW.yml +++ b/config/locales/activerecord.zh-TW.yml @@ -21,6 +21,14 @@ zh-TW: username: invalid: 只能有字母、數字及底線 reserved: 是保留關鍵字 + admin/webhook: + attributes: + url: + invalid: 不是有效的 URL + doorkeeper/application: + attributes: + website: + invalid: 不是有效的 URL status: attributes: reblog: diff --git a/config/locales/af.yml b/config/locales/af.yml index bc54cfdfd4..d69e6b92d1 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -8,10 +8,28 @@ af: federation_hint_html: Met 'n rekening op %{instance} sal jy in staat wees om mense op enige Mastodon en federasie bediener te volg. get_apps: Probeer 'n mobiele toepassing hosted_on: Mastodon gehuisves op %{domain} + tagline: Gedesentraliseerde sosiale netwerk admin: + domain_blocks: + existing_domain_block: Jy het alreeds strenger perke ingelê op %{name}. trends: only_allowed: Slegs toegelate trending: Gewild + webhooks: + add_new: Voeg end-punt by + delete: Wis uit + disable: Deaktiveer + disabled: Gedeaktiveer + edit: Redigeer end-punt + empty: Jy het tans geen opgestelde web-hoek end-punte nie. + enable: Aktiveer + enabled: Aktief + new: Nuwe web-hoek + rotate_secret: Roteer geheim + secret: Onderteken geheim + status: Status + title: Web-hoeke + webhook: Web-hoek disputes: strikes: approve_appeal: Aanvaar appêl diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 9d78451bbd..01f55f344e 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -42,7 +42,6 @@ ar: two: منشورات zero: منشورات status_count_before: نشروا - tagline: اتبع أصدقائك وصديقاتك واكتشف آخرين وأخريات terms: شروط الخدمة unavailable_content: محتوى غير متوفر unavailable_content_description: @@ -842,7 +841,6 @@ ar: applications: created: تم إنشاء التطبيق بنجاح destroyed: تم حذف التطبيق بنجاح - invalid_url: إن الرابط المقدم غير صالح regenerate_token: إعادة توليد رمز النفاذ token_regenerated: تم إعادة إنشاء الرمز الوصول بنجاح warning: كن حذرا مع هذه البيانات. لا تقم أبدا بمشاركتها مع الآخَرين! diff --git a/config/locales/ast.yml b/config/locales/ast.yml index a9bcbbdf7e..1fb1cee900 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -24,7 +24,6 @@ ast: one: artículu other: artículos status_count_before: Que crearon - tagline: Sigui a persones y conoz a más xente terms: Términos del serviciu unavailable_content_description: domain: Sirvidor @@ -144,6 +143,8 @@ ast: site_title: Nome del sirvidor title: Axustes del sitiu title: Alministración + webhooks: + events: Eventos admin_mailer: new_pending_account: body: Los detalles de la cuenta nueva tán embaxo. Pues aprobar o refugar esta aplicación. @@ -164,7 +165,6 @@ ast: sensitive_content: Conteníu sensible toot_layout: Distribución de los barritos applications: - invalid_url: La URL apurrida nun ye válida warning: Ten munchu curiáu con estos datos, ¡enxamás nun los compartas con naide! auth: change_password: Contraseña diff --git a/config/locales/bg.yml b/config/locales/bg.yml index c9e2647878..04296b342a 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -29,7 +29,6 @@ bg: one: състояние other: състояния status_count_before: Написали - tagline: Следвайте приятели и открийте нови terms: Условия за ползване unavailable_content: Модерирани сървъри unavailable_content_description: @@ -178,8 +177,6 @@ bg: application_mailer: settings: 'Промяна на предпочитанията за e-mail: %{link}' view: 'Преглед:' - applications: - invalid_url: Предоставеният URL е невалиден auth: didnt_get_confirmation: Не получих инструкции за потвърждение forgot_password: Забравих си паролата diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 20a99fd2fc..ae1ced4506 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -31,7 +31,6 @@ bn: one: অবস্থা other: স্থিতিগুলি status_count_before: কে লিখেছে - tagline: পরিচিতজনদের সাথে যুক্ত হন এবং নতুনদের সাথে পরিচিত হন terms: ব্যবহারের শর্তাবলী unavailable_content: অনুপলব্ধ সামগ্রী unavailable_content_description: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index f0efd3f503..8c8fa1ffb8 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -38,7 +38,7 @@ ca: one: publicació other: publicacions status_count_before: Qui ha publicat - tagline: Segueix els teus amics i descobreix-ne de nous + tagline: Xarxa social descentralitzada terms: Condicions de servei unavailable_content: Servidors moderats unavailable_content_description: @@ -852,6 +852,26 @@ ca: edit_preset: Edita l'avís predeterminat empty: Encara no has definit cap preavís. title: Gestiona les configuracions predefinides dels avisos + webhooks: + add_new: Afegir extrem + delete: Elimina + description_html: Un webhook habilita Mastodon per a empènyer notificacions en temps real sobre els esdeveniments escollits de la teva pròpia aplicació, per tant la teva aplicació pot activar reaccions automaticament. + disable: Desactiva + disabled: Desactivat + edit: Editar extrem + empty: Encara no tens cap extrem de webhook configurat. + enable: Activa + enabled: Actiu + enabled_events: + one: 1 esdeveniment activat + other: "%{count} esdeveniments activats" + events: Esdeveniments + new: Nou webhook + rotate_secret: Rota el secret + secret: Signant el secret + status: Estat + title: Webhooks + webhook: Webhook admin_mailer: new_appeal: actions: @@ -916,7 +936,6 @@ ca: applications: created: L'aplicació s'ha creat correctament destroyed: L'aplicació s'ha suprimit correctament - invalid_url: L'URL proporcionat no és correcte regenerate_token: Torna a generar l'identificador d'accés token_regenerated: L'identificador d'accés s'ha generat correctament warning: Aneu amb compte amb aquestes dades. No les compartiu mai amb ningú! diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml index 6429696ed2..35e826c9c4 100644 --- a/config/locales/ckb.yml +++ b/config/locales/ckb.yml @@ -37,7 +37,6 @@ ckb: one: دۆخ other: پۆست status_count_before: لە لایەن یەکەوە - tagline: دوای هاوڕێکان بکەوە و ئەوانەی نوێ بدۆزیەوە terms: مەرجەکانی خزمەتگوزاری unavailable_content: ڕاژەی چاودێریکراو unavailable_content_description: @@ -721,7 +720,6 @@ ckb: applications: created: بەرنامە بە سەرکەوتوویی دروست کرا destroyed: بەرنامە بە سەرکەوتوویی سڕدراوەتەوە - invalid_url: بەستەری دابینکراو نادروستە regenerate_token: دووبارە دروستکردنەوەی نیشانەی چوونە ژوورەوە token_regenerated: کۆدی دەستپێگەیشتن بە سەرکەوتوویی دروستکرا warning: زۆر ئاگاداربە لەم داتایە. هەرگیز لەگەڵ کەس دا هاوبەشی مەکە! diff --git a/config/locales/co.yml b/config/locales/co.yml index ca4c7ed3d9..183439447f 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -35,7 +35,6 @@ co: one: statutu other: statuti status_count_before: Chì anu pubblicatu - tagline: Siguità amichi è scopre ancu di più altri terms: Cundizione di u serviziu unavailable_content: Cuntinutu micca dispunibule unavailable_content_description: @@ -705,7 +704,6 @@ co: applications: created: Applicazione creata destroyed: Applicazione sguassata - invalid_url: L’URL ch’è stata pruvista ùn hè valida regenerate_token: Creà un’altra fiscia d’accessu token_regenerated: A fiscia d’accessu hè stata rigenerata warning: Abbadate à quessi dati. Ùn i date à nisunu! diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 0140d41276..1868b9dd73 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -40,7 +40,7 @@ cs: one: příspěvek other: příspěvků status_count_before: Kteří napsali - tagline: Sledujte své přátele a objevujte nové + tagline: Decentralizovaná sociální síť terms: Podmínky používání unavailable_content: Moderované servery unavailable_content_description: @@ -886,6 +886,28 @@ cs: edit_preset: Upravit předlohu pro varování empty: Zatím jste nedefinovali žádné předlohy varování. title: Spravovat předlohy pro varování + webhooks: + add_new: Přidat koncový bod + delete: Smazat + description_html: "Webhook umožňuje Mastodonu o vybraných událostech notifikovat v reálném čase vaši vlastní aplikaci, aby mohla automaticky spouštět reakce." + disable: Vypnout + disabled: Vypnuto + edit: Upravit koncový bod + empty: Nemáte ještě nastavené žádné koncové body webhooků. + enable: Zapnout + enabled: Aktivní + enabled_events: + few: "%{count} zapnuté události" + many: "%{count} zapnutých událostí" + one: 1 zapnutá událost + other: "%{count} zapnutých událostí" + events: Události + new: Nový webhook + rotate_secret: Obnovit klíč + secret: Podpisový klíč + status: Stav + title: Webhooky + webhook: Webhook admin_mailer: new_appeal: actions: @@ -950,7 +972,6 @@ cs: applications: created: Aplikace úspěšně vytvořena destroyed: Aplikace úspěšně smazána - invalid_url: Zadaná URL adresa je neplatná regenerate_token: Znovu vygenerovat přístupový token token_regenerated: Přístupový token byl úspěšně vygenerován warning: Zacházejte s těmito daty opatrně. Nikdy je s nikým nesdílejte! @@ -1334,7 +1355,7 @@ cs: description_html: Zapnete-li dvoufázové ověřování pomocí ověřovací aplikace, k přihlášení budete u sebe muset mít svůj mobil, který pro Vás bude generovat kódy k opsání. enable: Zapnout instructions_html: "Naskenujte tento QR kód do Google Authenticator nebo podobné TOTP aplikace na svém telefonu. Následně bude tato aplikace generovat kódy, které budete zadávat při přihlašování." - manual_instructions: 'Nemůžete-li načíst QR kód a potřebujete ho zadat ručně, zde je tajemství v textové podobě:' + manual_instructions: 'Nemůžete-li načíst QR kód a potřebujete ho zadat ručně, zde je klíč v textové podobě:' setup: Nastavit wrong_code: Zadaný kód je neplatný! Je čas na serveru i zařízení generujícím kód správný? pagination: diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 3510673467..9137533256 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -42,7 +42,6 @@ cy: two: statwsau zero: statwsau status_count_before: Ysgrifennwyd gan - tagline: Dilyn ffrindiau a darganfod rhai newydd terms: Telerau gwasanaeth unavailable_content: Cynnwys nad yw ar gael unavailable_content_description: @@ -587,7 +586,6 @@ cy: applications: created: Cais wedi ei greu'n llwyddiannus destroyed: Cais wedi ei ddileu'n llwyddiannus - invalid_url: Mae'r URL a ddarparwyd yn annilys regenerate_token: Adfywio tocyn mynediad token_regenerated: Adfywiwyd y tocyn mynediad yn llwyddiannus warning: Byddwch yn ofalus a'r data hyn. Peidiwch a'i rannu byth! diff --git a/config/locales/da.yml b/config/locales/da.yml index 0195aa5a3e..337005369e 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -38,7 +38,7 @@ da: one: indlæg other: indlæg status_count_before: Som har postet - tagline: Følg venner og opdag nye + tagline: Decentraliseret socialt netværk terms: Tjenestevilkår unavailable_content: Modererede servere unavailable_content_description: @@ -852,6 +852,26 @@ da: edit_preset: Redigér advarselsforvalg empty: Ingen advarselsforvalg defineret endnu. title: Håndtérr advarselsforvalg + webhooks: + add_new: Tilføj endepunkt + delete: Slet + description_html: En webhook lader Mastodon pushe notifikationer i realtid om valgte begivenheder til ens egen applikation, så denne automatisk kan udløse reaktioner. + disable: Deaktivér + disabled: Deaktiveret + edit: Redigér endepunkt + empty: Der er endnu ikke opsat nogen webhook-endepunkter. + enable: Aktivér + enabled: Aktiv + enabled_events: + one: 1 aktiv begivenhed + other: "%{count} aktive begivenheder" + events: Begivenheder + new: Ny webhook + rotate_secret: Rotér hemmelighed + secret: Signeringshemmelighed + status: Status + title: Webhooks + webhook: Webhook admin_mailer: new_appeal: actions: @@ -916,7 +936,6 @@ da: applications: created: Applikation oprettet destroyed: Applikation slettet - invalid_url: Den angivne URL er ugyldig regenerate_token: Regenerér adgangstoken token_regenerated: Adgangstoken regenereret warning: Vær meget påpasselig med disse data. Del dem aldrig med nogen! diff --git a/config/locales/de.yml b/config/locales/de.yml index a52841a396..d15011a5ea 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -38,7 +38,7 @@ de: one: Beitrag other: Beiträge status_count_before: mit - tagline: Finde deine Freunde und entdecke neue + tagline: Dezentrales soziales Netzwerk terms: Nutzungsbedingungen unavailable_content: Nicht verfügbarer Inhalt unavailable_content_description: @@ -428,6 +428,7 @@ de: destroyed_msg: Die Domain-Blockade wurde rückgängig gemacht domain: Domain edit: Domainblockade bearbeiten + existing_domain_block: Du hast %{name} bereits stärker eingeschränkt. existing_domain_block_html: Es gibt schon eine Blockade für %{name}, diese muss erst aufgehoben werden. new: create: Blockade einrichten @@ -851,6 +852,26 @@ de: edit_preset: Warnungsvorlage bearbeiten empty: Du hast noch keine Warnungsvorlagen hinzugefügt. title: Warnungsvorlagen verwalten + webhooks: + add_new: Endpunkt hinzufügen + delete: Löschen + description_html: Ein Webhook ermöglicht Mastodon Echtzeitbenachrichtigungen über ausgewählte Ereignisse an deine eigene Anwendung zu senden damit deine Anwendung automatisch Reaktionen auslösen kann. + disable: Deaktivieren + disabled: Deaktiviert + edit: Endpunkt bearbeiten + empty: Du hast noch keine Webhook Endpunkte konfiguriert. + enable: Aktivieren + enabled: Aktiv + enabled_events: + one: 1 aktiviertes Ereignis + other: "%{count} aktivierte Ereignisse" + events: Ereignisse + new: Neuer Webhook + rotate_secret: Geheimen Schlüssel rotieren + secret: Signaturgeheimnis + status: Status + title: Webhooks + webhook: Webhook admin_mailer: new_appeal: actions: @@ -915,7 +936,6 @@ de: applications: created: Anwendung erfolgreich erstellt destroyed: Anwendung erfolgreich gelöscht - invalid_url: Die angegebene URL ist ungültig regenerate_token: Zugangs-Token neu erstellen token_regenerated: Zugangs-Token neu erstellt warning: Sei mit diesen Daten sehr vorsichtig. Teile sie mit niemandem! diff --git a/config/locales/doorkeeper.af.yml b/config/locales/doorkeeper.af.yml index 252f9fd5a2..ec1eda8bd1 100644 --- a/config/locales/doorkeeper.af.yml +++ b/config/locales/doorkeeper.af.yml @@ -1 +1,164 @@ +--- af: + activerecord: + attributes: + doorkeeper/application: + name: Toepassing naam + redirect_uri: Herlei URI + scopes: Bestekke + website: Toepassing webtuiste + errors: + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: kan nie 'n vragment bevat nie. + invalid_uri: moet 'n geldige URI wees. + relative_uri: moet 'n absolute URI wees. + secured_uri: moet 'n HTTPS/SSL URI wees. + doorkeeper: + applications: + buttons: + authorize: Magtig + cancel: Kanselleer + destroy: Vernietig + edit: Redigeer + submit: Dien in + confirmations: + destroy: Is jy seker? + edit: + title: Redigeer toepassing + form: + error: Oeps! Hersien jou vorm vir moontlike foute + help: + native_redirect_uri: Gebruik %{native_redirect_uri} vir plaaslike toetse + redirect_uri: Gebruik een lyn per URI + scopes: Verdeel omvang-grense met spasies. Los dit leeg om verstek omvange te gebruik. + index: + application: Toepassing + callback_url: Terugroep URL + delete: Wis uit + empty: Jy het geen toepassings nie. + name: Naam + new: Nuwe toepassing + scopes: Omvange + show: Vertoon + title: Jou toepassings + new: + title: Nuwe toepassing + show: + actions: Aksies + application_id: Kliënt sleutel + callback_urls: Terugroep URL'e + scopes: Omvange + secret: Kliënt geheim + title: 'Toepassing: %{name}' + authorizations: + buttons: + authorize: Magtig + deny: Weier + error: + title: "'n Fout het plaasgevind" + new: + prompt_html: "%{client_name} wil toegang hê tot jou rekening. Dit is a derde party toepassing. Indien jy dit nie vertrou nie, moet dit nie bemagtig word nie." + review_permissions: Hersien toestemming + title: Benodig magtiging + show: + title: Kopieër hierdie magtigings kode en plaas dit in die toepassing. + authorized_applications: + buttons: + revoke: Herroep + confirmations: + revoke: Is jy seker? + index: + authorized_at: Bemagtig op %{date} + description_html: Hierdie is toepassings wat deur middel van die API toegang tot jou rekening kan verkry. As daar enige toepassings is wat jy nie herken nie, of 'n toepassing is wat wangedra, kan die bemagtiging herroep word. + last_used_at: Laas gebruik op %{date} + never_used: Noot gebruik nie + scopes: Magtiging + superapp: Intern + title: Jou gemagtigde toepassings + errors: + messages: + access_denied: Die hulpbron eienaar of magtigingsbediener het die aansoek afgekeur. + credential_flow_not_configured: Hulpbron Eienaar Wagwoord Geloofsbrewe vloei het gefaal omdat Doorkeeper.configure.resource_owner_from_credentials nie opgestel is nie. + flash: + applications: + create: + notice: Toepassing geskep. + destroy: + notice: Toepassing uitgewis. + update: + notice: Toepassing opdateer. + authorized_applications: + destroy: + notice: Toepassing herroep. + grouped_scopes: + access: + read: Slegs-lees toegang + read/write: Lees en skryf toegang + write: Slegs-skryf toegang + title: + accounts: Rekeninge + admin/accounts: Administrasie van rekeninge + admin/all: Alle administratiewe funksies + admin/reports: Administrasie van rapporteringe + all: Alles + blocks: Blokkeringe + bookmarks: Boekmerke + conversations: Gesprekke + crypto: End-tot-end enkripsie + favourites: Gunstelinge + filters: Filters + follow: Verhoudinge + lists: Lyste + media: Media aanhegsels + mutes: Dempinge + notifications: Kennisgewings + push: Stoot kennisgewings + reports: Rapporteringe + search: Soek + statuses: Plasings + layouts: + admin: + nav: + applications: Toepassings + oauth2_provider: OAuth2 Verskaffer + application: + title: Benodig OAuth bemagtiging + scopes: + admin:read: lees alle data op die bediener + admin:read:accounts: lees sensitiewe inligting vanaf alle rekeninge + admin:read:reports: lees sensitiewe inligting van alle verslae end aangeklaagde rekeninge + admin:write: verander alle data op die bediener + admin:write:accounts: voer modereer aksies uit op rekeninge + admin:write:reports: voer modereer aksies uit op verslae + crypto: gebruik end-tot-end enkripsie + follow: verander rekening verhoudinge + push: ontvang jou stootkennisgewings + read: lees die data van al jou rekeninge + read:accounts: sien rekening inligting + read:blocks: sien blokeringe + read:bookmarks: sien jou boekmerke + read:favourites: sien jou gunstelinge + read:filters: sien jou filters + read:lists: sien jou lyste + read:mutes: sien jou stilmake + read:notifications: sien jou kennisgewinge + read:reports: sien jou rapporteringe + read:search: soek namens jou + read:statuses: sien alle plasings + write: verander alle data van jou rekening + write:accounts: verander jou profiel + write:blocks: blokeer rekeninge en domeine + write:bookmarks: boekmerk plasings + write:conversations: demp en wis gesprekke uit + write:favourites: merk gunsteling plasings + write:filters: skep filters + write:follows: volg mense + write:lists: skep lyste + write:media: laai meda lêers op + write:mutes: demp mense en gesprekke + write:notifications: maak jou kennisgewings skoon + write:reports: rapporteer ander mense + write:statuses: publiseer plasings diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml index 684b993abc..0a0b6b1beb 100644 --- a/config/locales/doorkeeper.pt-BR.yml +++ b/config/locales/doorkeeper.pt-BR.yml @@ -60,7 +60,8 @@ pt-BR: error: title: Ocorreu um erro new: - review_permissions: Analisar permissões + prompt_html: O %{client_name} gostaria de ter permissão para acessar sua conta. É uma aplicação de terceiros. Se você não confia, então você não deve autorizá-lo. + review_permissions: Revisar permissões title: Autorização necessária show: title: Copie este código de autorização e cole no aplicativo. @@ -71,6 +72,8 @@ pt-BR: revoke: Você tem certeza? index: authorized_at: Autorizado em %{date} + description_html: Estas são as aplicações que podem acessar sua conta usando a API. Se houver aplicativos que você não reconhece ou com mau funcionamento, você pode revogar seu acesso. + last_used_at: Última vez usado em %{date} never_used: Nunca usado scopes: Permissões superapp: Interno @@ -110,16 +113,23 @@ pt-BR: destroy: notice: Aplicativo revogado. grouped_scopes: + access: + read: Acesso somente para leitura + read/write: Acesso de leitura e escrita + write: Acesso somente para escrita title: accounts: Contas + admin/accounts: Administração de contas + admin/all: Todas as funções administrativas + admin/reports: Administração de relatórios all: Tudo - blocks: Blocos + blocks: Bloqueios bookmarks: Salvos conversations: Conversas crypto: Criptografia de ponta a ponta favourites: Favoritos filters: Filtros - follow: Relações + follow: Relacionamentos lists: Listas media: Mídias anexadas notifications: Notificações @@ -161,6 +171,7 @@ pt-BR: write:accounts: alterar seu perfil write:blocks: bloquear contas e domínios write:bookmarks: salvar toots + write:conversations: silenciar e excluir conversas write:favourites: favoritar toots write:filters: criar filtros write:follows: seguir pessoas diff --git a/config/locales/el.yml b/config/locales/el.yml index 1320dcbb40..96ec15247a 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -36,7 +36,7 @@ el: one: δημοσίευση other: δημοσιεύσεις status_count_before: Που έγραψαν - tagline: Ακολούθησε τους γνωστούς σου και ανακάλυψε νέους ανθρώπους + tagline: Αποκεντρωμένο κοινωνικό δίκτυο terms: Όροι χρήσης unavailable_content: Μη διαθέσιμο unavailable_content_description: @@ -618,6 +618,12 @@ el: edit_preset: Ενημέρωση προκαθορισμένης προειδοποίησης empty: Δεν έχετε ακόμη ορίσει κάποια προεπιλογή προειδοποίησης. title: Διαχείριση προκαθορισμένων προειδοποιήσεων + webhooks: + delete: Διαγραφή + disable: Απενεργοποίηση + disabled: Απενεργοποιημένα + enable: Ενεργοποίηση + status: Κατάσταση admin_mailer: new_appeal: actions: @@ -658,7 +664,6 @@ el: applications: created: Η εφαρμογή δημιουργήθηκε επιτυχώς destroyed: Η εφαρμογή διαγράφηκε επιτυχώς - invalid_url: Το URL δεν είναι έγκυρο regenerate_token: Αναδημιουργία του διακριτικού πρόσβασης (access token) token_regenerated: Το διακριτικό πρόσβασης (access token) αναδημιουργήθηκε επιτυχώς warning: Μεγάλη προσοχή με αυτά τα στοιχεία. Μην τα μοιραστείς ποτέ με κανέναν! diff --git a/config/locales/eo.yml b/config/locales/eo.yml index babbce7da4..d287fb5906 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -36,9 +36,8 @@ eo: one: mesaĝo other: mesaĝoj status_count_before: Kie skribiĝis - tagline: Sekvi amikojn kaj trovi iujn novajn terms: Uzkondiĉoj - unavailable_content: Kontrolitaj serviloj + unavailable_content: Moderigitaj serviloj unavailable_content_description: domain: Servilo reason: 'Kialo:' @@ -86,8 +85,8 @@ eo: title: Plenumi kontrolan agon al %{acct} account_moderation_notes: create: Lasi noton - created_msg: Kontrola noto sukcese kreita! - destroyed_msg: Kontrola noto sukcese detruita! + created_msg: Noto de mederigado sukcese kreita! + destroyed_msg: Noto de moderigado sukcese detruita! accounts: add_email_domain_block: Bloki retadresan domajnon approve: Aprobi @@ -140,8 +139,8 @@ eo: all: Ĉio pending: Pritraktata suspended: Haltigita - title: Kontrolado - moderation_notes: Kontrolaj notoj + title: Moderigado + moderation_notes: Notoj de moderigado most_recent_activity: Lasta ago most_recent_ip: Lasta IP no_account_selected: Neniu konto estis ŝanĝita ĉar neniu estis selektita @@ -167,7 +166,7 @@ eo: role: Permesoj roles: admin: Administranto - moderator: Kontrolanto + moderator: Moderigisto staff: Teamo user: Uzanto search: Serĉi @@ -416,7 +415,7 @@ eo: moderation: all: Ĉiuj limited: Limigita - title: Kontrolo + title: Moderigado private_comment: Privata komento public_comment: Publika komento purge: Purigu @@ -697,7 +696,6 @@ eo: applications: created: Aplikaĵo sukcese kreita destroyed: Aplikaĵo sukcese forigita - invalid_url: La URL donita ne estas valida regenerate_token: Rekrei aliran ĵetonon token_regenerated: Alira ĵetono sukcese rekreita warning: Estu tre atenta kun ĉi tiu datumo. Neniam diskonigu ĝin al iu ajn! @@ -950,7 +948,7 @@ eo: only_redirect_html: Alie, vi povas nur aldoni alidirekton en via profilo. other_data: Neniu alia datumo estos movita aŭtomate moderation: - title: Kontrolado + title: Moderigado notification_mailer: digest: action: Vidi ĉiujn sciigojn diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml index aeba0b97d9..79ae68bf45 100644 --- a/config/locales/es-AR.yml +++ b/config/locales/es-AR.yml @@ -38,7 +38,7 @@ es-AR: one: mensaje other: mensajes status_count_before: Que enviaron - tagline: Seguí a tus amigos y descubrí nueva gente + tagline: Red social descentralizada terms: Términos del servicio unavailable_content: Servidores moderados unavailable_content_description: @@ -852,6 +852,26 @@ es-AR: edit_preset: Editar preajuste de advertencia empty: Aún no ha definido ningún preajuste de advertencia. title: Administrar preajustes de advertencia + webhooks: + add_new: Agregar punto final + delete: Eliminar + description_html: Un webhook habilita a Mastodon a enviar notificaciones en tiempo real sobre los eventos elegidos a tu propia aplicación, así la misma puede activar automáticamente las reacciones. + disable: Deshabilitar + disabled: Deshabilitada + edit: Editar punto final + empty: Todavía no tenés configurado ningún punto final de webhook. + enable: Habilitar + enabled: Activar + enabled_events: + one: 1 evento habilitado + other: "%{count} eventos habilitados" + events: Eventos + new: Nuevo webhook + rotate_secret: Rotar secreto + secret: Firma secreta + status: Estado + title: Webhooks + webhook: Webhook admin_mailer: new_appeal: actions: @@ -916,7 +936,6 @@ es-AR: applications: created: Aplicación creada exitosamente destroyed: Aplicación eliminada exitosamente - invalid_url: La dirección web ofrecida no es válida regenerate_token: Regenerar clave de acceso token_regenerated: Clave de acceso regenerada exitosamente warning: Ojo con estos datos. ¡Nunca los compartas con nadie! diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml index 5f9a9f5e7e..f57fb96015 100644 --- a/config/locales/es-MX.yml +++ b/config/locales/es-MX.yml @@ -38,7 +38,7 @@ es-MX: one: estado other: estados status_count_before: Qué han escrito - tagline: Seguir a amigos existentes y descubre nuevos + tagline: Red social descentralizada terms: Condiciones de servicio unavailable_content: Contenido no disponible unavailable_content_description: @@ -428,6 +428,7 @@ es-MX: destroyed_msg: El bloque de dominio se deshizo domain: Dominio edit: Editar nuevo dominio bloqueado + existing_domain_block: Ya ha impuesto límites más estrictos a %{name}. existing_domain_block_html: Ya ha impuesto límites más estrictos a %{name}, necesita desbloquearlo primero. new: create: Crear bloque @@ -915,7 +916,6 @@ es-MX: applications: created: Aplicación creada exitosamente destroyed: Apicación eliminada exitosamente - invalid_url: La URL proporcionada es incorrecta regenerate_token: Regenerar token de acceso token_regenerated: Token de acceso regenerado exitosamente warning: Ten mucho cuidado con estos datos. ¡No los compartas con nadie! diff --git a/config/locales/es.yml b/config/locales/es.yml index 9001931341..96d985f530 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -38,7 +38,7 @@ es: one: estado other: estados status_count_before: Qué han escrito - tagline: Seguir a amigos existentes y descubre nuevos + tagline: Red social descentralizada terms: Condiciones de servicio unavailable_content: Contenido no disponible unavailable_content_description: @@ -852,6 +852,26 @@ es: edit_preset: Editar aviso predeterminado empty: Aún no has definido ningún preajuste de advertencia. title: Editar configuración predeterminada de avisos + webhooks: + add_new: Añadir endpoint + delete: Eliminar + description_html: Un webhook permite a Mastodon enviar notificaciones en tiempo real sobre los eventos elegidos a tu propia aplicación, para que tu aplicación pueda lanzar reacciones automáticamente. + disable: Deshabilitar + disabled: Deshabilitado + edit: Editar endpoint + empty: Aún no tienes ningún endpoint de webhook configurado. + enable: Habilitar + enabled: Activo + enabled_events: + one: 1 evento habilitado + other: "%{count} eventos habilitados" + events: Eventos + new: Nuevo webhook + rotate_secret: Rotar secreto + secret: Firmando secreto + status: Estado + title: Webhooks + webhook: Webhook admin_mailer: new_appeal: actions: @@ -916,7 +936,6 @@ es: applications: created: Aplicación creada exitosamente destroyed: Apicación eliminada exitosamente - invalid_url: La URL proporcionada es incorrecta regenerate_token: Regenerar token de acceso token_regenerated: Token de acceso regenerado exitosamente warning: Ten mucho cuidado con estos datos. ¡No los compartas con nadie! diff --git a/config/locales/et.yml b/config/locales/et.yml index 3c48bad5b7..a551ab4245 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -35,7 +35,6 @@ et: one: postitust other: staatuseid status_count_before: Kes on avaldanud - tagline: Jälgi sõpru ja leia uusi terms: Kasutustingimused unavailable_content: Sisu pole saadaval unavailable_content_description: @@ -540,7 +539,6 @@ et: applications: created: Rakenduse loomine õnnestus destroyed: Rakenduse kustutamine õnnestus - invalid_url: Antud URL on vale regenerate_token: Loo uus access token token_regenerated: Access tokeni loomine õnnestus warning: Olge nende andmetega ettevaatlikud. Ärge jagage neid kellegagi! diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 096dd276b5..a71cd186d1 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -36,7 +36,6 @@ eu: one: bidalketa other: bidalketa status_count_before: Hauek - tagline: Jarraitu lagunak eta egin berriak terms: Erabilera baldintzak unavailable_content: Eduki eskuraezina unavailable_content_description: @@ -855,7 +854,6 @@ eu: applications: created: Aplikazioa ongi sortu da destroyed: Aplikazioa ongi ezabatu da - invalid_url: Emandako URL-a baliogabea da regenerate_token: Birsortu sarbide token-a token_regenerated: Sarbide token-a ongi birsortu da warning: Kontuz datu hauekin, ez partekatu inoiz inorekin! diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 1c7b9f9cc2..93b766859a 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -38,7 +38,6 @@ fa: one: چیز نوشته‌اند other: چیز نوشته‌اند status_count_before: که در کنار هم - tagline: با دوستان خود در ارتباط باشید و دوستان تازه پیدا کنید terms: شرایط خدمت unavailable_content: محتوای ناموجود unavailable_content_description: @@ -813,7 +812,6 @@ fa: applications: created: برنامه با موفقیت ساخته شد destroyed: برنامه با موفقیت پاک شد - invalid_url: نشانی واردشده معتبر نیست regenerate_token: دوباره‌سازی کد دسترسی token_regenerated: کد دسترسی با موفقیت ساخته شد warning: خیلی مواظب این اطلاعات باشید و آن را به هیچ کس ندهید! diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 55e2332cfc..ff369f2fe7 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -38,7 +38,6 @@ fi: one: julkaisun other: julkaisua status_count_before: Julkaistu - tagline: Seuraa ja löydä uusia kavereita terms: Käyttöehdot unavailable_content: Moderoidut palvelimet unavailable_content_description: @@ -860,7 +859,6 @@ fi: applications: created: Sovelluksen luonti onnistui destroyed: Sovelluksen poisto onnistui - invalid_url: Annettu URL on virheellinen regenerate_token: Luo pääsytunnus uudelleen token_regenerated: Pääsytunnuksen uudelleenluonti onnistui warning: Säilytä tietoa hyvin. Älä milloinkaan jaa sitä muille! diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 109fd68496..5f74972f95 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -37,8 +37,8 @@ fr: status_count_after: one: message other: messages - status_count_before: Qui a publié - tagline: Suivez vos ami·e·s et découvrez-en de nouveaux·elles + status_count_before: Ayant publié + tagline: Réseau social décentralisé terms: Conditions d’utilisation unavailable_content: Serveurs modérés unavailable_content_description: @@ -428,6 +428,7 @@ fr: destroyed_msg: Le blocage de domaine a été désactivé domain: Domaine edit: Modifier le blocage de domaine + existing_domain_block: Vous avez déjà imposé des limites plus strictes à %{name}. existing_domain_block_html: Vous avez déjà imposé des limites plus strictes à %{name}, vous devez d’abord le/la débloquer. new: create: Créer le blocage @@ -851,6 +852,25 @@ fr: edit_preset: Éditer les avertissements prédéfinis empty: Vous n'avez pas encore créé de paramètres prédéfinis pour les avertissements. title: Gérer les avertissements prédéfinis + webhooks: + add_new: Ajouter un point de terminaison + delete: Supprimer + description_html: Un point d'ancrage web permet à Mastodon d'envoyer des notifications en temps réel concernant des événements sélectionnés vers votre propre application, afin que celle-ci puisse déclencher automatiquement des réactions. + disable: Désactiver + disabled: Désactivé + edit: Modifier le point de terminaison + empty: Pour l'instant, vous n'avez configuré aucun lien d'ancrage web pour point de terminaison. + enable: Activer + enabled: Actif + enabled_events: + one: 1 événement activé + other: "%{count} événements activés" + events: Événements + new: Nouveau point d’ancrage web + rotate_secret: Effectuer une rotation du secret + status: État + title: Points d’ancrage web + webhook: Point d’ancrage web admin_mailer: new_appeal: actions: @@ -915,7 +935,6 @@ fr: applications: created: Application créée avec succès destroyed: Application supprimée avec succès - invalid_url: L’URL fournie est invalide regenerate_token: Régénérer le jeton d’accès token_regenerated: Jeton d’accès régénéré avec succès warning: Soyez prudent·e avec ces données. Ne les partagez pas ! @@ -1519,6 +1538,9 @@ fr: pinned: Message épinglé reblogged: a partagé sensitive_content: Contenu sensible + strikes: + errors: + too_late: Il est trop tard pour faire appel à cette sanction tags: does_not_match_previous_name: ne correspond pas au nom précédent terms: diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 931cea4fb1..387ba6c2a3 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -40,7 +40,6 @@ gd: other: post two: phost status_count_before: A dh’fhoillsich - tagline: Lean air caraidean ’s rùraich feadhainn ùra terms: Teirmichean na seirbheise unavailable_content: Frithealaichean fo mhaorsainneachd unavailable_content_description: @@ -446,6 +445,7 @@ gd: destroyed_msg: Chan eil an àrainn ’ga bacadh tuilleadh domain: Àrainn edit: Deasaich bacadh na h-àrainne + existing_domain_block: Chuir thu cuingeachaidhean nas teinne air %{name} mu thràth. existing_domain_block_html: Chuir thu cuingeachadh nas teinne air %{name} mu thràth, feumaidh tu a dì-bhacadh an toiseach. new: create: Cruthaich bacadh @@ -949,7 +949,6 @@ gd: applications: created: Chaidh an t-iarrtas a chruthachadh destroyed: Chaidh an t-iarrtas a sguabadh às - invalid_url: Tha an t-URL a thugadh seachad mì-dhligheach regenerate_token: Ath-ghin an tòcan inntrigidh token_regenerated: Chaidh an tòcan inntrigidh ath-ghintinn warning: Bi glè chùramach leis an dàta seo. Na co-roinn le duine sam bith e! diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 48435b45bb..5b303b08f1 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -11,8 +11,8 @@ gl: apps: Aplicacións móbiles apps_platforms: Emprega Mastodon dende iOS, Android e outras plataformas browse_directory: Mira o directorio e filtra por intereses - browse_local_posts: Navega polas publicacións públicas deste servidor en tempo real - browse_public_posts: Navega polas publicacións públicas de Mastodon en tempo real + browse_local_posts: Unha ollada aos últimos comentarios públicos neste servidor + browse_public_posts: Cronoloxía en directo cos comentarios públicos en Mastodon contact: Contacto contact_missing: Non establecido contact_unavailable: Non dispoñíbel @@ -31,14 +31,14 @@ gl: privacy_policy: Política de privacidade rules: Regras do servidor rules_html: 'Aquí tes un resumo das regras que debes seguir se queres ter unha conta neste servidor de Mastodon:' - see_whats_happening: Ver o que está a acontecer + see_whats_happening: Mira o que acontece server_stats: 'Estatísticas do servidor:' source_code: Código fonte status_count_after: one: publicación other: publicacións status_count_before: Que publicaron - tagline: Segue ás túas amizades e coñece novas + tagline: Rede social descentralizada terms: Termos do servizo unavailable_content: Contido non dispoñíbel unavailable_content_description: @@ -852,6 +852,26 @@ gl: edit_preset: Editar aviso preestablecido empty: Non definiches os avisos prestablecidos. title: Xestionar avisos preestablecidos + webhooks: + add_new: Engadir punto de extremo + delete: Eliminar + description_html: Un webhook permítelle a Mastodon enviar notificacións en tempo real á túa aplicación acerca dos eventos elexidos e así, a aplicación activará automáticamente a súa programación. + disable: Desactivar + disabled: Desactivado + edit: Editar extremo + empty: Non tes configurado ningún punto extremo para o webhook. + enable: Activar + enabled: Activo + enabled_events: + one: 1 evento activado + other: "%{count} eventos activados" + events: Eventos + new: Novo webhook + rotate_secret: Rotar segredo + secret: Segredo de acceso + status: Estado + title: Webhooks + webhook: Webhook admin_mailer: new_appeal: actions: @@ -916,7 +936,6 @@ gl: applications: created: Creouse con éxito este aplicativo destroyed: Eliminouse con éxito o aplicativo - invalid_url: A URL proporcionada non é válida regenerate_token: Votar a xenerar o testemuño de acceso token_regenerated: Rexenerouse con éxito o testemuño de acceso warning: Ten moito tino con estos datos. Non os compartas nunca con ninguén! diff --git a/config/locales/he.yml b/config/locales/he.yml index 2d0cf8ae94..0400341255 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1,7 +1,7 @@ --- he: about: - about_hashtag_html: אלו סטטוסים פומביים המתוייגים בתור#%{hashtag}. ניתן להגיב, להדהד או לחבב אותם אם יש לך חשבון בכל מקום בפדרציה. + about_hashtag_html: אלו הודעות פומביות המתוייגות בתור#%{hashtag}. ניתן להגיב, להדהד או לחבב אותם אם יש לך חשבון בכל מקום שהוא בפדרציה. about_mastodon_html: מסטודון היא רשת חברתית חופשית, מבוססת תוכנה חופשית ("קוד פתוח"). כאלטרנטיבה בלתי ריכוזית לפלטפרומות המסחריות, מסטודון מאפשרת להמנע מהסיכונים הנלווים להפקדת התקשורת שלך בידי חברה יחידה. שמת את מבטחך בשרת אחד — לא משנה במי בחרת, תמיד אפשר לדבר עם כל שאר המשתמשים. לכל מי שרוצה יש את האפשרות להקים שרת מסטודון עצמאי, ולהשתתף ברשת החברתית באופן חלק. about_this: אודות שרת זה active_count_after: פעיל @@ -40,7 +40,6 @@ he: other: חצרוצים two: חצרוצים status_count_before: שכתבו - tagline: מעקב אחרי חברים וגילוי חדשים terms: תנאי שימוש unavailable_content: שרתים מוגבלים unavailable_content_description: @@ -885,6 +884,14 @@ he: edit_preset: ערוך/י טקסט מוכן מראש לאזהרה empty: לא הגדרת עדיין שום טקסט מוכן מראש לאזהרה. title: ניהול טקסטים מוכנים מראש לאזהרות + webhooks: + delete: מחיקה + disable: כיבוי + disabled: כבוי + enable: אפשר + enabled: פעילים + events: אירועים + status: סטטוס admin_mailer: new_appeal: actions: @@ -949,7 +956,6 @@ he: applications: created: ישום נוצר בהצלחה destroyed: ישום נמחק בהצלחה - invalid_url: כתובת הקישורית אינה חוקית regenerate_token: יצירת אסימון גישה מחדש token_regenerated: אסימון גישה יוצר מחדש בהצלחה warning: זהירות רבה נדרשת עם מידע זה. אין לחלוק אותו אף פעם עם אף אחד! diff --git a/config/locales/hr.yml b/config/locales/hr.yml index dd3b99dccb..fd90a5ac46 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -79,8 +79,6 @@ hr: application_mailer: settings: 'Promijeni postavke e-pošte: %{link}' view: 'Vidi:' - applications: - invalid_url: Unesena poveznica nije valjana auth: didnt_get_confirmation: Niste primili upute za potvrđivanje? forgot_password: Zaboravljena lozinka? diff --git a/config/locales/hu.yml b/config/locales/hu.yml index faee9de06f..5ee01ea2cf 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -38,7 +38,7 @@ hu: one: bejegyzést írt other: bejegyzést írt status_count_before: Eddig - tagline: Kövess barátokat és találj újakat + tagline: Decentralizált szociális hálózat terms: Felhasználási feltételek unavailable_content: Kimoderált szerverek unavailable_content_description: @@ -854,6 +854,26 @@ hu: edit_preset: Figyelmeztetés szerkesztése empty: Nem definiáltál még egyetlen figyelmeztetést sem. title: Figyelmeztetések + webhooks: + add_new: Végpont hozzáadása + delete: Törlés + description_html: Egy webhook lehetővé teszi a Mastodon számára, hogy valósidejű értesítéseket küldjön le a kiválasztott eseményekről a te alkalmazásodnak, így az alkalmazásod automatikusan reagálhat ezekre. + disable: Letiltás + disabled: Letiltva + edit: Végpont szerkesztése + empty: Még nincs beállított webhook végpontod. + enable: Engedélyezés + enabled: Aktív + enabled_events: + one: 1 engedélyezett esemény + other: "%{count} engedélyezett esemény" + events: Események + new: Új webhook + rotate_secret: Titok forgatása + secret: Titok aláírása + status: Állapot + title: Webhookok + webhook: Webhook admin_mailer: new_appeal: actions: @@ -918,7 +938,6 @@ hu: applications: created: Alkalmazás sikeresen létrehozva destroyed: Alkalmazás sikeresen eltávolítva - invalid_url: A megadott URL nem megfelelő regenerate_token: Hozzáférési kulcs újragenerálása token_regenerated: Hozzáférési kulcs sikeresen újragenerálva warning: Ez érzékeny adat. Soha ne oszd meg másokkal! diff --git a/config/locales/hy.yml b/config/locales/hy.yml index f24b3197e6..831ca66216 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -33,7 +33,6 @@ hy: one: գրառում other: ստատուս status_count_before: Որոնք արել են՝ - tagline: Հետեւիր ընկերներիդ եւ գտիր նորերին terms: Ծառայութեան պայմանները unavailable_content: Մոդերացուող սպասարկիչներ unavailable_content_description: @@ -551,7 +550,6 @@ hy: view_profile: Նայել անձնական էջը view_status: Նայել գրառումը applications: - invalid_url: Տրամադրուած URL անվաւեր է regenerate_token: Ստեղծել նոր հասանելիութեան կտրոն your_token: Քո մուտքի բանալին auth: diff --git a/config/locales/id.yml b/config/locales/id.yml index c278f749f6..368b21add1 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -35,7 +35,7 @@ id: status_count_after: other: status status_count_before: Yang telah menulis - tagline: Ikuti teman dan temukan yang baru + tagline: Jejaring sosial terdesentralisasi terms: Kebijakan layanan unavailable_content: Konten tak tersedia unavailable_content_description: @@ -833,6 +833,21 @@ id: edit_preset: Sunting preset peringatan empty: Anda belum mendefinisikan peringatan apapun. title: Kelola preset peringatan + webhooks: + add_new: Tambah titik akhir + delete: Hapus + disable: Matikan + disabled: Nonaktif + edit: Edit titik akhir + enable: Aktifkan + enabled: Aktif + enabled_events: + other: "%{count} acara aktif" + events: Acara + new: Webhook baru + status: Status + title: Webhook + webhook: Webhook admin_mailer: new_appeal: actions: @@ -897,7 +912,6 @@ id: applications: created: Aplikasi berhasil dibuat destroyed: Aplikasi berhasil dihapus - invalid_url: URL tidak sesuai regenerate_token: Buat ulang token akses token_regenerated: Token akses berhasil dibuat ulang warning: Hati-hati dengan data ini. Jangan bagikan kepada siapapun! diff --git a/config/locales/io.yml b/config/locales/io.yml index 3649ec946b..7cf253089e 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -38,7 +38,7 @@ io: one: posto other: posti status_count_before: Qua publikigis - tagline: Sequez amiki e deskovrez nova personi + tagline: Necentralizita sociala reto terms: Serveskondicioni unavailable_content: Jerata servili unavailable_content_description: @@ -852,6 +852,26 @@ io: edit_preset: Modifikez avertfixito empty: Vu ne fixis irga avertfixito til nun. title: Jerez avertfixiti + webhooks: + add_new: Insertez finpunto + delete: Efacez + description_html: "Rethoko povigas Mastodon sendar samtempoavizi pri selektita eventi a vua sua apliko, por ke vua apliko povas automate kauzigar reakti." + disable: Desaktivigez + disabled: Desaktivigita + edit: Modifikez finpunto + empty: Vu ne havas irga ajustita finpunti ankore. + enable: Aktivigez + enabled: Aktiva + enabled_events: + one: 1 aktivigita evento + other: "%{count} aktivigita eventi" + events: Eventi + new: Nova rethoko + rotate_secret: Rotacigez sekreto + secret: Signosekreto + status: Stando + title: Rethoki + webhook: Rethok admin_mailer: new_appeal: actions: @@ -916,7 +936,6 @@ io: applications: created: Apliko sucesoze kreesas destroyed: Apliko sucesoze efacesas - invalid_url: La URL donita ne esas valida regenerate_token: Rifacez acesficho token_regenerated: Acesficho sucesoze riganesas warning: Sorgemez per ca informi. Ne partigez kun irgu! diff --git a/config/locales/is.yml b/config/locales/is.yml index 4e3f9353eb..f9d408822f 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -38,7 +38,7 @@ is: one: færsla other: færslur status_count_before: Sem stóðu fyrir - tagline: Fylgstu með vinum og uppgötvaðu nýja + tagline: Dreift samfélagsnet terms: Þjónustuskilmálar unavailable_content: Ekki tiltækt efni unavailable_content_description: @@ -852,6 +852,14 @@ is: edit_preset: Breyta forstilltri aðvörun empty: Þú hefur ekki enn skilgreint neinar aðvaranaforstillingar. title: Sýsla með forstilltar aðvaranir + webhooks: + delete: Eyða + disable: Gera óvirkt + disabled: Óvirkt + enable: Virkja + enabled: Virkt + events: Atburðir + status: Staða admin_mailer: new_appeal: actions: @@ -916,7 +924,6 @@ is: applications: created: Það tókst að búa til forrit destroyed: Það tókst að eyða forriti - invalid_url: Slóðin sem þú gafst upp er ógild regenerate_token: Endurgera aðgangsteikn token_regenerated: Það tókst að endurgera aðgangsteiknið warning: Farðu mjög varlega með þessi gögn. Þú skalt aldrei deila þeim með neinum! diff --git a/config/locales/it.yml b/config/locales/it.yml index 708436ee1c..f97779d26c 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -38,7 +38,7 @@ it: one: stato other: stati status_count_before: Che hanno pubblicato - tagline: Segui amici e trovane di nuovi + tagline: Social network decentralizzato terms: Termini di Servizio unavailable_content: Server moderati unavailable_content_description: @@ -852,6 +852,26 @@ it: edit_preset: Modifica avviso predefinito empty: Non hai ancora definito alcun avviso preimpostato. title: Gestisci avvisi predefiniti + webhooks: + add_new: Aggiungi endpoint + delete: Elimina + description_html: Un webhook consente a Mastodon di inviare notifiche in tempo reale su determinati eventi alla tua applicazione, così la tua applicazione può attivare automaticamente delle reazioni. + disable: Disabilita + disabled: Disabilitato + edit: Modifica endpoint + empty: Non hai ancora configurato alcun endpoint per webhook. + enable: Abilita + enabled: Attivo + enabled_events: + one: 1 evento abilitato + other: "%{count} eventi abilitati" + events: Eventi + new: Nuovo webhook + rotate_secret: Ruota segreto + secret: Segreto per firma + status: Stato + title: Webhook + webhook: Webhook admin_mailer: new_appeal: actions: @@ -918,7 +938,6 @@ it: applications: created: Applicazione creata con successo destroyed: Applicazione eliminata con successo - invalid_url: L'URL fornito non è valido regenerate_token: Rigenera il token di accesso token_regenerated: Token di accesso rigenerato warning: Fa' molta attenzione con questi dati. Non fornirli mai a nessun altro! diff --git a/config/locales/ja.yml b/config/locales/ja.yml index defd5ab7ca..b7139523b5 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -35,7 +35,7 @@ ja: status_count_after: other: 投稿 status_count_before: 投稿数 - tagline: Follow friends and discover new ones + tagline: 分散型ソーシャルネットワーク terms: 利用規約 unavailable_content: 制限中のサーバー unavailable_content_description: @@ -825,6 +825,18 @@ ja: edit_preset: プリセット警告文を編集 empty: まだプリセット警告文が作成されていません。 title: プリセット警告文を管理 + webhooks: + add_new: エンドポイントを追加 + delete: 削除 + disable: 無効化 + disabled: 無効 + edit: エンドポイントを編集 + enable: 有効化 + enabled: アクティブ + events: イベント + new: 新しいwebhook + title: Webhooks + webhook: Webhook admin_mailer: new_appeal: actions: @@ -885,7 +897,6 @@ ja: applications: created: アプリが作成されました destroyed: アプリが削除されました - invalid_url: URLが無効です regenerate_token: アクセストークンの再生成 token_regenerated: アクセストークンが再生成されました warning: このデータは気をつけて取り扱ってください。他の人と共有しないでください！ diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 7e6d591eca..bd02b0f8de 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -305,7 +305,6 @@ ka: applications: created: აპლიკაცია წარმატებით შეიქმნა destroyed: აპლიკაცია წარმატებით გაუქმდა - invalid_url: მოწოდებული ურლ არასწორია regenerate_token: წვდომის ტოკენის რეგენერაცია token_regenerated: წვდომის ტოკენის რეგენერაცია მოხერხდა warning: იყავით ძალიან ფრთხილად ამ მონაცემთან. არასდროს გააზიაროთ ეს! diff --git a/config/locales/kab.yml b/config/locales/kab.yml index 66d029d7a9..0db4e1c9dc 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -29,7 +29,6 @@ kab: one: n tsuffeɣt other: n tsuffiɣin status_count_before: I d-yessuffɣen - tagline: Ḍfeṛ imddukkal-ik tissineḍ-d wiyaḍ terms: Tiwetlin n useqdec unavailable_content: Ulac agbur unavailable_content_description: diff --git a/config/locales/kk.yml b/config/locales/kk.yml index a01a2424aa..406f7e3c87 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -32,7 +32,6 @@ kk: one: жазба other: жазба status_count_before: Барлығы - tagline: Достарыңызды оқыңыз және жаңа авторларды табыңыз terms: Қолдану шарттары unavailable_content: Қолжетімсіз контент unavailable_content_description: @@ -477,7 +476,6 @@ kk: applications: created: Application succеssfully created destroyed: Application succеssfully deleted - invalid_url: The providеd URL is invalid regenerate_token: Regenerate accеss token token_regenerated: Access token succеssfully regenerated warning: Be very carеful with this data. Never share it with anyone! diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 630beabfbd..65bc57e3ae 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -37,7 +37,7 @@ ko: status_count_after: other: 개 status_count_before: 게시물 수 - tagline: 친구들을 팔로우 하고 새로운 사람들도 만나기 + tagline: 분산화된 소셜 네트워크 terms: 이용약관 unavailable_content: 이용 불가능한 컨텐츠 unavailable_content_description: @@ -837,6 +837,14 @@ ko: edit_preset: 경고 틀 수정 empty: 아직 어떤 경고 틀도 정의되지 않았습니다. title: 경고 틀 관리 + webhooks: + add_new: 엔드포인트 추가 + delete: 삭제 + disable: 비활성화 + disabled: 비활성화됨 + edit: 엔드포인트 수정 + enable: 활성화 + enabled: 활성화됨 admin_mailer: new_appeal: actions: @@ -901,7 +909,6 @@ ko: applications: created: 애플리케이션이 성공적으로 생성되었습니다 destroyed: 애플리케이션이 성공적으로 삭제되었습니다 - invalid_url: 올바르지 않은 URL입니다 regenerate_token: 토큰 재생성 token_regenerated: 액세스 토큰이 성공적으로 재생성되었습니다 warning: 이 데이터를 조심히 다뤄 주세요. 다른 사람들과 절대로 공유하지 마세요! diff --git a/config/locales/ku.yml b/config/locales/ku.yml index 78d99c2e51..a157dbb4e4 100644 --- a/config/locales/ku.yml +++ b/config/locales/ku.yml @@ -38,7 +38,7 @@ ku: one: şandî other: şandî status_count_before: Hatin weşan - tagline: Hevalên xwe bişopîne û yên nû bibîne + tagline: Tora civakî ya nenavendî terms: Peyama mercan unavailable_content: Rajekarên li hev kirî unavailable_content_description: @@ -854,6 +854,26 @@ ku: edit_preset: Hişyariyên pêşsazkirî serrast bike empty: Te hin tu hişyariyên pêşsazkirî destnîşan nekirine. title: Hişyariyên pêşsazkirî bi rêve bibe + webhooks: + add_new: Xala dawîbûnê tevlî bike + delete: Jê bibe + description_html: "çengeleke tevnê dihêle ku Mastodon agahdariyên dema-rastîn ên derbarê çalakiyên hilbijartî de bisepîne ser sepana te, bi vî awayî sepana te dikare reaksiyonan bi awayekî bixweber nîşan bide." + disable: Neçalak bike + disabled: Neçalakkirî + edit: Xala dawîbûnê serrast bike + empty: Hîn çengela tevnê ya xala dawîbûnê ya te ku hatiye pevesazkirin tune ne. + enable: Çalak bike + enabled: Çalak + enabled_events: + one: 1 bûyer çalakkirî + other: "%{count} bûyer çalakkirî" + events: Bûyer + new: Çengela tevnê ya nû + rotate_secret: Veşartî bizivirîne + secret: Îmzekirina veşartî + status: Rewş + title: Çengelên tevnê + webhook: Çengela tevnê admin_mailer: new_appeal: actions: @@ -918,7 +938,6 @@ ku: applications: created: Sepan bi awayekî serkeftî hat çêkirin destroyed: Sepan bi awayekî serkeftî hat jêbirin - invalid_url: URL ya hatiye dayîn ne derbasdar e regenerate_token: Nîşandera gihandinê bi nûve çêbike token_regenerated: Nîşandera gihandinê bi serkeftî nû ve hat çêkirin warning: Bi van daneyan re pir baldar be. Tu caran bi kesî re parve neke! diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 864d2f43f3..5846f7d5d4 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -353,7 +353,6 @@ lt: applications: created: Aplikacija sėkmingai sukurta destroyed: Aplikacija sėkmingai ištrinta - invalid_url: Gauta URL nuoroda netinkama regenerate_token: Regeneruoti prieigos žetoną token_regenerated: Prieigos žetonas sėkmingai sugeneruotas warning: Būkite atsargūs su šia informacija. Niekada jos nesidalinkite! diff --git a/config/locales/lv.yml b/config/locales/lv.yml index f9d404303d..2ceec30b22 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -39,13 +39,13 @@ lv: other: ziņas zero: nav status_count_before: Kurš publicējis - tagline: Seko draugiem un atrodi jaunus + tagline: Decentralizēts sociālais tīkls terms: Pakalpojuma noteikumi unavailable_content: Moderētie serveri unavailable_content_description: domain: Serveris reason: Iemesls - rejecting_media: 'Multivides faili no šiem serveriem netiks apstrādāti vai saglabāti, un netiks parādīti sīktēli, kuriem nepieciešama manuāla noklikšķināšana uz sākotnējā faila:' + rejecting_media: 's faili no šiem serveriem netiks apstrādāti vai saglabāti, un netiks parādīti sīktēli, kuriem nepieciešama manuāla noklikšķināšana uz sākotnējā faila:' rejecting_media_title: Filtrēts saturs silenced: 'Ziņas no šiem serveriem tiks paslēptas publiskās ziņu lentās un sarunās, un no lietotāju mijiedarbības netiks ģenerēti paziņojumi, ja vien tu tiem nesekosi:' silenced_title: Ierobežoti serveri @@ -72,7 +72,7 @@ lv: joined: Pievienojās %{date} last_active: pēdējā aktivitāte link_verified_on: Šīs saites piederība tika pārbaudīta %{date} - media: Mediji + media: Multivide moved_html: "%{name} ir pārcēlies uz %{new_profile_link}:" network_hidden: Šāda informācija nav pieejama nothing_here: Te nekā nav! @@ -770,7 +770,7 @@ lv: report: Ziņojums deleted: Dzēstie media: - title: Mediji + title: Multivide no_status_selected: Neviena ziņa netika mainīta, jo neviena netika atlasīta title: Konta ziņas with_media: Ar medijiem @@ -869,6 +869,27 @@ lv: edit_preset: Labot iepriekš iestatītus brīdinājumus empty: Tu vēl neesi definējis iepriekš iestatītos brīdinājumus. title: Pārvaldīt brīdinājuma iestatījumus + webhooks: + add_new: Pievienot galapunktu + delete: Dzēst + description_html: Izmantojot tīmekļa aizķeri, Mastodon var nosūtīt jūsu lietojumprogrammai reāllaika paziņojumus par izvēlētajiem notikumiem, lai tava lietojumprogramma varētu automātiski izraisīt reakcijas. + disable: Atspējot + disabled: Atspējots + edit: Rediģēt galapunktu + empty: Tev vēl nav konfigurēts neviens tīmekļa aizķeres galapunkts. + enable: Iespējot + enabled: Aktīvie + enabled_events: + one: 1 iespējots notikums + other: "%{count} iespējoti notikumi" + zero: "%{count} iespējotu notikumu" + events: Notikumi + new: Jauna tīmekļa aizķere + rotate_secret: Pagriezt noslēpumu + secret: Paraksta noslēpums + status: Statuss + title: Tīmekļa āķi + webhook: Tīmekļa āķis admin_mailer: new_appeal: actions: @@ -933,7 +954,6 @@ lv: applications: created: Lietojumprogramma ir veiksmīgi izveidota destroyed: Lietojumprogramma ir veiksmīgi dzēsta - invalid_url: Norādītais URL nav derīgs regenerate_token: Atjaunot piekļuves marķieri token_regenerated: Piekļuves marķieris veiksmīgi atjaunots warning: Esi ļoti uzmanīgs ar šiem datiem. Nekad nedalies ne ar vienu ar tiem! diff --git a/config/locales/ml.yml b/config/locales/ml.yml index daee6098c5..f035633ca9 100644 --- a/config/locales/ml.yml +++ b/config/locales/ml.yml @@ -15,7 +15,6 @@ ml: see_whats_happening: എന്തൊക്കെ സംഭവിക്കുന്നു എന്ന് കാണുക source_code: സോഴ്സ് കോഡ് status_count_before: ആരാൽ എഴുതപ്പെട്ടു - tagline: സുഹൃത്തുക്കളെ പിന്തുടരുകയും പുതിയവരെ കണ്ടെത്തുകയും ചെയ്യുക terms: സേവന വ്യവസ്ഥകൾ unavailable_content: ലഭ്യമല്ലാത്ത ഉള്ളടക്കം unavailable_content_description: diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 4e101a890d..d400d3256a 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -34,7 +34,6 @@ ms: status_count_after: other: hantaran status_count_before: Siapa terbitkan - tagline: Ikuti rakan lama dan terokai rakan baharu terms: Terma perkhidmatan unavailable_content: Pelayan disederhanakan unavailable_content_description: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 764ae42d69..db49efbb9e 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -36,7 +36,7 @@ nl: one: toot other: berichten status_count_before: Zij schreven - tagline: Vrienden volgen en nieuwe ontdekken + tagline: Gedecentraliseerd sociaal netwerk terms: Gebruiksvoorwaarden unavailable_content: Gemodereerde servers unavailable_content_description: @@ -680,7 +680,6 @@ nl: applications: created: Aanmaken toepassing geslaagd destroyed: Verwijderen toepassing geslaagd - invalid_url: De opgegeven URL is ongeldig regenerate_token: Toegangscode opnieuw aanmaken token_regenerated: Opnieuw aanmaken toegangscode geslaagd warning: Wees voorzichtig met deze gegevens. Deel het nooit met iemand anders! diff --git a/config/locales/nn.yml b/config/locales/nn.yml index ea5020bbfe..5218270da4 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -30,7 +30,6 @@ nn: server_stats: 'Tenarstatistikk:' source_code: Kjeldekode status_count_before: Som skreiv - tagline: Fylg vener og oppdag nye terms: Brukarvilkår unavailable_content: Utilgjengeleg innhald unavailable_content_description: @@ -634,7 +633,6 @@ nn: applications: created: Søknad laga destroyed: Søknad sletta - invalid_url: Denne lenkja er ugyldig regenerate_token: Lag tilgangsnykel på nytt token_regenerated: Tilgangsnykel laga på nytt warning: Ver varsam med dette datumet. Aldri del det med nokon! diff --git a/config/locales/no.yml b/config/locales/no.yml index 4abc8f086d..30b7a56fb7 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -33,7 +33,6 @@ one: innlegg other: statuser status_count_before: Som skrev - tagline: Følg venner og oppdag nye terms: Bruksvilkår unavailable_content: Utilgjengelig innhold unavailable_content_description: @@ -629,7 +628,6 @@ applications: created: Søknaden ble vellykket oppretttet destroyed: Søknaden ble vellykket slettet - invalid_url: Den oppgitte URLen er ugyldig regenerate_token: Regenerer tilgangsnøkkel token_regenerated: Tilgangsnøkkel vellykket regenerert warning: Vær veldig forsiktig med denne data. Aldri del den med noen! diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 678d5d0dcd..57cecbdc40 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -31,7 +31,6 @@ oc: one: estatut other: estatuts status_count_before: qu’an escrich - tagline: Seguètz d’amics e trobatz-ne de nòus terms: Condicions d’utilizacion unavailable_content: Contengut pas disponible unavailable_content_description: @@ -573,7 +572,6 @@ oc: applications: created: Aplicacion ben creada destroyed: Aplication corrcètament suprimida - invalid_url: L’URL donada es invalida regenerate_token: Tornar generar lo geton d’accès token_regenerated: Geton d’accès ben regenerat warning: Mèfi ! Agachatz de partejar aquela donada amb degun ! diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 2709572def..7557ab83f1 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -40,7 +40,6 @@ pl: one: wpisu other: wpisów status_count_before: Są autorami - tagline: Śledź znajomych i poznawaj nowych terms: Zasady użytkowania unavailable_content: Niedostępne treści unavailable_content_description: @@ -871,6 +870,28 @@ pl: edit_preset: Edytuj szablon ostrzeżenia empty: Nie zdefiniowano jeszcze żadnych szablonów ostrzegawczych. title: Zarządzaj szablonami ostrzeżeń + webhooks: + add_new: Dodaj punkt końcowy + delete: Usuń + description_html: "webhook umożliwia Mastodon dostarczanie powiadomień w czasie rzeczywistym o wybranych wydarzeniach do twojej aplikacji, aby mogła automatycznie wyzwalać reakcje." + disable: Wyłącz + disabled: Wyłączone + edit: Edytuj punkt końcowy + empty: Nie masz jeszcze skonfigurowanych żadnych webhooków do punktów końcowych. + enable: Włącz + enabled: Aktywne + enabled_events: + few: "%{count} włączone zdarzenia" + many: "%{count} włączonych zdarzeń" + one: 1 włączone zdarzenie + other: "%{count} włączonych zdarzeń" + events: Zdarzenia + new: Nowy webhook + rotate_secret: Odśwież klucz szyfrowania + secret: Podpisywanie klucza szyfrowania + status: Stan + title: Webhooki + webhook: Webhook admin_mailer: new_appeal: actions: @@ -935,7 +956,6 @@ pl: applications: created: Pomyślnie utworzono aplikację destroyed: Pomyślnie usunięto aplikację - invalid_url: Wprowadzony adres URL jest nieprawidłowy regenerate_token: Wygeneruj nowy token dostępu token_regenerated: Pomyślnie wygenerowano nowy token dostępu warning: Przechowuj te dane ostrożnie. Nie udostępniaj ich nikomu! diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index b248110490..7661df9a0d 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -38,7 +38,6 @@ pt-BR: one: toot other: toots status_count_before: Autores de - tagline: Siga seus amigos e faça novas amizades terms: Termos de serviço unavailable_content: Conteúdo indisponível unavailable_content_description: @@ -428,6 +427,7 @@ pt-BR: destroyed_msg: Domínio desbloqueado domain: Domínio edit: Editar bloqueio de domínio + existing_domain_block: Você já impôs limites mais rigorosos em %{name}. existing_domain_block_html: Você já impôs limites mais estritos em %{name}, você precisa desbloqueá-lo primeiro. new: create: Criar bloqueio @@ -615,6 +615,7 @@ pt-BR: forwarded: Encaminhados forwarded_to: Encaminhado para %{domain} mark_as_resolved: Marcar como resolvido + mark_as_sensitive: Marcar como sensível mark_as_unresolved: Marcar como não resolvido no_one_assigned: Ninguém notes: @@ -800,6 +801,7 @@ pt-BR: usable: Pode ser usado usage_comparison: Usado %{today} vezes hoje, em comparação com %{yesterday} de ontem title: Em alta + trending: Em alta warning_presets: add_new: Adicionar novo delete: Excluir @@ -807,6 +809,12 @@ pt-BR: empty: Você ainda não definiu nenhuma predefinição de alerta. title: Gerenciar os avisos pré-definidos admin_mailer: + new_appeal: + actions: + delete_statuses: para excluir suas publicações + none: um aviso + sensitive: para marcar sua conta como sensível + silence: para limitar sua conta new_pending_account: body: Os detalhes da nova conta estão abaixo. Você pode aprovar ou vetar. subject: Nova conta para revisão em %{instance} (%{username}) @@ -851,7 +859,6 @@ pt-BR: applications: created: Aplicativo criado com sucesso destroyed: Aplicativo excluído com sucesso - invalid_url: O link fornecido é inválido regenerate_token: Gerar código de acesso token_regenerated: Código de acesso gerado com sucesso warning: Tenha cuidado com estes dados. Nunca compartilhe com alguém! diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 377360a9d8..9607762bbd 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -38,7 +38,7 @@ pt-PT: one: publicação other: publicações status_count_before: Que fizeram - tagline: Siga os seus amigos e descubra novas amizades + tagline: Rede social descentralizada terms: Termos de serviço unavailable_content: Conteúdo indisponível unavailable_content_description: @@ -852,6 +852,26 @@ pt-PT: edit_preset: Editar o aviso predefinido empty: Ainda não definiu nenhum aviso predefinido. title: Gerir os avisos predefinidos + webhooks: + add_new: Adicionar endpoint + delete: Eliminar + description_html: Um webhook possibilita que o Mastodon envie notificações em tempo real de eventos seleccionados, para um seu aplicativo, para que este possa acionar ações automaticamente. + disable: Desativar + disabled: Desativado + edit: Editar endpoint + empty: Não tem ainda qualquer endpoint de webhook configurado. + enable: Ativar + enabled: Activo + enabled_events: + one: 1 evento ativado + other: "%{count} eventos ativados" + events: Eventos + new: Novo webhook + rotate_secret: Alternar segredo + secret: Segredo de assinatura + status: Estado + title: Webhooks + webhook: Webhook admin_mailer: new_appeal: actions: @@ -916,7 +936,6 @@ pt-PT: applications: created: Aplicação criada com sucesso destroyed: Aplicação eliminada com sucesso - invalid_url: O URL é inválido regenerate_token: Regenerar token de acesso token_regenerated: Token de acesso regenerado com sucesso warning: Cuidado com estes dados. Não partilhar com ninguém! diff --git a/config/locales/ro.yml b/config/locales/ro.yml index d13aa54647..3203e9178b 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -36,7 +36,6 @@ ro: one: stare other: de stări status_count_before: Care au postat - tagline: Urmăriți prietenii și descoperiți alții noi terms: Termeni de serviciu unavailable_content: Conținut indisponibil unavailable_content_description: @@ -295,7 +294,6 @@ ro: applications: created: Aplicație creată cu succes destroyed: Aplicație ștearsă cu succes - invalid_url: URL-ul furnizat nu este valid regenerate_token: Regenerează token-ul de acces token_regenerated: Token de acces regenerat cu succes warning: Fiți foarte atent cu aceste date. Nu le împărtășiți niciodată cu cineva! diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 39a3b3eb7d..47f944129d 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -40,7 +40,7 @@ ru: one: пост other: поста status_count_before: И опубликовано - tagline: Подписывайтесь на друзей и заводите новые знакомства + tagline: Децентрализованная социальная сеть terms: Условия использования unavailable_content: Недоступный контент unavailable_content_description: @@ -403,6 +403,16 @@ ru: media_storage: Медиа файлы new_users: новые пользователи opened_reports: жалоб открыто + pending_reports_html: + few: "%{count} ожидающих отчета" + many: "%{count} ожидающих отчетов" + one: "%{count} ожидающий отчет" + other: "%{count} ожидающих отчетов" + pending_users_html: + few: "%{count} ожидающих пользователя" + many: "%{count} ожидающих пользователей" + one: "%{count} ожидающий пользователь" + other: "%{count} ожидающих пользователей" resolved_reports: жалоб решено software: Программное обеспечение sources: Источники регистрации @@ -500,6 +510,7 @@ ru: suspend: Приостановить policy: Политика reason: Публичная причина + title: Политика контента dashboard: instance_accounts_dimension: Популярные аккаунты instance_accounts_measure: сохраненные учетные записи @@ -803,6 +814,8 @@ ru: statuses: allow: Разрешить пост allow_account: Разрешить автора + disallow: Запретить пост + disallow_account: Запретить автора title: Популярные посты tags: current_score: Текущий счет %{score} @@ -818,6 +831,7 @@ ru: peaked_on_and_decaying: Последний пик — %{date}, сейчас идёт на спад title: Актуальные хэштеги trendable: Может появляться в списке «актуального» + trending_rank: 'Популярное #%{rank}' usable: Может использоваться usage_comparison: Использовано %{today} сегодня, для сравнения вчера %{yesterday} used_by_over_week: @@ -833,12 +847,35 @@ ru: edit_preset: Удалить шаблон предупреждения empty: Вы еще не определили пресеты предупреждений. title: Управление шаблонами предупреждений + webhooks: + add_new: Добавить конечную точку + delete: Удалить + description_html: "Вебхуки позволяют Mastodon отправлять вашим приложениям уведомления в реальном времени о выбранных происходящих событиях, а они могут обрабатывать их в автоматическом режиме." + disable: Отключить + disabled: Отключено + edit: Редактировать вебхук + empty: У вас пока нет настроенных конечных точек вебхуков. + enable: Включить + enabled: Активен + enabled_events: + few: "%{count} события включено" + many: "%{count} событий включено" + one: "%{count} событие включено" + other: "%{count} событий включено" + events: События + new: Новый вебхук + rotate_secret: Сгенерировать новый + secret: Ключ подписи + status: Состояние + title: Вебхуки + webhook: Вебхук admin_mailer: new_appeal: actions: none: предупреждение silence: ограничить учётную запись suspend: приостановить действие учётной записи + body: "%{target} обжалуют решение модератора %{action_taken_by} от %{date}, которое %{type}. Они написали:" subject: "%{username} обжалует решение модерации на %{instance}" new_pending_account: body: Ниже указана информация учётной записи. Вы можете одобрить или отклонить заявку. @@ -885,7 +922,6 @@ ru: applications: created: Приложение успешно создано destroyed: Приложение успешно удалено - invalid_url: Введенный URL неверен regenerate_token: Повторно сгенерировать токен доступа token_regenerated: Токен доступа успешно сгенерирован warning: Будьте очень внимательны с этими данными. Не делитесь ими ни с кем! diff --git a/config/locales/sc.yml b/config/locales/sc.yml index 99cd3f0b58..4906541437 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -35,7 +35,6 @@ sc: one: istadu other: istados status_count_before: Atributzione de - tagline: Sighi is amistades tuas e iscoberi·nde àteras terms: Cunditziones de su servìtziu unavailable_content: Serbidores moderados unavailable_content_description: @@ -659,7 +658,6 @@ sc: applications: created: Aplicatzione creada destroyed: Aplicatzione cantzellada - invalid_url: S'URL frunidu no est curretu regenerate_token: Torra a generare s'identificadore de atzessu token_regenerated: Identificadore de atzessu generadu warning: Dae cara a custos datos. Non ddos cumpartzas mai cun nemos! diff --git a/config/locales/simple_form.af.yml b/config/locales/simple_form.af.yml index 252f9fd5a2..a52c53eba1 100644 --- a/config/locales/simple_form.af.yml +++ b/config/locales/simple_form.af.yml @@ -1 +1,11 @@ +--- af: + simple_form: + hints: + webhook: + events: Kies gebeurtenisse om te stuur + url: Waarheen gebeurtenisse gestuur sal word + labels: + webhook: + events: Geaktiveerde gebeurtenisse + url: End-punt URL diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml index 2e06326484..ccbb902823 100644 --- a/config/locales/simple_form.ca.yml +++ b/config/locales/simple_form.ca.yml @@ -91,6 +91,9 @@ ca: name: Només pots canviar la caixa de les lletres, per exemple, per fer-la més llegible user: chosen_languages: Quan estigui marcat, només es mostraran les publicacions en les llengües seleccionades en les línies de temps públiques + webhook: + events: Selecciona esdeveniments a enviar + url: On els esdeveniments seran enviats labels: account: fields: @@ -219,6 +222,9 @@ ca: name: Etiqueta trendable: Permet que aquesta etiqueta aparegui en les tendències usable: Permetre a les publicacions emprar aquesta etiqueta + webhook: + events: Esdeveniments activats + url: URL del extrem 'no': 'No' recommended: Recomanat required: diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml index 32711aa0df..789b328b59 100644 --- a/config/locales/simple_form.cs.yml +++ b/config/locales/simple_form.cs.yml @@ -91,6 +91,9 @@ cs: name: Můžete měnit pouze velikost písmen, například kvůli lepší čitelnosti user: chosen_languages: Po zaškrtnutí budou ve veřejných časových osách zobrazeny pouze příspěvky ve zvolených jazycích + webhook: + events: Zvolte odesílané události + url: Kam budou události odesílány labels: account: fields: @@ -219,6 +222,9 @@ cs: name: Hashtag trendable: Povolit zobrazení tohoto hashtagu mezi populárními usable: Povolit používat tento hashtag v příspěvcích + webhook: + events: Zapnuté události + url: URL koncového bodu 'no': Ne recommended: Doporučeno required: diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index 88b17a6c53..84450c768d 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -91,6 +91,9 @@ da: name: Kun bogstavtyper (store/små) kan ændres, eksempelvis for at gøre det mere læsbart user: chosen_languages: Når markeret, vil kun indlæg på de valgte sprog fremgå på offentlige tidslinjer + webhook: + events: Vælg begivenheder at sende + url: Hvor begivenheder sendes til labels: account: fields: @@ -219,6 +222,9 @@ da: name: Hashtag trendable: Tillad visning af dette hashtag under trends usable: Tillad indlæg at benytte dette hashtag + webhook: + events: Aktive begivenheder + url: Endepunkts-URL 'no': Nej recommended: Anbefalet required: diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index e9ae172069..46472cdcfd 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -91,6 +91,9 @@ de: name: Du kannst zum Beispiel nur die Groß- und Kleinschreibung der Buchstaben ändern, um es lesbarer zu machen user: chosen_languages: Wenn aktiviert, werden nur Beiträge in den ausgewählten Sprachen auf den öffentlichen Zeitleisten angezeigt + webhook: + events: Zu sendende Ereignisse auswählen + url: Wo Ereignisse hingesendet werden labels: account: fields: @@ -219,6 +222,9 @@ de: name: Hashtag trendable: Erlaube es diesen Hashtag in den Trends erscheinen zu lassen usable: Beiträge erlauben, diesen Hashtag zu verwenden + webhook: + events: Aktivierte Ereignisse + url: Endpunkt-URL 'no': Nein recommended: Empfohlen required: diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml new file mode 100644 index 0000000000..ef03d18104 --- /dev/null +++ b/config/locales/simple_form.en-GB.yml @@ -0,0 +1 @@ +en-GB: diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml index d4a9ad264f..8f30266e36 100644 --- a/config/locales/simple_form.es-AR.yml +++ b/config/locales/simple_form.es-AR.yml @@ -91,6 +91,9 @@ es-AR: name: Sólo podés cambiar la capitalización de las letras, por ejemplo, para que sea más legible user: chosen_languages: Cuando estén marcados, sólo se mostrarán los mensajes en los idiomas seleccionados en las líneas temporales públicas + webhook: + events: Seleccionar eventos para enviar + url: Adónde serán enviados los eventos labels: account: fields: @@ -219,6 +222,9 @@ es-AR: name: Etiqueta trendable: Permitir que esta etiqueta aparezca bajo tendencias usable: Permitir a los mensajes usar esta etiqueta + webhook: + events: Eventos habilitados + url: Dirección web del punto final 'no': 'No' recommended: Opción recomendada required: diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml index d02e97a3ad..66efd68abc 100644 --- a/config/locales/simple_form.es-MX.yml +++ b/config/locales/simple_form.es-MX.yml @@ -49,6 +49,7 @@ es-MX: phrase: Se aplicará sin importar las mayúsculas o los avisos de contenido de un toot scopes: Qué APIs de la aplicación tendrán acceso. Si seleccionas el alcance de nivel mas alto, no necesitas seleccionar las individuales. setting_aggregate_reblogs: No mostrar nuevos retoots para los toots que han sido recientemente retooteados (sólo afecta a los retoots recibidos recientemente) + setting_always_send_emails: Normalmente las notificaciones por correo electrónico no se enviarán cuando estés usando Mastodon activamente setting_default_sensitive: El contenido multimedia sensible está oculto por defecto y puede ser mostrado con un click setting_display_media_default: Ocultar contenido multimedia marcado como sensible setting_display_media_hide_all: Siempre ocultar todo el contenido multimedia @@ -151,6 +152,7 @@ es-MX: phrase: Palabra clave o frase setting_advanced_layout: Habilitar interfaz web avanzada setting_aggregate_reblogs: Agrupar retoots en las líneas de tiempo + setting_always_send_emails: Enviar siempre notificaciones por correo setting_auto_play_gif: Reproducir automáticamente los GIFs animados setting_boost_modal: Mostrar ventana de confirmación antes de un Retoot setting_crop_images: Recortar a 16x9 las imágenes de los toots no expandidos diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index 53c6d9c45e..53863ba311 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -91,6 +91,9 @@ es: name: Sólo se puede cambiar el cajón de las letras, por ejemplo, para que sea más legible user: chosen_languages: Cuando se marca, solo se mostrarán las publicaciones en los idiomas seleccionados en las líneas de tiempo públicas + webhook: + events: Seleccionar eventos para enviar + url: Donde los eventos serán enviados labels: account: fields: @@ -219,6 +222,9 @@ es: name: Etiqueta trendable: Permitir que esta etiqueta aparezca bajo tendencias usable: Permitir a las publicaciones usar esta etiqueta + webhook: + events: Eventos habilitados + url: URL de Endpoint 'no': 'No' recommended: Recomendado required: diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index 9a777c45ce..c4fd49040d 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -91,6 +91,9 @@ fr: name: Vous ne pouvez modifier que la casse des lettres, par exemple, pour le rendre plus lisible user: chosen_languages: Lorsque coché, seuls les messages dans les langues sélectionnées seront affichés sur les fils publics + webhook: + events: Sélectionnez les événements à envoyer + url: Là où les événements seront envoyés labels: account: fields: @@ -219,6 +222,9 @@ fr: name: Hashtag trendable: Autoriser ce hashtag à apparaitre dans les tendances usable: Autoriser les messages à utiliser ce hashtag + webhook: + events: Événements activés + url: URL du point de terminaison 'no': Non recommended: Recommandé required: diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml index 83447f7ec1..28d0986309 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -91,6 +91,9 @@ gl: name: Só podes cambiar maiús/minúsculas, por exemplo, mellorar a lexibilidade user: chosen_languages: Se ten marca, só as publicacións nos idiomas seleccionados serán mostrados en cronoloxías públicas + webhook: + events: Elexir eventos a enviar + url: Cando serán enviados os eventos labels: account: fields: @@ -219,6 +222,9 @@ gl: name: Cancelo trendable: Permitir que este cancelo apareza en tendencias usable: Permitir que as publicacións utilicen este cancelo + webhook: + events: Eventos activados + url: URL do extremo 'no': Non recommended: Recomendado required: diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml index 6faf1842a3..c7fe6026cb 100644 --- a/config/locales/simple_form.he.yml +++ b/config/locales/simple_form.he.yml @@ -91,6 +91,8 @@ he: name: ניתן רק להחליף בין אותיות קטנות וגדולות, למשל כדי לשפר את הקריאות user: chosen_languages: אם פעיל, רק חצרוצים בשפות הנבחרות יוצגו לפידים הפומביים + webhook: + events: בחר אירועים לשליחה labels: account: fields: diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml index fb147a22ce..3aba339954 100644 --- a/config/locales/simple_form.hu.yml +++ b/config/locales/simple_form.hu.yml @@ -91,6 +91,9 @@ hu: name: Csak a kis/nagybetűséget változtathatod meg, pl. hogy olvashatóbb legyen user: chosen_languages: Ha aktív, csak a kiválasztott nyelvű bejegyzések jelennek majd meg a nyilvános idővonalon + webhook: + events: Válaszd ki a küldendő eseményeket + url: Ahová az eseményket küldjük labels: account: fields: @@ -219,6 +222,9 @@ hu: name: Hashtag trendable: A hashtag megjelenhet a felkapottak között usable: Bejegyzések használhatják ezt a hashtaget + webhook: + events: Engedélyezett események + url: Végponti URL 'no': Nem recommended: Ajánlott required: diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml index 0e2d5e3a93..5f72276b7c 100644 --- a/config/locales/simple_form.io.yml +++ b/config/locales/simple_form.io.yml @@ -91,6 +91,9 @@ io: name: Vu povas nur chanjar literkaso, por exemplo, por kauzigar lu divenar plu lektebla user: chosen_languages: Kande marketigesis, nur posti en selektesis lingui montresos en publika tempolinei + webhook: + events: Selektigez eventi por sendar + url: Ibe eventi sendesos labels: account: fields: @@ -219,6 +222,9 @@ io: name: Hashtago trendable: Permisez ca hashtago aparar che tendenci usable: Permisez posti uzar ca hashtago + webhook: + events: Aktivigita eventi + url: URL di finpunto 'no': Ne recommended: Rekomendito required: diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml index 7eb014193e..4d86f24dfe 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -91,6 +91,9 @@ it: name: Puoi cambiare solo il minuscolo/maiuscolo delle lettere, ad esempio, per renderlo più leggibile user: chosen_languages: Quando una o più lingue sono contrassegnate, nelle timeline pubbliche vengono mostrati solo i toot nelle lingue selezionate + webhook: + events: Seleziona eventi da inviare + url: Dove gli eventi saranno inviati labels: account: fields: @@ -219,6 +222,9 @@ it: name: Hashtag trendable: Permetti a questo hashtag di apparire nelle tendenze usable: Permetti ai post di usare questo hashtag + webhook: + events: Eventi abilitati + url: URL endpoint 'no': 'No' recommended: Consigliato required: diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 5f61ee19cd..cde47dbd04 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -219,6 +219,9 @@ ja: name: ハッシュタグ trendable: トレンドへの表示を許可する usable: 投稿への使用を許可する + webhook: + events: 有効なイベント + url: エンドポイントURL 'no': いいえ recommended: おすすめ required: diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml index e9e6603cd0..9cfe371b55 100644 --- a/config/locales/simple_form.ku.yml +++ b/config/locales/simple_form.ku.yml @@ -93,6 +93,9 @@ ku: name: Tîpan, mînak ji bo ku bêhtir paknivîs bibe, tenê rewşa tîpên girdek/hûrdek dikarî biguherînî user: chosen_languages: Dema were nîşankirin, tenê parvekirinên bi zimanên hilbijartî dê di rêzikên giştî de werin nîşandan + webhook: + events: Bûyeran hilbijêre bo şandinê + url: Cihê ku bûyer wê werin şandin labels: account: fields: @@ -221,6 +224,9 @@ ku: name: Hashtag trendable: Bihêle ku ev hashtag werê xuyakirin di bin rojevê de usable: Bihêle ku şandî ev hashtag bi kar bînin + webhook: + events: Bûyerên çalakkirî + url: Girêdana xala dawîbûnê 'no': Na recommended: Pêşniyarkirî required: diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml index e512551ba9..97fa2bff4d 100644 --- a/config/locales/simple_form.lv.yml +++ b/config/locales/simple_form.lv.yml @@ -91,6 +91,9 @@ lv: name: Tu vari mainīt tikai burtu lielumu, piemēram, lai tie būtu vieglāk lasāmi user: chosen_languages: Ja ieķeksēts, publiskos laika grafikos tiks parādītas tikai ziņas noteiktajās valodās + webhook: + events: Atlasi nosūtāmos notikums + url: Kur notikumi tiks nosūtīti labels: account: fields: @@ -219,6 +222,9 @@ lv: name: Tēmturis trendable: Atļaut šim tēmturim parādīties zem tendencēm usable: Atļaut lietot ziņās šo tēmturi + webhook: + events: Iespējotie notikumi + url: Galapunkta URL 'no': Nē recommended: Ieteicams required: diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml index 0793f55bcd..b0373fbc62 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -91,6 +91,9 @@ pl: name: Możesz zmieniać tylko wielkość liter, np. aby były bardziej widoczne user: chosen_languages: Jeżeli zaznaczone, tylko wpisy w wybranych językach będą wyświetlane na publicznych osiach czasu + webhook: + events: Wybierz zdarzenia do wysłania + url: Dokąd będą wysłane zdarzenia labels: account: fields: @@ -219,6 +222,9 @@ pl: name: Hashtag trendable: Pozwól na wyświetlanie tego hashtagu w „Na czasie” usable: Pozwól na umieszczanie tego hashtagu we wpisach + webhook: + events: Włączone zdarzenia + url: Endpoint URL 'no': Nie recommended: Polecane required: diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml index 42116174f3..16972ca6ab 100644 --- a/config/locales/simple_form.pt-PT.yml +++ b/config/locales/simple_form.pt-PT.yml @@ -91,6 +91,9 @@ pt-PT: name: Só pode alterar a capitalização das letras, por exemplo, para torná-las mais legíveis user: chosen_languages: Quando seleccionado, só publicações nas línguas escolhidas serão mostradas nas cronologias públicas + webhook: + events: Selecione os eventos a enviar + url: Para onde os eventos serão enviados labels: account: fields: @@ -219,6 +222,9 @@ pt-PT: name: Hashtag trendable: Permitir que esta hashtag apareça em destaque usable: Permitir que toots utilizem esta hashtag + webhook: + events: Eventos ativados + url: URL do Endpoint 'no': Não recommended: Recomendado required: diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml index 839be0a69e..571411c096 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -91,6 +91,9 @@ ru: name: Вы можете изменить только регистр букв чтобы, например, сделать тег более читаемым user: chosen_languages: Если выбрано, то в публичных лентах будут показаны только посты на выбранных языках. + webhook: + events: Выберите события для отправки + url: Куда события будут отправляться labels: account: fields: @@ -219,6 +222,9 @@ ru: name: Хэштег trendable: Разрешить показ хэштега в трендах usable: Разрешить использовать этот хэштег в постах + webhook: + events: Включенные события + url: Endpoint URL 'no': Нет recommended: Рекомендуем required: diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index 5ae4b2e047..bd482f7786 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -111,7 +111,7 @@ sk: max_uses: Najviac možno použiť new_password: Nové heslo note: O tebe - otp_attempt: Dvoj-faktorový overovací (2FA) kód + otp_attempt: Dvoj-faktorový overovací kód password: Heslo phrase: Kľúčové slovo, alebo fráza setting_advanced_layout: Zapni pokročilé užívateľské rozhranie @@ -139,6 +139,7 @@ sk: setting_use_blurhash: Ukáž farebné prechody pre skryté médiá setting_use_pending_items: Pomalý režim severity: Závažnosť + sign_in_token_attempt: Bezpečnostný kód type: Typ importu username: Prezývka username_or_email: Prezývka, alebo email diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml index f1870ab9ae..04df4eb496 100644 --- a/config/locales/simple_form.sl.yml +++ b/config/locales/simple_form.sl.yml @@ -91,6 +91,9 @@ sl: name: Spremenite lahko le npr. velikost črk (velike/male), da je bolj berljivo user: chosen_languages: Ko je označeno, bodo v javnih časovnicah prikazane samo objave v izbranih jezikih + webhook: + events: Izberite dogodke za pošiljanje + url: Kam bodo poslani dogodki labels: account: fields: @@ -219,6 +222,9 @@ sl: name: Ključnik trendable: Dovoli, da se ta ključnik pojavi med trendi usable: Dovoli, da objave uporabljajo ta ključnik + webhook: + events: Omogočeni dogodki + url: URL končne točke 'no': Ne recommended: Priporočeno required: diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml index 1136169b7f..0e2fb4ab88 100644 --- a/config/locales/simple_form.sq.yml +++ b/config/locales/simple_form.sq.yml @@ -91,6 +91,9 @@ sq: name: Mund të ndryshoni shkronjat vetëm nga të mëdha në të vogla ose anasjelltas, për shembull, për t’i bërë më të lexueshme user: chosen_languages: Në iu vëntë shenjë, te rrjedha kohore publike do të shfaqen vetëm mesazhe në gjuhët e përzgjedhura + webhook: + events: Përzgjidhni akte për dërgim + url: Ku do të dërgohen aktet labels: account: fields: @@ -219,6 +222,9 @@ sq: name: Hashtag trendable: Lejoje këtë hashtag të shfaqet në prirje usable: Lejoji mesazhet të përdorin këtë hashtag + webhook: + events: Akte të aktivizuar + url: URL pikëmbarimi 'no': Jo recommended: E rekomanduar required: diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml index 21e3aab784..9942130659 100644 --- a/config/locales/simple_form.tr.yml +++ b/config/locales/simple_form.tr.yml @@ -91,6 +91,9 @@ tr: name: Harflerin, örneğin daha okunabilir yapmak için, sadece büyük/küçük harf durumlarını değiştirebilirsiniz user: chosen_languages: İşaretlendiğinde, yalnızca seçilen dillerdeki tootlar genel zaman çizelgelerinde görüntülenir + webhook: + events: Gönderilecek etkinlikleri seçin + url: Olayların gönderileceği yer labels: account: fields: @@ -219,6 +222,9 @@ tr: name: Etiket trendable: Bu etiketin gündem altında görünmesine izin ver usable: Tootların bu etiketi kullanmasına izin ver + webhook: + events: Etkin olaylar + url: Uç nokta URL’si 'no': Hayır recommended: Önerilen required: diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml index 4d023b77d3..9b8ecb5734 100644 --- a/config/locales/simple_form.uk.yml +++ b/config/locales/simple_form.uk.yml @@ -91,6 +91,9 @@ uk: name: Тут ви можете лише змінювати регістр літер, щоб підвищити читабельність user: chosen_languages: У глобальних стрічках будуть відображатися дмухи тільки обраними мовами + webhook: + events: Оберіть події для надсилання + url: Куди надсилатимуться події labels: account: fields: @@ -219,6 +222,9 @@ uk: name: Хештеґ trendable: Дозволити появу цього хештеґа у списку популярних хештеґів usable: Дозволити дмухам використовувати цей хештеґ + webhook: + events: Увімкнені події + url: URL кінцевої точки 'no': Ні recommended: Рекомендовано required: diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml index 59c7a634bf..729be66348 100644 --- a/config/locales/simple_form.vi.yml +++ b/config/locales/simple_form.vi.yml @@ -91,6 +91,9 @@ vi: name: Bạn có thể thay đổi cách viết hoa các chữ cái để giúp nó dễ đọc hơn user: chosen_languages: Chỉ hiển thị những tút viết bằng các ngôn ngữ được chọn sau + webhook: + events: Chọn sự kiện để gửi + url: Nơi những sự kiện được gửi đến labels: account: fields: @@ -219,6 +222,9 @@ vi: name: Hashtag trendable: Cho phép xuất hiện trong xu hướng usable: Cho phép dùng trong tút + webhook: + events: Những sự kiện đã bật + url: URL endpoint 'no': Tắt recommended: Đề xuất required: diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml index 86103ec96a..4cc6af416c 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -91,6 +91,9 @@ zh-TW: name: 您只能變更大小寫，例如，以使其更易讀。 user: chosen_languages: 當核取時，只有選取語言的嘟文會在公開時間軸中顯示 + webhook: + events: 請選擇要傳送的事件 + url: 事件會被傳送至何處 labels: account: fields: @@ -219,6 +222,9 @@ zh-TW: name: 主題標籤 trendable: 允許此主題標籤在趨勢下顯示 usable: 允許嘟文使用此主題標籤 + webhook: + events: 已啟用的事件 + url: 端點 URL 'no': 否 recommended: 建議 required: diff --git a/config/locales/sk.yml b/config/locales/sk.yml index d59e81cc8a..1f64c78c72 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -38,7 +38,7 @@ sk: one: príspevok other: príspevky status_count_before: Ktorí napísali - tagline: Nasleduj kamarátov, a objavuj nových + tagline: Decentralizovaná sociálna sieť terms: Podmienky užitia unavailable_content: Nedostupný obsah unavailable_content_description: @@ -634,7 +634,6 @@ sk: applications: created: Aplikácia bola vytvorená úspešne destroyed: Aplikáciu sa podarilo odstrániť - invalid_url: Zadaná URL adresa je nesprávna regenerate_token: Znovu vygeneruj prístupový token token_regenerated: Prístupový token bol úspešne vygenerovaný znova warning: Na tieto údaje dávaj ohromný pozor. Nikdy ich s nikým nezďieľaj! diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 8f54e9f74f..ff3492d605 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -40,7 +40,7 @@ sl: other: objav two: stanja status_count_before: Ki so avtorji - tagline: Sledite prijateljem in odkrijte nove + tagline: Decentralizirano družbeno omrežje terms: Pogoji storitve unavailable_content: Moderirani strežniki unavailable_content_description: @@ -886,6 +886,23 @@ sl: edit_preset: Uredi prednastavitev opozoril empty: Zaenkrat še niste določili nobenih opozorilnih prednastavitev. title: Upravljaj prednastavitev opozoril + webhooks: + add_new: Dodaj končno točko + delete: Izbriši + description_html: "Spletna zanka omogoča, da Mastodon potiska obvestila v resničnem času o izbranih dogodkih vašemu programu, tako da ta lahko samodejno proži odzive." + disable: Onemogoči + disabled: Onemogočeno + edit: Uredi končno točko + empty: Zaenkrat še nimate prilagojenih končnih točk spletnih zank. + enable: Omogoči + enabled: Dejaven + events: Dogodki + new: Nova spletna zanka + rotate_secret: Zasukaj skrivnost + secret: Skrivnost podpisovanja + status: Stanje + title: Spletne zanke + webhook: Spletna zanka admin_mailer: new_appeal: actions: @@ -950,7 +967,6 @@ sl: applications: created: Aplikacija je bila uspešno ustvarjena destroyed: Aplikacija je bila uspešno izbrisana - invalid_url: Navedeni URL je neveljaven regenerate_token: Obnovite dostopni žeton token_regenerated: Dostopni žeton je bil uspešno regeneriran warning: Bodite zelo previdni s temi podatki. Nikoli jih ne delite z nikomer! diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 8974b9c841..0e4d9871ee 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -38,7 +38,7 @@ sq: one: mesazh other: mesazhe status_count_before: Që kanë krijuar - tagline: Ndiqni shokë dhe zbuloni të rinj + tagline: Rrjet shoqëror i decentralizuar terms: Kushte shërbimi unavailable_content: Shërbyes të moderuar unavailable_content_description: @@ -200,7 +200,7 @@ sq: only_password: Vetëm fjalëkalim password_and_2fa: Fjalëkalim dhe 2FA sensitive: Rezervat - sensitized: iu vu shenjë si rezervat + sensitized: Iu vu shenjë si rezervat shared_inbox_url: URL kutie të përbashkët mesazhesh show: created_reports: Ka bërë raportime @@ -428,6 +428,7 @@ sq: destroyed_msg: Bllokimi i përkatësisë u hoq domain: Përkatësi edit: Përpunoni bllokim përkatësie + existing_domain_block: Keni vendosur tashmë kufizime më të rrepta mbi %{name}. existing_domain_block_html: Keni vendosur tashmë kufizime më të rrepta mbi %{name}, lypset ta zhbllokoni së pari. new: create: Krijoni bllokim @@ -516,6 +517,7 @@ sq: delivery: all: Krejt clear: Spastro gabime dërgimi + failing: Dështim restart: Rinis dërgimin stop: Ndale dërgimin unavailable: Jo i passhëm @@ -839,12 +841,32 @@ sq: one: Përdorur nga një person gjatë javës së kaluar other: Përdorur nga %{count} vetë gjatë javës së kaluar title: Në modë + trending: Në modë warning_presets: add_new: Shtoni të ri delete: Fshije edit_preset: Përpunoni sinjalizim të paracaktuar empty: S’keni përcaktuar ende sinjalizime të gatshme. title: Administroni sinjalizime të paracaktuara + webhooks: + add_new: Shtoni pikëmbarim + delete: Fshije + description_html: Një webhook i bën të mundur Mastodon-it t’i dërgojë aplikacioni tuaj njoftime aty për aty rreth aktesh që keni zgjedhur, që kështu aplikacioni juaj të mund të prodhojë automatikisht reagime. + disable: Çaktivizoje + disabled: Të çaktivizuar + edit: Përpunoni pikëmbarim + empty: S’keni ende ndonjë pikëmbarim webhook të formësuar. + enable: Aktivizoje + enabled: Aktiv + enabled_events: + one: 1 akt i aktivizuar + other: "%{count}s akte të aktivizuar" + events: Akte + new: "Webhook i ri" + rotate_secret: Ciklo të fshehtën + secret: E fshehtë nënshkrimesh + status: Gjendje + title: Webhook-ë admin_mailer: new_appeal: actions: @@ -906,7 +928,6 @@ sq: applications: created: Aplikimi u krijua me sukses destroyed: Aplikimi u fshi me sukses - invalid_url: URL-ja e dhënë është e pavlefshme regenerate_token: Riprodho token hyrjesh token_regenerated: Token-i i hyrjeve u riprodhua me sukses warning: Bëni shumë kujdes me ato të dhëna. Mos ia jepni kurrë njeriu! @@ -1510,9 +1531,93 @@ sq: pinned: Mesazh i fiksuar reblogged: të përforcuara sensitive_content: Lëndë rezervat + strikes: + errors: + too_late: Është shumë vonë për apelim të këtij paralajmërimi tags: does_not_match_previous_name: s’përputhet me emrin e mëparshëm terms: + body_html: | +

Rregulla Privatësie

+

Ç’informacion mbledhim?

+ +
    +
  • Hollësi elementare llogarish: Nëse regjistroheni në këtë shërbyes, mund t’ju kërkohet të jepni një emër përdoruesi, një adresë email dhe një fjalëkalim. Mund të jepni edhe hollësi shtesë profili, bie fjala, një emër për në ekran dhe jetëshkrim, si dhe të ngarkoni një foto profili dhe një figurë kryesh. Emri i përdoruesit, emri në ekran, jetëshkrimi, fotoja e profilit dhe figura e kryes janë përherë të dukshme publikisht.
    • +
  • Postime, ndjekje dhe të tjera hollësi publike: Lista e personave që ndiqni tregohet publikisht, po kjo vlen edhe për ndjekësit tuaj. Kur parashtroni një mesazh, depozitohen gjithashtu data dhe koha, si dhe aplikacioni prej nga parashtruar mesazhin. Mesazhet mund të përmbajnë bashkëngjitje media, bie fjala, foto dhe video. Postimet publike dhe jo të tilla janë të passhme publikisht. Kur te profili juaj përfshini një postim, edhe ky është informacion i passhëm publikisht. Postimet tuaja u dërgohen ndjekësve tuaj, në disa raste kjo do të thotë se dërgohen te shërbyes të ndryshëm dhe në ta depozitohen kopje të tyre. Kur fshini postime, kjo ka gjasa t’u dërgohet ndjekësve tuaj. Veprimi i riblogimit, ose vënia shenjë si i parapëlqyer një postimi tjetër është përherë gjë publike.
    • +
  • Postime të drejtpërdrejta dhe vetëm për ndjekës: Krejt postimet depozitohen dhe përpunohen te shërbyesi. Postimet vetëm për ndjekës u dërgohen ndjekësve tuaj dhe përdoruesve që përmenden në ta, kurse postimet e drejtpërdrejta u dërgohen vetëm përdoruesve të përmendur në to. Në disa raste kjo do të thotë se dërgohen në shërbyes të ndryshëm dhe kopje të tyre depozitohen atje. Përpiqemi në mirëbesim të kufizojmë hyrjen në këto postime të vetëm personave të autorizuar, por shërbyes të tjerë mund të mos bëjnë kështu. Ndaj është e rëndësishme të shqyrtohen shërbyesit të cilëve u përkasin ndjekësit tuaj. Që nga rregullimet mund të aktivizoni/çaktivizoni një mundësi për miratim dhe hedhje poshtë dorazi të ndjekësve të rinj. Ju lutemi, kini parasysh se operatorët e shërbyesve dhe cilido shërbyes marrës mund t’i shohë këto mesazhe, si dhe se marrësit mund të bëjnë foto ekrani, kopjojnë, ose rindajnë me të tjerët ato mesazhe. Mos ndani me të tjerë gjëra me spec përmes Mastodon-it.
    • +
  • IP-ra dhe të tjera tejtëdhëna: Kur bëni hyrjen në llogari, regjistrojmë adresën IP prej nga hyni, si dhe emrin e aplikacionit që përdorni për shfletim. Krejt sesionet me hyrje mund t’i shqyrtoni dhe shfuqizoni që nga rregullimet. Adresa e fundit IP e përdorur depozitohet për deri 12 muaj. Mund të mbajmë gjithashtu regjistra shërbyesi që përfshijnë adresën IP të çdo kërkese ndaj shërbyesit tonë.
    • +
+ +
+ +

Për se e përdorim informacionin tuaj?

+ +

Çfarëdo hollësi që mbledhim prej jush mund të përdoret në rrugët vijuese:

+ +
    +
  • Për të dhënë funksionet bazë të Mastodon-it. Me lëndën e personave të tjerë mund të ndërveproni, si dhe të postoni lëndën tuaj, vetëm kur jeni i futur në llogarinë tuaj. Për shembull, mund të ndiqni persona të tjerë për të parë postimet e tyre në rrjedhën tuaj kohore të personalizuar.
    • +
  • Për të ndihmuar në moderimin e bashkësisë, për shembull, krahasimi i adresës tuaj IP me të tjera të ditura, për të pikasur shmangie dëbimesh, apo cenime të tjera.
    • +
  • Adresa email që jepni mund të përdoret për t’ju dërguar informacion, njoftime mbi persona të tjerë që ndërveprojnë me lëndën tuaj, ose që ju dërgojnë mesazhe, si dhe për t’iu përgjigjur kërkesave dhe/ose çështjeve apo pyetjeve të tjera.
    • +
+ +
+ +

Si e mbrojmë informacionin tuaj?

+ +

Sendërtojmë një larmi masash sigurie për të ruajtur parrezikshmërinë e informacionit tuaj personal, kur jepni, parashtroni ose përdorni informacionin tuaj personal. Mes të tjerash, sesioni i shfletuesit tuaj, si dhe trafiku mes aplikacioneve tuaja dhe API-t sigurohen me SSL dhe fjalëkalimi juaj fshehtëzohet me një algoritëm të fuqishëm njëkahësh. Për të siguruar më tej hyrjen në llogarinë tuaj, mund të aktivizoni mirëfilltësim dufaktorësh.

+ +
+ +

Cili është rregulli ynë për mbajtje të dhënash?

+ +

Do të përpiqemi në mirëbesim:

+ +
    +
  • Të mbajmë regjistra shërbyesi që përmbajnë adresën IP të krejt kërkesave të bëra këtij shërbyesi, ashtu siç mbahen këta regjistra, për jo më shumë se 90 ditë.
    • +
  • Të mbajmë për jo më shumë se 12 muaj adresat IP përshoqëruar përdoruesve të regjistruar.
    • +
+ +

Mund të kërkoni dhe shkarkoni një arkiv të lëndës tuaj, përfshi postimet tuaja, bashkëngjitje media, foto profili dhe figure kryesh.

+ +

Mund të fshini kurdo në mënyrë të pakthyeshme llogarinë tuaj.

+ +
+ +

A përdorim cookies?

+ +

Po. Cookie-t janë kartela të vockla që një sajt ose furnizuesi i shërbimit përkatës shpërngul në diskun e kompjuterit tuaj përmes shfletuesit tuaj (nëse e lejoni). Këto cookies i bëjnë të mundur sajtit të njohë shfletuesin tuaj dhe, nëse keni regjistruar një llogari, t’ia përshoqërojë atë llogarisë që keni regjistruar.

+ +

Cookie-t i përdorim për të kuptuar dhe ruajtur parapëlqimet tuaja për vizita të ardhshme.

+ +
+ +

A u japim palëve të jashtme ndonjë informacion?

+ +

Nuk u shesim, shkëmbejmë, apo shpërngulim informacion tuajin personalisht të identifikueshëm palëve të jashtme. Këtu nuk përfshin palë të treta të besuara që na ndihmojnë në funksionimin e sajtit tonë, në mbajtjen në këmbë të biznesit tonë, ose për t’ju shërbyer juve, për sa kohë që këto palë pajtohen me mbajtjen rezervat të këtij informacioni. Mundet edhe të japim informacion tuajin, kur besojmë se dhënia është e duhur për të qenë në pajtim me ligjet, për të zbatuar rregullat tonë mbi sajtin, ose për të mbrojtur të drejtat, pronën apo sigurinë tonë apo të të tjerëve.

+ +

Lënda juaj publike mund të shkarkohet nga shërbyes të tjerë në rrjet. Postim tuaja publike, si dhe ato vetëm për ndjekësit, u dërgohen shërbyesve ku gjenden ndjekësit tuaj, ndërsa mesazhet e drejtpërdrejtë u dërgohen shërbyesve të marrësve, në rastin kur këta ndjekës apo marrës gjenden në një tjetër shërbyes nga ky.

+ +

Kur autorizoni një aplikacion të përdorë llogarinë tuaj, në varësi të fushëveprimit të lejeve që miratoni, ky mund të hyjë në hollësitë e profilit tuaj publik, listën e atyre që ndiqni, ndjekësit tuaj, listat tuaja, krejt postimet tuaja dhe të parapëlqyerit tuaj. Aplikaconet s’mund të njohin kurrë adresën tuaj email dhe fjalëkalimin tuaj.

+ +
+ +

Përdorim sajti nga fëmijë

+ +

Nëse ky shërbyes gjendet në BE ose ZEE: Sajti, produktet dhe shërbimet tona u adresohen të tëra personave që janë të paktën 16 vjeç. Nëse jeni nën moshën 16 vjeç, sipas domosdoshmërive të GDPR-së (Rregullorja e Përgjithshme e Mbrojtjes së të Dhënave) mos e përdorni këtë sajt.

+ +

Nëse ky shërbyes gjendet në ShBA: Sajti, produktet dhe shërbimet tona u adresohen të tëra personave që janë të paktën 13 vjeç. Nëse jeni nën moshën 13 vjeç, sipas domosdoshmërive të COPPA-s (Ligji i Mbrojtjes së Privatësisë Internetore të Fëmijëve) mos e përdorni këtë sajt.

+ +

kërkesat ligjore mund të jenë të tjera, nëse ky shërbyes gjendet nën një juridiksion tjetër.

+ +
+ +

Ndryshime te Rregullat tona të Privatësisë

+ +

Nëse vendosim të ndryshojmë rregullat tona të privatësisë, ato ndryshime do t’i postojmë te kjo faqe.

+ +

Ky dokument licencohet sipas CC-BY-SA. Qe përditësuar së fundi më 26 maj 2022.

+ +

Përshtatur fillimisht prej rregulave të privatësisë së Discourse-it.

title: Kushte Shërbimi dhe Rregulla Privatësie te %{instance} themes: contrast: Mastodon (Me shumë kontrast) diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 321fc6398b..cfea20c555 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -220,7 +220,6 @@ sr-Latn: applications: created: Aplikacija uspešno napravljena destroyed: Aplikacija uspešno obrisana - invalid_url: Data adresa nije ispravna regenerate_token: Rekreiraj pristupni token token_regenerated: Pristupni token uspešno rekreiran warning: Oprezno sa ovim podacima. Nikad je ne delite ni sa kim! diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 94d8c43cf2..445f8f3265 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -368,7 +368,6 @@ sr: applications: created: Апликација успешно направљена destroyed: Апликација успешно обрисана - invalid_url: Дата адреса није исправна regenerate_token: Рекреирај приступни токен token_regenerated: Приступни токен успешно рекреиран warning: Опрезно са овим подацима. Никад је не делите ни са ким! diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 715358d5ea..a84ae6cfec 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -36,7 +36,6 @@ sv: one: status other: statusar status_count_before: Som skapat - tagline: Följ vänner och upptäck nya terms: Användarvillkor unavailable_content: Otillgängligt innehåll unavailable_content_description: @@ -668,7 +667,6 @@ sv: applications: created: Ansökan är framgångsrikt skapad destroyed: Ansökan är framgångsrikt borttagen - invalid_url: Den angivna webbadressen är ogiltig regenerate_token: Regenerera access token token_regenerated: Access token lyckades regenereras warning: Var mycket försiktig med denna data. Dela aldrig den med någon! diff --git a/config/locales/ta.yml b/config/locales/ta.yml index e3b61a487b..3016250ccd 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -28,7 +28,6 @@ ta: one: பதிவு other: பதிவுகள் status_count_before: எழுதிய - tagline: நண்பர்களைப் பின்தொடரவும் மற்றும் புதியவர்களைக் கண்டுபிடிக்கவும் terms: சேவை விதிமுறைகள் unavailable_content: விசயங்கள் இல்லை unavailable_content_description: diff --git a/config/locales/th.yml b/config/locales/th.yml index 9fd23f5b35..c5f70753dc 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -34,7 +34,6 @@ th: status_count_after: other: โพสต์ status_count_before: ผู้เผยแพร่ - tagline: ติดตามเพื่อน ๆ และค้นพบเพื่อนใหม่ ๆ terms: เงื่อนไขการให้บริการ unavailable_content: เซิร์ฟเวอร์ที่มีการควบคุม unavailable_content_description: @@ -842,7 +841,6 @@ th: applications: created: สร้างแอปพลิเคชันสำเร็จ destroyed: ลบแอปพลิเคชันสำเร็จ - invalid_url: URL ที่ระบุไม่ถูกต้อง regenerate_token: สร้างโทเคนการเข้าถึงใหม่ token_regenerated: สร้างโทเคนการเข้าถึงใหม่สำเร็จ warning: ระวังเป็นอย่างสูงกับข้อมูลนี้ อย่าแบ่งปันข้อมูลกับใครก็ตาม! diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 23fe6508b9..9159acba32 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -38,7 +38,7 @@ tr: one: durum yazıldı other: durum yazıldı status_count_before: Şu ana kadar - tagline: Arkadaşlarını takip et ve yenilerini keşfet + tagline: Merkezi olmayan sosyal ağ terms: Kullanım şartları unavailable_content: Denetlenen sunucular unavailable_content_description: @@ -428,6 +428,7 @@ tr: destroyed_msg: Domain bloğu silindi domain: Alan adı edit: Etki alanı bloğunu düzenle + existing_domain_block: Zaten %{name} için daha katı sınırlamalar dayatmıştınız. existing_domain_block_html: '%{name}''e zaten daha katı sınırlar uyguladınız, önce engellemesini kaldırmanız gerekiyor.' new: create: Yeni blok oluştur @@ -851,6 +852,23 @@ tr: edit_preset: Uyarı ön-ayarını düzenle empty: Henüz önceden ayarlanmış bir uyarı tanımlanmadı. title: Uyarı ön-ayarlarını yönet + webhooks: + add_new: Uç nokta ekle + delete: Sil + description_html: Bir web kancası Mastodon'un, uygulamanızda seçili olaylar hakkında gerçek zamanlı bildirimler göndermesini sağlar, böylece uygulamanız otomatik olarak tepkileri tetikleyebilir. + disable: Devre dışı bırak + disabled: Devre dışı + edit: Uç nokta düzenle + empty: Henüz yapılandırılmış bir web kancanız yok. + enable: Etkinleştir + enabled: Etkin + events: Olaylar + new: Yeni web kancası + rotate_secret: Gizi döndür + secret: Gizi imzalama + status: Durum + title: Web kancaları + webhook: Web kancası admin_mailer: new_appeal: actions: @@ -915,7 +933,6 @@ tr: applications: created: Uygulama başarıyla oluşturuldu destroyed: Uygulama başarıyla silindi - invalid_url: Verilen URL geçerli değil regenerate_token: Erişim belirtecini yeniden oluştur token_regenerated: Erişim belirteci başarıyla oluşturuldu warning: Bu verilere çok dikkat edin. Asla kimseyle paylaşmayın! diff --git a/config/locales/uk.yml b/config/locales/uk.yml index aa210c980e..53a4b35673 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -38,7 +38,7 @@ uk: one: статус other: статуси status_count_before: Опубліковано - tagline: Слідкуйте за друзями та знаходьте нових + tagline: Децентралізована соціальна мережа terms: Правила використання unavailable_content: Недоступний вміст unavailable_content_description: @@ -864,6 +864,28 @@ uk: edit_preset: Редагувати шаблон попередження empty: Ви ще не визначили жодних попереджень. title: Управління шаблонами попереджень + webhooks: + add_new: Додати кінцеву точку + delete: Видалити + description_html: "Вебхук дає змогу Mastodon надсилати повідомлення про обрані події до вашого застосунку в реальному часі, щоб застосунок міг автоматично реагувати на реакції." + disable: Вимкнути + disabled: Вимкнено + edit: Редагувати кінцеву точку + empty: Ще не налаштовано жодних кінцевих точок вебхука. + enable: Увімкнути + enabled: Активні + enabled_events: + few: "%{count} увімкнені події" + many: "%{count} увімкнених подій" + one: 1 увімкнена подія + other: "%{count} увімкнені події" + events: Події + new: Новий вебхук + rotate_secret: Обернути секрет + secret: Секрет підписування + status: Стан + title: Вебхуки + webhook: Вебхук admin_mailer: new_appeal: actions: @@ -923,7 +945,6 @@ uk: applications: created: Застосунок успішно створений destroyed: Застосунок успішно видалений - invalid_url: Введена URL неправильна regenerate_token: Перегенерувати токен доступу token_regenerated: Токен доступу успішне перегенеровано warning: Будьте дуже обережні з цими даними. Ніколи не діліться ними ні з ким! diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 7f0022191d..72d06ab556 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -35,7 +35,7 @@ vi: status_count_after: other: tút status_count_before: Nơi lưu giữ - tagline: Theo dõi bạn bè và khám phá thế giới + tagline: Mạng xã hội liên hợp terms: Điều khoản dịch vụ unavailable_content: Giới hạn chung unavailable_content_description: @@ -417,6 +417,7 @@ vi: destroyed_msg: Đã thôi chặn máy chủ domain: Máy chủ edit: Chỉnh sửa máy chủ bị chặn + existing_domain_block: Bạn đã hạn chế %{name} trước đó. existing_domain_block_html: Bạn đã áp đặt các giới hạn chặt chẽ hơn cho %{name}, trước tiên bạn cần bỏ chặn nó. new: create: Tạo chặn @@ -832,6 +833,25 @@ vi: edit_preset: Sửa mẫu có sẵn empty: Bạn chưa thêm mẫu nhắc nhở nào cả. title: Quản lý mẫu nhắc nhở + webhooks: + add_new: Thêm endpoint + delete: Xóa bỏ + description_html: "Webhook cho phép Mastodon gửi nhận thông báo đẩy thời gian thật về những sự kiện cho ứng dụng thứ ba của bạn, cho ứng dụng của bạn có thể tự động kích hoạt reaction." + disable: Tắt + disabled: Đã tắt + edit: Sửa endpoint + empty: Bạn chưa thiết lập webhook endpoint nào. + enable: Bật + enabled: Hoạt động + enabled_events: + other: "%{count} sự kiện đã bật" + events: Sự kiện + new: Webhook mới + rotate_secret: Xoay bí mật + secret: Token đăng nhập + status: Trạng thái + title: Webhook + webhook: Webhook admin_mailer: new_appeal: actions: @@ -896,7 +916,6 @@ vi: applications: created: Đơn đăng ký được tạo thành công destroyed: Đã xóa đơn đăng ký - invalid_url: Cung cấp URL không hợp lệ regenerate_token: Tạo lại mã truy cập token_regenerated: Mã truy cập được tạo lại thành công warning: Hãy rất cẩn thận với dữ liệu này. Không bao giờ chia sẻ nó với bất cứ ai! diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 783733a0a6..475d03a2a3 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -19,7 +19,7 @@ zh-CN: continue_to_web: 继续前往网页应用 discover_users: 发现用户 documentation: 文档 - federation_hint_html: 在 %{instance} 上拥有账号后，你可以关注任何兼容Mastodon的服务器上的人。 + federation_hint_html: 在 %{instance} 上拥有账号后，你可以关注任何兼容 Mastodon 服务器上的人。 get_apps: 尝试移动应用 hosted_on: 运行在 %{domain} 上的 Mastodon 站点 instance_actor_flash: '这个账号是个虚拟账号，不代表任何用户，只用来代表服务器本身。它用于和其它服务器互通，所以不应该被封禁，除非你想封禁整个实例。但是想封禁整个实例的时候，你应该用域名封禁。 @@ -37,7 +37,7 @@ zh-CN: status_count_after: other: 条嘟文 status_count_before: 他们共嘟出了 - tagline: 关注并发现新朋友 + tagline: 分布式社交网络 terms: 使用条款 unavailable_content: 被限制的服务器 unavailable_content_description: @@ -419,6 +419,7 @@ zh-CN: destroyed_msg: 域名屏蔽已撤销 domain: 域名 edit: 编辑域名屏蔽 + existing_domain_block: 您已经对 %{name} 设置了更严格的限制。 existing_domain_block_html: 你已经对 %{name} 施加了更严格的限制，你需要先 解封。 new: create: 添加屏蔽 @@ -434,7 +435,7 @@ zh-CN: private_comment: 私密评论 private_comment_hint: 给这一域名限制添加备注，供监察员内部使用 public_comment: 公开评论 - public_comment_hint: 给这一域名限制添加公开的评论，如果你推广你的域名限制列表的话，这些评论就会显示出来。 + public_comment_hint: 给这一域名限制添加公开的评论，在公告域名限制列表开启时这些评论将会公开可见。 reject_media: 拒绝接收媒体文件 reject_media_hint: 删除本站已缓存的媒体文件，并且不再接收来自该域名的任何媒体文件。此选项不影响封禁 reject_reports: 拒绝接收举报 @@ -834,6 +835,10 @@ zh-CN: edit_preset: 编辑预置警告 empty: 你尚未定义任何警告预设。 title: 管理预设警告 + webhooks: + delete: 删除 + disable: 禁用 + enable: 启用 admin_mailer: new_appeal: actions: @@ -898,7 +903,6 @@ zh-CN: applications: created: 应用创建成功 destroyed: 应用删除成功 - invalid_url: URL 无效 regenerate_token: 重置访问令牌 token_regenerated: 访问令牌重置成功 warning: 一定小心，千万不要把它分享给任何人！ diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index bbf5b4dad1..5b6e0b83a2 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -34,7 +34,6 @@ zh-HK: status_count_after: other: 篇文章 status_count_before: 共發佈了 - tagline: 關注朋友並探索新朋友 terms: 使用條款 unavailable_content: 受限制的伺服器 unavailable_content_description: @@ -679,7 +678,6 @@ zh-HK: applications: created: 已建立應用程式 destroyed: 已刪除應用程式 - invalid_url: 所提供的網址不正確 regenerate_token: 重設 token token_regenerated: 已重設 token warning: 警告，不要把它分享給任何人！ diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 032a5c9517..7d2bb80cbe 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -35,7 +35,7 @@ zh-TW: status_count_after: other: 條嘟文 status_count_before: 他們共嘟出了 - tagline: 關注朋友並探索新朋友 + tagline: 去中心化社群網路 terms: 使用條款 unavailable_content: 無法取得的內容 unavailable_content_description: @@ -835,6 +835,25 @@ zh-TW: edit_preset: 編輯預設警告 empty: 您未曾定義任何預設警告 title: 管理預設警告 + webhooks: + add_new: 新增端點 + delete: 刪除 + description_html: "Webhook 讓 Mastodon 可以將關於選定的事件的即時通知推送到您自己的應用程式，如此您的應用程式就可以自動觸發反應。" + disable: 停用 + disabled: 已停用 + edit: 編輯端點 + empty: 您沒有任何設定好的 webhook 端點。 + enable: 啟用 + enabled: 生效 + enabled_events: + other: "%{count} 個已啟用的端點" + events: 事件 + new: 新增 Webhook + rotate_secret: 更換密鑰 + secret: 簽署密鑰 + status: 狀態 + title: Webhooks + webhook: Webhook admin_mailer: new_appeal: actions: @@ -899,7 +918,6 @@ zh-TW: applications: created: 已建立應用 destroyed: 已刪除應用 - invalid_url: 網址不正確 regenerate_token: 重設 token token_regenerated: 已重設 token warning: 警告，不要把它分享給任何人! From aab1a1c409fadfc0ae83c2ede600796659b01c97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:33:21 +0900 Subject: [PATCH 13/38] Bump wicg-inert from 3.1.1 to 3.1.2 (#18655) Bumps [wicg-inert](https://github.com/WICG/inert) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/WICG/inert/releases) - [Commits](https://github.com/WICG/inert/compare/v3.1.1...v3.1.2) --- updated-dependencies: - dependency-name: wicg-inert dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 625d920f97..5382c0c9fe 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,7 @@ "webpack-bundle-analyzer": "^4.5.0", "webpack-cli": "^3.3.12", "webpack-merge": "^5.8.0", - "wicg-inert": "^3.1.1", + "wicg-inert": "^3.1.2", "ws": "^8.7.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 85547ee8fe..2e8e1df35d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11681,10 +11681,10 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -wicg-inert@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.1.1.tgz#b033fd4fbfb9e3fd709e5d84becbdf2e06e5c229" - integrity sha512-PhBaNh8ur9Xm4Ggy4umelwNIP6pPP1bv3EaWaKqfb/QNme2rdLjm7wIInvV4WhxVHhzA4Spgw9qNSqWtB/ca2A== +wicg-inert@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.1.2.tgz#df10cf756b773a96fce107c3ddcd43be5d1e3944" + integrity sha512-Ba9tGNYxXwaqKEi9sJJvPMKuo063umUPsHN0JJsjrs2j8KDSzkWLMZGZ+MH1Jf1Fq4OWZ5HsESJID6nRza2ang== wide-align@^1.1.5: version "1.1.5" From 73c903e63d99ba5dbc6a09db22d15da1f673773a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:35:44 +0900 Subject: [PATCH 14/38] Bump sidekiq-scheduler from 4.0.0 to 4.0.1 (#18654) Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases) - [Changelog](https://github.com/moove-it/sidekiq-scheduler/blob/master/CHANGELOG.md) - [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v4.0.0...v4.0.1) --- updated-dependencies: - dependency-name: sidekiq-scheduler dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9790df2c9a..64d2a6d7f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -606,7 +606,7 @@ GEM redis (>= 4.2.0) sidekiq-bulk (0.2.0) sidekiq - sidekiq-scheduler (4.0.0) + sidekiq-scheduler (4.0.1) redis (>= 4.2.0) rufus-scheduler (~> 3.2) sidekiq (>= 4) From 6e226a873688287429fbbf865a5ed1df2fef438a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:42:17 +0900 Subject: [PATCH 15/38] Bump @babel/plugin-transform-runtime from 7.18.2 to 7.18.5 (#18647) Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.18.2 to 7.18.5. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.18.5/packages/babel-plugin-transform-runtime) --- updated-dependencies: - dependency-name: "@babel/plugin-transform-runtime" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 5382c0c9fe..3fe34a6ca5 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@babel/core": "^7.18.5", "@babel/plugin-proposal-decorators": "^7.18.2", "@babel/plugin-transform-react-inline-elements": "^7.16.7", - "@babel/plugin-transform-runtime": "^7.18.2", + "@babel/plugin-transform-runtime": "^7.18.5", "@babel/preset-env": "^7.18.2", "@babel/preset-react": "^7.17.12", "@babel/runtime": "^7.18.3", diff --git a/yarn.lock b/yarn.lock index 2e8e1df35d..89deee99b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -897,10 +897,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.17.12" -"@babel/plugin-transform-runtime@^7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.2.tgz#04637de1e45ae8847ff14b9beead09c33d34374d" - integrity sha512-mr1ufuRMfS52ttq+1G1PD8OJNqgcTFjq3hwn8SZ5n1x1pBhi0E36rYMdTK0TsKtApJ4lDEdfXJwtGobQMHSMPg== +"@babel/plugin-transform-runtime@^7.18.5": + version "7.18.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.5.tgz#f4d3188ba6a8815793993c71c2c225d0ee1d7743" + integrity sha512-Q17hHxXr2fplrE+5BSC1j1Fo5cOA8YeP8XW3/1paI8MzF/faZGh0MaH1KC4jLAvqLPamQWHB5/B7KqSLY1kuHA== dependencies: "@babel/helper-module-imports" "^7.16.7" "@babel/helper-plugin-utils" "^7.17.12" From 7aa2a059f8a7e21b66cb2d5bb3c856eb6be38de2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:43:24 +0900 Subject: [PATCH 16/38] Bump net-ldap from 0.17.0 to 0.17.1 (#18648) Bumps [net-ldap](https://github.com/ruby-ldap/ruby-net-ldap) from 0.17.0 to 0.17.1. - [Release notes](https://github.com/ruby-ldap/ruby-net-ldap/releases) - [Changelog](https://github.com/ruby-ldap/ruby-net-ldap/blob/master/History.rdoc) - [Commits](https://github.com/ruby-ldap/ruby-net-ldap/compare/v0.17.0...v0.17.1) --- updated-dependencies: - dependency-name: net-ldap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 64d2a6d7f8..a2c2360ca6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -399,7 +399,7 @@ GEM msgpack (1.5.2) multi_json (1.15.0) multipart-post (2.1.1) - net-ldap (0.17.0) + net-ldap (0.17.1) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) From 757fe82fd5a5be6fed35aab3cbd41fa9497ee79c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:46:48 +0900 Subject: [PATCH 17/38] Bump reselect from 4.1.5 to 4.1.6 (#18646) Bumps [reselect](https://github.com/reduxjs/reselect) from 4.1.5 to 4.1.6. - [Release notes](https://github.com/reduxjs/reselect/releases) - [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md) - [Commits](https://github.com/reduxjs/reselect/compare/v4.1.5...v4.1.6) --- updated-dependencies: - dependency-name: reselect dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3fe34a6ca5..0322c5e184 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "regenerator-runtime": "^0.13.9", "rellax": "^1.12.1", "requestidlecallback": "^0.3.0", - "reselect": "^4.1.5", + "reselect": "^4.1.6", "rimraf": "^3.0.2", "sass": "^1.52.3", "sass-loader": "^10.2.0", diff --git a/yarn.lock b/yarn.lock index 89deee99b3..14dc691047 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9621,10 +9621,10 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -reselect@^4.1.5: - version "4.1.5" - resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.5.tgz#852c361247198da6756d07d9296c2b51eddb79f6" - integrity sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ== +reselect@^4.1.6: + version "4.1.6" + resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.6.tgz#19ca2d3d0b35373a74dc1c98692cdaffb6602656" + integrity sha512-ZovIuXqto7elwnxyXbBtCPo9YFEr3uJqj2rRbcOOog1bmu2Ag85M4hixSwFWyaBMKXNgvPaJ9OSu9SkBPIeJHQ== resolve-cwd@^2.0.0: version "2.0.0" From b37825f2e22a7b68e91b1c7cafd486ee35c683c0 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Fri, 17 Jun 2022 05:07:10 +0900 Subject: [PATCH 18/38] Add GitHub Actions to package-ecosystem (#18603) --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bb1fccf7ca..c785d4a357 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -20,3 +20,11 @@ updates: open-pull-requests-limit: 99 allow: - dependency-type: direct + + - package-ecosystem: github-actions + directory: '/' + schedule: + interval: weekly + open-pull-requests-limit: 99 + allow: + - dependency-type: direct From e789b8d4c13bae4cbc7e156b073b4e46accd8b34 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Fri, 17 Jun 2022 05:09:43 +0900 Subject: [PATCH 19/38] Set-up Problem Matchers (#18598) --- .github/stylelint-matcher.json | 21 +++++++++++++++++++++ .github/workflows/linter.yml | 12 ++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 .github/stylelint-matcher.json diff --git a/.github/stylelint-matcher.json b/.github/stylelint-matcher.json new file mode 100644 index 0000000000..cdfd4086bd --- /dev/null +++ b/.github/stylelint-matcher.json @@ -0,0 +1,21 @@ +{ + "problemMatcher": [ + { + "owner": "stylelint", + "pattern": [ + { + "regexp": "^([^\\s].*)$", + "file": 1 + }, + { + "regexp": "^\\s+((\\d+):(\\d+))?\\s+(✖|×)\\s+(.*)\\s{2,}(.*)$", + "line": 2, + "column": 3, + "message": 5, + "code": 6, + "loop": true + } + ] + } + ] +} diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index fd535ea9a5..f77a9720e0 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -50,8 +50,19 @@ jobs: # Full git history is needed to get a proper list of changed files within `super-linter` fetch-depth: 0 + - name: Set-up Node.js + uses: actions/setup-node@v3 + with: + node-version: 16.x + cache: yarn - name: Intall dependencies run: yarn install --frozen-lockfile + - name: Set-up RuboCop Problem Mathcher + uses: r7kamura/rubocop-problem-matchers-action@v1 + - name: Set-up Stylelint Problem Matcher + uses: xt0rted/stylelint-problem-matcher@v1 + # https://github.com/xt0rted/stylelint-problem-matcher/issues/360 + - run: echo "::add-matcher::.github/stylelint-matcher.json" ################################ # Run Linter against code base # @@ -61,6 +72,7 @@ jobs: env: CSS_FILE_NAME: stylelint.config.js DEFAULT_BRANCH: main + NO_COLOR: 1 # https://github.com/xt0rted/stylelint-problem-matcher/issues/360 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} JAVASCRIPT_ES_CONFIG_FILE: .eslintrc.js LINTER_RULES_PATH: . From 4e26fb0ea945212609eb03245b2d615f2782b435 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Fri, 17 Jun 2022 05:09:58 +0900 Subject: [PATCH 20/38] Drop support for Ruby v2.5 and Node.js v12 (#18323) * Drop support for Ruby v2.5 and Node.js v12 * Update package.json --- README.md | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d47bb7ab48..5019bd0975 100644 --- a/README.md +++ b/README.md @@ -72,8 +72,8 @@ Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Stre - **PostgreSQL** 9.5+ - **Redis** 4+ -- **Ruby** 2.5+ -- **Node.js** 12+ +- **Ruby** 2.6+ +- **Node.js** 14+ The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation. diff --git a/package.json b/package.json index 0322c5e184..80ad1add3b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@mastodon/mastodon", "license": "AGPL-3.0-or-later", "engines": { - "node": ">=12" + "node": ">=14" }, "scripts": { "postversion": "git push --tags", From 9cec3f3597350045702dc2ac34099de78672e5e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jun 2022 14:38:07 +0900 Subject: [PATCH 21/38] Bump actions/checkout from 2 to 3 (#18679) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-image.yml | 2 +- .github/workflows/check-i18n.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 75c7b54a65..d215650ea3 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -14,7 +14,7 @@ jobs: build-image: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: docker/setup-qemu-action@v1 - uses: docker/setup-buildx-action@v1 - uses: docker/login-action@v1 diff --git a/.github/workflows/check-i18n.yml b/.github/workflows/check-i18n.yml index be38a096de..1c60515f8c 100644 --- a/.github/workflows/check-i18n.yml +++ b/.github/workflows/check-i18n.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install system dependencies run: | sudo apt-get update From 943dfb854c1752b452d49dcadc49eebf2bbd86b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jun 2022 14:39:21 +0900 Subject: [PATCH 22/38] Bump docker/metadata-action from 3 to 4 (#18674) Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 3 to 4. - [Release notes](https://github.com/docker/metadata-action/releases) - [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md) - [Commits](https://github.com/docker/metadata-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index d215650ea3..a51debf6bf 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -22,7 +22,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} if: github.event_name != 'pull_request' - - uses: docker/metadata-action@v3 + - uses: docker/metadata-action@v4 id: meta with: images: tootsuite/mastodon From 5d3995e51e5095615a637696029f9d0e54c790ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jun 2022 14:40:46 +0900 Subject: [PATCH 23/38] Bump docker/build-push-action from 2 to 3 (#18675) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 3. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index a51debf6bf..ac2f777b50 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -32,7 +32,7 @@ jobs: type=edge,branch=main type=match,pattern=v(.*),group=0 type=ref,event=pr - - uses: docker/build-push-action@v2 + - uses: docker/build-push-action@v3 with: context: . platforms: linux/amd64,linux/arm64 From d5a890c7660902b8e8f5ff6bd0bd185b0f56754e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jun 2022 14:42:02 +0900 Subject: [PATCH 24/38] Bump i18n-tasks from 1.0.10 to 1.0.11 (#18683) Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 1.0.10 to 1.0.11. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v1.0.10...v1.0.11) --- updated-dependencies: - dependency-name: i18n-tasks dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a2c2360ca6..1966e6d2d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -306,7 +306,7 @@ GEM rainbow (>= 2.0.0) i18n (1.10.0) concurrent-ruby (~> 1.0) - i18n-tasks (1.0.10) + i18n-tasks (1.0.11) activesupport (>= 4.0.2) ast (>= 2.1.0) better_html (~> 1.0) @@ -395,7 +395,7 @@ GEM mime-types-data (3.2022.0105) mini_mime (1.1.2) mini_portile2 (2.8.0) - minitest (5.15.0) + minitest (5.16.0) msgpack (1.5.2) multi_json (1.15.0) multipart-post (2.1.1) @@ -511,7 +511,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) rails-i18n (6.0.0) i18n (>= 0.7, < 2) @@ -719,7 +719,7 @@ GEM xorcist (1.1.2) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.5.4) + zeitwerk (2.6.0) PLATFORMS ruby From 2c5fbf68b737aff34d2d5808d0ccfb6046558806 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jun 2022 14:42:43 +0900 Subject: [PATCH 25/38] Bump bullet from 7.0.1 to 7.0.2 (#18617) Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.0.1 to 7.0.2. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/7.0.1...7.0.2) --- updated-dependencies: - dependency-name: bullet dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1966e6d2d5..8db79d0c33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,7 +122,7 @@ GEM concurrent-ruby (~> 1.0, >= 1.0.5) redis (>= 1.0, <= 5.0) builder (3.2.4) - bullet (7.0.1) + bullet (7.0.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) bundler-audit (0.9.1) @@ -678,7 +678,7 @@ GEM unf_ext unf_ext (0.0.8) unicode-display_width (2.1.0) - uniform_notifier (1.14.2) + uniform_notifier (1.16.0) validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) From 9ba42984e6925197a5bb91f30d616f04d457f94e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jun 2022 14:43:21 +0900 Subject: [PATCH 26/38] Bump rubocop-rails from 2.14.2 to 2.15.0 (#18681) Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.14.2 to 2.15.0. - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.14.2...v2.15.0) --- updated-dependencies: - dependency-name: rubocop-rails dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e0005faba7..bf04d968e7 100644 --- a/Gemfile +++ b/Gemfile @@ -133,7 +133,7 @@ group :development do gem 'letter_opener_web', '~> 2.0' gem 'memory_profiler' gem 'rubocop', '~> 1.30', require: false - gem 'rubocop-rails', '~> 2.14', require: false + gem 'rubocop-rails', '~> 2.15', require: false gem 'brakeman', '~> 5.2', require: false gem 'bundler-audit', '~> 0.9', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 8db79d0c33..43beba7692 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -579,7 +579,7 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.18.0) parser (>= 3.1.1.0) - rubocop-rails (2.14.2) + rubocop-rails (2.15.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) @@ -821,7 +821,7 @@ DEPENDENCIES rspec-sidekiq (~> 3.1) rspec_junit_formatter (~> 0.5) rubocop (~> 1.30) - rubocop-rails (~> 2.14) + rubocop-rails (~> 2.15) ruby-progressbar (~> 1.11) sanitize (~> 6.0) scenic (~> 1.6) From 81d68a458aef20deb98dad3c119a30ba993013da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jun 2022 14:43:55 +0900 Subject: [PATCH 27/38] Bump prettier from 2.6.2 to 2.7.1 (#18684) Bumps [prettier](https://github.com/prettier/prettier) from 2.6.2 to 2.7.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.6.2...2.7.1) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 80ad1add3b..470cc330fa 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "jest": "^28.1.0", "jest-environment-jsdom": "^28.1.0", "postcss-scss": "^4.0.4", - "prettier": "^2.6.2", + "prettier": "^2.7.1", "raf": "^3.4.1", "react-intl-translations-manager": "^5.0.3", "react-test-renderer": "^16.14.0", diff --git a/yarn.lock b/yarn.lock index 14dc691047..ca1995ff15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8822,10 +8822,10 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -prettier@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032" - integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew== +prettier@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" + integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== pretty-format@^25.2.1, pretty-format@^25.5.0: version "25.5.0" From bb096ed888e760cf85d83494fe7b0120c42b7e64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jun 2022 14:44:57 +0900 Subject: [PATCH 28/38] Bump intersection-observer from 0.12.0 to 0.12.2 (#18682) Bumps [intersection-observer](https://github.com/GoogleChromeLabs/intersection-observer) from 0.12.0 to 0.12.2. - [Release notes](https://github.com/GoogleChromeLabs/intersection-observer/releases) - [Commits](https://github.com/GoogleChromeLabs/intersection-observer/commits) --- updated-dependencies: - dependency-name: intersection-observer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 470cc330fa..6fe43c8665 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "http-link-header": "^1.0.4", "immutable": "^4.1.0", "imports-loader": "^1.2.0", - "intersection-observer": "^0.12.0", + "intersection-observer": "^0.12.2", "intl": "^1.2.5", "intl-messageformat": "^2.2.0", "intl-relativeformat": "^6.4.3", diff --git a/yarn.lock b/yarn.lock index ca1995ff15..8603a4e62c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5895,10 +5895,10 @@ interpret@^1.4.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== -intersection-observer@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.12.0.tgz#6c84628f67ce8698e5f9ccf857d97718745837aa" - integrity sha512-2Vkz8z46Dv401zTWudDGwO7KiGHNDkMv417T5ItcNYfmvHR/1qCTVBO9vwH8zZmQ0WkA/1ARwpysR9bsnop4NQ== +intersection-observer@^0.12.0, intersection-observer@^0.12.2: + version "0.12.2" + resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.12.2.tgz#4a45349cc0cd91916682b1f44c28d7ec737dc375" + integrity sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg== intl-format-cache@^2.0.5: version "2.2.9" From 89ac84d0766b7bb29a25f88aa14c941cb68e1d6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jun 2022 14:46:13 +0900 Subject: [PATCH 29/38] Bump stylelint from 14.8.5 to 14.9.1 (#18653) Bumps [stylelint](https://github.com/stylelint/stylelint) from 14.8.5 to 14.9.1. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/14.8.5...14.9.1) --- updated-dependencies: - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 136 +++++++++------------------------------------------ 2 files changed, 25 insertions(+), 113 deletions(-) diff --git a/package.json b/package.json index 6fe43c8665..d1022f39a1 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "raf": "^3.4.1", "react-intl-translations-manager": "^5.0.3", "react-test-renderer": "^16.14.0", - "stylelint": "^14.8.5", + "stylelint": "^14.9.1", "stylelint-config-standard-scss": "^4.0.0", "webpack-dev-server": "^3.11.3", "yargs": "^17.5.1" diff --git a/yarn.lock b/yarn.lock index 8603a4e62c..24ed84ee35 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1124,6 +1124,11 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@csstools/selector-specificity@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.1.tgz#b6b8d81780b9a9f6459f4bfe9226ac6aefaefe87" + integrity sha512-aG20vknL4/YjQF9BSV7ts4EWm/yrjagAN7OWBNmlbEOUiu0llj4OGrFoOKK3g2vey4/p2omKCoHrWtPxSwV3HA== + "@emotion/babel-plugin@^11.7.1": version "11.9.2" resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.9.2.tgz#723b6d394c89fb2ef782229d92ba95a740576e95" @@ -2815,7 +2820,7 @@ braces@^2.3.1, braces@^2.3.2: split-string "^3.0.2" to-regex "^3.0.1" -braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: +braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -3673,10 +3678,10 @@ css-font-weight-keywords@^1.0.0: resolved "https://registry.yarnpkg.com/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz#9bc04671ac85bc724b574ef5d3ac96b0d604fd97" integrity sha1-m8BGcayFvHJLV07106yWsNYE/Zc= -css-functions-list@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.0.1.tgz#1460df7fb584d1692c30b105151dbb988c8094f9" - integrity sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw== +css-functions-list@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz#cf5b09f835ad91a00e5959bcfc627cd498e1321b" + integrity sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w== css-global-keywords@^1.0.1: version "1.0.1" @@ -7065,11 +7070,6 @@ lockfile@^1.0: dependencies: signal-exit "^3.0.2" -lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -7322,15 +7322,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== - dependencies: - braces "^3.0.1" - picomatch "^2.2.3" - -micromatch@^4.0.5: +micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -7576,11 +7568,6 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== -nanoid@^3.1.23: - version "3.2.0" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" - integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== - nanoid@^3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" @@ -8693,7 +8680,7 @@ postcss-selector-parser@^3.0.0: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.6: +postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.6: version "6.0.10" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d" integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== @@ -8701,25 +8688,6 @@ postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.6: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-selector-parser@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c" - integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg== - dependencies: - cssesc "^3.0.0" - indexes-of "^1.0.1" - uniq "^1.0.1" - -postcss-selector-parser@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3" - integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw== - dependencies: - cssesc "^3.0.0" - indexes-of "^1.0.1" - uniq "^1.0.1" - util-deprecate "^1.0.2" - postcss-svgo@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz#343a2cdbac9505d416243d496f724f38894c941e" @@ -8743,12 +8711,7 @@ postcss-value-parser@^3.0.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" - integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== - -postcss-value-parser@^4.2.0: +postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== @@ -8772,16 +8735,7 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27, postcss@^7.0.32: source-map "^0.6.1" supports-color "^6.1.0" -postcss@^8.2.15: - version "8.3.0" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.0.tgz#b1a713f6172ca427e3f05ef1303de8b65683325f" - integrity sha512-+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ== - dependencies: - colorette "^1.2.2" - nanoid "^3.1.23" - source-map-js "^0.6.2" - -postcss@^8.4.14: +postcss@^8.2.15, postcss@^8.4.14: version "8.4.14" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig== @@ -10140,11 +10094,6 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-js@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" - integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== - source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -10254,11 +10203,6 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -specificity@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019" - integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg== - split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" @@ -10476,14 +10420,7 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" - -strip-ansi@^6.0.1: +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -10581,15 +10518,16 @@ stylelint-scss@^4.0.0: postcss-selector-parser "^6.0.6" postcss-value-parser "^4.1.0" -stylelint@^14.8.5: - version "14.8.5" - resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.8.5.tgz#0fcbf5b6821283b5a249dde36d70f1158da0a2a3" - integrity sha512-e3t4H/hlWlspkcNUrkhf44RU3OpPTA7uBOoREGBzSwdEF+2g/+gbZq7WEpMP7BpopcSe/uLaTvDuL+URL7cdnQ== +stylelint@^14.9.1: + version "14.9.1" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.9.1.tgz#6494ed38f148b1e75b402d678a3b6a8aae86dfda" + integrity sha512-RdAkJdPiLqHawCSnu21nE27MjNXaVd4WcOHA4vK5GtIGjScfhNnaOuWR2wWdfKFAvcWQPOYe311iveiVKSmwsA== dependencies: + "@csstools/selector-specificity" "^2.0.1" balanced-match "^2.0.0" colord "^2.9.2" cosmiconfig "^7.0.1" - css-functions-list "^3.0.1" + css-functions-list "^3.1.0" debug "^4.3.4" execall "^2.0.0" fast-glob "^3.2.11" @@ -10617,7 +10555,6 @@ stylelint@^14.8.5: postcss-selector-parser "^6.0.10" postcss-value-parser "^4.2.0" resolve-from "^5.0.0" - specificity "^0.4.1" string-width "^4.2.3" strip-ansi "^6.0.1" style-search "^0.1.0" @@ -10677,15 +10614,7 @@ supports-color@^8.0.0: dependencies: has-flag "^4.0.0" -supports-hyperlinks@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== - dependencies: - has-flag "^4.0.0" - supports-color "^7.0.0" - -supports-hyperlinks@^2.2.0: +supports-hyperlinks@^2.0.0, supports-hyperlinks@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== @@ -10727,19 +10656,7 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -table@^6.0.9: - version "6.7.1" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" - integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== - dependencies: - ajv "^8.0.1" - lodash.clonedeep "^4.5.0" - lodash.truncate "^4.4.2" - slice-ansi "^4.0.0" - string-width "^4.2.0" - strip-ansi "^6.0.0" - -table@^6.8.0: +table@^6.0.9, table@^6.8.0: version "6.8.0" resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA== @@ -11320,12 +11237,7 @@ uuid@^8.3.1: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" - integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== - -v8-compile-cache@^2.3.0: +v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1, v8-compile-cache@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== From 7b5100aaedc27fbc60cf4064313dcafe237bdf53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jun 2022 14:47:12 +0900 Subject: [PATCH 30/38] Bump ws from 8.7.0 to 8.8.0 (#18652) Bumps [ws](https://github.com/websockets/ws) from 8.7.0 to 8.8.0. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/8.7.0...8.8.0) --- updated-dependencies: - dependency-name: ws dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d1022f39a1..df61125aca 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "webpack-cli": "^3.3.12", "webpack-merge": "^5.8.0", "wicg-inert": "^3.1.2", - "ws": "^8.7.0" + "ws": "^8.8.0" }, "devDependencies": { "@babel/eslint-parser": "^7.18.2", diff --git a/yarn.lock b/yarn.lock index 24ed84ee35..5bd929f424 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11665,10 +11665,10 @@ ws@^7.3.1: resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== -ws@^8.2.3, ws@^8.7.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.7.0.tgz#eaf9d874b433aa00c0e0d8752532444875db3957" - integrity sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg== +ws@^8.2.3, ws@^8.8.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz#8e71c75e2f6348dbf8d78005107297056cb77769" + integrity sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ== xml-name-validator@^4.0.0: version "4.0.0" From 0391b2a6033b56bd0ce213c35a21186fdcb607bc Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 19 Jun 2022 08:18:08 +0200 Subject: [PATCH 31/38] Fix contrast of some elements with new brand colors (#18691) --- app/javascript/styles/contrast/variables.scss | 8 ++--- .../styles/mastodon-light/variables.scss | 5 +-- app/javascript/styles/mastodon/admin.scss | 6 ++-- .../styles/mastodon/components.scss | 32 ++++++++----------- .../styles/mastodon/containers.scss | 2 +- app/javascript/styles/mastodon/dashboard.scss | 4 +-- app/javascript/styles/mastodon/forms.scss | 13 +++----- app/javascript/styles/mastodon/statuses.scss | 4 +-- app/javascript/styles/mastodon/variables.scss | 2 +- 9 files changed, 34 insertions(+), 42 deletions(-) diff --git a/app/javascript/styles/contrast/variables.scss b/app/javascript/styles/contrast/variables.scss index cfe3b21dbc..9edfd6d8d7 100644 --- a/app/javascript/styles/contrast/variables.scss +++ b/app/javascript/styles/contrast/variables.scss @@ -4,19 +4,17 @@ $black: #000000; $classic-base-color: #282c37; $classic-primary-color: #9baec8; $classic-secondary-color: #d9e1e8; -$classic-highlight-color: #2b90d9; +$classic-highlight-color: #6364ff; $ui-base-color: $classic-base-color !default; $ui-primary-color: $classic-primary-color !default; $ui-secondary-color: $classic-secondary-color !default; - -// Differences -$ui-highlight-color: #2b5fd9; +$ui-highlight-color: $classic-highlight-color !default; $darker-text-color: lighten($ui-primary-color, 20%) !default; $dark-text-color: lighten($ui-primary-color, 12%) !default; $secondary-text-color: lighten($ui-secondary-color, 6%) !default; -$highlight-text-color: $classic-highlight-color !default; +$highlight-text-color: lighten($ui-highlight-color, 8%) !default; $action-button-color: #8d9ac2; $inverted-text-color: $black !default; diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss index f6bc3ac960..cae065878c 100644 --- a/app/javascript/styles/mastodon-light/variables.scss +++ b/app/javascript/styles/mastodon-light/variables.scss @@ -5,7 +5,7 @@ $white: #ffffff; $classic-base-color: #282c37; $classic-primary-color: #9baec8; $classic-secondary-color: #d9e1e8; -$classic-highlight-color: #2b90d9; +$classic-highlight-color: #6364ff; // Differences $success-green: lighten(#3c754d, 8%); @@ -17,10 +17,11 @@ $ui-base-color: $classic-secondary-color !default; $ui-base-lighter-color: #b0c0cf; $ui-primary-color: #9bcbed; $ui-secondary-color: $classic-base-color !default; -$ui-highlight-color: #2b90d9; +$ui-highlight-color: $classic-highlight-color !default; $primary-text-color: $black !default; $darker-text-color: $classic-base-color !default; +$highlight-text-color: darken($ui-highlight-color, 8%) !default; $dark-text-color: #444b5d; $action-button-color: #606984; diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 18638e18f5..f83d6424ad 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -133,12 +133,12 @@ $content-width: 840px; .simple-navigation-active-leaf a { color: $primary-text-color; - background-color: $ui-highlight-color; + background-color: darken($ui-highlight-color, 2%); border-bottom: 0; border-radius: 0; &:hover { - background-color: lighten($ui-highlight-color, 5%); + background-color: $ui-highlight-color; } } } @@ -885,7 +885,7 @@ a.name-tag, border: 0; a { - color: lighten($ui-highlight-color, 8%); + color: $highlight-text-color; } dl:first-child .verified { diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 13474a0035..1ada1fcf7d 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -42,7 +42,7 @@ } .button { - background-color: $ui-highlight-color; + background-color: darken($ui-highlight-color, 2%); border: 10px none; border-radius: 4px; box-sizing: border-box; @@ -60,20 +60,16 @@ text-align: center; text-decoration: none; text-overflow: ellipsis; - transition: all 100ms ease-in; white-space: nowrap; width: auto; &:active, &:focus, &:hover { - background-color: lighten($ui-highlight-color, 10%); - transition: all 200ms ease-out; + background-color: $ui-highlight-color; } &--destructive { - transition: none; - &:active, &:focus, &:hover { @@ -829,7 +825,7 @@ } a.unhandled-link { - color: lighten($ui-highlight-color, 8%); + color: $highlight-text-color; } .status__content__spoiler-link { @@ -899,7 +895,7 @@ } &.unhandled-link { - color: lighten($ui-highlight-color, 8%); + color: $highlight-text-color; } } } @@ -912,7 +908,7 @@ display: block; font-size: 15px; line-height: 20px; - color: lighten($ui-highlight-color, 8%); + color: $highlight-text-color; border: 0; background: transparent; padding: 0; @@ -2437,7 +2433,7 @@ a.account__display-name { height: 3.9375rem; bottom: 1.3125rem; right: 1.3125rem; - background: darken($ui-highlight-color, 3%); + background: darken($ui-highlight-color, 2%); color: $white; border-radius: 50%; font-size: 21px; @@ -2448,7 +2444,7 @@ a.account__display-name { &:hover, &:focus, &:active { - background: lighten($ui-highlight-color, 7%); + background: $ui-highlight-color; } } @@ -2881,11 +2877,11 @@ a.account__display-name { } .react-toggle--checked .react-toggle-track { - background-color: $ui-highlight-color; + background-color: darken($ui-highlight-color, 2%); } .react-toggle--checked:is(:hover, :focus-within):not(.react-toggle--disabled) .react-toggle-track { - background-color: lighten($ui-highlight-color, 10%); + background-color: $ui-highlight-color; } .react-toggle-track-check { @@ -2974,7 +2970,7 @@ a.account__display-name { } &.active { - color: $ui-highlight-color; + color: $highlight-text-color; } } } @@ -3407,14 +3403,14 @@ a.status-card.compact:hover { } a { - color: lighten($ui-highlight-color, 8%); + color: $highlight-text-color; text-decoration: none; &:hover, &:focus, &:active { text-decoration: underline; - color: lighten($ui-highlight-color, 12%); + color: lighten($highlight-text-color, 4%); } } } @@ -6427,8 +6423,8 @@ a.status-card.compact:hover { vertical-align: middle; &.checked { - border-color: lighten($ui-highlight-color, 8%); - background: lighten($ui-highlight-color, 8%); + border-color: lighten($ui-highlight-color, 4%); + background: lighten($ui-highlight-color, 4%); } } } diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss index 23dbece6b3..5703a64e36 100644 --- a/app/javascript/styles/mastodon/containers.scss +++ b/app/javascript/styles/mastodon/containers.scss @@ -791,7 +791,7 @@ border-top: 0; a { - color: lighten($ui-highlight-color, 8%); + color: $highlight-text-color; } dl:first-child .verified { diff --git a/app/javascript/styles/mastodon/dashboard.scss b/app/javascript/styles/mastodon/dashboard.scss index 7d0e51fdee..c21fc9eba8 100644 --- a/app/javascript/styles/mastodon/dashboard.scss +++ b/app/javascript/styles/mastodon/dashboard.scss @@ -82,7 +82,7 @@ display: flex; align-items: baseline; border-radius: 4px; - background: $ui-highlight-color; + background: darken($ui-highlight-color, 2%); color: $primary-text-color; transition: all 100ms ease-in; font-size: 14px; @@ -95,7 +95,7 @@ &:active, &:focus, &:hover { - background-color: lighten($ui-highlight-color, 10%); + background-color: $ui-highlight-color; transition: all 200ms ease-out; } diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss index 94f553b76c..d57eabc09f 100644 --- a/app/javascript/styles/mastodon/forms.scss +++ b/app/javascript/styles/mastodon/forms.scss @@ -463,14 +463,14 @@ code { width: 100%; border: 0; border-radius: 4px; - background: $ui-highlight-color; + background: darken($ui-highlight-color, 2%); color: $primary-text-color; font-size: 18px; line-height: inherit; height: auto; padding: 10px; - text-transform: uppercase; text-decoration: none; + text-transform: uppercase; text-align: center; box-sizing: border-box; cursor: pointer; @@ -483,13 +483,10 @@ code { margin-right: 0; } - &:hover { - background-color: lighten($ui-highlight-color, 5%); - } - &:active, - &:focus { - background-color: darken($ui-highlight-color, 5%); + &:focus, + &:hover { + background-color: $ui-highlight-color; } &:disabled:hover { diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss index a926aff969..a3237a6307 100644 --- a/app/javascript/styles/mastodon/statuses.scss +++ b/app/javascript/styles/mastodon/statuses.scss @@ -80,7 +80,7 @@ .button.logo-button { flex: 0 auto; font-size: 14px; - background: $ui-highlight-color; + background: darken($ui-highlight-color, 2%); color: $primary-text-color; text-transform: none; line-height: 1.2; @@ -104,7 +104,7 @@ &:active, &:focus, &:hover { - background: lighten($ui-highlight-color, 10%); + background: $ui-highlight-color; } &:disabled, diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss index 544f33ebff..be2c900eaa 100644 --- a/app/javascript/styles/mastodon/variables.scss +++ b/app/javascript/styles/mastodon/variables.scss @@ -34,7 +34,7 @@ $primary-text-color: $white !default; $darker-text-color: $ui-primary-color !default; $dark-text-color: $ui-base-lighter-color !default; $secondary-text-color: $ui-secondary-color !default; -$highlight-text-color: $ui-highlight-color !default; +$highlight-text-color: lighten($ui-highlight-color, 8%) !default; $action-button-color: $ui-base-lighter-color !default; $passive-text-color: $gold-star !default; $active-passive-text-color: $success-green !default; From 14dff49f92db0c9ad22575920fc8f00bd201ce42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jun 2022 15:53:39 +0900 Subject: [PATCH 32/38] Bump jest from 28.1.0 to 28.1.1 (#18657) Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) from 28.1.0 to 28.1.1. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v28.1.1/packages/jest) --- updated-dependencies: - dependency-name: jest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 643 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 404 insertions(+), 241 deletions(-) diff --git a/package.json b/package.json index df61125aca..1d2fdaa5d5 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "eslint-plugin-jsx-a11y": "~6.5.1", "eslint-plugin-promise": "~6.0.0", "eslint-plugin-react": "~7.30.0", - "jest": "^28.1.0", + "jest": "^28.1.1", "jest-environment-jsdom": "^28.1.0", "postcss-scss": "^4.0.4", "prettier": "^2.7.1", diff --git a/yarn.lock b/yarn.lock index 5bd929f424..aec39d0a07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1284,28 +1284,28 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-28.1.0.tgz#db78222c3d3b0c1db82f1b9de51094c2aaff2176" - integrity sha512-tscn3dlJFGay47kb4qVruQg/XWlmvU0xp3EJOjzzY+sBaI+YgwKcvAmTcyYU7xEiLLIY5HCdWRooAL8dqkFlDA== +"@jest/console@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-28.1.1.tgz#305f8ca50b6e70413839f54c0e002b60a0f2fd7d" + integrity sha512-0RiUocPVFEm3WRMOStIHbRWllG6iW6E3/gUPnf4lkrVFyXIIDeCe+vlKeYyFOMhB2EPE6FLFCNADSOOQMaqvyA== dependencies: - "@jest/types" "^28.1.0" + "@jest/types" "^28.1.1" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^28.1.0" - jest-util "^28.1.0" + jest-message-util "^28.1.1" + jest-util "^28.1.1" slash "^3.0.0" -"@jest/core@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-28.1.0.tgz#784a1e6ce5358b46fcbdcfbbd93b1b713ed4ea80" - integrity sha512-/2PTt0ywhjZ4NwNO4bUqD9IVJfmFVhVKGlhvSpmEfUCuxYf/3NHcKmRFI+I71lYzbTT3wMuYpETDCTHo81gC/g== +"@jest/core@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-28.1.1.tgz#086830bec6267accf9af5ca76f794858e9f9f092" + integrity sha512-3pYsBoZZ42tXMdlcFeCc/0j9kOlK7MYuXs2B1QbvDgMoW1K9NJ4G/VYvIbMb26iqlkTfPHo7SC2JgjDOk/mxXw== dependencies: - "@jest/console" "^28.1.0" - "@jest/reporters" "^28.1.0" - "@jest/test-result" "^28.1.0" - "@jest/transform" "^28.1.0" - "@jest/types" "^28.1.0" + "@jest/console" "^28.1.1" + "@jest/reporters" "^28.1.1" + "@jest/test-result" "^28.1.1" + "@jest/transform" "^28.1.1" + "@jest/types" "^28.1.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" @@ -1313,20 +1313,20 @@ exit "^0.1.2" graceful-fs "^4.2.9" jest-changed-files "^28.0.2" - jest-config "^28.1.0" - jest-haste-map "^28.1.0" - jest-message-util "^28.1.0" + jest-config "^28.1.1" + jest-haste-map "^28.1.1" + jest-message-util "^28.1.1" jest-regex-util "^28.0.2" - jest-resolve "^28.1.0" - jest-resolve-dependencies "^28.1.0" - jest-runner "^28.1.0" - jest-runtime "^28.1.0" - jest-snapshot "^28.1.0" - jest-util "^28.1.0" - jest-validate "^28.1.0" - jest-watcher "^28.1.0" + jest-resolve "^28.1.1" + jest-resolve-dependencies "^28.1.1" + jest-runner "^28.1.1" + jest-runtime "^28.1.1" + jest-snapshot "^28.1.1" + jest-util "^28.1.1" + jest-validate "^28.1.1" + jest-watcher "^28.1.1" micromatch "^4.0.4" - pretty-format "^28.1.0" + pretty-format "^28.1.1" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" @@ -1341,20 +1341,30 @@ "@types/node" "*" jest-mock "^28.1.0" -"@jest/expect-utils@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.0.tgz#a5cde811195515a9809b96748ae8bcc331a3538a" - integrity sha512-5BrG48dpC0sB80wpeIX5FU6kolDJI4K0n5BM9a5V38MGx0pyRvUBSS0u2aNTdDzmOrCjhOg8pGs6a20ivYkdmw== +"@jest/environment@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.1.tgz#c4cbf85283278d768f816ebd1a258ea6f9e39d4f" + integrity sha512-9auVQ2GzQ7nrU+lAr8KyY838YahElTX9HVjbQPPS2XjlxQ+na18G113OoBhyBGBtD6ZnO/SrUy5WR8EzOj1/Uw== + dependencies: + "@jest/fake-timers" "^28.1.1" + "@jest/types" "^28.1.1" + "@types/node" "*" + jest-mock "^28.1.1" + +"@jest/expect-utils@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.1.tgz#d84c346025b9f6f3886d02c48a6177e2b0360587" + integrity sha512-n/ghlvdhCdMI/hTcnn4qV57kQuV9OTsZzH1TTCVARANKhl6hXJqLKUkwX69ftMGpsbpt96SsDD8n8LD2d9+FRw== dependencies: jest-get-type "^28.0.2" -"@jest/expect@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-28.1.0.tgz#2e5a31db692597070932366a1602b5157f0f217c" - integrity sha512-be9ETznPLaHOmeJqzYNIXv1ADEzENuQonIoobzThOYPuK/6GhrWNIJDVTgBLCrz3Am73PyEU2urQClZp0hLTtA== +"@jest/expect@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-28.1.1.tgz#ea4fcc8504b45835029221c0dc357c622a761326" + integrity sha512-/+tQprrFoT6lfkMj4mW/mUIfAmmk/+iQPmg7mLDIFOf2lyf7EBHaS+x3RbeR0VZVMe55IvX7QRoT/2aK3AuUXg== dependencies: - expect "^28.1.0" - jest-snapshot "^28.1.0" + expect "^28.1.1" + jest-snapshot "^28.1.1" "@jest/fake-timers@^28.1.0": version "28.1.0" @@ -1368,25 +1378,37 @@ jest-mock "^28.1.0" jest-util "^28.1.0" -"@jest/globals@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-28.1.0.tgz#a4427d2eb11763002ff58e24de56b84ba79eb793" - integrity sha512-3m7sTg52OTQR6dPhsEQSxAvU+LOBbMivZBwOvKEZ+Rb+GyxVnXi9HKgOTYkx/S99T8yvh17U4tNNJPIEQmtwYw== +"@jest/fake-timers@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.1.tgz#47ce33296ab9d680c76076d51ddbe65ceb3337f1" + integrity sha512-BY/3+TyLs5+q87rGWrGUY5f8e8uC3LsVHS9Diz8+FV3ARXL4sNnkLlIB8dvDvRrp+LUCGM+DLqlsYubizGUjIA== dependencies: - "@jest/environment" "^28.1.0" - "@jest/expect" "^28.1.0" - "@jest/types" "^28.1.0" + "@jest/types" "^28.1.1" + "@sinonjs/fake-timers" "^9.1.1" + "@types/node" "*" + jest-message-util "^28.1.1" + jest-mock "^28.1.1" + jest-util "^28.1.1" -"@jest/reporters@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-28.1.0.tgz#5183a28b9b593b6000fa9b89b031c7216b58a9a0" - integrity sha512-qxbFfqap/5QlSpIizH9c/bFCDKsQlM4uAKSOvZrP+nIdrjqre3FmKzpTtYyhsaVcOSNK7TTt2kjm+4BJIjysFA== +"@jest/globals@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-28.1.1.tgz#c0a7977f85e26279cc090d9adcdf82b8a34c4061" + integrity sha512-dEgl/6v7ToB4vXItdvcltJBgny0xBE6xy6IYQrPJAJggdEinGxCDMivNv7sFzPcTITGquXD6UJwYxfJ/5ZwDSg== + dependencies: + "@jest/environment" "^28.1.1" + "@jest/expect" "^28.1.1" + "@jest/types" "^28.1.1" + +"@jest/reporters@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-28.1.1.tgz#9389f4bb3cce4d9b586f6195f83c79cd2a1c8662" + integrity sha512-597Zj4D4d88sZrzM4atEGLuO7SdA/YrOv9SRXHXRNC+/FwPCWxZhBAEzhXoiJzfRwn8zes/EjS8Lo6DouGN5Gg== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^28.1.0" - "@jest/test-result" "^28.1.0" - "@jest/transform" "^28.1.0" - "@jest/types" "^28.1.0" + "@jest/console" "^28.1.1" + "@jest/test-result" "^28.1.1" + "@jest/transform" "^28.1.1" + "@jest/types" "^28.1.1" "@jridgewell/trace-mapping" "^0.3.7" "@types/node" "*" chalk "^4.0.0" @@ -1399,8 +1421,9 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.1.3" - jest-util "^28.1.0" - jest-worker "^28.1.0" + jest-message-util "^28.1.1" + jest-util "^28.1.1" + jest-worker "^28.1.1" slash "^3.0.0" string-length "^4.0.1" strip-ansi "^6.0.0" @@ -1423,24 +1446,24 @@ callsites "^3.0.0" graceful-fs "^4.2.9" -"@jest/test-result@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-28.1.0.tgz#fd149dee123510dd2fcadbbf5f0020f98ad7f12c" - integrity sha512-sBBFIyoPzrZho3N+80P35A5oAkSKlGfsEFfXFWuPGBsW40UAjCkGakZhn4UQK4iQlW2vgCDMRDOob9FGKV8YoQ== +"@jest/test-result@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-28.1.1.tgz#c6f18d1bbb01aa88925dd687872a75f8414b317a" + integrity sha512-hPmkugBktqL6rRzwWAtp1JtYT4VHwv8OQ+9lE5Gymj6dHzubI/oJHMUpPOt8NrdVWSrz9S7bHjJUmv2ggFoUNQ== dependencies: - "@jest/console" "^28.1.0" - "@jest/types" "^28.1.0" + "@jest/console" "^28.1.1" + "@jest/types" "^28.1.1" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-28.1.0.tgz#ce7294bbe986415b9a30e218c7e705e6ebf2cdf2" - integrity sha512-tZCEiVWlWNTs/2iK9yi6o3AlMfbbYgV4uuZInSVdzZ7ftpHZhCMuhvk2HLYhCZzLgPFQ9MnM1YaxMnh3TILFiQ== +"@jest/test-sequencer@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-28.1.1.tgz#f594ee2331df75000afe0d1ae3237630ecec732e" + integrity sha512-nuL+dNSVMcWB7OOtgb0EGH5AjO4UBCt68SLP08rwmC+iRhyuJWS9MtZ/MpipxFwKAlHFftbMsydXqWre8B0+XA== dependencies: - "@jest/test-result" "^28.1.0" + "@jest/test-result" "^28.1.1" graceful-fs "^4.2.9" - jest-haste-map "^28.1.0" + jest-haste-map "^28.1.1" slash "^3.0.0" "@jest/transform@^28.1.0": @@ -1464,6 +1487,27 @@ slash "^3.0.0" write-file-atomic "^4.0.1" +"@jest/transform@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.1.tgz#83541f2a3f612077c8501f49cc4e205d4e4a6b27" + integrity sha512-PkfaTUuvjUarl1EDr5ZQcCA++oXkFCP9QFUkG0yVKVmNObjhrqDy0kbMpMebfHWm3CCDHjYNem9eUSH8suVNHQ== + dependencies: + "@babel/core" "^7.11.6" + "@jest/types" "^28.1.1" + "@jridgewell/trace-mapping" "^0.3.7" + babel-plugin-istanbul "^6.1.1" + chalk "^4.0.0" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.0.0" + graceful-fs "^4.2.9" + jest-haste-map "^28.1.1" + jest-regex-util "^28.0.2" + jest-util "^28.1.1" + micromatch "^4.0.4" + pirates "^4.0.4" + slash "^3.0.0" + write-file-atomic "^4.0.1" + "@jest/types@^25.5.0": version "25.5.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d" @@ -1485,10 +1529,10 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" -"@jest/types@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.0.tgz#508327a89976cbf9bd3e1cc74641a29fd7dfd519" - integrity sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA== +"@jest/types@^28.1.0", "@jest/types@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.1.tgz#d059bbc80e6da6eda9f081f293299348bd78ee0b" + integrity sha512-vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw== dependencies: "@jest/schemas" "^28.0.2" "@types/istanbul-lib-coverage" "^2.0.0" @@ -2524,6 +2568,19 @@ babel-jest@^28.1.0: graceful-fs "^4.2.9" slash "^3.0.0" +babel-jest@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.1.tgz#2a3a4ae50964695b2d694ccffe4bec537c5a3586" + integrity sha512-MEt0263viUdAkTq5D7upHPNxvt4n9uLUGa6pPz3WviNBMtOmStb1lIXS3QobnoqM+qnH+vr4EKlvhe8QcmxIYw== + dependencies: + "@jest/transform" "^28.1.1" + "@types/babel__core" "^7.1.14" + babel-plugin-istanbul "^6.1.1" + babel-preset-jest "^28.1.1" + chalk "^4.0.0" + graceful-fs "^4.2.9" + slash "^3.0.0" + babel-loader@^8.2.5: version "8.2.5" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e" @@ -2562,6 +2619,16 @@ babel-plugin-jest-hoist@^28.0.2: "@types/babel__core" "^7.1.14" "@types/babel__traverse" "^7.0.6" +babel-plugin-jest-hoist@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.1.tgz#5e055cdcc47894f28341f87f5e35aad2df680b11" + integrity sha512-NovGCy5Hn25uMJSAU8FaHqzs13cFoOI4lhIujiepssjCKRsAo3TA734RDWSGxuFTsUJXerYOqQQodlxgmtqbzw== + dependencies: + "@babel/template" "^7.3.3" + "@babel/types" "^7.3.3" + "@types/babel__core" "^7.1.14" + "@types/babel__traverse" "^7.0.6" + babel-plugin-lodash@^3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz#4f6844358a1340baed182adbeffa8df9967bc196" @@ -2669,6 +2736,14 @@ babel-preset-jest@^28.0.2: babel-plugin-jest-hoist "^28.0.2" babel-preset-current-node-syntax "^1.0.0" +babel-preset-jest@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.1.1.tgz#5b6e5e69f963eb2d70f739c607b8f723c0ee75e4" + integrity sha512-FCq9Oud0ReTeWtcneYf/48981aTfXYuB9gbU4rBNNJVBSQ6ssv7E6v/qvbBxtOWwZFXjLZwpg+W3q7J6vhH25g== + dependencies: + babel-plugin-jest-hoist "^28.1.1" + babel-preset-current-node-syntax "^1.0.0" + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -4092,10 +4167,10 @@ diff-sequences@^25.2.6: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg== -diff-sequences@^28.0.2: - version "28.0.2" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.0.2.tgz#40f8d4ffa081acbd8902ba35c798458d0ff1af41" - integrity sha512-YtEoNynLDFCRznv/XDalsKGSZDoj0U5kLnXvY0JSq3nBboRrZXjD81+eSiwi+nzcZDwedMmcowcxNwwgFW23mQ== +diff-sequences@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6" + integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw== diffie-hellman@^5.0.0: version "5.0.3" @@ -4795,16 +4870,16 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.0.tgz#10e8da64c0850eb8c39a480199f14537f46e8360" - integrity sha512-qFXKl8Pmxk8TBGfaFKRtcQjfXEnKAs+dmlxdwvukJZorwrAabT7M3h8oLOG01I2utEhkmUTi17CHaPBovZsKdw== +expect@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.1.tgz#ca6fff65f6517cf7220c2e805a49c19aea30b420" + integrity sha512-/AANEwGL0tWBwzLNOvO0yUdy2D52jVdNXppOqswC49sxMN2cPWsGCQdzuIf9tj6hHoBQzNvx75JUYuQAckPo3w== dependencies: - "@jest/expect-utils" "^28.1.0" + "@jest/expect-utils" "^28.1.1" jest-get-type "^28.0.2" - jest-matcher-utils "^28.1.0" - jest-message-util "^28.1.0" - jest-util "^28.1.0" + jest-matcher-utils "^28.1.1" + jest-message-util "^28.1.1" + jest-util "^28.1.1" express@^4.17.1, express@^4.18.1: version "4.18.1" @@ -6405,74 +6480,74 @@ jest-changed-files@^28.0.2: execa "^5.0.0" throat "^6.0.1" -jest-circus@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-28.1.0.tgz#e229f590911bd54d60efaf076f7acd9360296dae" - integrity sha512-rNYfqfLC0L0zQKRKsg4n4J+W1A2fbyGH7Ss/kDIocp9KXD9iaL111glsLu7+Z7FHuZxwzInMDXq+N1ZIBkI/TQ== +jest-circus@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-28.1.1.tgz#3d27da6a974d85a466dc0cdc6ddeb58daaa57bb4" + integrity sha512-75+BBVTsL4+p2w198DQpCeyh1RdaS2lhEG87HkaFX/UG0gJExVq2skG2pT7XZEGBubNj2CytcWSPan4QEPNosw== dependencies: - "@jest/environment" "^28.1.0" - "@jest/expect" "^28.1.0" - "@jest/test-result" "^28.1.0" - "@jest/types" "^28.1.0" + "@jest/environment" "^28.1.1" + "@jest/expect" "^28.1.1" + "@jest/test-result" "^28.1.1" + "@jest/types" "^28.1.1" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" is-generator-fn "^2.0.0" - jest-each "^28.1.0" - jest-matcher-utils "^28.1.0" - jest-message-util "^28.1.0" - jest-runtime "^28.1.0" - jest-snapshot "^28.1.0" - jest-util "^28.1.0" - pretty-format "^28.1.0" + jest-each "^28.1.1" + jest-matcher-utils "^28.1.1" + jest-message-util "^28.1.1" + jest-runtime "^28.1.1" + jest-snapshot "^28.1.1" + jest-util "^28.1.1" + pretty-format "^28.1.1" slash "^3.0.0" stack-utils "^2.0.3" throat "^6.0.1" -jest-cli@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-28.1.0.tgz#cd1d8adb9630102d5ba04a22895f63decdd7ac1f" - integrity sha512-fDJRt6WPRriHrBsvvgb93OxgajHHsJbk4jZxiPqmZbMDRcHskfJBBfTyjFko0jjfprP544hOktdSi9HVgl4VUQ== +jest-cli@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-28.1.1.tgz#23ddfde8940e1818585ae4a568877b33b0e51cfe" + integrity sha512-+sUfVbJqb1OjBZ0OdBbI6OWfYM1i7bSfzYy6gze1F1w3OKWq8ZTEKkZ8a7ZQPq6G/G1qMh/uKqpdWhgl11NFQQ== dependencies: - "@jest/core" "^28.1.0" - "@jest/test-result" "^28.1.0" - "@jest/types" "^28.1.0" + "@jest/core" "^28.1.1" + "@jest/test-result" "^28.1.1" + "@jest/types" "^28.1.1" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.9" import-local "^3.0.2" - jest-config "^28.1.0" - jest-util "^28.1.0" - jest-validate "^28.1.0" + jest-config "^28.1.1" + jest-util "^28.1.1" + jest-validate "^28.1.1" prompts "^2.0.1" yargs "^17.3.1" -jest-config@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-28.1.0.tgz#fca22ca0760e746fe1ce1f9406f6b307ab818501" - integrity sha512-aOV80E9LeWrmflp7hfZNn/zGA4QKv/xsn2w8QCBP0t0+YqObuCWTSgNbHJ0j9YsTuCO08ZR/wsvlxqqHX20iUA== +jest-config@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-28.1.1.tgz#e90b97b984f14a6c24a221859e81b258990fce2f" + integrity sha512-tASynMhS+jVV85zKvjfbJ8nUyJS/jUSYZ5KQxLUN2ZCvcQc/OmhQl2j6VEL3ezQkNofxn5pQ3SPYWPHb0unTZA== dependencies: "@babel/core" "^7.11.6" - "@jest/test-sequencer" "^28.1.0" - "@jest/types" "^28.1.0" - babel-jest "^28.1.0" + "@jest/test-sequencer" "^28.1.1" + "@jest/types" "^28.1.1" + babel-jest "^28.1.1" chalk "^4.0.0" ci-info "^3.2.0" deepmerge "^4.2.2" glob "^7.1.3" graceful-fs "^4.2.9" - jest-circus "^28.1.0" - jest-environment-node "^28.1.0" + jest-circus "^28.1.1" + jest-environment-node "^28.1.1" jest-get-type "^28.0.2" jest-regex-util "^28.0.2" - jest-resolve "^28.1.0" - jest-runner "^28.1.0" - jest-util "^28.1.0" - jest-validate "^28.1.0" + jest-resolve "^28.1.1" + jest-runner "^28.1.1" + jest-util "^28.1.1" + jest-validate "^28.1.1" micromatch "^4.0.4" parse-json "^5.2.0" - pretty-format "^28.1.0" + pretty-format "^28.1.1" slash "^3.0.0" strip-json-comments "^3.1.1" @@ -6486,33 +6561,33 @@ jest-diff@^25.2.1: jest-get-type "^25.2.6" pretty-format "^25.5.0" -jest-diff@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-28.1.0.tgz#77686fef899ec1873dbfbf9330e37dd429703269" - integrity sha512-8eFd3U3OkIKRtlasXfiAQfbovgFgRDb0Ngcs2E+FMeBZ4rUezqIaGjuyggJBp+llosQXNEWofk/Sz4Hr5gMUhA== +jest-diff@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-28.1.1.tgz#1a3eedfd81ae79810931c63a1d0f201b9120106c" + integrity sha512-/MUUxeR2fHbqHoMMiffe/Afm+U8U4olFRJ0hiVG2lZatPJcnGxx292ustVu7bULhjV65IYMxRdploAKLbcrsyg== dependencies: chalk "^4.0.0" - diff-sequences "^28.0.2" + diff-sequences "^28.1.1" jest-get-type "^28.0.2" - pretty-format "^28.1.0" + pretty-format "^28.1.1" -jest-docblock@^28.0.2: - version "28.0.2" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-28.0.2.tgz#3cab8abea53275c9d670cdca814fc89fba1298c2" - integrity sha512-FH10WWw5NxLoeSdQlJwu+MTiv60aXV/t8KEwIRGEv74WARE1cXIqh1vGdy2CraHuWOOrnzTWj/azQKqW4fO7xg== +jest-docblock@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-28.1.1.tgz#6f515c3bf841516d82ecd57a62eed9204c2f42a8" + integrity sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA== dependencies: detect-newline "^3.0.0" -jest-each@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-28.1.0.tgz#54ae66d6a0a5b1913e9a87588d26c2687c39458b" - integrity sha512-a/XX02xF5NTspceMpHujmOexvJ4GftpYXqr6HhhmKmExtMXsyIN/fvanQlt/BcgFoRKN4OCXxLQKth9/n6OPFg== +jest-each@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-28.1.1.tgz#ba5238dacf4f31d9fe23ddc2c44c01e7c23885c4" + integrity sha512-A042rqh17ZvEhRceDMi784ppoXR7MWGDEKTXEZXb4svt0eShMZvijGxzKsx+yIjeE8QYmHPrnHiTSQVhN4nqaw== dependencies: - "@jest/types" "^28.1.0" + "@jest/types" "^28.1.1" chalk "^4.0.0" jest-get-type "^28.0.2" - jest-util "^28.1.0" - pretty-format "^28.1.0" + jest-util "^28.1.1" + pretty-format "^28.1.1" jest-environment-jsdom@^28.1.0: version "28.1.0" @@ -6528,17 +6603,17 @@ jest-environment-jsdom@^28.1.0: jest-util "^28.1.0" jsdom "^19.0.0" -jest-environment-node@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-28.1.0.tgz#6ed2150aa31babba0c488c5b4f4d813a585c68e6" - integrity sha512-gBLZNiyrPw9CSMlTXF1yJhaBgWDPVvH0Pq6bOEwGMXaYNzhzhw2kA/OijNF8egbCgDS0/veRv97249x2CX+udQ== +jest-environment-node@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-28.1.1.tgz#1c86c59003a7d319fa06ea3b1bbda6c193715c67" + integrity sha512-2aV/eeY/WNgUUJrrkDJ3cFEigjC5fqT1+fCclrY6paqJ5zVPoM//sHmfgUUp7WLYxIdbPwMiVIzejpN56MxnNA== dependencies: - "@jest/environment" "^28.1.0" - "@jest/fake-timers" "^28.1.0" - "@jest/types" "^28.1.0" + "@jest/environment" "^28.1.1" + "@jest/fake-timers" "^28.1.1" + "@jest/types" "^28.1.1" "@types/node" "*" - jest-mock "^28.1.0" - jest-util "^28.1.0" + jest-mock "^28.1.1" + jest-util "^28.1.1" jest-get-type@^25.2.6: version "25.2.6" @@ -6569,23 +6644,42 @@ jest-haste-map@^28.1.0: optionalDependencies: fsevents "^2.3.2" -jest-leak-detector@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-28.1.0.tgz#b65167776a8787443214d6f3f54935a4c73c8a45" - integrity sha512-uIJDQbxwEL2AMMs2xjhZl2hw8s77c3wrPaQ9v6tXJLGaaQ+4QrNJH5vuw7hA7w/uGT/iJ42a83opAqxGHeyRIA== +jest-haste-map@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.1.tgz#471685f1acd365a9394745bb97c8fc16289adca3" + integrity sha512-ZrRSE2o3Ezh7sb1KmeLEZRZ4mgufbrMwolcFHNRSjKZhpLa8TdooXOOFlSwoUzlbVs1t0l7upVRW2K7RWGHzbQ== + dependencies: + "@jest/types" "^28.1.1" + "@types/graceful-fs" "^4.1.3" + "@types/node" "*" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.9" + jest-regex-util "^28.0.2" + jest-util "^28.1.1" + jest-worker "^28.1.1" + micromatch "^4.0.4" + walker "^1.0.8" + optionalDependencies: + fsevents "^2.3.2" + +jest-leak-detector@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-28.1.1.tgz#537f37afd610a4b3f4cab15e06baf60484548efb" + integrity sha512-4jvs8V8kLbAaotE+wFR7vfUGf603cwYtFf1/PYEsyX2BAjSzj8hQSVTP6OWzseTl0xL6dyHuKs2JAks7Pfubmw== dependencies: jest-get-type "^28.0.2" - pretty-format "^28.1.0" + pretty-format "^28.1.1" -jest-matcher-utils@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.0.tgz#2ae398806668eeabd293c61712227cb94b250ccf" - integrity sha512-onnax0n2uTLRQFKAjC7TuaxibrPSvZgKTcSCnNUz/tOjJ9UhxNm7ZmPpoQavmTDUjXvUQ8KesWk2/VdrxIFzTQ== +jest-matcher-utils@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.1.tgz#a7c4653c2b782ec96796eb3088060720f1e29304" + integrity sha512-NPJPRWrbmR2nAJ+1nmnfcKKzSwgfaciCCrYZzVnNoxVoyusYWIjkBMNvu0RHJe7dNj4hH3uZOPZsQA+xAYWqsw== dependencies: chalk "^4.0.0" - jest-diff "^28.1.0" + jest-diff "^28.1.1" jest-get-type "^28.0.2" - pretty-format "^28.1.0" + pretty-format "^28.1.1" jest-message-util@^28.1.0: version "28.1.0" @@ -6602,6 +6696,21 @@ jest-message-util@^28.1.0: slash "^3.0.0" stack-utils "^2.0.3" +jest-message-util@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.1.tgz#60aa0b475cfc08c8a9363ed2fb9108514dd9ab89" + integrity sha512-xoDOOT66fLfmTRiqkoLIU7v42mal/SqwDKvfmfiWAdJMSJiU+ozgluO7KbvoAgiwIrrGZsV7viETjc8GNrA/IQ== + dependencies: + "@babel/code-frame" "^7.12.13" + "@jest/types" "^28.1.1" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.9" + micromatch "^4.0.4" + pretty-format "^28.1.1" + slash "^3.0.0" + stack-utils "^2.0.3" + jest-mock@^28.1.0: version "28.1.0" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.0.tgz#ccc7cc12a9b330b3182db0c651edc90d163ff73e" @@ -6610,6 +6719,14 @@ jest-mock@^28.1.0: "@jest/types" "^28.1.0" "@types/node" "*" +jest-mock@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.1.tgz#37903d269427fa1ef5b2447be874e1c62a39a371" + integrity sha512-bDCb0FjfsmKweAvE09dZT59IMkzgN0fYBH6t5S45NoJfd2DHkS3ySG2K+hucortryhO3fVuXdlxWcbtIuV/Skw== + dependencies: + "@jest/types" "^28.1.1" + "@types/node" "*" + jest-pnp-resolver@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" @@ -6620,111 +6737,111 @@ jest-regex-util@^28.0.2: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead" integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw== -jest-resolve-dependencies@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.0.tgz#167becb8bee6e20b5ef4a3a728ec67aef6b0b79b" - integrity sha512-Ue1VYoSZquPwEvng7Uefw8RmZR+me/1kr30H2jMINjGeHgeO/JgrR6wxj2ofkJ7KSAA11W3cOrhNCbj5Dqqd9g== +jest-resolve-dependencies@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.1.tgz#3dffaaa56f4b41bc6b61053899d1756401763a27" + integrity sha512-p8Y150xYJth4EXhOuB8FzmS9r8IGLEioiaetgdNGb9VHka4fl0zqWlVe4v7mSkYOuEUg2uB61iE+zySDgrOmgQ== dependencies: jest-regex-util "^28.0.2" - jest-snapshot "^28.1.0" + jest-snapshot "^28.1.1" -jest-resolve@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-28.1.0.tgz#b1f32748a6cee7d1779c7ef639c0a87078de3d35" - integrity sha512-vvfN7+tPNnnhDvISuzD1P+CRVP8cK0FHXRwPAcdDaQv4zgvwvag2n55/h5VjYcM5UJG7L4TwE5tZlzcI0X2Lhw== +jest-resolve@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-28.1.1.tgz#bc2eaf384abdcc1aaf3ba7c50d1adf01e59095e5" + integrity sha512-/d1UbyUkf9nvsgdBildLe6LAD4DalgkgZcKd0nZ8XUGPyA/7fsnaQIlKVnDiuUXv/IeZhPEDrRJubVSulxrShA== dependencies: chalk "^4.0.0" graceful-fs "^4.2.9" - jest-haste-map "^28.1.0" + jest-haste-map "^28.1.1" jest-pnp-resolver "^1.2.2" - jest-util "^28.1.0" - jest-validate "^28.1.0" + jest-util "^28.1.1" + jest-validate "^28.1.1" resolve "^1.20.0" resolve.exports "^1.1.0" slash "^3.0.0" -jest-runner@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-28.1.0.tgz#aefe2a1e618a69baa0b24a50edc54fdd7e728eaa" - integrity sha512-FBpmuh1HB2dsLklAlRdOxNTTHKFR6G1Qmd80pVDvwbZXTriqjWqjei5DKFC1UlM732KjYcE6yuCdiF0WUCOS2w== +jest-runner@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-28.1.1.tgz#9ecdb3f27a00059986797aa6b012ba8306aa436c" + integrity sha512-W5oFUiDBgTsCloTAj6q95wEvYDB0pxIhY6bc5F26OucnwBN+K58xGTGbliSMI4ChQal5eANDF+xvELaYkJxTmA== dependencies: - "@jest/console" "^28.1.0" - "@jest/environment" "^28.1.0" - "@jest/test-result" "^28.1.0" - "@jest/transform" "^28.1.0" - "@jest/types" "^28.1.0" + "@jest/console" "^28.1.1" + "@jest/environment" "^28.1.1" + "@jest/test-result" "^28.1.1" + "@jest/transform" "^28.1.1" + "@jest/types" "^28.1.1" "@types/node" "*" chalk "^4.0.0" emittery "^0.10.2" graceful-fs "^4.2.9" - jest-docblock "^28.0.2" - jest-environment-node "^28.1.0" - jest-haste-map "^28.1.0" - jest-leak-detector "^28.1.0" - jest-message-util "^28.1.0" - jest-resolve "^28.1.0" - jest-runtime "^28.1.0" - jest-util "^28.1.0" - jest-watcher "^28.1.0" - jest-worker "^28.1.0" + jest-docblock "^28.1.1" + jest-environment-node "^28.1.1" + jest-haste-map "^28.1.1" + jest-leak-detector "^28.1.1" + jest-message-util "^28.1.1" + jest-resolve "^28.1.1" + jest-runtime "^28.1.1" + jest-util "^28.1.1" + jest-watcher "^28.1.1" + jest-worker "^28.1.1" source-map-support "0.5.13" throat "^6.0.1" -jest-runtime@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-28.1.0.tgz#4847dcb2a4eb4b0f9eaf41306897e51fb1665631" - integrity sha512-wNYDiwhdH/TV3agaIyVF0lsJ33MhyujOe+lNTUiolqKt8pchy1Hq4+tDMGbtD5P/oNLA3zYrpx73T9dMTOCAcg== +jest-runtime@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-28.1.1.tgz#569e1dc3c36c6c4c0b29516c1c49b6ad580abdaf" + integrity sha512-J89qEJWW0leOsqyi0D9zHpFEYHwwafFdS9xgvhFHtIdRghbadodI0eA+DrthK/1PebBv3Px8mFSMGKrtaVnleg== dependencies: - "@jest/environment" "^28.1.0" - "@jest/fake-timers" "^28.1.0" - "@jest/globals" "^28.1.0" + "@jest/environment" "^28.1.1" + "@jest/fake-timers" "^28.1.1" + "@jest/globals" "^28.1.1" "@jest/source-map" "^28.0.2" - "@jest/test-result" "^28.1.0" - "@jest/transform" "^28.1.0" - "@jest/types" "^28.1.0" + "@jest/test-result" "^28.1.1" + "@jest/transform" "^28.1.1" + "@jest/types" "^28.1.1" chalk "^4.0.0" cjs-module-lexer "^1.0.0" collect-v8-coverage "^1.0.0" execa "^5.0.0" glob "^7.1.3" graceful-fs "^4.2.9" - jest-haste-map "^28.1.0" - jest-message-util "^28.1.0" - jest-mock "^28.1.0" + jest-haste-map "^28.1.1" + jest-message-util "^28.1.1" + jest-mock "^28.1.1" jest-regex-util "^28.0.2" - jest-resolve "^28.1.0" - jest-snapshot "^28.1.0" - jest-util "^28.1.0" + jest-resolve "^28.1.1" + jest-snapshot "^28.1.1" + jest-util "^28.1.1" slash "^3.0.0" strip-bom "^4.0.0" -jest-snapshot@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.0.tgz#4b74fa8816707dd10fe9d551c2c258e5a67b53b6" - integrity sha512-ex49M2ZrZsUyQLpLGxQtDbahvgBjlLPgklkqGM0hq/F7W/f8DyqZxVHjdy19QKBm4O93eDp+H5S23EiTbbUmHw== +jest-snapshot@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.1.tgz#ab825c16c8d8b5e883bd57eee6ca8748c42ab848" + integrity sha512-1KjqHJ98adRcbIdMizjF5DipwZFbvxym/kFO4g4fVZCZRxH/dqV8TiBFCa6rqic3p0karsy8RWS1y4E07b7P0A== dependencies: "@babel/core" "^7.11.6" "@babel/generator" "^7.7.2" "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" "@babel/types" "^7.3.3" - "@jest/expect-utils" "^28.1.0" - "@jest/transform" "^28.1.0" - "@jest/types" "^28.1.0" + "@jest/expect-utils" "^28.1.1" + "@jest/transform" "^28.1.1" + "@jest/types" "^28.1.1" "@types/babel__traverse" "^7.0.6" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^28.1.0" + expect "^28.1.1" graceful-fs "^4.2.9" - jest-diff "^28.1.0" + jest-diff "^28.1.1" jest-get-type "^28.0.2" - jest-haste-map "^28.1.0" - jest-matcher-utils "^28.1.0" - jest-message-util "^28.1.0" - jest-util "^28.1.0" + jest-haste-map "^28.1.1" + jest-matcher-utils "^28.1.1" + jest-message-util "^28.1.1" + jest-util "^28.1.1" natural-compare "^1.4.0" - pretty-format "^28.1.0" + pretty-format "^28.1.1" semver "^7.3.5" jest-util@^28.1.0: @@ -6739,30 +6856,42 @@ jest-util@^28.1.0: graceful-fs "^4.2.9" picomatch "^2.2.3" -jest-validate@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-28.1.0.tgz#8a6821f48432aba9f830c26e28226ad77b9a0e18" - integrity sha512-Lly7CJYih3vQBfjLeANGgBSBJ7pEa18cxpQfQEq2go2xyEzehnHfQTjoUia8xUv4x4J80XKFIDwJJThXtRFQXQ== +jest-util@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.1.tgz#ff39e436a1aca397c0ab998db5a51ae2b7080d05" + integrity sha512-FktOu7ca1DZSyhPAxgxB6hfh2+9zMoJ7aEQA759Z6p45NuO8mWcqujH+UdHlCm/V6JTWwDztM2ITCzU1ijJAfw== dependencies: - "@jest/types" "^28.1.0" + "@jest/types" "^28.1.1" + "@types/node" "*" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" + picomatch "^2.2.3" + +jest-validate@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-28.1.1.tgz#59b7b339b3c85b5144bd0c06ad3600f503a4acc8" + integrity sha512-Kpf6gcClqFCIZ4ti5++XemYJWUPCFUW+N2gknn+KgnDf549iLul3cBuKVe1YcWRlaF8tZV8eJCap0eECOEE3Ug== + dependencies: + "@jest/types" "^28.1.1" camelcase "^6.2.0" chalk "^4.0.0" jest-get-type "^28.0.2" leven "^3.1.0" - pretty-format "^28.1.0" + pretty-format "^28.1.1" -jest-watcher@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.1.0.tgz#aaa7b4164a4e77eeb5f7d7b25ede5e7b4e9c9aaf" - integrity sha512-tNHMtfLE8Njcr2IRS+5rXYA4BhU90gAOwI9frTGOqd+jX0P/Au/JfRSNqsf5nUTcWdbVYuLxS1KjnzILSoR5hA== +jest-watcher@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.1.1.tgz#533597fb3bfefd52b5cd115cd916cffd237fb60c" + integrity sha512-RQIpeZ8EIJMxbQrXpJQYIIlubBnB9imEHsxxE41f54ZwcqWLysL/A0ZcdMirf+XsMn3xfphVQVV4EW0/p7i7Ug== dependencies: - "@jest/test-result" "^28.1.0" - "@jest/types" "^28.1.0" + "@jest/test-result" "^28.1.1" + "@jest/types" "^28.1.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" emittery "^0.10.2" - jest-util "^28.1.0" + jest-util "^28.1.1" string-length "^4.0.1" jest-worker@^26.5.0: @@ -6783,14 +6912,24 @@ jest-worker@^28.1.0: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-28.1.0.tgz#f420e41c8f2395b9a30445a97189ebb57593d831" - integrity sha512-TZR+tHxopPhzw3c3560IJXZWLNHgpcz1Zh0w5A65vynLGNcg/5pZ+VildAd7+XGOu6jd58XMY/HNn0IkZIXVXg== +jest-worker@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.1.tgz#3480c73247171dfd01eda77200f0063ab6a3bf28" + integrity sha512-Au7slXB08C6h+xbJPp7VIb6U0XX5Kc9uel/WFc6/rcTzGiaVCBRngBExSYuXSLFPULPSYU3cJ3ybS988lNFQhQ== dependencies: - "@jest/core" "^28.1.0" + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +jest@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest/-/jest-28.1.1.tgz#3c39a3a09791e16e9ef283597d24ab19a0df701e" + integrity sha512-qw9YHBnjt6TCbIDMPMpJZqf9E12rh6869iZaN08/vpOGgHJSAaLLUn6H8W3IAEuy34Ls3rct064mZLETkxJ2XA== + dependencies: + "@jest/core" "^28.1.1" + "@jest/types" "^28.1.1" import-local "^3.0.2" - jest-cli "^28.1.0" + jest-cli "^28.1.1" js-base64@^2.1.9: version "2.6.4" @@ -7176,6 +7315,13 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: dependencies: semver "^6.0.0" +makeerror@1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" + integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg== + dependencies: + tmpl "1.0.5" + makeerror@1.0.x: version "1.0.11" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" @@ -8811,6 +8957,16 @@ pretty-format@^28.1.0: ansi-styles "^5.0.0" react-is "^18.0.0" +pretty-format@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.1.tgz#f731530394e0f7fcd95aba6b43c50e02d86b95cb" + integrity sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw== + dependencies: + "@jest/schemas" "^28.0.2" + ansi-regex "^5.0.1" + ansi-styles "^5.0.0" + react-is "^18.0.0" + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -10833,7 +10989,7 @@ tiny-warning@^1.0.0: resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== -tmpl@1.0.x: +tmpl@1.0.5, tmpl@1.0.x: version "1.0.5" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== @@ -11305,6 +11461,13 @@ walker@^1.0.7: dependencies: makeerror "1.0.x" +walker@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" + integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== + dependencies: + makeerror "1.0.12" + warning@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" From d31ecdec5ab5f975e57c52ac2d37447f31280dfa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jun 2022 16:10:14 +0900 Subject: [PATCH 33/38] Bump jest-environment-jsdom from 28.1.0 to 28.1.1 (#18656) Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom) from 28.1.0 to 28.1.1. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v28.1.1/packages/jest-environment-jsdom) --- updated-dependencies: - dependency-name: jest-environment-jsdom dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 87 ++++++---------------------------------------------- 2 files changed, 11 insertions(+), 78 deletions(-) diff --git a/package.json b/package.json index 1d2fdaa5d5..708cfa42e0 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "eslint-plugin-promise": "~6.0.0", "eslint-plugin-react": "~7.30.0", "jest": "^28.1.1", - "jest-environment-jsdom": "^28.1.0", + "jest-environment-jsdom": "^28.1.1", "postcss-scss": "^4.0.4", "prettier": "^2.7.1", "raf": "^3.4.1", diff --git a/yarn.lock b/yarn.lock index aec39d0a07..ac6a55c83a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1331,16 +1331,6 @@ slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.0.tgz#dedf7d59ec341b9292fcf459fd0ed819eb2e228a" - integrity sha512-S44WGSxkRngzHslhV6RoAExekfF7Qhwa6R5+IYFa81mpcj0YgdBnRSmvHe3SNwOt64yXaE5GG8Y2xM28ii5ssA== - dependencies: - "@jest/fake-timers" "^28.1.0" - "@jest/types" "^28.1.0" - "@types/node" "*" - jest-mock "^28.1.0" - "@jest/environment@^28.1.1": version "28.1.1" resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.1.tgz#c4cbf85283278d768f816ebd1a258ea6f9e39d4f" @@ -1366,18 +1356,6 @@ expect "^28.1.1" jest-snapshot "^28.1.1" -"@jest/fake-timers@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.0.tgz#ea77878aabd5c5d50e1fc53e76d3226101e33064" - integrity sha512-Xqsf/6VLeAAq78+GNPzI7FZQRf5cCHj1qgQxCjws9n8rKw8r1UYoeaALwBvyuzOkpU3c1I6emeMySPa96rxtIg== - dependencies: - "@jest/types" "^28.1.0" - "@sinonjs/fake-timers" "^9.1.1" - "@types/node" "*" - jest-message-util "^28.1.0" - jest-mock "^28.1.0" - jest-util "^28.1.0" - "@jest/fake-timers@^28.1.1": version "28.1.1" resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.1.tgz#47ce33296ab9d680c76076d51ddbe65ceb3337f1" @@ -6589,18 +6567,18 @@ jest-each@^28.1.1: jest-util "^28.1.1" pretty-format "^28.1.1" -jest-environment-jsdom@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-28.1.0.tgz#1042cffd0343615c5fac2d2c8da20d1d43b73ef8" - integrity sha512-8n6P4xiDjNVqTWv6W6vJPuQdLx+ZiA3dbYg7YJ+DPzR+9B61K6pMVJrSs2IxfGRG4J7pyAUA5shQ9G0KEun78w== +jest-environment-jsdom@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-28.1.1.tgz#8bd721915b32f9b196723292c4461a0ad548b55b" + integrity sha512-41ZvgSoPNcKG5q3LuuOcAczdBxRq9DbZkPe24okN6ZCmiZdAfFtPg3z+lOtsT1fM6OAERApKT+3m0MRDQH2zIA== dependencies: - "@jest/environment" "^28.1.0" - "@jest/fake-timers" "^28.1.0" - "@jest/types" "^28.1.0" + "@jest/environment" "^28.1.1" + "@jest/fake-timers" "^28.1.1" + "@jest/types" "^28.1.1" "@types/jsdom" "^16.2.4" "@types/node" "*" - jest-mock "^28.1.0" - jest-util "^28.1.0" + jest-mock "^28.1.1" + jest-util "^28.1.1" jsdom "^19.0.0" jest-environment-node@^28.1.1: @@ -6681,21 +6659,6 @@ jest-matcher-utils@^28.1.1: jest-get-type "^28.0.2" pretty-format "^28.1.1" -jest-message-util@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.0.tgz#7e8f0b9049e948e7b94c2a52731166774ba7d0af" - integrity sha512-RpA8mpaJ/B2HphDMiDlrAZdDytkmwFqgjDZovM21F35lHGeUeCvYmm6W+sbQ0ydaLpg5bFAUuWG1cjqOl8vqrw== - dependencies: - "@babel/code-frame" "^7.12.13" - "@jest/types" "^28.1.0" - "@types/stack-utils" "^2.0.0" - chalk "^4.0.0" - graceful-fs "^4.2.9" - micromatch "^4.0.4" - pretty-format "^28.1.0" - slash "^3.0.0" - stack-utils "^2.0.3" - jest-message-util@^28.1.1: version "28.1.1" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.1.tgz#60aa0b475cfc08c8a9363ed2fb9108514dd9ab89" @@ -6711,14 +6674,6 @@ jest-message-util@^28.1.1: slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.0.tgz#ccc7cc12a9b330b3182db0c651edc90d163ff73e" - integrity sha512-H7BrhggNn77WhdL7O1apG0Q/iwl0Bdd5E1ydhCJzL3oBLh/UYxAwR3EJLsBZ9XA3ZU4PA3UNw4tQjduBTCTmLw== - dependencies: - "@jest/types" "^28.1.0" - "@types/node" "*" - jest-mock@^28.1.1: version "28.1.1" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.1.tgz#37903d269427fa1ef5b2447be874e1c62a39a371" @@ -6844,19 +6799,7 @@ jest-snapshot@^28.1.1: pretty-format "^28.1.1" semver "^7.3.5" -jest-util@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.0.tgz#d54eb83ad77e1dd441408738c5a5043642823be5" - integrity sha512-qYdCKD77k4Hwkose2YBEqQk7PzUf/NSE+rutzceduFveQREeH6b+89Dc9+wjX9dAwHcgdx4yedGA3FQlU/qCTA== - dependencies: - "@jest/types" "^28.1.0" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - -jest-util@^28.1.1: +jest-util@^28.1.0, jest-util@^28.1.1: version "28.1.1" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.1.tgz#ff39e436a1aca397c0ab998db5a51ae2b7080d05" integrity sha512-FktOu7ca1DZSyhPAxgxB6hfh2+9zMoJ7aEQA759Z6p45NuO8mWcqujH+UdHlCm/V6JTWwDztM2ITCzU1ijJAfw== @@ -8947,16 +8890,6 @@ pretty-format@^27.0.2: ansi-styles "^5.0.0" react-is "^17.0.1" -pretty-format@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.0.tgz#8f5836c6a0dfdb834730577ec18029052191af55" - integrity sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q== - dependencies: - "@jest/schemas" "^28.0.2" - ansi-regex "^5.0.1" - ansi-styles "^5.0.0" - react-is "^18.0.0" - pretty-format@^28.1.1: version "28.1.1" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.1.tgz#f731530394e0f7fcd95aba6b43c50e02d86b95cb" From f7d589aa87df2896e03bf16595c9741876dba1ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Jun 2022 16:10:40 +0900 Subject: [PATCH 34/38] Bump babel-jest from 28.1.0 to 28.1.1 (#18649) Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 28.1.0 to 28.1.1. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v28.1.1/packages/babel-jest) --- updated-dependencies: - dependency-name: babel-jest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 96 +--------------------------------------------------- 2 files changed, 2 insertions(+), 96 deletions(-) diff --git a/package.json b/package.json index 708cfa42e0..30fe8b6725 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "@babel/eslint-parser": "^7.18.2", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^12.1.5", - "babel-jest": "^28.1.0", + "babel-jest": "^28.1.1", "eslint": "^7.32.0", "eslint-plugin-import": "~2.26.0", "eslint-plugin-jsx-a11y": "~6.5.1", diff --git a/yarn.lock b/yarn.lock index ac6a55c83a..42d877453f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1444,27 +1444,6 @@ jest-haste-map "^28.1.1" slash "^3.0.0" -"@jest/transform@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.0.tgz#224a3c9ba4cc98e2ff996c0a89a2d59db15c74ce" - integrity sha512-omy2xe5WxlAfqmsTjTPxw+iXRTRnf+NtX0ToG+4S0tABeb4KsKmPUHq5UBuwunHg3tJRwgEQhEp0M/8oiatLEA== - dependencies: - "@babel/core" "^7.11.6" - "@jest/types" "^28.1.0" - "@jridgewell/trace-mapping" "^0.3.7" - babel-plugin-istanbul "^6.1.1" - chalk "^4.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.0.0" - graceful-fs "^4.2.9" - jest-haste-map "^28.1.0" - jest-regex-util "^28.0.2" - jest-util "^28.1.0" - micromatch "^4.0.4" - pirates "^4.0.4" - slash "^3.0.0" - write-file-atomic "^4.0.1" - "@jest/transform@^28.1.1": version "28.1.1" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.1.tgz#83541f2a3f612077c8501f49cc4e205d4e4a6b27" @@ -2533,19 +2512,6 @@ axobject-query@^2.2.0: resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be" integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA== -babel-jest@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.0.tgz#95a67f8e2e7c0042e7b3ad3951b8af41a533b5ea" - integrity sha512-zNKk0yhDZ6QUwfxh9k07GII6siNGMJWVUU49gmFj5gfdqDKLqa2RArXOF2CODp4Dr7dLxN2cvAV+667dGJ4b4w== - dependencies: - "@jest/transform" "^28.1.0" - "@types/babel__core" "^7.1.14" - babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^28.0.2" - chalk "^4.0.0" - graceful-fs "^4.2.9" - slash "^3.0.0" - babel-jest@^28.1.1: version "28.1.1" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.1.tgz#2a3a4ae50964695b2d694ccffe4bec537c5a3586" @@ -2587,16 +2553,6 @@ babel-plugin-istanbul@^6.1.1: istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^28.0.2: - version "28.0.2" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.0.2.tgz#9307d03a633be6fc4b1a6bc5c3a87e22bd01dd3b" - integrity sha512-Kizhn/ZL+68ZQHxSnHyuvJv8IchXD62KQxV77TBDV/xoBFBOfgRAk97GNs6hXdTTCiVES9nB2I6+7MXXrk5llQ== - dependencies: - "@babel/template" "^7.3.3" - "@babel/types" "^7.3.3" - "@types/babel__core" "^7.1.14" - "@types/babel__traverse" "^7.0.6" - babel-plugin-jest-hoist@^28.1.1: version "28.1.1" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.1.tgz#5e055cdcc47894f28341f87f5e35aad2df680b11" @@ -2706,14 +2662,6 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-jest@^28.0.2: - version "28.0.2" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.0.2.tgz#d8210fe4e46c1017e9fa13d7794b166e93aa9f89" - integrity sha512-sYzXIdgIXXroJTFeB3S6sNDWtlJ2dllCdTEsnZ65ACrMojj3hVNFRmnJ1HZtomGi+Be7aqpY/HJ92fr8OhKVkQ== - dependencies: - babel-plugin-jest-hoist "^28.0.2" - babel-preset-current-node-syntax "^1.0.0" - babel-preset-jest@^28.1.1: version "28.1.1" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.1.1.tgz#5b6e5e69f963eb2d70f739c607b8f723c0ee75e4" @@ -6603,25 +6551,6 @@ jest-get-type@^28.0.2: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203" integrity sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA== -jest-haste-map@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.0.tgz#6c1ee2daf1c20a3e03dbd8e5b35c4d73d2349cf0" - integrity sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw== - dependencies: - "@jest/types" "^28.1.0" - "@types/graceful-fs" "^4.1.3" - "@types/node" "*" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.9" - jest-regex-util "^28.0.2" - jest-util "^28.1.0" - jest-worker "^28.1.0" - micromatch "^4.0.4" - walker "^1.0.7" - optionalDependencies: - fsevents "^2.3.2" - jest-haste-map@^28.1.1: version "28.1.1" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.1.tgz#471685f1acd365a9394745bb97c8fc16289adca3" @@ -6846,15 +6775,6 @@ jest-worker@^26.5.0: merge-stream "^2.0.0" supports-color "^7.0.0" -jest-worker@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.0.tgz#ced54757a035e87591e1208253a6e3aac1a855e5" - integrity sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - jest-worker@^28.1.1: version "28.1.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.1.tgz#3480c73247171dfd01eda77200f0063ab6a3bf28" @@ -7265,13 +7185,6 @@ makeerror@1.0.12: dependencies: tmpl "1.0.5" -makeerror@1.0.x: - version "1.0.11" - resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" - integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= - dependencies: - tmpl "1.0.x" - map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -10922,7 +10835,7 @@ tiny-warning@^1.0.0: resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== -tmpl@1.0.5, tmpl@1.0.x: +tmpl@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== @@ -11387,13 +11300,6 @@ w3c-xmlserializer@^3.0.0: dependencies: xml-name-validator "^4.0.0" -walker@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" - integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= - dependencies: - makeerror "1.0.x" - walker@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" From 50e261ff66991dd3b01a326d6cadb6c6acf6a20d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 18:52:12 +0900 Subject: [PATCH 35/38] Bump docker/setup-qemu-action from 1 to 2 (#18676) Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 1 to 2. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index ac2f777b50..6c75ec7223 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v1 + - uses: docker/setup-qemu-action@v2 - uses: docker/setup-buildx-action@v1 - uses: docker/login-action@v1 with: From 0aee67fa3536e98e91a331e61eca2f74e4f0ae62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 18:52:36 +0900 Subject: [PATCH 36/38] Bump docker/login-action from 1 to 2 (#18678) Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 6c75ec7223..df96436969 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - uses: docker/setup-qemu-action@v2 - uses: docker/setup-buildx-action@v1 - - uses: docker/login-action@v1 + - uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From 27f41768e8d66d97c8d705d764e534e52ea13af9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 19:10:11 +0900 Subject: [PATCH 37/38] Bump sidekiq-unique-jobs from 7.1.24 to 7.1.25 (#18680) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 7.1.24 to 7.1.25. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.24...v7.1.25) --- updated-dependencies: - dependency-name: sidekiq-unique-jobs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 43beba7692..eb167e5a26 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -611,7 +611,7 @@ GEM rufus-scheduler (~> 3.2) sidekiq (>= 4) tilt (>= 1.4.0) - sidekiq-unique-jobs (7.1.24) + sidekiq-unique-jobs (7.1.25) brpoplpush-redis_script (> 0.1.1, <= 2.0.0) concurrent-ruby (~> 1.0, >= 1.0.5) sidekiq (>= 5.0, < 8.0) From 353e2c5d84fcfe253d58e0a0038deac0bfc867e3 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 19 Jun 2022 08:18:08 +0200 Subject: [PATCH 38/38] [Glitch] Fix contrast of some elements with new brand colors Port 0391b2a6033b56bd0ce213c35a21186fdcb607bc to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/styles/admin.scss | 6 +++--- .../glitch/styles/components/announcements.scss | 2 +- .../glitch/styles/components/columns.scss | 2 +- .../glitch/styles/components/directory.scss | 4 ++-- .../flavours/glitch/styles/components/index.scss | 16 +++++----------- .../glitch/styles/components/single_column.scss | 4 ++-- .../glitch/styles/components/status.scss | 2 +- .../flavours/glitch/styles/containers.scss | 2 +- .../glitch/styles/contrast/variables.scss | 8 +++----- .../flavours/glitch/styles/dashboard.scss | 4 ++-- app/javascript/flavours/glitch/styles/forms.scss | 13 +++++-------- .../glitch/styles/mastodon-light/variables.scss | 3 ++- .../flavours/glitch/styles/statuses.scss | 6 +++--- .../flavours/glitch/styles/variables.scss | 2 +- 14 files changed, 32 insertions(+), 42 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index d14648bb5c..9553aa4ae2 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -133,12 +133,12 @@ $content-width: 840px; .simple-navigation-active-leaf a { color: $primary-text-color; - background-color: $ui-highlight-color; + background-color: darken($ui-highlight-color, 2%); border-bottom: 0; border-radius: 0; &:hover { - background-color: lighten($ui-highlight-color, 5%); + background-color: $ui-highlight-color; } } } @@ -904,7 +904,7 @@ a.name-tag, border: 0; a { - color: lighten($ui-highlight-color, 8%); + color: $highlight-text-color; } dl:first-child .verified { diff --git a/app/javascript/flavours/glitch/styles/components/announcements.scss b/app/javascript/flavours/glitch/styles/components/announcements.scss index 52feefd3ca..85af9afc83 100644 --- a/app/javascript/flavours/glitch/styles/components/announcements.scss +++ b/app/javascript/flavours/glitch/styles/components/announcements.scss @@ -36,7 +36,7 @@ } &.unhandled-link { - color: lighten($ui-highlight-color, 8%); + color: $highlight-text-color; } } } diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss index 8d51ef8165..1440682f3f 100644 --- a/app/javascript/flavours/glitch/styles/components/columns.scss +++ b/app/javascript/flavours/glitch/styles/components/columns.scss @@ -201,7 +201,7 @@ } &.active { - color: $ui-highlight-color; + color: $highlight-text-color; } } } diff --git a/app/javascript/flavours/glitch/styles/components/directory.scss b/app/javascript/flavours/glitch/styles/components/directory.scss index b48c6c102b..803e075c9e 100644 --- a/app/javascript/flavours/glitch/styles/components/directory.scss +++ b/app/javascript/flavours/glitch/styles/components/directory.scss @@ -58,8 +58,8 @@ vertical-align: middle; &.checked { - border-color: lighten($ui-highlight-color, 8%); - background: lighten($ui-highlight-color, 8%); + border-color: lighten($ui-highlight-color, 4%); + background: lighten($ui-highlight-color, 4%); } } } diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index da9fb6ad2d..7f9ed21860 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -51,22 +51,16 @@ text-align: center; text-decoration: none; text-overflow: ellipsis; - transition: all 100ms ease-in; - transition-property: background-color; white-space: nowrap; width: auto; &:active, &:focus, &:hover { - background-color: lighten($ui-highlight-color, 7%); - transition: all 200ms ease-out; - transition-property: background-color; + background-color: $ui-highlight-color; } &--destructive { - transition: none; - &:active, &:focus, &:hover { @@ -916,11 +910,11 @@ } .react-toggle--checked .react-toggle-track { - background-color: $ui-highlight-color; + background-color: darken($ui-highlight-color, 2%); } .react-toggle--checked:is(:hover, :focus-within):not(.react-toggle--disabled) .react-toggle-track { - background-color: lighten($ui-highlight-color, 10%); + background-color: $ui-highlight-color; } .react-toggle-track-check { @@ -1216,14 +1210,14 @@ button.icon-button.active i.fa-retweet { } a { - color: lighten($ui-highlight-color, 8%); + color: $highlight-text-color; text-decoration: none; &:hover, &:focus, &:active { text-decoration: underline; - color: lighten($ui-highlight-color, 12%); + color: lighten($highlight-text-color, 4%); } } } diff --git a/app/javascript/flavours/glitch/styles/components/single_column.scss b/app/javascript/flavours/glitch/styles/components/single_column.scss index ba43e7f291..d10fc1d3e8 100644 --- a/app/javascript/flavours/glitch/styles/components/single_column.scss +++ b/app/javascript/flavours/glitch/styles/components/single_column.scss @@ -199,7 +199,7 @@ height: 3.9375rem; bottom: 1.3125rem; right: 1.3125rem; - background: darken($ui-highlight-color, 3%); + background: darken($ui-highlight-color, 2%); color: $white; border-radius: 50%; font-size: 21px; @@ -210,7 +210,7 @@ &:hover, &:focus, &:active { - background: lighten($ui-highlight-color, 7%); + background: $ui-highlight-color; } } diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index cc424f941c..9e346c5f08 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -187,7 +187,7 @@ } a.unhandled-link { - color: lighten($ui-highlight-color, 8%); + color: $highlight-text-color; .link-origin-tag { color: $gold-star; diff --git a/app/javascript/flavours/glitch/styles/containers.scss b/app/javascript/flavours/glitch/styles/containers.scss index 2bc55a1d73..b8d0fdad2a 100644 --- a/app/javascript/flavours/glitch/styles/containers.scss +++ b/app/javascript/flavours/glitch/styles/containers.scss @@ -797,7 +797,7 @@ border-top: 0; a { - color: lighten($ui-highlight-color, 8%); + color: $highlight-text-color; } dl:first-child .verified { diff --git a/app/javascript/flavours/glitch/styles/contrast/variables.scss b/app/javascript/flavours/glitch/styles/contrast/variables.scss index f6cadf0298..ab14a7b738 100644 --- a/app/javascript/flavours/glitch/styles/contrast/variables.scss +++ b/app/javascript/flavours/glitch/styles/contrast/variables.scss @@ -4,19 +4,17 @@ $black: #000000; $classic-base-color: #282c37; $classic-primary-color: #9baec8; $classic-secondary-color: #d9e1e8; -$classic-highlight-color: #2b90d9; +$classic-highlight-color: #6364ff; $ui-base-color: $classic-base-color !default; $ui-primary-color: $classic-primary-color !default; $ui-secondary-color: $classic-secondary-color !default; - -// Differences -$ui-highlight-color: #2b5fd9; +$ui-highlight-color: $classic-highlight-color !default; $darker-text-color: lighten($ui-primary-color, 20%) !default; $dark-text-color: lighten($ui-primary-color, 12%) !default; $secondary-text-color: lighten($ui-secondary-color, 6%) !default; -$highlight-text-color: $classic-highlight-color !default; +$highlight-text-color: lighten($ui-highlight-color, 8%) !default; $action-button-color: #8d9ac2; $inverted-text-color: $black !default; diff --git a/app/javascript/flavours/glitch/styles/dashboard.scss b/app/javascript/flavours/glitch/styles/dashboard.scss index 0a881bc108..9b06b44d6d 100644 --- a/app/javascript/flavours/glitch/styles/dashboard.scss +++ b/app/javascript/flavours/glitch/styles/dashboard.scss @@ -83,7 +83,7 @@ display: flex; align-items: baseline; border-radius: 4px; - background: $ui-highlight-color; + background: darken($ui-highlight-color, 2%); color: $primary-text-color; transition: all 100ms ease-in; font-size: 14px; @@ -96,7 +96,7 @@ &:active, &:focus, &:hover { - background-color: lighten($ui-highlight-color, 10%); + background-color: $ui-highlight-color; transition: all 200ms ease-out; } diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss index a08ca24f14..5aa75b41e3 100644 --- a/app/javascript/flavours/glitch/styles/forms.scss +++ b/app/javascript/flavours/glitch/styles/forms.scss @@ -454,14 +454,14 @@ code { width: 100%; border: 0; border-radius: 4px; - background: $ui-highlight-color; + background: darken($ui-highlight-color, 2%); color: $primary-text-color; font-size: 18px; line-height: inherit; height: auto; padding: 10px; - text-transform: uppercase; text-decoration: none; + text-transform: uppercase; text-align: center; box-sizing: border-box; cursor: pointer; @@ -474,13 +474,10 @@ code { margin-right: 0; } - &:hover { - background-color: lighten($ui-highlight-color, 5%); - } - &:active, - &:focus { - background-color: darken($ui-highlight-color, 5%); + &:focus, + &:hover { + background-color: $ui-highlight-color; } &:disabled:hover { diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss index 7709d45354..f1c8a3503a 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss @@ -5,7 +5,7 @@ $white: #ffffff; $classic-base-color: #282c37; $classic-primary-color: #9baec8; $classic-secondary-color: #d9e1e8; -$classic-highlight-color: #2b90d9; +$classic-highlight-color: #6364ff; $ui-base-color: $classic-secondary-color !default; $ui-base-lighter-color: darken($ui-base-color, 57%); @@ -15,6 +15,7 @@ $ui-secondary-color: $classic-base-color !default; $primary-text-color: $black !default; $darker-text-color: $classic-base-color !default; +$highlight-text-color: darken($ui-highlight-color, 8%) !default; $dark-text-color: #444b5d; $action-button-color: #606984; diff --git a/app/javascript/flavours/glitch/styles/statuses.scss b/app/javascript/flavours/glitch/styles/statuses.scss index b807fa45a8..c302fc0d0d 100644 --- a/app/javascript/flavours/glitch/styles/statuses.scss +++ b/app/javascript/flavours/glitch/styles/statuses.scss @@ -76,7 +76,7 @@ .button.logo-button { flex: 0 auto; font-size: 14px; - background: $ui-highlight-color; + background: darken($ui-highlight-color, 2%); color: $primary-text-color; text-transform: none; line-height: 1.2; @@ -100,7 +100,7 @@ &:active, &:focus, &:hover { - background: lighten($ui-highlight-color, 10%); + background: $ui-highlight-color; } &:disabled, @@ -267,7 +267,7 @@ a.button.logo-button { display: block; font-size: 15px; line-height: 20px; - color: lighten($ui-highlight-color, 8%); + color: $highlight-text-color; border: 0; background: transparent; padding: 0; diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss index c2da24184d..65758e6e09 100644 --- a/app/javascript/flavours/glitch/styles/variables.scss +++ b/app/javascript/flavours/glitch/styles/variables.scss @@ -34,7 +34,7 @@ $primary-text-color: $white !default; $darker-text-color: $ui-primary-color !default; $dark-text-color: $ui-base-lighter-color !default; $secondary-text-color: $ui-secondary-color !default; -$highlight-text-color: $ui-highlight-color !default; +$highlight-text-color: lighten($ui-highlight-color, 8%) !default; $action-button-color: $ui-base-lighter-color !default; $passive-text-color: $gold-star !default; $active-passive-text-color: $success-green !default;