From 376b429f948ecb1335301e5c4452e18c7a43cc93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 10:55:40 +0200 Subject: [PATCH 01/33] Bump stackprof from 0.2.24 to 0.2.25 (#24498) 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 27d7a22077..fa5687559a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -679,7 +679,7 @@ GEM sshkit (1.21.4) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - stackprof (0.2.24) + stackprof (0.2.25) statsd-ruby (1.5.0) stoplight (3.0.1) redlock (~> 1.0) From 738e179a88f563ad5a9792f1a58e1605da3ea438 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 10:56:17 +0200 Subject: [PATCH 02/33] Bump rubocop-performance from 1.16.0 to 1.17.1 (#24497) 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 fa5687559a..bc8732126b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -615,7 +615,7 @@ GEM parser (>= 3.2.1.0) rubocop-capybara (2.17.1) rubocop (~> 1.41) - rubocop-performance (1.16.0) + rubocop-performance (1.17.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) rubocop-rails (2.18.0) From d1aee44ff837784d13673686524ac8127a72abd1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 10:56:29 +0200 Subject: [PATCH 03/33] Bump oj from 3.14.2 to 3.14.3 (#24496) 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 bc8732126b..16d6c95570 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -445,7 +445,7 @@ GEM concurrent-ruby (~> 1.0, >= 1.0.2) sidekiq (>= 3.5) statsd-ruby (~> 1.4, >= 1.4.0) - oj (3.14.2) + oj (3.14.3) omniauth (1.9.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) From 08d318909c1955eeebd0187d29227b1b9110802c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 10:57:08 +0200 Subject: [PATCH 04/33] Bump lint-staged from 13.2.0 to 13.2.1 (#24491) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index e367803966..14a61ab539 100644 --- a/package.json +++ b/package.json @@ -190,7 +190,7 @@ "husky": "^8.0.3", "jest": "^29.5.0", "jest-environment-jsdom": "^29.5.0", - "lint-staged": "^13.1.2", + "lint-staged": "^13.2.1", "marky": "^1.2.5", "postcss-scss": "^4.0.6", "prettier": "^2.8.7", diff --git a/yarn.lock b/yarn.lock index e3ba8c8d52..72915b8aaf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7582,10 +7582,10 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= -lint-staged@^13.1.2: - version "13.2.0" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.2.0.tgz#b7abaf79c91cd36d824f17b23a4ce5209206126a" - integrity sha512-GbyK5iWinax5Dfw5obm2g2ccUiZXNGtAS4mCbJ0Lv4rq6iEtfBSjOYdcbOtAIFtM114t0vdpViDDetjVTSd8Vw== +lint-staged@^13.2.1: + version "13.2.1" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.2.1.tgz#9d30a14e3e42897ef417bc98556fb757f75cae87" + integrity sha512-8gfzinVXoPfga5Dz/ZOn8I2GOhf81Wvs+KwbEXQn/oWZAvCVS2PivrXfVbFJc93zD16uC0neS47RXHIjXKYZQw== dependencies: chalk "5.2.0" cli-truncate "^3.1.0" @@ -8351,12 +8351,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.12.2, object-inspect@^1.9.0: - version "1.12.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" - integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== - -object-inspect@^1.12.3: +object-inspect@^1.12.2, object-inspect@^1.12.3, object-inspect@^1.9.0: version "1.12.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== From 881326ff61851f9c24f915ac9612b8bc264ba6ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 10:57:41 +0200 Subject: [PATCH 05/33] Bump typescript from 5.0.3 to 5.0.4 (#24489) 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 14a61ab539..e1e662d8ac 100644 --- a/package.json +++ b/package.json @@ -199,7 +199,7 @@ "react-test-renderer": "^16.14.0", "stylelint": "^15.3.0", "stylelint-config-standard-scss": "^7.0.1", - "typescript": "^5.0.3", + "typescript": "^5.0.4", "webpack-dev-server": "^3.11.3", "yargs": "^17.7.1" }, diff --git a/yarn.lock b/yarn.lock index 72915b8aaf..bc8967154c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11385,10 +11385,10 @@ type@^2.0.0: resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3" integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow== -typescript@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.3.tgz#fe976f0c826a88d0a382007681cbb2da44afdedf" - integrity sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA== +typescript@^5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b" + integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw== unbox-primitive@^1.0.2: version "1.0.2" From 3c7053a2db86450d48849ca6b2f7e9ab6ff071bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 10:57:57 +0200 Subject: [PATCH 06/33] Bump axios from 1.3.4 to 1.3.5 (#24485) 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 e1e662d8ac..94e69cdc5f 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "abortcontroller-polyfill": "^1.7.5", "arrow-key-navigation": "^1.2.0", "autoprefixer": "^10.4.14", - "axios": "^1.3.4", + "axios": "^1.3.5", "babel-loader": "^8.3.0", "babel-plugin-lodash": "^3.3.4", "babel-plugin-preval": "^5.1.0", diff --git a/yarn.lock b/yarn.lock index bc8967154c..174eac54d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3212,10 +3212,10 @@ axe-core@^4.6.2: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.6.3.tgz#fc0db6fdb65cc7a80ccf85286d91d64ababa3ece" integrity sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg== -axios@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.4.tgz#f5760cefd9cfb51fd2481acf88c05f67c4523024" - integrity sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ== +axios@^1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.5.tgz#e07209b39a0d11848e3e341fa087acd71dadc542" + integrity sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" From a2a66300d99ed53d63a7f065ffbed53d2ce074e3 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 11 Apr 2023 11:25:29 +0200 Subject: [PATCH 07/33] Clean up the post deployment migration generator (#24233) --- .../post_deployment_migration/USAGE | 10 +++++++ .../post_deployment_migration_generator.rb | 17 ++++++++++++ .../templates/migration.erb | 8 ++++++ .../post_deployment_migration_generator.rb | 17 ------------ .../post_deployment_migration/migration.rb | 8 ------ ...ost_deployment_migration_generator_spec.rb | 27 +++++++++++++++++++ 6 files changed, 62 insertions(+), 25 deletions(-) create mode 100644 lib/generators/post_deployment_migration/USAGE create mode 100644 lib/generators/post_deployment_migration/post_deployment_migration_generator.rb create mode 100644 lib/generators/post_deployment_migration/templates/migration.erb delete mode 100644 lib/generators/post_deployment_migration_generator.rb delete mode 100644 lib/templates/rails/post_deployment_migration/migration.rb create mode 100644 spec/generators/post_deployment_migration_generator_spec.rb diff --git a/lib/generators/post_deployment_migration/USAGE b/lib/generators/post_deployment_migration/USAGE new file mode 100644 index 0000000000..57f3c6aa1c --- /dev/null +++ b/lib/generators/post_deployment_migration/USAGE @@ -0,0 +1,10 @@ +Description: + Generate a Rails migration in the db/post_migrate/ dir. + + Interacts with the post_deployment_migrations initializer. + +Example: + bin/rails generate post_deployment_migration IsolateChanges + + Creates a migration in db/post_migrate/_isolate_changes.rb + which will have `disable_ddl_transaction!` and a `change` method included. diff --git a/lib/generators/post_deployment_migration/post_deployment_migration_generator.rb b/lib/generators/post_deployment_migration/post_deployment_migration_generator.rb new file mode 100644 index 0000000000..adb34a2896 --- /dev/null +++ b/lib/generators/post_deployment_migration/post_deployment_migration_generator.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +require 'rails/generators/active_record' + +class PostDeploymentMigrationGenerator < Rails::Generators::NamedBase + source_root File.expand_path('templates', __dir__) + + include Rails::Generators::Migration + + def create_post_deployment_migration + migration_template 'migration.erb', "db/post_migrate/#{file_name}.rb" + end + + def self.next_migration_number(path) + ActiveRecord::Generators::Base.next_migration_number(path) + end +end diff --git a/lib/generators/post_deployment_migration/templates/migration.erb b/lib/generators/post_deployment_migration/templates/migration.erb new file mode 100644 index 0000000000..fd6a02a0f7 --- /dev/null +++ b/lib/generators/post_deployment_migration/templates/migration.erb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>] + disable_ddl_transaction! + + def change + end +end diff --git a/lib/generators/post_deployment_migration_generator.rb b/lib/generators/post_deployment_migration_generator.rb deleted file mode 100644 index 798c01b883..0000000000 --- a/lib/generators/post_deployment_migration_generator.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -require 'rails/generators' - -module Rails - class PostDeploymentMigrationGenerator < Rails::Generators::NamedBase - def create_migration_file - timestamp = Time.zone.now.strftime('%Y%m%d%H%M%S') - - template 'migration.rb', "db/post_migrate/#{timestamp}_#{file_name}.rb" - end - - def migration_class_name - file_name.camelize - end - end -end diff --git a/lib/templates/rails/post_deployment_migration/migration.rb b/lib/templates/rails/post_deployment_migration/migration.rb deleted file mode 100644 index 503205b841..0000000000 --- a/lib/templates/rails/post_deployment_migration/migration.rb +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -class <%= migration_class_name %> < ActiveRecord::Migration[5.2] - disable_ddl_transaction! - - def change - end -end diff --git a/spec/generators/post_deployment_migration_generator_spec.rb b/spec/generators/post_deployment_migration_generator_spec.rb new file mode 100644 index 0000000000..d552880e3b --- /dev/null +++ b/spec/generators/post_deployment_migration_generator_spec.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +require 'rails_helper' +require 'rails/generators/testing/behaviour' +require 'rails/generators/testing/assertions' + +require 'generators/post_deployment_migration/post_deployment_migration_generator' + +describe PostDeploymentMigrationGenerator, type: :generator do + include Rails::Generators::Testing::Behaviour + include Rails::Generators::Testing::Assertions + include FileUtils + + tests described_class + destination File.expand_path('../../tmp', __dir__) + before { prepare_destination } + after { rm_rf(destination_root) } + + describe 'the migration' do + it 'generates expected file' do + run_generator %w(Changes) + + assert_migration('db/post_migrate/changes.rb', /disable_ddl/) + assert_migration('db/post_migrate/changes.rb', /change/) + end + end +end From 36eeb70d5315be045a638d77f8ff0a71dce61076 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 11 Apr 2023 11:35:39 +0200 Subject: [PATCH 08/33] Spec coverage on Settings/ controllers specs (#24221) --- .../settings/aliases_controller_spec.rb | 46 +++++++++++++++++ .../settings/featured_tags_controller_spec.rb | 39 +++++++++++---- .../migration/redirects_controller_spec.rb | 45 ++++++++++++++++- .../settings/pictures_controller_spec.rb | 30 ++++++++++++ .../preferences/appearance_controller_spec.rb | 9 ++++ ..._authentication_methods_controller_spec.rb | 49 +++++++++++++++---- spec/fabricators/featured_tag_fabricator.rb | 7 +++ 7 files changed, 205 insertions(+), 20 deletions(-) create mode 100644 spec/fabricators/featured_tag_fabricator.rb diff --git a/spec/controllers/settings/aliases_controller_spec.rb b/spec/controllers/settings/aliases_controller_spec.rb index 805f659886..ef8724faf4 100644 --- a/spec/controllers/settings/aliases_controller_spec.rb +++ b/spec/controllers/settings/aliases_controller_spec.rb @@ -18,4 +18,50 @@ describe Settings::AliasesController do expect(response).to have_http_status(200) end end + + describe 'POST #create' do + context 'with valid alias' do + before { stub_resolver } + + it 'creates an alias for the user' do + expect do + post :create, params: { account_alias: { acct: 'new@example.com' } } + end.to change(AccountAlias, :count).by(1) + + expect(response).to redirect_to(settings_aliases_path) + end + end + + context 'with invalid alias' do + it 'does not create an alias for the user' do + expect do + post :create, params: { account_alias: { acct: 'format-wrong' } } + end.to_not change(AccountAlias, :count) + + expect(response).to have_http_status(200) + end + end + end + + describe 'DELETE #destroy' do + let(:account_alias) do + AccountAlias.new(account: user.account, acct: 'new@example.com').tap do |account_alias| + account_alias.save(validate: false) + end + end + + it 'removes an alias' do + delete :destroy, params: { id: account_alias.id } + + expect(response).to redirect_to(settings_aliases_path) + expect { account_alias.reload }.to raise_error(ActiveRecord::RecordNotFound) + end + end + + private + + def stub_resolver + resolver = instance_double(ResolveAccountService, call: Fabricate(:account)) + allow(ResolveAccountService).to receive(:new).and_return(resolver) + end end diff --git a/spec/controllers/settings/featured_tags_controller_spec.rb b/spec/controllers/settings/featured_tags_controller_spec.rb index 5c61351af3..fc25e7aa88 100644 --- a/spec/controllers/settings/featured_tags_controller_spec.rb +++ b/spec/controllers/settings/featured_tags_controller_spec.rb @@ -11,20 +11,20 @@ describe Settings::FeaturedTagsController do end end - describe 'POST #create' do - context 'when user is not sign in' do - subject { post :create } + context 'when user is not signed in' do + subject { post :create } - it_behaves_like 'authenticate user' - end + it_behaves_like 'authenticate user' + end - context 'when user is sign in' do + context 'when user is signed in' do + let(:user) { Fabricate(:user, password: '12345678') } + + before { sign_in user, scope: :user } + + describe 'POST #create' do subject { post :create, params: { featured_tag: params } } - let(:user) { Fabricate(:user, password: '12345678') } - - before { sign_in user, scope: :user } - context 'when parameter is valid' do let(:params) { { name: 'test' } } @@ -41,5 +41,24 @@ describe Settings::FeaturedTagsController do end end end + + describe 'GET to #index' do + it 'responds with success' do + get :index + + expect(response).to have_http_status(200) + end + end + + describe 'DELETE to #destroy' do + let(:featured_tag) { Fabricate(:featured_tag, account: user.account) } + + it 'removes the featured tag' do + delete :destroy, params: { id: featured_tag.id } + + expect(response).to redirect_to(settings_featured_tags_path) + expect { featured_tag.reload }.to raise_error(ActiveRecord::RecordNotFound) + end + end end end diff --git a/spec/controllers/settings/migration/redirects_controller_spec.rb b/spec/controllers/settings/migration/redirects_controller_spec.rb index 50d9e1927b..54897bb7fd 100644 --- a/spec/controllers/settings/migration/redirects_controller_spec.rb +++ b/spec/controllers/settings/migration/redirects_controller_spec.rb @@ -5,7 +5,7 @@ require 'rails_helper' describe Settings::Migration::RedirectsController do render_views - let!(:user) { Fabricate(:user) } + let!(:user) { Fabricate(:user, password: 'testtest') } before do sign_in user, scope: :user @@ -17,4 +17,47 @@ describe Settings::Migration::RedirectsController do expect(response).to have_http_status(200) end end + + describe 'POST #create' do + context 'with valid params' do + before { stub_resolver } + + it 'redirects to the settings migration path' do + post :create, params: { form_redirect: { acct: 'new@host.com', current_password: 'testtest' } } + + expect(response).to redirect_to(settings_migration_path) + end + end + + context 'with non valid params' do + it 'returns success and renders the new page' do + post :create, params: { form_redirect: { acct: '' } } + + expect(response).to have_http_status(200) + expect(response).to render_template(:new) + end + end + end + + describe 'DELETE #destroy' do + let(:account) { Fabricate(:account) } + + before do + user.account.update(moved_to_account_id: account.id) + end + + it 'resets the account and sends an update' do + delete :destroy + + expect(response).to redirect_to(settings_migration_path) + expect(user.account.reload.moved_to_account).to be_nil + end + end + + private + + def stub_resolver + resolver = instance_double(ResolveAccountService, call: Fabricate(:account)) + allow(ResolveAccountService).to receive(:new).and_return(resolver) + end end diff --git a/spec/controllers/settings/pictures_controller_spec.rb b/spec/controllers/settings/pictures_controller_spec.rb index 2368dc55dd..705878f03d 100644 --- a/spec/controllers/settings/pictures_controller_spec.rb +++ b/spec/controllers/settings/pictures_controller_spec.rb @@ -18,5 +18,35 @@ describe Settings::PicturesController do expect(response).to have_http_status(400) end end + + context 'with valid picture id' do + context 'when account updates correctly' do + let(:service) { instance_double(UpdateAccountService, call: true) } + + before do + allow(UpdateAccountService).to receive(:new).and_return(service) + end + + it 'updates the account' do + delete :destroy, params: { id: 'avatar' } + expect(response).to redirect_to(settings_profile_path) + expect(response).to have_http_status(303) + expect(service).to have_received(:call).with(user.account, { 'avatar' => nil, 'avatar_remote_url' => '' }) + end + end + + context 'when account cannot update' do + let(:service) { instance_double(UpdateAccountService, call: false) } + + before do + allow(UpdateAccountService).to receive(:new).and_return(service) + end + + it 'redirects to profile' do + delete :destroy, params: { id: 'avatar' } + expect(response).to redirect_to(settings_profile_path) + end + end + end end end diff --git a/spec/controllers/settings/preferences/appearance_controller_spec.rb b/spec/controllers/settings/preferences/appearance_controller_spec.rb index 7c7f716b71..df0237a6b3 100644 --- a/spec/controllers/settings/preferences/appearance_controller_spec.rb +++ b/spec/controllers/settings/preferences/appearance_controller_spec.rb @@ -14,7 +14,16 @@ describe Settings::Preferences::AppearanceController do describe 'GET #show' do it 'returns http success' do get :show + expect(response).to have_http_status(200) end end + + describe 'PUT #update' do + it 'redirects correctly' do + put :update, params: { user: { setting_theme: 'contrast' } } + + expect(response).to redirect_to(settings_preferences_appearance_path) + end + end end diff --git a/spec/controllers/settings/two_factor_authentication_methods_controller_spec.rb b/spec/controllers/settings/two_factor_authentication_methods_controller_spec.rb index 66ffe89f3d..153eca1a5a 100644 --- a/spec/controllers/settings/two_factor_authentication_methods_controller_spec.rb +++ b/spec/controllers/settings/two_factor_authentication_methods_controller_spec.rb @@ -5,14 +5,24 @@ require 'rails_helper' describe Settings::TwoFactorAuthenticationMethodsController do render_views - let(:user) { Fabricate(:user) } + context 'when not signed in' do + describe 'GET to #index' do + it 'redirects' do + get :index - describe 'GET #index' do - context 'when signed in' do - before do - sign_in user, scope: :user + expect(response).to redirect_to '/auth/sign_in' end + end + end + context 'when signed in' do + let(:user) { Fabricate(:user) } + + before do + sign_in user, scope: :user + end + + describe 'GET #index' do describe 'when user has enabled otp' do before do user.update(otp_required_for_login: true) @@ -38,11 +48,32 @@ describe Settings::TwoFactorAuthenticationMethodsController do end end - context 'when not signed in' do - it 'redirects' do - get :index + describe 'POST to #disable' do + before do + user.update(otp_required_for_login: true) + end - expect(response).to redirect_to '/auth/sign_in' + context 'when user has not passed challenge' do + it 'renders challenge page' do + post :disable + + expect(response).to have_http_status(200) + expect(response).to render_template('auth/challenges/new') + end + end + + context 'when user has passed challenge' do + before do + mailer = instance_double(ApplicationMailer::MessageDelivery, deliver_later!: true) + allow(UserMailer).to receive(:two_factor_disabled).with(user).and_return(mailer) + end + + it 'redirects to settings page' do + post :disable, session: { challenge_passed_at: 10.minutes.ago } + + expect(UserMailer).to have_received(:two_factor_disabled).with(user) + expect(response).to redirect_to(settings_otp_authentication_path) + end end end end diff --git a/spec/fabricators/featured_tag_fabricator.rb b/spec/fabricators/featured_tag_fabricator.rb new file mode 100644 index 0000000000..747d8e36a5 --- /dev/null +++ b/spec/fabricators/featured_tag_fabricator.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +Fabricator(:featured_tag) do + account + tag + name 'Tag' +end From 999d992c109d40fe7606b0cd3d3275b165f50b65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 11:47:10 +0200 Subject: [PATCH 09/33] Bump @babel/core from 7.21.3 to 7.21.4 (#24386) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 239 ++++++++++++--------------------------------------- 2 files changed, 58 insertions(+), 183 deletions(-) diff --git a/package.json b/package.json index 94e69cdc5f..1710f43077 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ }, "private": true, "dependencies": { - "@babel/core": "^7.21.3", + "@babel/core": "^7.21.4", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", "@babel/plugin-transform-react-inline-elements": "^7.21.0", "@babel/plugin-transform-runtime": "^7.21.0", diff --git a/yarn.lock b/yarn.lock index 174eac54d2..e136663d5b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24,10 +24,10 @@ jsonpointer "^5.0.0" leven "^3.1.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" - integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" + integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== dependencies: "@babel/highlight" "^7.18.6" @@ -36,61 +36,42 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30" integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ== -"@babel/compat-data@^7.20.5": - version "7.20.10" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec" - integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg== +"@babel/compat-data@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f" + integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g== -"@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.21.3", "@babel/core@^7.7.2": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.3.tgz#cf1c877284a469da5d1ce1d1e53665253fae712e" - integrity sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw== +"@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.21.4", "@babel/core@^7.7.2": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659" + integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.21.3" - "@babel/helper-compilation-targets" "^7.20.7" + "@babel/code-frame" "^7.21.4" + "@babel/generator" "^7.21.4" + "@babel/helper-compilation-targets" "^7.21.4" "@babel/helper-module-transforms" "^7.21.2" "@babel/helpers" "^7.21.0" - "@babel/parser" "^7.21.3" + "@babel/parser" "^7.21.4" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.3" - "@babel/types" "^7.21.3" + "@babel/traverse" "^7.21.4" + "@babel/types" "^7.21.4" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.2" semver "^6.3.0" -"@babel/generator@^7.15.4": - version "7.21.1" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz#951cc626057bc0af2c35cd23e9c64d384dea83dd" - integrity sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA== +"@babel/generator@^7.21.4", "@babel/generator@^7.7.2": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc" + integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA== dependencies: - "@babel/types" "^7.21.0" + "@babel/types" "^7.21.4" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/generator@^7.21.0", "@babel/generator@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.3.tgz#232359d0874b392df04045d72ce2fd9bb5045fce" - integrity sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA== - dependencies: - "@babel/types" "^7.21.3" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" - -"@babel/generator@^7.7.2": - version "7.17.10" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.10.tgz#c281fa35b0c349bbe9d02916f4ae08fc85ed7189" - integrity sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg== - dependencies: - "@babel/types" "^7.17.10" - "@jridgewell/gen-mapping" "^0.1.0" - jsesc "^2.5.1" - "@babel/helper-annotate-as-pure@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" @@ -114,13 +95,13 @@ "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/types" "^7.19.0" -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" - integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656" + integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg== dependencies: - "@babel/compat-data" "^7.20.5" - "@babel/helper-validator-option" "^7.18.6" + "@babel/compat-data" "^7.21.4" + "@babel/helper-validator-option" "^7.21.0" browserslist "^4.21.3" lru-cache "^5.1.1" semver "^6.3.0" @@ -185,14 +166,6 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-function-name@^7.15.4", "@babel/helper-function-name@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" - integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== - dependencies: - "@babel/template" "^7.20.7" - "@babel/types" "^7.21.0" - "@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0": version "7.19.0" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" @@ -201,7 +174,15 @@ "@babel/template" "^7.18.10" "@babel/types" "^7.19.0" -"@babel/helper-hoist-variables@^7.15.4", "@babel/helper-hoist-variables@^7.18.6": +"@babel/helper-function-name@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" + integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== + dependencies: + "@babel/template" "^7.20.7" + "@babel/types" "^7.21.0" + +"@babel/helper-hoist-variables@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== @@ -298,7 +279,7 @@ dependencies: "@babel/types" "^7.20.0" -"@babel/helper-split-export-declaration@^7.15.4", "@babel/helper-split-export-declaration@^7.18.6": +"@babel/helper-split-export-declaration@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== @@ -310,11 +291,6 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== -"@babel/helper-validator-identifier@^7.14.0": - version "7.15.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" - integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== - "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": version "7.19.1" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" @@ -358,30 +334,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0": - version "7.3.1" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.1.tgz#8f4ffd45f779e6132780835ffa7a215fa0b2d181" - integrity sha512-ATz6yX/L8LEnC3dtLQnIx4ydcPxhLcoy9Vl6re00zb2w5lG6itY6Vhnr1KFRPq/FHNsgl/gh2mjNN20f9iJTTA== - -"@babel/parser@^7.12.13": - version "7.15.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.8.tgz#7bacdcbe71bdc3ff936d510c15dcea7cf0b99016" - integrity sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA== - -"@babel/parser@^7.14.7", "@babel/parser@^7.20.7": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.0.tgz#cc09288743b867763cb927ba101ccdf0b600b7e4" - integrity sha512-ONjtg4renj14A9pj3iA5T5+r5Eijxbr2eNIkMBTC74occDSsRZUpe8vowmowAjFR1imWlkD8eEmjYXiREZpGZg== - -"@babel/parser@^7.15.4": - version "7.21.2" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz#dacafadfc6d7654c3051a66d6fe55b6cb2f2a0b3" - integrity sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ== - -"@babel/parser@^7.21.0", "@babel/parser@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.3.tgz#1d285d67a19162ff9daa358d4cb41d50c06220b3" - integrity sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17" + integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" @@ -1115,7 +1071,7 @@ dependencies: regenerator-runtime "^0.13.11" -"@babel/template@^7.18.10", "@babel/template@^7.20.7": +"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== @@ -1124,100 +1080,26 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/template@^7.3.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" - integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== +"@babel/traverse@^7.18.10", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4", "@babel/traverse@^7.7.2": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36" + integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q== dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/traverse@^7.18.10", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.0.tgz#0e1807abd5db98e6a19c204b80ed1e3f5bca0edc" - integrity sha512-Xdt2P1H4LKTO8ApPfnO1KmzYMFpp7D/EinoXzLYN/cHcBNrVCAkAtGUcXnHXrl/VGktureU6fkQrHSBE2URfoA== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.21.0" + "@babel/code-frame" "^7.21.4" + "@babel/generator" "^7.21.4" "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-function-name" "^7.21.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.21.0" - "@babel/types" "^7.21.0" + "@babel/parser" "^7.21.4" + "@babel/types" "^7.21.4" debug "^4.1.0" globals "^11.1.0" -"@babel/traverse@^7.21.2", "@babel/traverse@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.3.tgz#4747c5e7903d224be71f90788b06798331896f67" - integrity sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.21.3" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.21.3" - "@babel/types" "^7.21.3" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/traverse@^7.7.2": - version "7.15.4" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d" - integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA== - dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.15.4" - "@babel/helper-function-name" "^7.15.4" - "@babel/helper-hoist-variables" "^7.15.4" - "@babel/helper-split-export-declaration" "^7.15.4" - "@babel/parser" "^7.15.4" - "@babel/types" "^7.15.4" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.12.13", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.0.tgz#3fc3fc74e0cdad878182e5f66cc6bcab1915a802" - integrity sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg== - dependencies: - "@babel/helper-validator-identifier" "^7.14.0" - to-fast-properties "^2.0.0" - -"@babel/types@^7.15.4": - version "7.21.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.2.tgz#92246f6e00f91755893c2876ad653db70c8310d1" - integrity sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw== - dependencies: - "@babel/helper-string-parser" "^7.19.4" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" - -"@babel/types@^7.17.10": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.6.tgz#5d781dd10a3f0c9f1f931bd19de5eb26ec31acf0" - integrity sha512-NdBNzPDwed30fZdDQtVR7ZgaO4UKjuaQFH9VArS+HMnurlOY0JWN+4ROlu/iapMFwjRQU4pOG4StZfDmulEwGA== - dependencies: - "@babel/helper-validator-identifier" "^7.18.6" - to-fast-properties "^2.0.0" - -"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.0.tgz#1da00d89c2f18b226c9207d96edbeb79316a1819" - integrity sha512-uR7NWq2VNFnDi7EYqiRz2Jv/VQIu38tu64Zy8TX2nQFQ6etJ9V/Rr2msW8BS132mum2rL645qpDrLtAJtVpuow== - dependencies: - "@babel/helper-string-parser" "^7.19.4" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" - -"@babel/types@^7.21.2", "@babel/types@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.3.tgz#4865a5357ce40f64e3400b0f3b737dc6d4f64d05" - integrity sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg== +"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4" + integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA== dependencies: "@babel/helper-string-parser" "^7.19.4" "@babel/helper-validator-identifier" "^7.19.1" @@ -10198,14 +10080,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.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== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.7: +semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: version "7.3.8" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== From 7d7cfeaa06b98ad0b535469592eac26846a76970 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 11:54:16 +0200 Subject: [PATCH 10/33] Bump @babel/preset-typescript from 7.21.0 to 7.21.4 (#24396) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 54 +++++++++++++++++++++++++--------------------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 1710f43077..3d167b5861 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@babel/plugin-transform-runtime": "^7.21.0", "@babel/preset-env": "^7.20.2", "@babel/preset-react": "^7.18.6", - "@babel/preset-typescript": "^7.21.0", + "@babel/preset-typescript": "^7.21.4", "@babel/runtime": "^7.21.0", "@gamestdio/websocket": "^0.3.2", "@github/webauthn-json": "^2.1.1", diff --git a/yarn.lock b/yarn.lock index e136663d5b..6cfc36e93a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -258,7 +258,7 @@ "@babel/traverse" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/helper-simple-access@^7.19.4", "@babel/helper-simple-access@^7.20.2": +"@babel/helper-simple-access@^7.20.2": version "7.20.2" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== @@ -296,12 +296,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== -"@babel/helper-validator-option@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" - integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== - -"@babel/helper-validator-option@^7.21.0": +"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ== @@ -547,12 +542,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.12.13", "@babel/plugin-syntax-jsx@^7.18.6", "@babel/plugin-syntax-jsx@^7.7.2": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" - integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q== +"@babel/plugin-syntax-jsx@^7.12.13", "@babel/plugin-syntax-jsx@^7.18.6", "@babel/plugin-syntax-jsx@^7.21.4", "@babel/plugin-syntax-jsx@^7.7.2": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2" + integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" @@ -744,14 +739,14 @@ "@babel/helper-module-transforms" "^7.19.6" "@babel/helper-plugin-utils" "^7.19.0" -"@babel/plugin-transform-modules-commonjs@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz#25b32feef24df8038fc1ec56038917eacb0b730c" - integrity sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ== +"@babel/plugin-transform-modules-commonjs@^7.19.6", "@babel/plugin-transform-modules-commonjs@^7.21.2": + version "7.21.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7" + integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA== dependencies: - "@babel/helper-module-transforms" "^7.19.6" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-simple-access" "^7.19.4" + "@babel/helper-module-transforms" "^7.21.2" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-simple-access" "^7.20.2" "@babel/plugin-transform-modules-systemjs@^7.19.6": version "7.19.6" @@ -912,11 +907,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-typescript@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.0.tgz#f0956a153679e3b377ae5b7f0143427151e4c848" - integrity sha512-xo///XTPp3mDzTtrqXoBlK9eiAYW3wv9JXglcn/u1bi60RW11dEUxIgA8cbnDhutS1zacjMRmAwxE0gMklLnZg== +"@babel/plugin-transform-typescript@^7.21.3": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz#316c5be579856ea890a57ebc5116c5d064658f2b" + integrity sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw== dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-create-class-features-plugin" "^7.21.0" "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-typescript" "^7.20.0" @@ -1040,14 +1036,16 @@ "@babel/plugin-transform-react-jsx-development" "^7.18.6" "@babel/plugin-transform-react-pure-annotations" "^7.18.6" -"@babel/preset-typescript@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.21.0.tgz#bcbbca513e8213691fe5d4b23d9251e01f00ebff" - integrity sha512-myc9mpoVA5m1rF8K8DgLEatOYFDpwC+RkMkjZ0Du6uI62YvDe8uxIEYVs/VCdSJ097nlALiU/yBC7//3nI+hNg== +"@babel/preset-typescript@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.21.4.tgz#b913ac8e6aa8932e47c21b01b4368d8aa239a529" + integrity sha512-sMLNWY37TCdRH/bJ6ZeeOH1nPuanED7Ai9Y/vH31IPqalioJ6ZNFUWONsakhv4r4n+I6gm5lmoE0olkgib/j/A== dependencies: "@babel/helper-plugin-utils" "^7.20.2" "@babel/helper-validator-option" "^7.21.0" - "@babel/plugin-transform-typescript" "^7.21.0" + "@babel/plugin-syntax-jsx" "^7.21.4" + "@babel/plugin-transform-modules-commonjs" "^7.21.2" + "@babel/plugin-transform-typescript" "^7.21.3" "@babel/runtime-corejs3@^7.10.2": version "7.10.3" From b178fd3f925c49ce6a858d039e85fbf70226d129 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 12:04:40 +0200 Subject: [PATCH 11/33] Bump @babel/preset-env from 7.20.2 to 7.21.4 (#24382) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 363 ++++++++++++++++++++++++++++----------------------- 2 files changed, 199 insertions(+), 166 deletions(-) diff --git a/package.json b/package.json index 3d167b5861..a07826f659 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", "@babel/plugin-transform-react-inline-elements": "^7.21.0", "@babel/plugin-transform-runtime": "^7.21.0", - "@babel/preset-env": "^7.20.2", + "@babel/preset-env": "^7.21.4", "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.21.4", "@babel/runtime": "^7.21.0", diff --git a/yarn.lock b/yarn.lock index 6cfc36e93a..b5f958e917 100644 --- a/yarn.lock +++ b/yarn.lock @@ -31,12 +31,7 @@ dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1": - version "7.20.1" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30" - integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ== - -"@babel/compat-data@^7.21.4": +"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f" integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g== @@ -95,7 +90,7 @@ "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/types" "^7.19.0" -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.21.4": +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656" integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg== @@ -134,7 +129,7 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/helper-split-export-declaration" "^7.18.6" -"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.19.0": +"@babel/helper-create-regexp-features-plugin@^7.18.6": version "7.19.0" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b" integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw== @@ -142,6 +137,14 @@ "@babel/helper-annotate-as-pure" "^7.18.6" regexpu-core "^5.1.0" +"@babel/helper-create-regexp-features-plugin@^7.20.5": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz#40411a8ab134258ad2cf3a3d987ec6aa0723cee5" + integrity sha512-M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + regexpu-core "^5.3.1" + "@babel/helper-define-polyfill-provider@^0.3.3": version "0.3.3" resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a" @@ -166,7 +169,7 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0": +"@babel/helper-function-name@^7.18.9": version "7.19.0" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== @@ -210,7 +213,7 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.21.2": +"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2": version "7.21.2" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2" integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ== @@ -236,7 +239,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== -"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9": +"@babel/helper-remap-async-to-generator@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519" integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA== @@ -246,7 +249,7 @@ "@babel/helper-wrap-function" "^7.18.9" "@babel/types" "^7.18.9" -"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.19.1", "@babel/helper-replace-supers@^7.20.7": +"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331" integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A== @@ -265,13 +268,6 @@ dependencies: "@babel/types" "^7.20.2" -"@babel/helper-skip-transparent-expression-wrappers@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818" - integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw== - dependencies: - "@babel/types" "^7.18.9" - "@babel/helper-skip-transparent-expression-wrappers@^7.20.0": version "7.20.0" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" @@ -341,22 +337,22 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50" - integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1" + integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" - "@babel/plugin-proposal-optional-chaining" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" + "@babel/plugin-proposal-optional-chaining" "^7.20.7" -"@babel/plugin-proposal-async-generator-functions@^7.20.1": - version "7.20.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz#352f02baa5d69f4e7529bdac39aaa02d41146af9" - integrity sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g== +"@babel/plugin-proposal-async-generator-functions@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326" + integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA== dependencies: "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/helper-remap-async-to-generator" "^7.18.9" "@babel/plugin-syntax-async-generators" "^7.8.4" @@ -368,13 +364,13 @@ "@babel/helper-create-class-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-class-static-block@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020" - integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw== +"@babel/plugin-proposal-class-static-block@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d" + integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-create-class-features-plugin" "^7.21.0" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-proposal-dynamic-import@^7.18.6": @@ -401,12 +397,12 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23" - integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q== +"@babel/plugin-proposal-logical-assignment-operators@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83" + integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6": @@ -425,16 +421,16 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz#a556f59d555f06961df1e572bb5eca864c84022d" - integrity sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ== +"@babel/plugin-proposal-object-rest-spread@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a" + integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg== dependencies: - "@babel/compat-data" "^7.20.1" - "@babel/helper-compilation-targets" "^7.20.0" + "@babel/compat-data" "^7.20.5" + "@babel/helper-compilation-targets" "^7.20.7" "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.20.1" + "@babel/plugin-transform-parameters" "^7.20.7" "@babel/plugin-proposal-optional-catch-binding@^7.18.6": version "7.18.6" @@ -444,13 +440,13 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993" - integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w== +"@babel/plugin-proposal-optional-chaining@^7.20.7", "@babel/plugin-proposal-optional-chaining@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea" + integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-proposal-private-methods@^7.18.6": @@ -461,14 +457,14 @@ "@babel/helper-create-class-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-private-property-in-object@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503" - integrity sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw== +"@babel/plugin-proposal-private-property-in-object@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc" + integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-create-class-features-plugin" "^7.21.0" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": @@ -619,21 +615,21 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-arrow-functions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe" - integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ== +"@babel/plugin-transform-arrow-functions@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551" + integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-async-to-generator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615" - integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag== +"@babel/plugin-transform-async-to-generator@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354" + integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q== dependencies: "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-remap-async-to-generator" "^7.18.6" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-remap-async-to-generator" "^7.18.9" "@babel/plugin-transform-block-scoped-functions@^7.18.6": version "7.18.6" @@ -642,39 +638,40 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-block-scoping@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz#f59b1767e6385c663fd0bce655db6ca9c8b236ed" - integrity sha512-y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ== +"@babel/plugin-transform-block-scoping@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02" + integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ== dependencies: "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-classes@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz#c0033cf1916ccf78202d04be4281d161f6709bb2" - integrity sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g== +"@babel/plugin-transform-classes@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665" + integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-compilation-targets" "^7.20.0" + "@babel/helper-compilation-targets" "^7.20.7" "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" + "@babel/helper-function-name" "^7.21.0" "@babel/helper-optimise-call-expression" "^7.18.6" "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-replace-supers" "^7.19.1" + "@babel/helper-replace-supers" "^7.20.7" "@babel/helper-split-export-declaration" "^7.18.6" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e" - integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw== +"@babel/plugin-transform-computed-properties@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa" + integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/template" "^7.20.7" -"@babel/plugin-transform-destructuring@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz#c23741cfa44ddd35f5e53896e88c75331b8b2792" - integrity sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw== +"@babel/plugin-transform-destructuring@^7.21.3": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401" + integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA== dependencies: "@babel/helper-plugin-utils" "^7.20.2" @@ -701,12 +698,12 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-for-of@^7.18.8": - version "7.18.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1" - integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ== +"@babel/plugin-transform-for-of@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e" + integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-function-name@^7.18.9": version "7.18.9" @@ -731,15 +728,15 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-modules-amd@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd" - integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg== +"@babel/plugin-transform-modules-amd@^7.20.11": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a" + integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g== dependencies: - "@babel/helper-module-transforms" "^7.19.6" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-modules-commonjs@^7.19.6", "@babel/plugin-transform-modules-commonjs@^7.21.2": +"@babel/plugin-transform-modules-commonjs@^7.21.2": version "7.21.2" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7" integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA== @@ -748,14 +745,14 @@ "@babel/helper-plugin-utils" "^7.20.2" "@babel/helper-simple-access" "^7.20.2" -"@babel/plugin-transform-modules-systemjs@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d" - integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ== +"@babel/plugin-transform-modules-systemjs@^7.20.11": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e" + integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw== dependencies: "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-module-transforms" "^7.19.6" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/helper-validator-identifier" "^7.19.1" "@babel/plugin-transform-modules-umd@^7.18.6": @@ -766,13 +763,13 @@ "@babel/helper-module-transforms" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz#ec7455bab6cd8fb05c525a94876f435a48128888" - integrity sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw== +"@babel/plugin-transform-named-capturing-groups-regex@^7.20.5": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8" + integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.19.0" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-create-regexp-features-plugin" "^7.20.5" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-new-target@^7.18.6": version "7.18.6" @@ -789,10 +786,10 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/helper-replace-supers" "^7.18.6" -"@babel/plugin-transform-parameters@^7.20.1": - version "7.20.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.3.tgz#7b3468d70c3c5b62e46be0a47b6045d8590fb748" - integrity sha512-oZg/Fpx0YDrj13KsLyO8I/CX3Zdw7z0O9qOd95SqcoIzuqy/WTGWvePeHAnZCN54SfdyjHcb1S30gc8zlzlHcA== +"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db" + integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ== dependencies: "@babel/helper-plugin-utils" "^7.20.2" @@ -844,13 +841,13 @@ "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-regenerator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73" - integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ== +"@babel/plugin-transform-regenerator@^7.20.5": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d" + integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - regenerator-transform "^0.15.0" + "@babel/helper-plugin-utils" "^7.20.2" + regenerator-transform "^0.15.1" "@babel/plugin-transform-reserved-words@^7.18.6": version "7.18.6" @@ -878,13 +875,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-spread@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6" - integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w== +"@babel/plugin-transform-spread@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e" + integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw== dependencies: - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/plugin-transform-sticky-regex@^7.18.6": version "7.18.6" @@ -932,31 +929,31 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506" - integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg== +"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.4.tgz#a952482e634a8dd8271a3fe5459a16eb10739c58" + integrity sha512-2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw== dependencies: - "@babel/compat-data" "^7.20.1" - "@babel/helper-compilation-targets" "^7.20.0" + "@babel/compat-data" "^7.21.4" + "@babel/helper-compilation-targets" "^7.21.4" "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-validator-option" "^7.18.6" + "@babel/helper-validator-option" "^7.21.0" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9" - "@babel/plugin-proposal-async-generator-functions" "^7.20.1" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7" + "@babel/plugin-proposal-async-generator-functions" "^7.20.7" "@babel/plugin-proposal-class-properties" "^7.18.6" - "@babel/plugin-proposal-class-static-block" "^7.18.6" + "@babel/plugin-proposal-class-static-block" "^7.21.0" "@babel/plugin-proposal-dynamic-import" "^7.18.6" "@babel/plugin-proposal-export-namespace-from" "^7.18.9" "@babel/plugin-proposal-json-strings" "^7.18.6" - "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9" + "@babel/plugin-proposal-logical-assignment-operators" "^7.20.7" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" "@babel/plugin-proposal-numeric-separator" "^7.18.6" - "@babel/plugin-proposal-object-rest-spread" "^7.20.2" + "@babel/plugin-proposal-object-rest-spread" "^7.20.7" "@babel/plugin-proposal-optional-catch-binding" "^7.18.6" - "@babel/plugin-proposal-optional-chaining" "^7.18.9" + "@babel/plugin-proposal-optional-chaining" "^7.21.0" "@babel/plugin-proposal-private-methods" "^7.18.6" - "@babel/plugin-proposal-private-property-in-object" "^7.18.6" + "@babel/plugin-proposal-private-property-in-object" "^7.21.0" "@babel/plugin-proposal-unicode-property-regex" "^7.18.6" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" @@ -973,40 +970,40 @@ "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.18.6" - "@babel/plugin-transform-async-to-generator" "^7.18.6" + "@babel/plugin-transform-arrow-functions" "^7.20.7" + "@babel/plugin-transform-async-to-generator" "^7.20.7" "@babel/plugin-transform-block-scoped-functions" "^7.18.6" - "@babel/plugin-transform-block-scoping" "^7.20.2" - "@babel/plugin-transform-classes" "^7.20.2" - "@babel/plugin-transform-computed-properties" "^7.18.9" - "@babel/plugin-transform-destructuring" "^7.20.2" + "@babel/plugin-transform-block-scoping" "^7.21.0" + "@babel/plugin-transform-classes" "^7.21.0" + "@babel/plugin-transform-computed-properties" "^7.20.7" + "@babel/plugin-transform-destructuring" "^7.21.3" "@babel/plugin-transform-dotall-regex" "^7.18.6" "@babel/plugin-transform-duplicate-keys" "^7.18.9" "@babel/plugin-transform-exponentiation-operator" "^7.18.6" - "@babel/plugin-transform-for-of" "^7.18.8" + "@babel/plugin-transform-for-of" "^7.21.0" "@babel/plugin-transform-function-name" "^7.18.9" "@babel/plugin-transform-literals" "^7.18.9" "@babel/plugin-transform-member-expression-literals" "^7.18.6" - "@babel/plugin-transform-modules-amd" "^7.19.6" - "@babel/plugin-transform-modules-commonjs" "^7.19.6" - "@babel/plugin-transform-modules-systemjs" "^7.19.6" + "@babel/plugin-transform-modules-amd" "^7.20.11" + "@babel/plugin-transform-modules-commonjs" "^7.21.2" + "@babel/plugin-transform-modules-systemjs" "^7.20.11" "@babel/plugin-transform-modules-umd" "^7.18.6" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5" "@babel/plugin-transform-new-target" "^7.18.6" "@babel/plugin-transform-object-super" "^7.18.6" - "@babel/plugin-transform-parameters" "^7.20.1" + "@babel/plugin-transform-parameters" "^7.21.3" "@babel/plugin-transform-property-literals" "^7.18.6" - "@babel/plugin-transform-regenerator" "^7.18.6" + "@babel/plugin-transform-regenerator" "^7.20.5" "@babel/plugin-transform-reserved-words" "^7.18.6" "@babel/plugin-transform-shorthand-properties" "^7.18.6" - "@babel/plugin-transform-spread" "^7.19.0" + "@babel/plugin-transform-spread" "^7.20.7" "@babel/plugin-transform-sticky-regex" "^7.18.6" "@babel/plugin-transform-template-literals" "^7.18.9" "@babel/plugin-transform-typeof-symbol" "^7.18.9" "@babel/plugin-transform-unicode-escapes" "^7.18.10" "@babel/plugin-transform-unicode-regex" "^7.18.6" "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.20.2" + "@babel/types" "^7.21.4" babel-plugin-polyfill-corejs2 "^0.3.3" babel-plugin-polyfill-corejs3 "^0.6.0" babel-plugin-polyfill-regenerator "^0.4.1" @@ -1047,6 +1044,11 @@ "@babel/plugin-transform-modules-commonjs" "^7.21.2" "@babel/plugin-transform-typescript" "^7.21.3" +"@babel/regjsgen@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" + integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== + "@babel/runtime-corejs3@^7.10.2": version "7.10.3" resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.3.tgz#931ed6941d3954924a7aa967ee440e60c507b91a" @@ -9679,6 +9681,13 @@ regenerate-unicode-properties@^10.0.1: dependencies: regenerate "^1.4.2" +regenerate-unicode-properties@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c" + integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ== + dependencies: + regenerate "^1.4.2" + regenerate@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" @@ -9694,10 +9703,10 @@ regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.3, regenerator-runtime@^ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== -regenerator-transform@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537" - integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg== +regenerator-transform@^0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56" + integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg== dependencies: "@babel/runtime" "^7.8.4" @@ -9730,6 +9739,18 @@ regexpu-core@^5.1.0: unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.0.0" +regexpu-core@^5.3.1: + version "5.3.2" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" + integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ== + dependencies: + "@babel/regjsgen" "^0.8.0" + regenerate "^1.4.2" + regenerate-unicode-properties "^10.1.0" + regjsparser "^0.9.1" + unicode-match-property-ecmascript "^2.0.0" + unicode-match-property-value-ecmascript "^2.1.0" + regjsgen@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" @@ -9742,6 +9763,13 @@ regjsparser@^0.8.2: dependencies: jsesc "~0.5.0" +regjsparser@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" + integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ== + dependencies: + jsesc "~0.5.0" + remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -11301,6 +11329,11 @@ unicode-match-property-value-ecmascript@^2.0.0: resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== +unicode-match-property-value-ecmascript@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0" + integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA== + unicode-property-aliases-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" From ccd74ecd1031cd6c38270c342b0075913d84e741 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 12:11:13 +0200 Subject: [PATCH 12/33] Bump @babel/plugin-transform-runtime from 7.21.0 to 7.21.4 (#24394) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index a07826f659..dafe7a8a45 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@babel/core": "^7.21.4", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", "@babel/plugin-transform-react-inline-elements": "^7.21.0", - "@babel/plugin-transform-runtime": "^7.21.0", + "@babel/plugin-transform-runtime": "^7.21.4", "@babel/preset-env": "^7.21.4", "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.21.4", diff --git a/yarn.lock b/yarn.lock index b5f958e917..4d4cb9f722 100644 --- a/yarn.lock +++ b/yarn.lock @@ -206,12 +206,12 @@ dependencies: "@babel/types" "^7.21.0" -"@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" - integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== +"@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af" + integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg== dependencies: - "@babel/types" "^7.18.6" + "@babel/types" "^7.21.4" "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2": version "7.21.2" @@ -856,12 +856,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-runtime@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz#2a884f29556d0a68cd3d152dcc9e6c71dfb6eee8" - integrity sha512-ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg== +"@babel/plugin-transform-runtime@^7.21.4": + version "7.21.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.4.tgz#2e1da21ca597a7d01fc96b699b21d8d2023191aa" + integrity sha512-1J4dhrw1h1PqnNNpzwxQ2UBymJUF8KuPjAAnlLwZcGhHAIqUigFW7cdK6GHoB64ubY4qXQNYknoUeks4Wz7CUA== dependencies: - "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-module-imports" "^7.21.4" "@babel/helper-plugin-utils" "^7.20.2" babel-plugin-polyfill-corejs2 "^0.3.3" babel-plugin-polyfill-corejs3 "^0.6.0" From 4a23ee4b9d52b19249b99694f91540c25e6c1c89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 12:12:32 +0200 Subject: [PATCH 13/33] Bump addressable from 2.8.2 to 2.8.4 (#24482) 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 16d6c95570..cb94df830d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,7 +94,7 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.2) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) aes_key_wrap (1.1.0) airbrussh (1.4.1) From 6502fcb5cf62b57ffee5e2f96f7284ab85f5bd7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 12:14:09 +0200 Subject: [PATCH 14/33] Bump aws-sdk-s3 from 1.120.0 to 1.120.1 (#24483) 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 cb94df830d..df340f2522 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,7 +109,7 @@ GEM attr_required (1.0.1) awrence (1.2.1) aws-eventstream (1.2.0) - aws-partitions (1.739.0) + aws-partitions (1.743.0) aws-sdk-core (3.171.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -118,7 +118,7 @@ GEM aws-sdk-kms (1.63.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.120.0) + aws-sdk-s3 (1.120.1) aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) From b6e353fde148c4c45642317d28acebf6dfa55973 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 12:15:53 +0200 Subject: [PATCH 15/33] Bump rimraf from 4.4.1 to 5.0.0 (#24492) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 47 +++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index dafe7a8a45..a0692cd9d3 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "regenerator-runtime": "^0.13.11", "requestidlecallback": "^0.3.0", "reselect": "^4.1.7", - "rimraf": "^4.4.1", + "rimraf": "^5.0.0", "sass": "^1.60.0", "sass-loader": "^10.2.0", "stacktrace-js": "^2.0.2", diff --git a/yarn.lock b/yarn.lock index 4d4cb9f722..e69a56b454 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5712,6 +5712,16 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" +glob@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.0.0.tgz#034ab2e93644ba702e769c3e0558143d3fbd1612" + integrity sha512-zmp9ZDC6NpDNLujV2W2n+3lH+BafIVZ4/ct+Yj3BMZTH/+bgm/eVjHzeFLwxJrrIGgjjS2eiQLlpurHsNlEAtQ== + dependencies: + fs.realpath "^1.0.0" + minimatch "^9.0.0" + minipass "^5.0.0" + path-scurry "^1.6.4" + glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" @@ -5724,7 +5734,7 @@ glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^9.2.0, glob@^9.3.4: +glob@^9.3.4: version "9.3.4" resolved "https://registry.yarnpkg.com/glob/-/glob-9.3.4.tgz#e75dee24891a80c25cc7ee1dd327e126b98679af" integrity sha512-qaSc49hojMOv1EPM4EuyITjDSgSKI0rthoHnvE81tcOi1SCVndHko7auqxdQ14eiQG2NDBJBE86+2xIrbIvrbA== @@ -7655,6 +7665,11 @@ lru-cache@^7.14.1: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== +lru-cache@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.0.1.tgz#ac061ed291f8b9adaca2b085534bb1d3b61bef83" + integrity sha512-C8QsKIN1UIXeOs3iWmiZ1lQY+EnKDojWd37fXy1aSbJvH4iSma1uy2OWuoB3m4SYRli5+CUjDv3Dij5DVoetmg== + lz-string@^1.4.4: version "1.4.4" resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" @@ -7913,6 +7928,13 @@ minimatch@^8.0.2: dependencies: brace-expansion "^2.0.1" +minimatch@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.0.tgz#bfc8e88a1c40ffd40c172ddac3decb8451503b56" + integrity sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -7960,6 +7982,11 @@ minipass@^4.0.2, minipass@^4.2.4: resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.5.tgz#9e0e5256f1e3513f8c34691dd68549e85b2c8ceb" integrity sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q== +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== + minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -8596,6 +8623,14 @@ path-scurry@^1.6.1: lru-cache "^7.14.1" minipass "^4.0.2" +path-scurry@^1.6.4: + version "1.6.4" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.6.4.tgz#020a9449e5382a4acb684f9c7e1283bc5695de66" + integrity sha512-Qp/9IHkdNiXJ3/Kon++At2nVpnhRiPq/aSvQN+H3U1WZbvNRK0RIQK/o4HMqPoXjpuGJUEWpHSs6Mnjxqh3TQg== + dependencies: + lru-cache "^9.0.0" + minipass "^5.0.0" + path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -9932,12 +9967,12 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" -rimraf@^4.4.1: - version "4.4.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-4.4.1.tgz#bd33364f67021c5b79e93d7f4fa0568c7c21b755" - integrity sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og== +rimraf@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.0.tgz#5bda14e410d7e4dd522154891395802ce032c2cb" + integrity sha512-Jf9llaP+RvaEVS5nPShYFhtXIrb3LRKP281ib3So0KkeZKo2wIKyq0Re7TOSwanasA423PSr6CCIL4bP6T040g== dependencies: - glob "^9.2.0" + glob "^10.0.0" ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" From b9efca65e387cdce66e7786acdd64281fe97272d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 12:53:13 +0200 Subject: [PATCH 16/33] Bump net-ldap from 0.17.1 to 0.18.0 (#24484) 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 9d4f69dae6..3e8e643880 100644 --- a/Gemfile +++ b/Gemfile @@ -36,7 +36,7 @@ group :pam_authentication, optional: true do gem 'devise_pam_authenticatable2', '~> 9.2' end -gem 'net-ldap', '~> 0.17' +gem 'net-ldap', '~> 0.18' gem 'omniauth-cas', '~> 2.0' gem 'omniauth-saml', '~> 1.10' gem 'omniauth_openid_connect', '~> 0.6.1' diff --git a/Gemfile.lock b/Gemfile.lock index df340f2522..db15509ed5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -426,7 +426,7 @@ GEM net-imap (0.3.4) date net-protocol - net-ldap (0.17.1) + net-ldap (0.18.0) net-pop (0.1.2) net-protocol net-protocol (0.2.1) @@ -826,7 +826,7 @@ DEPENDENCIES memory_profiler mime-types (~> 3.4.1) net-http (~> 0.3.2) - net-ldap (~> 0.17) + net-ldap (~> 0.18) nokogiri (~> 1.14) nsa (~> 0.2) oj (~> 3.14) From fe841b6bb623b649718bff68ca5bca41b03cf1bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 13:43:54 +0200 Subject: [PATCH 17/33] Bump sass from 1.60.0 to 1.61.0 (#24487) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 20 +++++--------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index a0692cd9d3..0986c1449a 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "requestidlecallback": "^0.3.0", "reselect": "^4.1.7", "rimraf": "^5.0.0", - "sass": "^1.60.0", + "sass": "^1.61.0", "sass-loader": "^10.2.0", "stacktrace-js": "^2.0.2", "stringz": "^2.1.0", diff --git a/yarn.lock b/yarn.lock index e69a56b454..67b6c27273 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6168,17 +6168,7 @@ immutable@^3.8.2: resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3" integrity sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg== -immutable@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23" - integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw== - -immutable@^4.0.0-rc.1: - version "4.0.0-rc.12" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.12.tgz#ca59a7e4c19ae8d9bf74a97bdf0f6e2f2a5d0217" - integrity sha512-0M2XxkZLx/mi3t8NVwIm1g8nHoEmM9p9UBl/G9k4+hm0kBgOVdMV/B3CY5dQ8qG8qc80NN4gDV4HQv6FTJ5q7A== - -immutable@^4.3.0: +immutable@^4.0.0, immutable@^4.0.0-rc.1, immutable@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be" integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg== @@ -10060,10 +10050,10 @@ sass-loader@^10.2.0: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.60.0: - version "1.60.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.60.0.tgz#657f0c23a302ac494b09a5ba8497b739fb5b5a81" - integrity sha512-updbwW6fNb5gGm8qMXzVO7V4sWf7LMXnMly/JEyfbfERbVH46Fn6q02BX7/eHTdKpE7d+oTkMMQpFWNUMfFbgQ== +sass@^1.61.0: + version "1.61.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.61.0.tgz#d1f6761bb833887b8fdab32a24e052c40531d02b" + integrity sha512-PDsN7BrVkNZK2+dj/dpKQAWZavbAQ87IXqVvw2+oEYI+GwlTWkvbQtL7F2cCNbMqJEYKPh1EcjSxsnqIb/kyaQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From 8eeb0ae7c0c6e9c37f581f87ad8b688daaf8af4c Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 11 Apr 2023 14:24:26 +0200 Subject: [PATCH 18/33] Explicitly enable `@babel/plugin-proposal-optional-chaining` to fix build failures (#24504) --- babel.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/babel.config.js b/babel.config.js index 9ed0740993..0b81f1453f 100644 --- a/babel.config.js +++ b/babel.config.js @@ -20,6 +20,7 @@ module.exports = (api) => { plugins: [ ['react-intl', { messagesDir: './build/messages' }], 'preval', + '@babel/plugin-proposal-optional-chaining', '@babel/plugin-proposal-nullish-coalescing-operator', ], overrides: [ From 4c457a350b01463700058d33e48bffda4c1a0a51 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 11 Apr 2023 14:24:44 +0200 Subject: [PATCH 19/33] Fix check-i18n task complaining about translated files (#24501) --- .github/workflows/check-i18n.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-i18n.yml b/.github/workflows/check-i18n.yml index df0d75c9f6..1349803224 100644 --- a/.github/workflows/check-i18n.yml +++ b/.github/workflows/check-i18n.yml @@ -43,7 +43,7 @@ jobs: run: | yarn build:development yarn manage:translations - git diff --exit-code + git diff --exit-code -- app/javascript/mastodon/locales/defaultMessages.json app/javascript/mastodon/locales/en.json - name: Check locale file normalization run: bundle exec i18n-tasks check-normalized From 0765aeba3831374e7ee734acb7d02a684c12947a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 15:03:44 +0200 Subject: [PATCH 20/33] Bump eslint from 8.36.0 to 8.38.0 (#24493) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 78 +++++++++++++++++++++------------------------------- 2 files changed, 32 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index 0986c1449a..7539780c4e 100644 --- a/package.json +++ b/package.json @@ -182,7 +182,7 @@ "@typescript-eslint/eslint-plugin": "^5.55.0", "@typescript-eslint/parser": "^5.55.0", "babel-jest": "^29.5.0", - "eslint": "^8.36.0", + "eslint": "^8.38.0", "eslint-plugin-import": "~2.27.5", "eslint-plugin-jsx-a11y": "~6.7.1", "eslint-plugin-promise": "~6.1.1", diff --git a/yarn.lock b/yarn.lock index 67b6c27273..0ac3662dfd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1230,14 +1230,14 @@ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.4.0.tgz#3e61c564fcd6b921cb789838631c5ee44df09403" integrity sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ== -"@eslint/eslintrc@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.1.tgz#7888fe7ec8f21bc26d646dbd2c11cd776e21192d" - integrity sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw== +"@eslint/eslintrc@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.2.tgz#01575e38707add677cf73ca1589abba8da899a02" + integrity sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.5.0" + espree "^9.5.1" globals "^13.19.0" ignore "^5.2.0" import-fresh "^3.2.1" @@ -1245,10 +1245,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.36.0": - version "8.36.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.36.0.tgz#9837f768c03a1e4a30bd304a64fb8844f0e72efe" - integrity sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg== +"@eslint/js@8.38.0": + version "8.38.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.38.0.tgz#73a8a0d8aa8a8e6fe270431c5e72ae91b5337892" + integrity sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g== "@floating-ui/core@^1.0.1": version "1.0.1" @@ -1590,14 +1590,6 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" -"@nodelib/fs.scandir@2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" - integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== - dependencies: - "@nodelib/fs.stat" "2.0.4" - run-parallel "^1.1.9" - "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1606,25 +1598,17 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" - integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== - "@nodelib/fs.stat@2.0.5": version "2.0.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== -"@nodelib/fs.walk@^1.2.3": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" - integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== - dependencies: - "@nodelib/fs.scandir" "2.1.4" - fastq "^1.6.0" +"@nodelib/fs.stat@^2.0.2": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" + integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== -"@nodelib/fs.walk@^1.2.8": +"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": version "1.2.8" resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== @@ -5035,20 +5019,20 @@ eslint-scope@^7.1.1: esrecurse "^4.3.0" estraverse "^5.2.0" -eslint-visitor-keys@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" - integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc" + integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ== -eslint@^8.36.0: - version "8.36.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.36.0.tgz#1bd72202200a5492f91803b113fb8a83b11285cf" - integrity sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw== +eslint@^8.38.0: + version "8.38.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.38.0.tgz#a62c6f36e548a5574dd35728ac3c6209bd1e2f1a" + integrity sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.4.0" - "@eslint/eslintrc" "^2.0.1" - "@eslint/js" "8.36.0" + "@eslint/eslintrc" "^2.0.2" + "@eslint/js" "8.38.0" "@humanwhocodes/config-array" "^0.11.8" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" @@ -5059,8 +5043,8 @@ eslint@^8.36.0: doctrine "^3.0.0" escape-string-regexp "^4.0.0" eslint-scope "^7.1.1" - eslint-visitor-keys "^3.3.0" - espree "^9.5.0" + eslint-visitor-keys "^3.4.0" + espree "^9.5.1" esquery "^1.4.2" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -5086,14 +5070,14 @@ eslint@^8.36.0: strip-json-comments "^3.1.0" text-table "^0.2.0" -espree@^9.5.0: - version "9.5.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.0.tgz#3646d4e3f58907464edba852fa047e6a27bdf113" - integrity sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw== +espree@^9.5.1: + version "9.5.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.1.tgz#4f26a4d5f18905bf4f2e0bd99002aab807e96dd4" + integrity sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg== dependencies: acorn "^8.8.0" acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.3.0" + eslint-visitor-keys "^3.4.0" esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" From 8ffa11740f5a1461be2e6973a7d345fb47a5e92a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 15:25:55 +0200 Subject: [PATCH 21/33] Bump @typescript-eslint/parser from 5.55.0 to 5.58.0 (#24494) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 48 +++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 7539780c4e..189577eb5f 100644 --- a/package.json +++ b/package.json @@ -180,7 +180,7 @@ "@types/webpack": "^4.41.33", "@types/yargs": "^17.0.22", "@typescript-eslint/eslint-plugin": "^5.55.0", - "@typescript-eslint/parser": "^5.55.0", + "@typescript-eslint/parser": "^5.58.0", "babel-jest": "^29.5.0", "eslint": "^8.38.0", "eslint-plugin-import": "~2.27.5", diff --git a/yarn.lock b/yarn.lock index 0ac3662dfd..b77dbd5c5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2433,14 +2433,14 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.55.0": - version "5.55.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.55.0.tgz#8c96a0b6529708ace1dcfa60f5e6aec0f5ed2262" - integrity sha512-ppvmeF7hvdhUUZWSd2EEWfzcFkjJzgNQzVST22nzg958CR+sphy8A6K7LXQZd6V75m1VKjp+J4g/PCEfSCmzhw== +"@typescript-eslint/parser@^5.58.0": + version "5.58.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.58.0.tgz#2ac4464cf48bef2e3234cb178ede5af352dddbc6" + integrity sha512-ixaM3gRtlfrKzP8N6lRhBbjTow1t6ztfBvQNGuRM8qH1bjFFXIJ35XY+FC0RRBKn3C6cT+7VW1y8tNm7DwPHDQ== dependencies: - "@typescript-eslint/scope-manager" "5.55.0" - "@typescript-eslint/types" "5.55.0" - "@typescript-eslint/typescript-estree" "5.55.0" + "@typescript-eslint/scope-manager" "5.58.0" + "@typescript-eslint/types" "5.58.0" + "@typescript-eslint/typescript-estree" "5.58.0" debug "^4.3.4" "@typescript-eslint/scope-manager@5.55.0": @@ -2451,6 +2451,14 @@ "@typescript-eslint/types" "5.55.0" "@typescript-eslint/visitor-keys" "5.55.0" +"@typescript-eslint/scope-manager@5.58.0": + version "5.58.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.58.0.tgz#5e023a48352afc6a87be6ce3c8e763bc9e2f0bc8" + integrity sha512-b+w8ypN5CFvrXWQb9Ow9T4/6LC2MikNf1viLkYTiTbkQl46CnR69w7lajz1icW0TBsYmlpg+mRzFJ4LEJ8X9NA== + dependencies: + "@typescript-eslint/types" "5.58.0" + "@typescript-eslint/visitor-keys" "5.58.0" + "@typescript-eslint/type-utils@5.55.0": version "5.55.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.55.0.tgz#74bf0233523f874738677bb73cb58094210e01e9" @@ -2466,6 +2474,11 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.55.0.tgz#9830f8d3bcbecf59d12f821e5bc6960baaed41fd" integrity sha512-M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug== +"@typescript-eslint/types@5.58.0": + version "5.58.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.58.0.tgz#54c490b8522c18986004df7674c644ffe2ed77d8" + integrity sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g== + "@typescript-eslint/typescript-estree@5.55.0": version "5.55.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.55.0.tgz#8db7c8e47ecc03d49b05362b8db6f1345ee7b575" @@ -2479,6 +2492,19 @@ semver "^7.3.7" tsutils "^3.21.0" +"@typescript-eslint/typescript-estree@5.58.0": + version "5.58.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.58.0.tgz#4966e6ff57eaf6e0fce2586497edc097e2ab3e61" + integrity sha512-cRACvGTodA+UxnYM2uwA2KCwRL7VAzo45syNysqlMyNyjw0Z35Icc9ihPJZjIYuA5bXJYiJ2YGUB59BqlOZT1Q== + dependencies: + "@typescript-eslint/types" "5.58.0" + "@typescript-eslint/visitor-keys" "5.58.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + semver "^7.3.7" + tsutils "^3.21.0" + "@typescript-eslint/utils@5.55.0": version "5.55.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.55.0.tgz#34e97322e7ae5b901e7a870aabb01dad90023341" @@ -2501,6 +2527,14 @@ "@typescript-eslint/types" "5.55.0" eslint-visitor-keys "^3.3.0" +"@typescript-eslint/visitor-keys@5.58.0": + version "5.58.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.58.0.tgz#eb9de3a61d2331829e6761ce7fd13061781168b4" + integrity sha512-/fBraTlPj0jwdyTwLyrRTxv/3lnU2H96pNTVM6z3esTWLtA5MZ9ghSMJ7Rb+TtUAdtEw9EyJzJ0EydIMKxQ9gA== + dependencies: + "@typescript-eslint/types" "5.58.0" + eslint-visitor-keys "^3.3.0" + "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" From 458e49c40cdd7c5e35bfc928f21778eb1b90e66b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 15:39:08 +0200 Subject: [PATCH 22/33] Bump @typescript-eslint/eslint-plugin from 5.55.0 to 5.58.0 (#24488) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 74 ++++++++++++++-------------------------------------- 2 files changed, 21 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index 189577eb5f..e713ee3f17 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ "@types/uuid": "^8.3.4", "@types/webpack": "^4.41.33", "@types/yargs": "^17.0.22", - "@typescript-eslint/eslint-plugin": "^5.55.0", + "@typescript-eslint/eslint-plugin": "^5.58.0", "@typescript-eslint/parser": "^5.58.0", "babel-jest": "^29.5.0", "eslint": "^8.38.0", diff --git a/yarn.lock b/yarn.lock index b77dbd5c5d..bb6688b023 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2417,15 +2417,15 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^5.55.0": - version "5.55.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.55.0.tgz#bc2400c3a23305e8c9a9c04aa40933868aaaeb47" - integrity sha512-IZGc50rtbjk+xp5YQoJvmMPmJEYoC53SiKPXyqWfv15XoD2Y5Kju6zN0DwlmaGJp1Iw33JsWJcQ7nw0lGCGjVg== +"@typescript-eslint/eslint-plugin@^5.58.0": + version "5.58.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.58.0.tgz#b1d4b0ad20243269d020ef9bbb036a40b0849829" + integrity sha512-vxHvLhH0qgBd3/tW6/VccptSfc8FxPQIkmNTVLWcCOVqSBvqpnKkBTYrhcGlXfSnd78azwe+PsjYFj0X34/njA== dependencies: "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.55.0" - "@typescript-eslint/type-utils" "5.55.0" - "@typescript-eslint/utils" "5.55.0" + "@typescript-eslint/scope-manager" "5.58.0" + "@typescript-eslint/type-utils" "5.58.0" + "@typescript-eslint/utils" "5.58.0" debug "^4.3.4" grapheme-splitter "^1.0.4" ignore "^5.2.0" @@ -2443,14 +2443,6 @@ "@typescript-eslint/typescript-estree" "5.58.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.55.0": - version "5.55.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.55.0.tgz#e863bab4d4183ddce79967fe10ceb6c829791210" - integrity sha512-OK+cIO1ZGhJYNCL//a3ROpsd83psf4dUJ4j7pdNVzd5DmIk+ffkuUIX2vcZQbEW/IR41DYsfJTB19tpCboxQuw== - dependencies: - "@typescript-eslint/types" "5.55.0" - "@typescript-eslint/visitor-keys" "5.55.0" - "@typescript-eslint/scope-manager@5.58.0": version "5.58.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.58.0.tgz#5e023a48352afc6a87be6ce3c8e763bc9e2f0bc8" @@ -2459,39 +2451,21 @@ "@typescript-eslint/types" "5.58.0" "@typescript-eslint/visitor-keys" "5.58.0" -"@typescript-eslint/type-utils@5.55.0": - version "5.55.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.55.0.tgz#74bf0233523f874738677bb73cb58094210e01e9" - integrity sha512-ObqxBgHIXj8rBNm0yh8oORFrICcJuZPZTqtAFh0oZQyr5DnAHZWfyw54RwpEEH+fD8suZaI0YxvWu5tYE/WswA== +"@typescript-eslint/type-utils@5.58.0": + version "5.58.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.58.0.tgz#f7d5b3971483d4015a470d8a9e5b8a7d10066e52" + integrity sha512-FF5vP/SKAFJ+LmR9PENql7fQVVgGDOS+dq3j+cKl9iW/9VuZC/8CFmzIP0DLKXfWKpRHawJiG70rVH+xZZbp8w== dependencies: - "@typescript-eslint/typescript-estree" "5.55.0" - "@typescript-eslint/utils" "5.55.0" + "@typescript-eslint/typescript-estree" "5.58.0" + "@typescript-eslint/utils" "5.58.0" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.55.0": - version "5.55.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.55.0.tgz#9830f8d3bcbecf59d12f821e5bc6960baaed41fd" - integrity sha512-M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug== - "@typescript-eslint/types@5.58.0": version "5.58.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.58.0.tgz#54c490b8522c18986004df7674c644ffe2ed77d8" integrity sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g== -"@typescript-eslint/typescript-estree@5.55.0": - version "5.55.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.55.0.tgz#8db7c8e47ecc03d49b05362b8db6f1345ee7b575" - integrity sha512-I7X4A9ovA8gdpWMpr7b1BN9eEbvlEtWhQvpxp/yogt48fy9Lj3iE3ild/1H3jKBBIYj5YYJmS2+9ystVhC7eaQ== - dependencies: - "@typescript-eslint/types" "5.55.0" - "@typescript-eslint/visitor-keys" "5.55.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - semver "^7.3.7" - tsutils "^3.21.0" - "@typescript-eslint/typescript-estree@5.58.0": version "5.58.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.58.0.tgz#4966e6ff57eaf6e0fce2586497edc097e2ab3e61" @@ -2505,28 +2479,20 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.55.0": - version "5.55.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.55.0.tgz#34e97322e7ae5b901e7a870aabb01dad90023341" - integrity sha512-FkW+i2pQKcpDC3AY6DU54yl8Lfl14FVGYDgBTyGKB75cCwV3KpkpTMFi9d9j2WAJ4271LR2HeC5SEWF/CZmmfw== +"@typescript-eslint/utils@5.58.0": + version "5.58.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.58.0.tgz#430d7c95f23ec457b05be5520c1700a0dfd559d5" + integrity sha512-gAmLOTFXMXOC+zP1fsqm3VceKSBQJNzV385Ok3+yzlavNHZoedajjS4UyS21gabJYcobuigQPs/z71A9MdJFqQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.55.0" - "@typescript-eslint/types" "5.55.0" - "@typescript-eslint/typescript-estree" "5.55.0" + "@typescript-eslint/scope-manager" "5.58.0" + "@typescript-eslint/types" "5.58.0" + "@typescript-eslint/typescript-estree" "5.58.0" eslint-scope "^5.1.1" semver "^7.3.7" -"@typescript-eslint/visitor-keys@5.55.0": - version "5.55.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.55.0.tgz#01ad414fca8367706d76cdb94adf788dc5b664a2" - integrity sha512-q2dlHHwWgirKh1D3acnuApXG+VNXpEY5/AwRxDVuEQpxWaB0jCDe0jFMVMALJ3ebSfuOVE8/rMS+9ZOYGg1GWw== - dependencies: - "@typescript-eslint/types" "5.55.0" - eslint-visitor-keys "^3.3.0" - "@typescript-eslint/visitor-keys@5.58.0": version "5.58.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.58.0.tgz#eb9de3a61d2331829e6761ce7fd13061781168b4" From ce50f04f0aeb311cbef60efd2d9be20c25105cab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:02:19 +0200 Subject: [PATCH 23/33] Bump glob from 9.3.4 to 10.0.0 (#24490) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 35 ----------------------------------- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/package.json b/package.json index e713ee3f17..b36f057792 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "file-loader": "^6.2.0", "font-awesome": "^4.7.0", "fuzzysort": "^2.0.4", - "glob": "^9.3.4", + "glob": "^10.0.0", "history": "^4.10.1", "http-link-header": "^1.1.0", "immutable": "^4.3.0", diff --git a/yarn.lock b/yarn.lock index bb6688b023..df91c9fb86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5718,16 +5718,6 @@ glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^9.3.4: - version "9.3.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-9.3.4.tgz#e75dee24891a80c25cc7ee1dd327e126b98679af" - integrity sha512-qaSc49hojMOv1EPM4EuyITjDSgSKI0rthoHnvE81tcOi1SCVndHko7auqxdQ14eiQG2NDBJBE86+2xIrbIvrbA== - dependencies: - fs.realpath "^1.0.0" - minimatch "^8.0.2" - minipass "^4.2.4" - path-scurry "^1.6.1" - global-modules@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" @@ -7634,11 +7624,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lru-cache@^7.14.1: - version "7.18.3" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" - integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== - lru-cache@^9.0.0: version "9.0.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.0.1.tgz#ac061ed291f8b9adaca2b085534bb1d3b61bef83" @@ -7895,13 +7880,6 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^8.0.2: - version "8.0.3" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-8.0.3.tgz#0415cb9bb0c1d8ac758c8a673eb1d288e13f5e75" - integrity sha512-tEEvU9TkZgnFDCtpnrEYnPsjT7iUx42aXfs4bzmQ5sMA09/6hZY0jeZcGkXyDagiBOvkUjNo8Viom+Me6+2x7g== - dependencies: - brace-expansion "^2.0.1" - minimatch@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.0.tgz#bfc8e88a1c40ffd40c172ddac3decb8451503b56" @@ -7951,11 +7929,6 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" -minipass@^4.0.2, minipass@^4.2.4: - version "4.2.5" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.5.tgz#9e0e5256f1e3513f8c34691dd68549e85b2c8ceb" - integrity sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q== - minipass@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" @@ -8589,14 +8562,6 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-scurry@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.6.1.tgz#dab45f7bb1d3f45a0e271ab258999f4ab7e23132" - integrity sha512-OW+5s+7cw6253Q4E+8qQ/u1fVvcJQCJo/VFD8pje+dbJCF1n5ZRMV2AEHbGp+5Q7jxQIYJxkHopnj6nzdGeZLA== - dependencies: - lru-cache "^7.14.1" - minipass "^4.0.2" - path-scurry@^1.6.4: version "1.6.4" resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.6.4.tgz#020a9449e5382a4acb684f9c7e1283bc5695de66" From f9940eba2f8fe0ea4bbc3eb385cb20c81818c18b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 11 Apr 2023 23:22:59 +0200 Subject: [PATCH 24/33] Bump nokogiri from 1.14.2 to 1.14.3 (#24510) --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index db15509ed5..1b4e7d503a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -437,7 +437,7 @@ GEM net-protocol net-ssh (7.0.1) nio4r (2.5.9) - nokogiri (1.14.2) + nokogiri (1.14.3) mini_portile2 (~> 2.8.0) racc (~> 1.4) nsa (0.2.8) From aca2cd152887352cc90073a93df6a46a0d642a1e Mon Sep 17 00:00:00 2001 From: Kuba Suder Date: Wed, 12 Apr 2023 10:06:57 +0200 Subject: [PATCH 25/33] fixed typo in a constant name (#24511) --- app/models/tag.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/tag.rb b/app/models/tag.rb index 554a92d901..9fb32cd06e 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -31,8 +31,8 @@ class Tag < ApplicationRecord HASHTAG_FIRST_SEQUENCE_CHUNK_ONE = "[[:word:]_][[:word:]#{HASHTAG_SEPARATORS}]*[[:alpha:]#{HASHTAG_SEPARATORS}]" HASHTAG_FIRST_SEQUENCE_CHUNK_TWO = "[[:word:]#{HASHTAG_SEPARATORS}]*[[:word:]_]" HASHTAG_FIRST_SEQUENCE = "(#{HASHTAG_FIRST_SEQUENCE_CHUNK_ONE}#{HASHTAG_FIRST_SEQUENCE_CHUNK_TWO})" - HASTAG_LAST_SEQUENCE = '([[:word:]_]*[[:alpha:]][[:word:]_]*)' - HASHTAG_NAME_PAT = "#{HASHTAG_FIRST_SEQUENCE}|#{HASTAG_LAST_SEQUENCE}" + HASHTAG_LAST_SEQUENCE = '([[:word:]_]*[[:alpha:]][[:word:]_]*)' + HASHTAG_NAME_PAT = "#{HASHTAG_FIRST_SEQUENCE}|#{HASHTAG_LAST_SEQUENCE}" HASHTAG_RE = /(?:^|[^\/\)\w])#(#{HASHTAG_NAME_PAT})/i HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i From cee357d5385c66a0217827ba3ceab2e77cd2f649 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 12 Apr 2023 12:44:58 +0200 Subject: [PATCH 26/33] Change all components to use the same error page in web UI (#24512) --- .../mastodon/components/missing_indicator.jsx | 29 ------------------- .../features/account_gallery/index.jsx | 6 ++-- .../features/account_timeline/index.jsx | 7 ++--- .../mastodon/features/followers/index.jsx | 6 ++-- .../mastodon/features/following/index.jsx | 6 ++-- .../features/generic_not_found/index.jsx | 11 ------- .../mastodon/features/list_timeline/index.jsx | 8 ++--- .../mastodon/features/status/index.jsx | 12 +++----- .../features/ui/util/async-components.js | 4 --- .../mastodon/locales/defaultMessages.json | 15 +--------- 10 files changed, 15 insertions(+), 89 deletions(-) delete mode 100644 app/javascript/mastodon/components/missing_indicator.jsx delete mode 100644 app/javascript/mastodon/features/generic_not_found/index.jsx diff --git a/app/javascript/mastodon/components/missing_indicator.jsx b/app/javascript/mastodon/components/missing_indicator.jsx deleted file mode 100644 index 05e0d653d7..0000000000 --- a/app/javascript/mastodon/components/missing_indicator.jsx +++ /dev/null @@ -1,29 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import { FormattedMessage } from 'react-intl'; -import illustration from 'mastodon/../images/elephant_ui_disappointed.svg'; -import classNames from 'classnames'; -import { Helmet } from 'react-helmet'; - -const MissingIndicator = ({ fullPage }) => ( -
-
- -
- -
- - -
- - - - -
-); - -MissingIndicator.propTypes = { - fullPage: PropTypes.bool, -}; - -export default MissingIndicator; diff --git a/app/javascript/mastodon/features/account_gallery/index.jsx b/app/javascript/mastodon/features/account_gallery/index.jsx index db76507dbf..b876df6a29 100644 --- a/app/javascript/mastodon/features/account_gallery/index.jsx +++ b/app/javascript/mastodon/features/account_gallery/index.jsx @@ -13,10 +13,10 @@ import MediaItem from './components/media_item'; import HeaderContainer from '../account_timeline/containers/header_container'; import ScrollContainer from 'mastodon/containers/scroll_container'; import LoadMore from 'mastodon/components/load_more'; -import MissingIndicator from 'mastodon/components/missing_indicator'; import { openModal } from 'mastodon/actions/modal'; import { FormattedMessage } from 'react-intl'; import { normalizeForLookup } from 'mastodon/reducers/accounts_map'; +import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error'; const mapStateToProps = (state, { params: { acct, id } }) => { const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]); @@ -161,9 +161,7 @@ class AccountGallery extends ImmutablePureComponent { if (!isAccount) { return ( - - - + ); } diff --git a/app/javascript/mastodon/features/account_timeline/index.jsx b/app/javascript/mastodon/features/account_timeline/index.jsx index d775636840..bc66f128d9 100644 --- a/app/javascript/mastodon/features/account_timeline/index.jsx +++ b/app/javascript/mastodon/features/account_timeline/index.jsx @@ -12,7 +12,6 @@ import ColumnBackButton from '../../components/column_back_button'; import { List as ImmutableList } from 'immutable'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { FormattedMessage } from 'react-intl'; -import MissingIndicator from 'mastodon/components/missing_indicator'; import TimelineHint from 'mastodon/components/timeline_hint'; import { me } from 'mastodon/initial_state'; import { connectTimeline, disconnectTimeline } from 'mastodon/actions/timelines'; @@ -20,6 +19,7 @@ import LimitedAccountHint from './components/limited_account_hint'; import { getAccountHidden } from 'mastodon/selectors'; import { fetchFeaturedTags } from '../../actions/featured_tags'; import { normalizeForLookup } from 'mastodon/reducers/accounts_map'; +import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error'; const emptyList = ImmutableList(); @@ -157,10 +157,7 @@ class AccountTimeline extends ImmutablePureComponent { ); } else if (!isLoading && !isAccount) { return ( - - - - + ); } diff --git a/app/javascript/mastodon/features/followers/index.jsx b/app/javascript/mastodon/features/followers/index.jsx index fe86ebb3b4..cdd65c9ef0 100644 --- a/app/javascript/mastodon/features/followers/index.jsx +++ b/app/javascript/mastodon/features/followers/index.jsx @@ -17,11 +17,11 @@ import Column from '../ui/components/column'; import HeaderContainer from '../account_timeline/containers/header_container'; import ColumnBackButton from '../../components/column_back_button'; import ScrollableList from '../../components/scrollable_list'; -import MissingIndicator from 'mastodon/components/missing_indicator'; import TimelineHint from 'mastodon/components/timeline_hint'; import LimitedAccountHint from '../account_timeline/components/limited_account_hint'; import { getAccountHidden } from 'mastodon/selectors'; import { normalizeForLookup } from 'mastodon/reducers/accounts_map'; +import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error'; const mapStateToProps = (state, { params: { acct, id } }) => { const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]); @@ -111,9 +111,7 @@ class Followers extends ImmutablePureComponent { if (!isAccount) { return ( - - - + ); } diff --git a/app/javascript/mastodon/features/following/index.jsx b/app/javascript/mastodon/features/following/index.jsx index 8095d73a35..26dee213d8 100644 --- a/app/javascript/mastodon/features/following/index.jsx +++ b/app/javascript/mastodon/features/following/index.jsx @@ -17,11 +17,11 @@ import Column from '../ui/components/column'; import HeaderContainer from '../account_timeline/containers/header_container'; import ColumnBackButton from '../../components/column_back_button'; import ScrollableList from '../../components/scrollable_list'; -import MissingIndicator from 'mastodon/components/missing_indicator'; import TimelineHint from 'mastodon/components/timeline_hint'; import LimitedAccountHint from '../account_timeline/components/limited_account_hint'; import { getAccountHidden } from 'mastodon/selectors'; import { normalizeForLookup } from 'mastodon/reducers/accounts_map'; +import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error'; const mapStateToProps = (state, { params: { acct, id } }) => { const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]); @@ -111,9 +111,7 @@ class Following extends ImmutablePureComponent { if (!isAccount) { return ( - - - + ); } diff --git a/app/javascript/mastodon/features/generic_not_found/index.jsx b/app/javascript/mastodon/features/generic_not_found/index.jsx deleted file mode 100644 index 41cd61a5f8..0000000000 --- a/app/javascript/mastodon/features/generic_not_found/index.jsx +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react'; -import Column from '../ui/components/column'; -import MissingIndicator from '../../components/missing_indicator'; - -const GenericNotFound = () => ( - - - -); - -export default GenericNotFound; diff --git a/app/javascript/mastodon/features/list_timeline/index.jsx b/app/javascript/mastodon/features/list_timeline/index.jsx index c0b9a62ff9..8297c2748d 100644 --- a/app/javascript/mastodon/features/list_timeline/index.jsx +++ b/app/javascript/mastodon/features/list_timeline/index.jsx @@ -10,13 +10,12 @@ import { openModal } from 'mastodon/actions/modal'; import { connectListStream } from 'mastodon/actions/streaming'; import { expandListTimeline } from 'mastodon/actions/timelines'; import Column from 'mastodon/components/column'; -import ColumnBackButton from 'mastodon/components/column_back_button'; import ColumnHeader from 'mastodon/components/column_header'; import Icon from 'mastodon/components/icon'; import LoadingIndicator from 'mastodon/components/loading_indicator'; -import MissingIndicator from 'mastodon/components/missing_indicator'; import RadioButton from 'mastodon/components/radio_button'; import StatusListContainer from 'mastodon/features/ui/containers/status_list_container'; +import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error'; const messages = defineMessages({ deleteMessage: { id: 'confirmations.delete_list.message', defaultMessage: 'Are you sure you want to permanently delete this list?' }, @@ -156,10 +155,7 @@ class ListTimeline extends React.PureComponent { ); } else if (list === false) { return ( - - - - + ); } diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx index 2d18c6e9d9..b547741f78 100644 --- a/app/javascript/mastodon/features/status/index.jsx +++ b/app/javascript/mastodon/features/status/index.jsx @@ -16,7 +16,6 @@ import { translateStatus, undoStatusTranslation, } from '../../actions/statuses'; -import MissingIndicator from '../../components/missing_indicator'; import LoadingIndicator from 'mastodon/components/loading_indicator'; import DetailedStatus from './components/detailed_status'; import ActionBar from './components/action_bar'; @@ -50,7 +49,6 @@ import { initBoostModal } from '../../actions/boosts'; import { initReport } from '../../actions/reports'; import { makeGetStatus, makeGetPictureInPicture } from '../../selectors'; import ScrollContainer from 'mastodon/containers/scroll_container'; -import ColumnBackButton from '../../components/column_back_button'; import ColumnHeader from '../../components/column_header'; import StatusContainer from '../../containers/status_container'; import { openModal } from '../../actions/modal'; @@ -62,6 +60,7 @@ import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from import { textForScreenReader, defaultMediaVisibility } from '../../components/status'; import Icon from 'mastodon/components/icon'; import { Helmet } from 'react-helmet'; +import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error'; const messages = defineMessages({ deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, @@ -584,19 +583,16 @@ class Status extends ImmutablePureComponent { if (status === null) { return ( - - - - + ); } if (ancestorsIds && ancestorsIds.size > 0) { - ancestors =
{this.renderChildren(ancestorsIds)}
; + ancestors = <>{this.renderChildren(ancestorsIds)}; } if (descendantsIds && descendantsIds.size > 0) { - descendants =
{this.renderChildren(descendantsIds)}
; + descendants = <>{this.renderChildren(descendantsIds)}; } const isLocal = status.getIn(['account', 'acct'], '').indexOf('@') === -1; diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js index 1cf07f6453..e6382fa10b 100644 --- a/app/javascript/mastodon/features/ui/util/async-components.js +++ b/app/javascript/mastodon/features/ui/util/async-components.js @@ -82,10 +82,6 @@ export function FollowRequests () { return import(/* webpackChunkName: "features/follow_requests" */'../../follow_requests'); } -export function GenericNotFound () { - return import(/* webpackChunkName: "features/generic_not_found" */'../../generic_not_found'); -} - export function FavouritedStatuses () { return import(/* webpackChunkName: "features/favourited_statuses" */'../../favourited_statuses'); } diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index b490a7b6bd..e6c2ae4b19 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -353,19 +353,6 @@ ], "path": "app/javascript/mastodon/components/media_gallery.json" }, - { - "descriptors": [ - { - "defaultMessage": "Not found", - "id": "missing_indicator.label" - }, - { - "defaultMessage": "This resource could not be found", - "id": "missing_indicator.sublabel" - } - ], - "path": "app/javascript/mastodon/components/missing_indicator.json" - }, { "descriptors": [ { @@ -4359,4 +4346,4 @@ ], "path": "app/javascript/mastodon/features/video/index.json" } -] \ No newline at end of file +] From f53d009778e2ae7a0a7b246147dff8e6bbec3755 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 12 Apr 2023 12:47:05 +0200 Subject: [PATCH 27/33] Refactor `Status._insert_record` slightly and tighten the test around reblogs of discarded statuses (#24516) --- app/models/status.rb | 52 ++++++++++++++++------------ spec/services/reblog_service_spec.rb | 5 ++- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/app/models/status.rb b/app/models/status.rb index 2757497db9..302049e20e 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -391,33 +391,41 @@ class Status < ApplicationRecord super || build_status_stat end - # Hack to use a "INSERT INTO ... SELECT ..." query instead of "INSERT INTO ... VALUES ..." query + # This is a hack to ensure that no reblogs of discarded statuses are created, + # as this cannot be enforced through database constraints the same way we do + # for reblogs of deleted statuses. + # + # To achieve this, we redefine the internal method responsible for issuing + # the "INSERT" statement and replace the "INSERT INTO ... VALUES ..." query + # with an "INSERT INTO ... SELECT ..." query with a "WHERE deleted_at IS NULL" + # clause on the reblogged status to ensure consistency at the database level. + # + # Otherwise, the code is kept as close as possible to ActiveRecord::Persistence + # code, and actually calls it if we are not handling a reblog. def self._insert_record(values) - if values.is_a?(Hash) && values['reblog_of_id'].present? - primary_key = self.primary_key - primary_key_value = nil + return super unless values.is_a?(Hash) && values['reblog_of_id'].present? - if primary_key - primary_key_value = values[primary_key] + primary_key = self.primary_key + primary_key_value = nil - if !primary_key_value && prefetch_primary_key? - primary_key_value = next_sequence_value - values[primary_key] = primary_key_value - end + if primary_key + primary_key_value = values[primary_key] + + if !primary_key_value && prefetch_primary_key? + primary_key_value = next_sequence_value + values[primary_key] = primary_key_value end - - # The following line is where we differ from stock ActiveRecord implementation - im = _compile_reblog_insert(values) - - # Since we are using SELECT instead of VALUES, a non-error `nil` return is possible. - # For our purposes, it's equivalent to a foreign key constraint violation - result = connection.insert(im, "#{self} Create", primary_key || false, primary_key_value) - raise ActiveRecord::InvalidForeignKey, "(reblog_of_id)=(#{values['reblog_of_id']}) is not present in table \"statuses\"" if result.nil? - - result - else - super end + + # The following line is where we differ from stock ActiveRecord implementation + im = _compile_reblog_insert(values) + + # Since we are using SELECT instead of VALUES, a non-error `nil` return is possible. + # For our purposes, it's equivalent to a foreign key constraint violation + result = connection.insert(im, "#{self} Create", primary_key || false, primary_key_value) + raise ActiveRecord::InvalidForeignKey, "(reblog_of_id)=(#{values['reblog_of_id']}) is not present in table \"statuses\"" if result.nil? + + result end def self._compile_reblog_insert(values) diff --git a/spec/services/reblog_service_spec.rb b/spec/services/reblog_service_spec.rb index c004722295..fdf5ec923c 100644 --- a/spec/services/reblog_service_spec.rb +++ b/spec/services/reblog_service_spec.rb @@ -38,7 +38,10 @@ RSpec.describe ReblogService, type: :service do let(:status) { Fabricate(:status, account: alice, visibility: :public) } before do - status.discard + # Update the in-database attribute without reflecting the change in + # the object. This cannot simulate all race conditions, but it is + # pretty close. + Status.where(id: status.id).update_all(deleted_at: Time.now.utc) # rubocop:disable Rails/SkipsModelValidations end it 'raises an exception' do From c5eba06d8c2cd777ee70a276169b0aa0eafb55af Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 12 Apr 2023 13:21:32 +0200 Subject: [PATCH 28/33] New Crowdin updates (#24447) Co-authored-by: Yamagishi Kazutoshi --- app/javascript/mastodon/locales/af.json | 2 - app/javascript/mastodon/locales/an.json | 2 - app/javascript/mastodon/locales/ar.json | 20 ++- app/javascript/mastodon/locales/ast.json | 2 - app/javascript/mastodon/locales/be.json | 2 - app/javascript/mastodon/locales/bg.json | 34 +++-- app/javascript/mastodon/locales/bn.json | 2 - app/javascript/mastodon/locales/br.json | 2 - app/javascript/mastodon/locales/bs.json | 2 - app/javascript/mastodon/locales/ca.json | 2 - app/javascript/mastodon/locales/ckb.json | 2 - app/javascript/mastodon/locales/co.json | 2 - app/javascript/mastodon/locales/cs.json | 2 - app/javascript/mastodon/locales/csb.json | 2 - app/javascript/mastodon/locales/cy.json | 2 - app/javascript/mastodon/locales/da.json | 2 - app/javascript/mastodon/locales/de.json | 2 - .../mastodon/locales/defaultMessages.json | 2 +- app/javascript/mastodon/locales/el.json | 2 - app/javascript/mastodon/locales/en-GB.json | 2 - app/javascript/mastodon/locales/en.json | 2 - app/javascript/mastodon/locales/eo.json | 2 - app/javascript/mastodon/locales/es-AR.json | 2 - app/javascript/mastodon/locales/es-MX.json | 2 - app/javascript/mastodon/locales/es.json | 6 +- app/javascript/mastodon/locales/et.json | 2 - app/javascript/mastodon/locales/eu.json | 2 - app/javascript/mastodon/locales/fa.json | 2 - app/javascript/mastodon/locales/fi.json | 4 +- app/javascript/mastodon/locales/fo.json | 2 - app/javascript/mastodon/locales/fr-QC.json | 2 - app/javascript/mastodon/locales/fr.json | 6 +- app/javascript/mastodon/locales/fy.json | 2 - app/javascript/mastodon/locales/ga.json | 2 - app/javascript/mastodon/locales/gd.json | 2 - app/javascript/mastodon/locales/gl.json | 2 - app/javascript/mastodon/locales/he.json | 2 - app/javascript/mastodon/locales/hi.json | 2 - app/javascript/mastodon/locales/hr.json | 2 - app/javascript/mastodon/locales/hu.json | 2 - app/javascript/mastodon/locales/hy.json | 2 - app/javascript/mastodon/locales/id.json | 2 - app/javascript/mastodon/locales/ig.json | 2 - app/javascript/mastodon/locales/io.json | 2 - app/javascript/mastodon/locales/is.json | 2 - app/javascript/mastodon/locales/it.json | 2 - app/javascript/mastodon/locales/ja.json | 2 - app/javascript/mastodon/locales/ka.json | 2 - app/javascript/mastodon/locales/kab.json | 2 - app/javascript/mastodon/locales/kk.json | 2 - app/javascript/mastodon/locales/kn.json | 2 - app/javascript/mastodon/locales/ko.json | 12 +- app/javascript/mastodon/locales/ku.json | 2 - app/javascript/mastodon/locales/kw.json | 2 - app/javascript/mastodon/locales/la.json | 2 - app/javascript/mastodon/locales/lt.json | 2 - app/javascript/mastodon/locales/lv.json | 2 - app/javascript/mastodon/locales/mk.json | 2 - app/javascript/mastodon/locales/ml.json | 2 - app/javascript/mastodon/locales/mr.json | 2 - app/javascript/mastodon/locales/ms.json | 2 - app/javascript/mastodon/locales/my.json | 4 +- app/javascript/mastodon/locales/nl.json | 2 - app/javascript/mastodon/locales/nn.json | 2 - app/javascript/mastodon/locales/no.json | 2 - app/javascript/mastodon/locales/oc.json | 2 - app/javascript/mastodon/locales/pa.json | 2 - app/javascript/mastodon/locales/pl.json | 54 ++++---- app/javascript/mastodon/locales/pt-BR.json | 2 - app/javascript/mastodon/locales/pt-PT.json | 2 - app/javascript/mastodon/locales/ro.json | 2 - app/javascript/mastodon/locales/ru.json | 2 - app/javascript/mastodon/locales/sa.json | 2 - app/javascript/mastodon/locales/sc.json | 2 - app/javascript/mastodon/locales/sco.json | 2 - app/javascript/mastodon/locales/si.json | 2 - app/javascript/mastodon/locales/sk.json | 14 +- app/javascript/mastodon/locales/sl.json | 18 ++- app/javascript/mastodon/locales/sq.json | 2 - app/javascript/mastodon/locales/sr-Latn.json | 2 - app/javascript/mastodon/locales/sr.json | 2 - app/javascript/mastodon/locales/sv.json | 20 ++- app/javascript/mastodon/locales/szl.json | 2 - app/javascript/mastodon/locales/ta.json | 2 - app/javascript/mastodon/locales/tai.json | 2 - app/javascript/mastodon/locales/te.json | 2 - app/javascript/mastodon/locales/th.json | 2 - app/javascript/mastodon/locales/tr.json | 2 - app/javascript/mastodon/locales/tt.json | 2 - app/javascript/mastodon/locales/ug.json | 2 - app/javascript/mastodon/locales/uk.json | 2 - app/javascript/mastodon/locales/ur.json | 2 - app/javascript/mastodon/locales/uz.json | 2 - app/javascript/mastodon/locales/vi.json | 2 - app/javascript/mastodon/locales/zgh.json | 2 - app/javascript/mastodon/locales/zh-CN.json | 20 ++- app/javascript/mastodon/locales/zh-HK.json | 2 - app/javascript/mastodon/locales/zh-TW.json | 14 +- config/locales/ca.yml | 4 +- config/locales/de.yml | 2 +- config/locales/doorkeeper.ku.yml | 2 + config/locales/en-GB.yml | 123 ++++++++++++++++++ config/locales/ko.yml | 2 +- config/locales/my.yml | 41 +++++- config/locales/pl.yml | 26 ++-- config/locales/simple_form.my.yml | 8 ++ config/locales/simple_form.pl.yml | 2 +- config/locales/simple_form.zh-CN.yml | 6 +- config/locales/simple_form.zh-TW.yml | 2 +- config/locales/th.yml | 2 +- config/locales/zh-CN.yml | 4 +- config/locales/zh-TW.yml | 12 +- 112 files changed, 304 insertions(+), 328 deletions(-) diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json index 9c87eb44e2..cdf9cf38cb 100644 --- a/app/javascript/mastodon/locales/af.json +++ b/app/javascript/mastodon/locales/af.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Jou rekening {disabledAccount} is tans gedeaktiveer omdat jy na {movedToAccount} verhuis het.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json index 9fea523c6f..0430d6bc2b 100644 --- a/app/javascript/mastodon/locales/an.json +++ b/app/javascript/mastodon/locales/an.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}", "loading_indicator.label": "Cargando...", "media_gallery.toggle_visible": "{number, plural, one {Amaga la imachen} other {Amaga las imáchens}}", - "missing_indicator.label": "No trobau", - "missing_indicator.sublabel": "No se trobó este recurso", "moved_to_account_banner.text": "La tuya cuenta {disabledAccount} ye actualment deshabilitada perque t'has mudau a {movedToAccount}.", "mute_modal.duration": "Duración", "mute_modal.hide_notifications": "Amagar notificacions d'este usuario?", diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index 399efe1439..0ba23067c3 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -102,7 +102,7 @@ "column.blocks": "المُستَخدِمون المَح؞ورون", "column.bookmarks": "الفواصل المرجعية", "column.community": "الخيط الزمني المحلي", - "column.direct": "Private mentions", + "column.direct": "الإ؎ارات الخاصة", "column.directory": "تَصَفُّحُ المَلفات ال؎خصية", "column.domain_blocks": "النطاقات المح؞ورة", "column.favourites": "المُفَضَّلَة", @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# عنصر جديد} other {# عناصر جديدة}}", "loading_indicator.label": "جارٍ التحميل ", "media_gallery.toggle_visible": "{number, plural, zero {} one {اخف الصورة} two {اخف الصورتين} few {اخف الصور} many {اخف الصور} other {اخف الصور}}", - "missing_indicator.label": "غير موجود", - "missing_indicator.sublabel": "تعذر العثور على هذا المورد", "moved_to_account_banner.text": "حساؚك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.", "mute_modal.duration": "المدة", "mute_modal.hide_notifications": "هل تود إخفاء الإخطارات القادمة من هذا المستخدم ؟", @@ -376,7 +374,7 @@ "navigation_bar.bookmarks": "الفواصل المرجعية", "navigation_bar.community_timeline": "الخيط المحلي", "navigation_bar.compose": "تحرير من؎ور جديد", - "navigation_bar.direct": "Private mentions", + "navigation_bar.direct": "الإ؎ارات الخاصة", "navigation_bar.discover": "اكت؎ف", "navigation_bar.domain_blocks": "النطاقات المح؞ورة", "navigation_bar.edit_profile": "عدّل الملف التعريفي", @@ -522,17 +520,17 @@ "report_notification.categories.spam": "مزعج", "report_notification.categories.violation": "القاعدة المنتهَكة", "report_notification.open": "فتح التقرير", - "search.no_recent_searches": "No recent searches", + "search.no_recent_searches": "ما من عمليات ؚحث تمت م؀خرًا", "search.placeholder": "اؚحث", "search.quick_action.account_search": "Profiles matching {x}", - "search.quick_action.go_to_account": "Go to profile {x}", - "search.quick_action.go_to_hashtag": "Go to hashtag {x}", - "search.quick_action.open_url": "Open URL in Mastodon", + "search.quick_action.go_to_account": "الذهاؚ إلى الصفحة ال؎خصية لـ {x}", + "search.quick_action.go_to_hashtag": "الذهاؚ إلى الوسم {x}", + "search.quick_action.open_url": "فتح الراؚط الت؎عؚي في ماستدون", "search.quick_action.status_search": "Posts matching {x}", "search.search_or_paste": "اؚحث أو أدخل راؚطا ت؎عؚيا URL", - "search_popout.quick_actions": "Quick actions", - "search_popout.recent": "Recent searches", - "search_results.accounts": "Profiles", + "search_popout.quick_actions": "الإجراءات السريعة", + "search_popout.recent": "عمليات الؚحث الأخيرة", + "search_results.accounts": "الصفحات التعريفية", "search_results.all": "الكل", "search_results.hashtags": "الوُسوم", "search_results.nothing_found": "تعذر العثور على نتا؊ج تتضمن هذه المصطلحات", diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json index c0920bbecc..99c0281daf 100644 --- a/app/javascript/mastodon/locales/ast.json +++ b/app/javascript/mastodon/locales/ast.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}", "loading_indicator.label": "Cargando
", "media_gallery.toggle_visible": "{number, plural, one {Anubrir la imaxe} other {Anubrir les imáxenes}}", - "missing_indicator.label": "Nun s'atopó", - "missing_indicator.sublabel": "Nun se pudo atopar esti recursu", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duración", "mute_modal.hide_notifications": "¿Quies anubrir los avisos d'esti perfil?", diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json index 72224a71cf..037e867efd 100644 --- a/app/javascript/mastodon/locales/be.json +++ b/app/javascript/mastodon/locales/be.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# МПвы элеЌеМт} few {# МПвыя элеЌеМты} many {# МПвых элеЌеМтаў} other {# МПвых элеЌеМтаў}}", "loading_indicator.label": "Загрузка...", "media_gallery.toggle_visible": "{number, plural, one {Схаваць віЎарыс} other {Схаваць віЎарысы}}", - "missing_indicator.label": "Не зМПйЎзеМа", - "missing_indicator.sublabel": "Гэты рэсурс Ме ЌагчыЌа зМайсці", "moved_to_account_banner.text": "Ваш улікПвы запіс {disabledAccount} зараз аЎключаМы таЌу штП вы пераМесеМы Ма {movedToAccount}.", "mute_modal.duration": "Працягласць", "mute_modal.hide_notifications": "Схаваць апавяшчэММі аЎ гэтага карыстальМіка?", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 284e6b22bf..e622c3d458 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -20,7 +20,7 @@ "account.blocked": "БлПкОраМО", "account.browse_more_on_origin_server": "РазглежЎаМе Ма Пще в ПрОгОМалМОя прПфОл", "account.cancel_follow_request": "ОттегляМе Ма заявката за пПслеЎваМе", - "account.direct": "Privately mention @{name}", + "account.direct": "ЧастМП спПЌеМаваМе Ма @{name}", "account.disable_notifications": "СпрОраМе Ма ОзвестОя прО публОкуваМе Пт @{name}", "account.domain_blocked": "БлПкОраМ ЎПЌейМ", "account.edit_profile": "РеЎактОраМе Ма прПфОла", @@ -102,7 +102,7 @@ "column.blocks": "БлПкОраМО пПтребОтелО", "column.bookmarks": "ОтЌеткО", "column.community": "ЛПкалМа часПва Пс", - "column.direct": "Private mentions", + "column.direct": "ЧастМО спПЌеМаваМОя", "column.directory": "РазглежЎаМе Ма прПфОлО", "column.domain_blocks": "БлПкОраМО ЎПЌейМО", "column.favourites": "ЛюбОЌО", @@ -216,7 +216,7 @@ "empty_column.blocks": "Още Ме сте блПкОралО МОкаквО пПтребОтелО.", "empty_column.bookmarked_statuses": "Още Ме сте ПтЌетМалО публОкацОО. ОтЌетвайкО МякПя, тП тя ще се пПкаже тук.", "empty_column.community": "МестМата часПва Пс е празМа. НапОшете МещП ПбществеМП, за Ўа завъртОте Мещата!", - "empty_column.direct": "You don't have any private mentions yet. When you send or receive one, it will show up here.", + "empty_column.direct": "Още МяЌате МОкаквО частМО спПЌеМаваМОя. Тук ще се пПказват, ОзпращайкО ОлО пПлучавайкО еЎМП.", "empty_column.domain_blocks": "Още МяЌа блПкОраМО ЎПЌейМО.", "empty_column.explore_statuses": "НяЌа МОщП МалагащП се в ЌПЌеМта. ПрПверете пак пП-късМП!", "empty_column.favourited_statuses": "Още МяЌате любОЌО публОкацОО. ППставяйкО МякПя в любОЌО, тП тя ще се пПкаже тук.", @@ -314,7 +314,7 @@ "keyboard_shortcuts.column": "СъсреЎПтПчеМОе Ма кПлПМа", "keyboard_shortcuts.compose": "ЀПкус Ма текстПвата зПМа за съставяМе", "keyboard_shortcuts.description": "ОпОс", - "keyboard_shortcuts.direct": "to open direct messages column", + "keyboard_shortcuts.direct": "за ПтваряМе Ма кПлПМата с частМО спПЌеМаваМОя", "keyboard_shortcuts.down": "ПреЌестваМе МаЎПлу в спОсъка", "keyboard_shortcuts.enter": "ОтваряМе Ма публОкацОя", "keyboard_shortcuts.favourite": "КъЌ любОЌО публОкацОО", @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# МПв елеЌеМт} other {# МПвО елеЌеМта}}", "loading_indicator.label": "ЗарежЎаМе...", "media_gallery.toggle_visible": "СкрОваМе Ма {number, plural, one {ОзПбражеМОе} other {ОзПбражеМОя}}", - "missing_indicator.label": "Не е МаЌереМП", - "missing_indicator.sublabel": "Ресурсът Ме ЌПже Ўа се МаЌерО", "moved_to_account_banner.text": "ВашОят акауМт {disabledAccount} сега е ОзключеМ, защПтП се преЌестОхте в {movedToAccount}.", "mute_modal.duration": "ВреЌетраеМе", "mute_modal.hide_notifications": "СкрОвате лО ОзвестОята Пт пПтребОтеля?", @@ -376,7 +374,7 @@ "navigation_bar.bookmarks": "ОтЌеткО", "navigation_bar.community_timeline": "ЛПкалеМ ОМфПпПтПк", "navigation_bar.compose": "СъставяМе Ма МПва публОкацОя", - "navigation_bar.direct": "Private mentions", + "navigation_bar.direct": "ЧастМО спПЌеМаваМОя", "navigation_bar.discover": "ОткрОваМе", "navigation_bar.domain_blocks": "БлПкОраМО ЎПЌейМО", "navigation_bar.edit_profile": "РеЎактОраМе Ма прПфОла", @@ -522,17 +520,17 @@ "report_notification.categories.spam": "СпаЌ", "report_notification.categories.violation": "НарушеМОе Ма правОлПтП", "report_notification.open": "ОтваряМе Ма ЎПклаЎа", - "search.no_recent_searches": "No recent searches", + "search.no_recent_searches": "НяЌа скПрПшМО търсеМОя", "search.placeholder": "ТърсеМе", - "search.quick_action.account_search": "Profiles matching {x}", - "search.quick_action.go_to_account": "Go to profile {x}", - "search.quick_action.go_to_hashtag": "Go to hashtag {x}", - "search.quick_action.open_url": "Open URL in Mastodon", - "search.quick_action.status_search": "Posts matching {x}", + "search.quick_action.account_search": "СъвпаЎеМОе Ма прПфОлО {x}", + "search.quick_action.go_to_account": "КъЌ прПфОл {x}", + "search.quick_action.go_to_hashtag": "КъЌ хаштаг {x}", + "search.quick_action.open_url": "ОтваряМе Ма URL аЎреса в Mastodon", + "search.quick_action.status_search": "СъвпаЎеМОе Ма публОкацОО {x}", "search.search_or_paste": "ТърсеМе ОлО пПставяМе Ма URL аЎрес", - "search_popout.quick_actions": "Quick actions", - "search_popout.recent": "Recent searches", - "search_results.accounts": "Profiles", + "search_popout.quick_actions": "БързО ЎействОя", + "search_popout.recent": "СкПрПшМО търсеМОя", + "search_results.accounts": "ПрПфОлО", "search_results.all": "ВсОчкП", "search_results.hashtags": "ХаштагПве", "search_results.nothing_found": "Не ЌПже Ўа се МаЌерО каквПтП О Ўа бОлП за тезО терЌОМО прО търсеМе", @@ -559,8 +557,8 @@ "status.copy": "КПпОраМе Ма връзката къЌ публОкацОя", "status.delete": "ИзтрОваМе", "status.detailed_status": "ППЎрПбеМ ОзглеЎ Ма разгПвПра", - "status.direct": "Privately mention @{name}", - "status.direct_indicator": "Private mention", + "status.direct": "ЧастМП спПЌеМаваМе Ма @{name}", + "status.direct_indicator": "ЧастМП спПЌеМаваМе", "status.edit": "РеЎактОраМе", "status.edited": "РеЎактОраМП Ма {date}", "status.edited_x_times": "РеЎактОраМП {count, plural,one {{count} път} other {{count} пътО}}", diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json index ccd856abc7..7b061aa95c 100644 --- a/app/javascript/mastodon/locales/bn.json +++ b/app/javascript/mastodon/locales/bn.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# àŠšàŠ€à§àŠš àŠœàŠ¿àŠšàŠ¿àŠž} other {# àŠšàŠ€à§àŠš àŠœàŠ¿àŠšàŠ¿àŠž}}", "loading_indicator.label": "àŠ†àŠžàŠ›à§‡...", "media_gallery.toggle_visible": "àŠŠà§ƒàŠ¶à§àŠ¯àŠ€àŠŸàŠ° àŠ…àŠ¬àŠžà§àŠ¥àŠŸ àŠ¬àŠŠàŠ²àŠŸàŠš", - "missing_indicator.label": "àŠ–à§àŠàŠœà§‡ àŠªàŠŸàŠ“à§ŸàŠŸ àŠ¯àŠŸà§ŸàŠšàŠ¿", - "missing_indicator.sublabel": "àŠœàŠ¿àŠšàŠ¿àŠžàŠŸàŠŸ àŠ–à§àŠàŠœà§‡ àŠªàŠŸàŠ“à§ŸàŠŸ àŠ¯àŠŸà§ŸàŠšàŠ¿", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "àŠžàŠ®à§ŸàŠ•àŠŸàŠ²", "mute_modal.hide_notifications": "àŠàŠ‡ àŠ¬à§àŠ¯àŠ¬àŠ¹àŠŸàŠ°àŠ•àŠŸàŠ°à§€àŠ° àŠªà§àŠ°àŠœà§àŠžàŠŸàŠªàŠš àŠ¬àŠšà§àŠ§ àŠ•àŠ°àŠ¬à§‡àŠš ?", diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json index c8ec088e13..d149b692f4 100644 --- a/app/javascript/mastodon/locales/br.json +++ b/app/javascript/mastodon/locales/br.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# dra nevez} other {# dra nevez}}", "loading_indicator.label": "O kargañ...", "media_gallery.toggle_visible": "{number, plural, one {Kuzhat ar skeudenn} other {Kuzhat ar skeudenn}}", - "missing_indicator.label": "Digavet", - "missing_indicator.sublabel": "An danvez-se ne vez ket kavet", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Padelezh", "mute_modal.hide_notifications": "Kuzhat kemenadennoù eus an implijer-se ?", diff --git a/app/javascript/mastodon/locales/bs.json b/app/javascript/mastodon/locales/bs.json index c2d34b7151..fc9db63308 100644 --- a/app/javascript/mastodon/locales/bs.json +++ b/app/javascript/mastodon/locales/bs.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index dd30da2157..57cc616ac1 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# element nou} other {# elements nous}}", "loading_indicator.label": "Es carrega...", "media_gallery.toggle_visible": "{number, plural, one {Amaga la imatge} other {Amaga les imatges}}", - "missing_indicator.label": "No s'ha trobat", - "missing_indicator.sublabel": "Aquest recurs no s'ha trobat", "moved_to_account_banner.text": "El teu compte {disabledAccount} està actualment desactivat perquÚ l'has traslladat a {movedToAccount}.", "mute_modal.duration": "Durada", "mute_modal.hide_notifications": "Amagar les notificacions d'aquest usuari?", diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json index ca0ca6f190..ee2f4ea4c7 100644 --- a/app/javascript/mastodon/locales/ckb.json +++ b/app/javascript/mastodon/locales/ckb.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# ØšÛ•Ú•Ú¯Û•ÛŒ نوێ} other {# ØšÛ•Ú•Ú¯Û•ÛŒ نوێ}}", "loading_indicator.label": "ؚارکردن...", "media_gallery.toggle_visible": "؎اردنەوەی {number, plural, one {image} other {images}}", - "missing_indicator.label": "نەدۆزرایەوە", - "missing_indicator.sublabel": "ØŠÛ•Ùˆ سەرچاوەیە نادۆزرێتەوە", "moved_to_account_banner.text": "؊ەکاونتەکەت {disabledAccount} لە ؊ێستادا لەکارخراوە چونکە تۆ چوویتە {movedToAccount}.", "mute_modal.duration": "ماوە", "mute_modal.hide_notifications": "؎اردنەوەی ؊اگانامەکان لەم ؚەکارهێنەرە؟ ", diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json index df675f1516..5ee863b443 100644 --- a/app/javascript/mastodon/locales/co.json +++ b/app/javascript/mastodon/locales/co.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# entrata nova} other {# entrate nove}}", "loading_indicator.label": "Caricamentu...", "media_gallery.toggle_visible": "Piattà {number, plural, one {ritrattu} other {ritratti}}", - "missing_indicator.label": "Micca trovu", - "missing_indicator.sublabel": "Ùn era micca pussivule di truvà sta risorsa", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Durata", "mute_modal.hide_notifications": "Piattà nutificazione da st'utilizatore?", diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json index a8cc9a5b24..042fa4cd22 100644 --- a/app/javascript/mastodon/locales/cs.json +++ b/app/javascript/mastodon/locales/cs.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nová poloÅŸka} few {# nové poloÅŸky} many {# novÃœch poloÅŸek} other {# novÃœch poloÅŸek}}", "loading_indicator.label": "Načítání...", "media_gallery.toggle_visible": "{number, plural, one {SkrÃœt obrázek} few {SkrÃœt obrázky} many {SkrÃœt obrázky} other {SkrÃœt obrázky}}", - "missing_indicator.label": "Nenalezeno", - "missing_indicator.sublabel": "Tento zdroj se nepodařilo najít", "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován, protoÅŸe jste se přesunul/a na {movedToAccount}.", "mute_modal.duration": "Trvání", "mute_modal.hide_notifications": "SkrÃœt oznámení od tohoto uÅŸivatele?", diff --git a/app/javascript/mastodon/locales/csb.json b/app/javascript/mastodon/locales/csb.json index 2150c1d7a3..2009934243 100644 --- a/app/javascript/mastodon/locales/csb.json +++ b/app/javascript/mastodon/locales/csb.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json index 5a076ca9dd..619f415f1b 100644 --- a/app/javascript/mastodon/locales/cy.json +++ b/app/javascript/mastodon/locales/cy.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# eitem newydd} other {# eitem newydd}}", "loading_indicator.label": "Llwytho...", "media_gallery.toggle_visible": "{number, plural, one {Cuddio delwedd} other {Cuddio delwedd}}", - "missing_indicator.label": "Heb ei ganfod", - "missing_indicator.sublabel": "Nid oes modd canfod yr adnodd hwn", "moved_to_account_banner.text": "Ar hyn y bryd, mae eich cyfrif {disabledAccount} wedi ei analluogi am i chi symud i {movedToAccount}.", "mute_modal.duration": "Hyd", "mute_modal.hide_notifications": "Cuddio hysbysiadau gan y defnyddiwr hwn?", diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json index ca9caf79d7..c2a05eddc4 100644 --- a/app/javascript/mastodon/locales/da.json +++ b/app/javascript/mastodon/locales/da.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nyt emne} other {# nye emner}}", "loading_indicator.label": "IndlÊser...", "media_gallery.toggle_visible": "{number, plural, one {Skjul billede} other {Skjul billeder}}", - "missing_indicator.label": "Ikke fundet", - "missing_indicator.sublabel": "Denne ressource kunne ikke findes", "moved_to_account_banner.text": "Din konto {disabledAccount} er pt. deaktiveret, da du flyttede til {movedToAccount}.", "mute_modal.duration": "Varighed", "mute_modal.hide_notifications": "Skjul notifikationer fra denne bruger?", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 2312ca2fbd..788dcd326e 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# neuer Beitrag} other {# neue BeitrÀge}}", "loading_indicator.label": "Wird geladen 
", "media_gallery.toggle_visible": "{number, plural, one {Medium ausblenden} other {Medien ausblenden}}", - "missing_indicator.label": "Nicht gefunden", - "missing_indicator.sublabel": "Der Inhalt konnte nicht gefunden werden", "moved_to_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert, weil du zu {movedToAccount} umgezogen bist.", "mute_modal.duration": "Dauer", "mute_modal.hide_notifications": "Benachrichtigungen dieses Profils ausblenden?", diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index e6c2ae4b19..f7832eddcd 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -4346,4 +4346,4 @@ ], "path": "app/javascript/mastodon/features/video/index.json" } -] +] \ No newline at end of file diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json index cefc86853c..622ab1a61a 100644 --- a/app/javascript/mastodon/locales/el.json +++ b/app/javascript/mastodon/locales/el.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# Μέο} other {# Μέα}}", "loading_indicator.label": "ΊορτώΜει...", "media_gallery.toggle_visible": "ΕΜαλλαγή ορατότητας", - "missing_indicator.label": "Δε βρέΞηκε", - "missing_indicator.sublabel": "ΑΎύΜατη η εύρεση αυτού του πόρου", "moved_to_account_banner.text": "Ο λογαριασΌός σας {disabledAccount} είΜαι προσωριΜά απεΜεργοποιηΌέΜος επειΎή ΌεταφερΞήκατε στο {movedToAccount}.", "mute_modal.duration": "Διάρκεια", "mute_modal.hide_notifications": "Απόκρυψη ειΎοποιήσεωΜ αυτού του χρήστη;", diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json index 5d381bc7d5..785bb1d823 100644 --- a/app/javascript/mastodon/locales/en-GB.json +++ b/app/javascript/mastodon/locales/en-GB.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 236f168616..c85f6d009f 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index be5ec1dc7a..614a0df86e 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -365,8 +365,6 @@ "load_pending": "{count,plural, one {# nova elemento} other {# novaj elementoj}}", "loading_indicator.label": "Ŝargado
", "media_gallery.toggle_visible": "{number, plural, one {Kaŝi la bildon} other {Kaŝi la bildojn}}", - "missing_indicator.label": "Ne trovita", - "missing_indicator.sublabel": "Ĉi tiu elemento ne estis trovita", "moved_to_account_banner.text": "Via konto {disabledAccount} estas malvalidigita ĉar vi movis ĝin al {movedToAccount}.", "mute_modal.duration": "DaÅ­ro", "mute_modal.hide_notifications": "Ĉu vi volas kaŝi la sciigojn de ĉi tiu uzanto?", diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json index a577cec79a..5767dd87ea 100644 --- a/app/javascript/mastodon/locales/es-AR.json +++ b/app/javascript/mastodon/locales/es-AR.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# elemento nuevo} other {# elementos nuevos}}", "loading_indicator.label": "Cargando...", "media_gallery.toggle_visible": "Ocultar {number, plural, one {imagen} other {imágenes}}", - "missing_indicator.label": "No se encontró", - "missing_indicator.sublabel": "No se encontró este recurso", "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te mudaste a {movedToAccount}.", "mute_modal.duration": "Duración", "mute_modal.hide_notifications": "¿Querés ocultar las notificaciones de este usuario?", diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json index 1338b8b463..0085563d27 100644 --- a/app/javascript/mastodon/locales/es-MX.json +++ b/app/javascript/mastodon/locales/es-MX.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}", "loading_indicator.label": "Cargando
", "media_gallery.toggle_visible": "Cambiar visibilidad", - "missing_indicator.label": "No encontrado", - "missing_indicator.sublabel": "No se encontró este recurso", "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.", "mute_modal.duration": "Duración", "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index d9f2540556..5355a07915 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -20,7 +20,7 @@ "account.blocked": "Bloqueado", "account.browse_more_on_origin_server": "Ver más en el perfil original", "account.cancel_follow_request": "Retirar solicitud de seguimiento", - "account.direct": "Mención privada @{name}", + "account.direct": "Mención privada a @{name}", "account.disable_notifications": "Dejar de notificarme cuando @{name} publique algo", "account.domain_blocked": "Dominio bloqueado", "account.edit_profile": "Editar perfil", @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}", "loading_indicator.label": "Cargando
", "media_gallery.toggle_visible": "Cambiar visibilidad", - "missing_indicator.label": "No encontrado", - "missing_indicator.sublabel": "No se encontró este recurso", "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.", "mute_modal.duration": "Duración", "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?", @@ -522,7 +520,7 @@ "report_notification.categories.spam": "Spam", "report_notification.categories.violation": "Infracción de regla", "report_notification.open": "Abrir informe", - "search.no_recent_searches": "Sin búsquedas recientes", + "search.no_recent_searches": "No hay búsquedas recientes", "search.placeholder": "Buscar", "search.quick_action.account_search": "Perfiles que coinciden con {x}", "search.quick_action.go_to_account": "Ir al perfil {x}", diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json index a61a577d69..b7ea77b252 100644 --- a/app/javascript/mastodon/locales/et.json +++ b/app/javascript/mastodon/locales/et.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# uus kirje} other {# uut kirjet}}", "loading_indicator.label": "Laeb..", "media_gallery.toggle_visible": "{number, plural, one {Varja pilt} other {Varja pildid}}", - "missing_indicator.label": "Ei leitud", - "missing_indicator.sublabel": "Seda ressurssi ei leitud", "moved_to_account_banner.text": "Kontot {disabledAccount} ei ole praegu võimalik kasutada, sest kolisid kontole {movedToAccount}.", "mute_modal.duration": "Kestus", "mute_modal.hide_notifications": "Kas peita teated sellelt kasutajalt?", diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json index 597f4fb50e..33044d0918 100644 --- a/app/javascript/mastodon/locales/eu.json +++ b/app/javascript/mastodon/locales/eu.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {eleentuberri #} other {# elementu berri}}", "loading_indicator.label": "Kargatzen...", "media_gallery.toggle_visible": "Txandakatu ikusgaitasuna", - "missing_indicator.label": "Ez aurkitua", - "missing_indicator.sublabel": "Baliabide hau ezin izan da aurkitu", "moved_to_account_banner.text": "Zure {disabledAccount} kontua desgaituta dago une honetan, {movedToAccount} kontura aldatu zinelako.", "mute_modal.duration": "Iraupena", "mute_modal.hide_notifications": "Ezkutatu erabiltzaile honen jakinarazpenak?", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 37e213c01a..8032535117 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# مورد جدید} other {# مورد جدید}}", "loading_indicator.label": "ؚار کردن ", "media_gallery.toggle_visible": "{number, plural, one {نهفتن تصویر} other {نهفتن تصاویر}}", - "missing_indicator.label": "ٟیدا ن؎د", - "missing_indicator.sublabel": "این منؚع ٟیدا ن؎د", "moved_to_account_banner.text": "حساؚتان {disabledAccount} اکنون از کار افتاده؛ چرا که ØšÙ‡ {movedToAccount} منتقل ؎دید.", "mute_modal.duration": "مدت زمان", "mute_modal.hide_notifications": "نهفتن آگاهی‌ها از این کارؚر؟", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index a086e0e213..f3139a9e9a 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# uusi kohde} other {# uutta kohdetta}}", "loading_indicator.label": "Ladataan...", "media_gallery.toggle_visible": "{number, plural, one {Piilota kuva} other {Piilota kuvat}}", - "missing_indicator.label": "Ei löytynyt", - "missing_indicator.sublabel": "TÀtÀ resurssia ei löytynyt", "moved_to_account_banner.text": "Tilisi {disabledAccount} on tÀllÀ hetkellÀ poissa kÀytöstÀ, koska teit siirron tiliin {movedToAccount}.", "mute_modal.duration": "Kesto", "mute_modal.hide_notifications": "Piilota tÀltÀ kÀyttÀjÀltÀ tulevat ilmoitukset?", @@ -587,7 +585,7 @@ "status.reblogs.empty": "Kukaan ei ole vielÀ tehostanut tÀtÀ viestiÀ. Kun joku tekee niin, nÀkyy kyseinen henkilö tÀssÀ.", "status.redraft": "Poista ja palauta muokattavaksi", "status.remove_bookmark": "Poista kirjanmerkki", - "status.replied_to": "Vastaus kÀyttÀjÀlle {name}", + "status.replied_to": "Vastattu {name}", "status.reply": "Vastaa", "status.replyAll": "Vastaa ketjuun", "status.report": "Raportoi @{name}", diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json index 29a2f7bc27..416dadb5b6 100644 --- a/app/javascript/mastodon/locales/fo.json +++ b/app/javascript/mastodon/locales/fo.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nÃœtt evni} other {# nÃœggj evni}}", "loading_indicator.label": "Innlesi...", "media_gallery.toggle_visible": "{number, plural, one {Fjal mynd} other {Fjal myndir}}", - "missing_indicator.label": "Ikki funnið", - "missing_indicator.sublabel": "Ikki bar til at finna hetta tilfarið", "moved_to_account_banner.text": "Konta tín {disabledAccount} er í lÞtuni óvirkin, tí tú flutti til {movedToAccount}.", "mute_modal.duration": "Tíðarbil", "mute_modal.hide_notifications": "Fjal fráboðanir frá hesum brúkaranum?", diff --git a/app/javascript/mastodon/locales/fr-QC.json b/app/javascript/mastodon/locales/fr-QC.json index ff85f43b7c..c291f19557 100644 --- a/app/javascript/mastodon/locales/fr-QC.json +++ b/app/javascript/mastodon/locales/fr-QC.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}", "loading_indicator.label": "Chargement
", "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}", - "missing_indicator.label": "Non trouvé", - "missing_indicator.sublabel": "Cette ressource n'a pas pu être trouvée", "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déménagé sur {movedToAccount}.", "mute_modal.duration": "Durée", "mute_modal.hide_notifications": "Masquer les notifications de ce compte?", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index d3f5bc5a7f..95e0ef62b6 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}", "loading_indicator.label": "Chargement
", "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}", - "missing_indicator.label": "Non trouvé", - "missing_indicator.sublabel": "Ressource introuvable", "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous l'avez déplacé à {movedToAccount}.", "mute_modal.duration": "Durée", "mute_modal.hide_notifications": "Masquer les notifications de cette personne ?", @@ -531,7 +529,7 @@ "search.quick_action.status_search": "Posts matching {x}", "search.search_or_paste": "Rechercher ou saisir une URL", "search_popout.quick_actions": "Quick actions", - "search_popout.recent": "Recent searches", + "search_popout.recent": "Recherches récentes", "search_results.accounts": "Profiles", "search_results.all": "Tous les résultats", "search_results.hashtags": "Hashtags", @@ -560,7 +558,7 @@ "status.delete": "Supprimer", "status.detailed_status": "Vue détaillée de la conversation", "status.direct": "Privately mention @{name}", - "status.direct_indicator": "Private mention", + "status.direct_indicator": "Mention privée", "status.edit": "Éditer", "status.edited": "Édité le {date}", "status.edited_x_times": "Edité {count, plural, one {{count} fois} other {{count} fois}}", diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json index d4dfe35a21..a2d83414e4 100644 --- a/app/javascript/mastodon/locales/fy.json +++ b/app/javascript/mastodon/locales/fy.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nij item} other {# nije items}}", "loading_indicator.label": "Lade
", "media_gallery.toggle_visible": "{number, plural, one {ÃŽfbylding ferstopje} other {ÃŽfbyldingen ferstopje}}", - "missing_indicator.label": "Net fûn", - "missing_indicator.sublabel": "Dizze boarne kin net fûn wurde", "moved_to_account_banner.text": "Omdat jo nei {movedToAccount} ferhuze binne is jo account {disabledAccount} op dit stuit útskeakele.", "mute_modal.duration": "Doer", "mute_modal.hide_notifications": "Meldingen fan dizze brûker ferstopje?", diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json index 6645483a50..1d10169bab 100644 --- a/app/javascript/mastodon/locales/ga.json +++ b/app/javascript/mastodon/locales/ga.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Ag lódáil...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Níor aimsíodh é", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Tréimhse", "mute_modal.hide_notifications": "Cuir póstalacha ón t-úsáideoir seo i bhfolach?", diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json index ca3b8b4ab2..0b16813851 100644 --- a/app/javascript/mastodon/locales/gd.json +++ b/app/javascript/mastodon/locales/gd.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nì ùr} two {# nì ùr} few {# nithean ùra} other {# nì ùr}}", "loading_indicator.label": "’Ga luchdadh
", "media_gallery.toggle_visible": "{number, plural, 1 {Falaich an dealbh} one {Falaich na dealbhan} two {Falaich na dealbhan} few {Falaich na dealbhan} other {Falaich na dealbhan}}", - "missing_indicator.label": "Cha deach càil a lorg", - "missing_indicator.sublabel": "Cha deach an goireas a lorg", "moved_to_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas on a rinn thu imrich gu {movedToAccount}.", "mute_modal.duration": "Faide", "mute_modal.hide_notifications": "A bheil thu airson na brathan fhalach on chleachdaiche seo?", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index 20279e71fb..0c4066b747 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# novo elemento} other {# novos elementos}}", "loading_indicator.label": "Estase a cargar...", "media_gallery.toggle_visible": "Agochar {number, plural, one {imaxe} other {imaxes}}", - "missing_indicator.label": "Non atopado", - "missing_indicator.sublabel": "Este recurso non foi atopado", "moved_to_account_banner.text": "A túa conta {disabledAccount} está actualmente desactivada porque movéchela a {movedToAccount}.", "mute_modal.duration": "Duración", "mute_modal.hide_notifications": "Agochar notificacións desta persoa?", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index 17b97ca74f..87c46230e0 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# ׀ךיט חדש} other {# ׀ךיטים חדשים}}", "loading_indicator.label": "טוען...", "media_gallery.toggle_visible": "{number, plural, one {להסתיך תמונה} two {להסתיך תמונותיים} many {להסתיך תמונות} other {להסתיך תמונות}}", - "missing_indicator.label": "לא נמ׊א", - "missing_indicator.sublabel": "לא ניתן היה למשוא את המשאב", "moved_to_account_banner.text": "חשבונך {disabledAccount} אינו ׀עיל כךגע עקב מעבך ל{movedToAccount}.", "mute_modal.duration": "משך הזמן", "mute_modal.hide_notifications": "להסתיך התךאות מחשבון זה?", diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json index 186de81294..794ea8ba26 100644 --- a/app/javascript/mastodon/locales/hi.json +++ b/app/javascript/mastodon/locales/hi.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "à€²à¥‹à€¡ à€¹à¥‹ à€°à€¹à€Ÿ à€¹à¥ˆ...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "à€šà€¹à¥€à€‚ à€®à€¿à€²à€Ÿ", - "missing_indicator.sublabel": "à€¯à€¹ à€žà€‚à€žà€Ÿà€§à€š à€šà€¹à¥€à€‚ à€®à€¿à€² à€žà€•à€Ÿà¥€", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "à€…à€µà€§à€¿", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index 47d2bfb923..5238228d29 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Učitavanje...", "media_gallery.toggle_visible": "Sakrij {number, plural, one {sliku} other {slike}}", - "missing_indicator.label": "Nije pronađeno", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Trajanje", "mute_modal.hide_notifications": "Sakrij obavijesti ovog korisnika?", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index 4cd7ebde72..46463c231a 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# új elem} other {# új elem}}", "loading_indicator.label": "Betöltés...", "media_gallery.toggle_visible": "{number, plural, one {Kép elrejtése} other {Képek elrejtése}}", - "missing_indicator.label": "Nincs találat", - "missing_indicator.sublabel": "Ez az erőforrás nem található", "moved_to_account_banner.text": "{disabledAccount} fiók jelenleg le van tiltva, mert más {movedToAccount} fiókba kerÃŒlt át.", "mute_modal.duration": "Időtartam", "mute_modal.hide_notifications": "Értesítések elrejtése ettől a felhasználótól?", diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json index e77641312e..703a7a47c4 100644 --- a/app/javascript/mastodon/locales/hy.json +++ b/app/javascript/mastodon/locales/hy.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# Õ¶ÕžÖ€ նիւթ} other {# Õ¶ÕžÖ€ նիւթ}}", "loading_indicator.label": "ԲեՌնւ՞ւՎ է ", "media_gallery.toggle_visible": "Ց՞ւցաՀրել/թաքցնել", - "missing_indicator.label": "Չգտն՞ւեց", - "missing_indicator.sublabel": "ÕŠÕ¡Õ·Õ¡Ö€Õš Õ¹Õ« Õ£Õ¿Õ¶Ö‚ÕžÖ‚ÕŽ", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Տեւ՞ղ՞ւթիւն", "mute_modal.hide_notifications": "Թաքցնե՞լ ծան՞ւց՞ւՎներն Õ¡ÕµÕœ օգտատիր՞ջից։", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 6e8a33d37d..f041bacba6 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, other {# item baru}}", "loading_indicator.label": "Tunggu sebentar...", "media_gallery.toggle_visible": "Tampil/Sembunyikan", - "missing_indicator.label": "Tidak ditemukan", - "missing_indicator.sublabel": "Sumber daya tak bisa ditemukan", "moved_to_account_banner.text": "Akun {disabledAccount} Anda kini dinonaktifkan karena Anda pindah ke {movedToAccount}.", "mute_modal.duration": "Durasi", "mute_modal.hide_notifications": "Sembunyikan notifikasi dari pengguna ini?", diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json index 41280827ea..0af0e0de1f 100644 --- a/app/javascript/mastodon/locales/ig.json +++ b/app/javascript/mastodon/locales/ig.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Na-adọnye...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index 7a83ec3013..321a8a8a87 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nova kozo} other {# nova kozi}}", "loading_indicator.label": "Kargante...", "media_gallery.toggle_visible": "Chanjar videbleso", - "missing_indicator.label": "Ne trovita", - "missing_indicator.sublabel": "Ca moyeno ne existas", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Durado", "mute_modal.hide_notifications": "Celez avizi de ca uzanto?", diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json index b9d6504734..0ae48363d3 100644 --- a/app/javascript/mastodon/locales/is.json +++ b/app/javascript/mastodon/locales/is.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nÃœtt atriði} other {# nÃœ atriði}}", "loading_indicator.label": "Hleð inn...", "media_gallery.toggle_visible": "Víxla sÃœnileika", - "missing_indicator.label": "Fannst ekki", - "missing_indicator.sublabel": "Tilfangið fannst ekki", "moved_to_account_banner.text": "Aðgangurinn ßinn {disabledAccount} er óvirkur í augnablikinu vegna ßess að ßú fluttir ßig yfir á {movedToAccount}.", "mute_modal.duration": "Lengd", "mute_modal.hide_notifications": "Fela tilkynningar frá ßessum notanda?", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index ab1cc02afc..6eb5f06050 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nuovo oggetto} other {# nuovi oggetti}}", "loading_indicator.label": "Caricamento...", "media_gallery.toggle_visible": "{number, plural, one {Nascondi immagine} other {Nascondi immagini}}", - "missing_indicator.label": "Non trovato", - "missing_indicator.sublabel": "Impossibile trovare questa risorsa", "moved_to_account_banner.text": "Il tuo profilo {disabledAccount} Ú correntemente disabilitato perché ti sei spostato a {movedToAccount}.", "mute_modal.duration": "Durata", "mute_modal.hide_notifications": "Nascondere le notifiche da questo utente?", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 803736eaa9..b320d34254 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -365,8 +365,6 @@ "load_pending": "{count}件の新着", "loading_indicator.label": "読み蟌み䞭...", "media_gallery.toggle_visible": "{number, plural, one {画像を閉じる} other {画像を閉じる}}", - "missing_indicator.label": "芋぀かりたせん", - "missing_indicator.sublabel": "芋぀かりたせんでした", "moved_to_account_banner.text": "あなたのアカりント『{disabledAccount}』は『{movedToAccount}』に移動したため珟圚無効になっおいたす。", "mute_modal.duration": "ミュヌトする期間", "mute_modal.hide_notifications": "このナヌザヌからの通知を隠したすか", diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json index 35e808ac16..ea9c08df50 100644 --- a/app/javascript/mastodon/locales/ka.json +++ b/app/javascript/mastodon/locales/ka.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "იტვირთება...", "media_gallery.toggle_visible": "ხილვადობის ჩართვა", - "missing_indicator.label": "არაა ნაპოვნი", - "missing_indicator.sublabel": "ამ რესურსის პოვნა ვერ მოხერხდა", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "დავმალოთ ლეტყობინებები ამ მომხმარებლისგან?", diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json index 4460e4b65a..a0868d68f9 100644 --- a/app/javascript/mastodon/locales/kab.json +++ b/app/javascript/mastodon/locales/kab.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}", "loading_indicator.label": "Yessalay-d
", "media_gallery.toggle_visible": "Ffer {number, plural, one {tugna} other {tugniwin}}", - "missing_indicator.label": "Ulac-it", - "missing_indicator.sublabel": "Ur nufi ara aÉ£balu-a", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Tanzagt", "mute_modal.hide_notifications": "TebÉ£iឍ ad teffreឍ talÉ£utin n umseqdac-a?", diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json index a2aea14595..8718cf3ccb 100644 --- a/app/javascript/mastodon/locales/kk.json +++ b/app/javascript/mastodon/locales/kk.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# жаңа Мәрсе} other {# жаңа Мәрсе}}", "loading_indicator.label": "Жүктеу...", "media_gallery.toggle_visible": "КөріМуЎі қПсу", - "missing_indicator.label": "ТабылЌаЎы", - "missing_indicator.sublabel": "Бұл ресурс табылЌаЎы", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Бұл қПлЎаМушы ескертпелеріМ жасыраЌыз ба?", diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json index 04edb85220..1de8074756 100644 --- a/app/javascript/mastodon/locales/kn.json +++ b/app/javascript/mastodon/locales/kn.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 7d7659569e..ac4b2a8346 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -44,7 +44,7 @@ "account.link_verified_on": "{date}에 읎 링크의 소유권읎 확읞 됚", "account.locked_info": "읎 계정의 프띌읎버시 섀정은 잠ꞈ윌로 섀정되얎 있습니닀. 계정 소유자가 수동윌로 팔로워륌 승읞합니닀.", "account.media": "믞디얎", - "account.mention": "@{name}에게 Ꞁ쓰Ʞ", + "account.mention": "@{name} 님에게 멘션", "account.moved_to": "{name} 님은 자신의 새 계정읎 닀음곌 같닀고 표시했습니닀:", "account.mute": "@{name} 뮀튞", "account.mute_notifications": "@{name}의 알늌을 뮀튞", @@ -272,7 +272,7 @@ "footer.get_app": "앱 닀욎로드하Ʞ", "footer.invite": "쎈대하Ʞ", "footer.keyboard_shortcuts": "킀볎드 닚축킀", - "footer.privacy_policy": "개읞정볎 정책", + "footer.privacy_policy": "개읞정볎처늬방칚", "footer.source_code": "소슀윔드 볎Ʞ", "footer.status": "상태", "generic.saved": "저장됚", @@ -365,8 +365,6 @@ "load_pending": "{count}개의 새 항목", "loading_indicator.label": "불러였는 쀑...", "media_gallery.toggle_visible": "읎믞지 숚ꞰꞰ", - "missing_indicator.label": "찟을 수 없습니닀", - "missing_indicator.sublabel": "읎 늬소슀륌 찟을 수 없었습니닀", "moved_to_account_banner.text": "당신의 계정 {disabledAccount}는 {movedToAccount}로 읎동하였Ʞ 때묞에 현재 비활성화 상태입니닀.", "mute_modal.duration": "êž°ê°„", "mute_modal.hide_notifications": "읎 사용자로부터의 알늌을 숚Ʞ시겠습니까?", @@ -401,7 +399,7 @@ "notification.favourite": "{name} 님읎 당신의 게시묌을 마음에 듀얎합니닀", "notification.follow": "{name} 님읎 나륌 팔로우했습니닀", "notification.follow_request": "{name} 님읎 팔로우 요청을 볎냈습니닀", - "notification.mention": "{name}님의 멘션", + "notification.mention": "{name} 님의 멘션", "notification.own_poll": "투표륌 마쳀습니닀.", "notification.poll": "찞여했던 투표가 끝났습니닀.", "notification.reblog": "{name} 님읎 부슀튞했습니닀", @@ -464,7 +462,7 @@ "privacy.unlisted.long": "몚두가 볌 수 있지만, 발견하Ʞ Ʞ능에서는 제왞됚", "privacy.unlisted.short": "믞등재", "privacy_policy.last_updated": "{date}에 마지막윌로 업데읎튞됚", - "privacy_policy.title": "개읞정볎 정책", + "privacy_policy.title": "개읞정볎처늬방칚", "refresh": "새로고칚", "regeneration_indicator.label": "불러였는 쀑 ", "regeneration_indicator.sublabel": "당신의 홈 플드가 쀀비되는 쀑입니닀!", @@ -573,7 +571,7 @@ "status.history.edited": "{name} 님읎 {date}에 수정핚", "status.load_more": "더 볎Ʞ", "status.media_hidden": "믞디얎 숚겚짐", - "status.mention": "@{name}님에게 멘션", + "status.mention": "@{name} 님에게 멘션", "status.more": "자섞히", "status.mute": "@{name} 님을 뮀튞하Ʞ", "status.mute_conversation": "읎 대화륌 뮀튞", diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json index 12124a6129..c0ab057766 100644 --- a/app/javascript/mastodon/locales/ku.json +++ b/app/javascript/mastodon/locales/ku.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# hêmaneke nû} other {#hêmaneke nû}}", "loading_indicator.label": "Tê barkirin...", "media_gallery.toggle_visible": "{number, plural, one {Wêneyê veşêre} other {Wêneyan veşêre}}", - "missing_indicator.label": "Nehate dîtin", - "missing_indicator.sublabel": "Ev çavkanî nehat dîtin", "moved_to_account_banner.text": "Ajimêrê te {disabledAccount} niha neçalak e ji ber ku te bar kir bo {movedToAccount}.", "mute_modal.duration": "Dem", "mute_modal.hide_notifications": "Agahdariyan ji ev bikarhêner veşêre?", diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json index b20f93e541..4155b8ac1d 100644 --- a/app/javascript/mastodon/locales/kw.json +++ b/app/javascript/mastodon/locales/kw.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# daklennowydh} other {# a daklennow nowydh}}", "loading_indicator.label": "Ow karga...", "media_gallery.toggle_visible": "Hide {number, plural, one {aven} other {aven}}", - "missing_indicator.label": "Ny veu kevys", - "missing_indicator.sublabel": "Ny yllir kavòs an asnodh ma", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duryans", "mute_modal.hide_notifications": "Kudha gwarnyansow a'n devnydhyer ma?", diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json index 00de10f737..9c236ac8f7 100644 --- a/app/javascript/mastodon/locales/la.json +++ b/app/javascript/mastodon/locales/la.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json index d1da039df5..8da8c12724 100644 --- a/app/javascript/mastodon/locales/lt.json +++ b/app/javascript/mastodon/locales/lt.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json index 4f1032ae26..4843408926 100644 --- a/app/javascript/mastodon/locales/lv.json +++ b/app/javascript/mastodon/locales/lv.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# jauna lieta} other {# jaunas lietas}}", "loading_indicator.label": "Ielādē...", "media_gallery.toggle_visible": "{number, plural, one {Slēpt attēlu} other {Slēpt attēlus}}", - "missing_indicator.label": "Nav atrasts", - "missing_indicator.sublabel": "Å o resursu nevarēja atrast", "moved_to_account_banner.text": "Tavs konts {disabledAccount} paÅ¡laik ir atspējots, jo pārcēlies uz kontu {movedToAccount}.", "mute_modal.duration": "Ilgums", "mute_modal.hide_notifications": "Slēpt paziņojumus no Å¡Ä« lietotāja?", diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json index c3778501b9..48e683d8a0 100644 --- a/app/javascript/mastodon/locales/mk.json +++ b/app/javascript/mastodon/locales/mk.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json index cfea1b34ee..dda67cc9ad 100644 --- a/app/javascript/mastodon/locales/ml.json +++ b/app/javascript/mastodon/locales/ml.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "àŽ²àµ‡àŽŸàŽ¡àŽ¿àŽ‚àŽ—àµ...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "àŽ•àŽŸàŽ£àŽŸàŽšàŽ¿àŽ²àµàŽ²", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "àŽ•àŽŸàŽ²àŽŸàŽµàŽ§àŽ¿", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json index b778c704ec..fa3852de21 100644 --- a/app/javascript/mastodon/locales/mr.json +++ b/app/javascript/mastodon/locales/mr.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "à€²à¥‹à€¡ à€•à€°à€€ à€†à€¹à¥‡...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json index 456706ce6c..e603d2f3d4 100644 --- a/app/javascript/mastodon/locales/ms.json +++ b/app/javascript/mastodon/locales/ms.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# item baharu} other {# item baharu}}", "loading_indicator.label": "Memuatkan...", "media_gallery.toggle_visible": "{number, plural, other {Sembunyikan imej}}", - "missing_indicator.label": "Tidak dijumpai", - "missing_indicator.sublabel": "Sumber ini tidak dijumpai", "moved_to_account_banner.text": "Akaun anda {disabledAccount} kini dinyahdayakan kerana anda berpindah ke {movedToAccount}.", "mute_modal.duration": "Tempoh", "mute_modal.hide_notifications": "Sembunyikan pemberitahuan daripada pengguna ini?", diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json index 197addd1b1..a3cb494215 100644 --- a/app/javascript/mastodon/locales/my.json +++ b/app/javascript/mastodon/locales/my.json @@ -29,7 +29,7 @@ "account.featured_tags.last_status_at": "{date} တလင် နောက်ဆုံသပို့စ်", "account.featured_tags.last_status_never": "ပို့စ်တင်ထာသခဌင်သမရဟိပါ", "account.featured_tags.title": "ဖော်ပဌထာသသောဟက်ရဟ်တက်ခ်မျာသ", - "account.follow": "စောင့်ကဌည့်မည်", + "account.follow": "စောင့်ကဌည့်မယ်", "account.followers": "စောင့်ကဌည့်သူမျာသ", "account.followers.empty": "ကသူကို စောင့်ကဌည့်သူ မရဟိသေသပါ။", "account.followers_counter": "{count, plural, one {{counter} ဖော်လိုဝါမျာသ} other {{counter} ဖော်လိုဝါမျာသ}}", @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "လုပ်ဆောင်နေသည် ", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "မတလေ့ပါ", - "missing_indicator.sublabel": "ရဟာဖလေနေသည်ကိုမတလေ့ပါ", "moved_to_account_banner.text": "{movedToAccount} အကောင့်သို့ပဌောင်သလဲထာသသဖဌင့် {disabledAccount} အကောင့်မဟာပိတ်ထာသသည်", "mute_modal.duration": "ကဌာချိန်", "mute_modal.hide_notifications": "ကအကောင့်မဟသတိပေသချက်မျာသကိုပိတ်မလာသ?", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index bb33a6f0c5..e08718c498 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nieuw item} other {# nieuwe items}}", "loading_indicator.label": "Laden
", "media_gallery.toggle_visible": "{number, plural, one {afbeelding verbergen} other {afbeeldingen verbergen}}", - "missing_indicator.label": "Niet gevonden", - "missing_indicator.sublabel": "Deze hulpbron kan niet gevonden worden", "moved_to_account_banner.text": "Omdat je naar {movedToAccount} bent verhuisd is jouw account {disabledAccount} momenteel uitgeschakeld.", "mute_modal.duration": "Duur", "mute_modal.hide_notifications": "Verberg meldingen van deze persoon?", diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json index 40b59ac4df..977d4cb653 100644 --- a/app/javascript/mastodon/locales/nn.json +++ b/app/javascript/mastodon/locales/nn.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nytt element} other {# nye element}}", "loading_indicator.label": "Lastar...", "media_gallery.toggle_visible": "{number, plural, one {Skjul bilete} other {Skjul bilete}}", - "missing_indicator.label": "Ikkje funne", - "missing_indicator.sublabel": "Fann ikkje ressursen", "moved_to_account_banner.text": "Kontoen din, {disabledAccount} er for tida deaktivert fordi du har flytta til {movedToAccount}.", "mute_modal.duration": "Varigheit", "mute_modal.hide_notifications": "Skjul varsel frÃ¥ denne brukaren?", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index a03c51b0ab..797edc9e24 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural,one {# ny gjenstand} other {# nye gjenstander}}", "loading_indicator.label": "Laster...", "media_gallery.toggle_visible": "Veksle synlighet", - "missing_indicator.label": "Ikke funnet", - "missing_indicator.sublabel": "Denne ressursen ble ikke funnet", "moved_to_account_banner.text": "Din konto {disabledAccount} er for Þyeblikket deaktivert fordi du flyttet til {movedToAccount}.", "mute_modal.duration": "Varighet", "mute_modal.hide_notifications": "Skjul varslinger fra denne brukeren?", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index c333c2ecee..6c940e8ec6 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nòu element} other {# nòu elements}}", "loading_indicator.label": "Cargament
", "media_gallery.toggle_visible": "Modificar la visibilitat", - "missing_indicator.label": "Pas trobat", - "missing_indicator.sublabel": "Aquesta ressorsa es pas estada trobada", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Durada", "mute_modal.hide_notifications": "Rescondre las notificacions d’aquesta persona ?", diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json index d330c136ca..aacb50a851 100644 --- a/app/javascript/mastodon/locales/pa.json +++ b/app/javascript/mastodon/locales/pa.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 77d1d7c853..bad712d1c6 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -17,7 +17,7 @@ "account.badges.group": "Grupa", "account.block": "Blokuj @{name}", "account.block_domain": "Blokuj wszystko z {domain}", - "account.blocked": "Zablokowano", + "account.blocked": "Zablokowany(-a)", "account.browse_more_on_origin_server": "Zobacz więcej na oryginalnym profilu", "account.cancel_follow_request": "Wycofaj Ōądanie obserwowania", "account.direct": "Prywatna wzmianka @{name}", @@ -54,7 +54,7 @@ "account.posts_with_replies": "Wpisy i odpowiedzi", "account.report": "Zgłoś @{name}", "account.requested": "Oczekująca prośba, kliknij aby anulować", - "account.requested_follow": "{name} poprosił(a) o moÅŒliwość zaobserwowania twojego profilu", + "account.requested_follow": "{name} chce zaobserwować twój profil", "account.share": "Udostępnij profil @{name}", "account.show_reblogs": "Pokazuj podbicia od @{name}", "account.statuses_counter": "{count, plural, one {{counter} wpis} few {{counter} wpisy} many {{counter} wpisów} other {{counter} wpisów}}", @@ -75,7 +75,7 @@ "alert.rate_limited.message": "Spróbuj ponownie po {retry_time, time, medium}.", "alert.rate_limited.title": "Ograniczony czasowo", "alert.unexpected.message": "Wystąpił nieoczekiwany błąd.", - "alert.unexpected.title": "O nie!", + "alert.unexpected.title": "Ups!", "announcement.announcement": "Ogłoszenie", "attachments_list.unprocessed": "(nieprzetworzone)", "audio.hide": "Ukryj dźwięk", @@ -131,7 +131,7 @@ "compose_form.hashtag_warning": "Ten wpis nie będzie widoczny pod podanymi hasztagami, poniewaÅŒ jest oznaczony jako niepubliczny. Tylko publiczne wpisy mogą zostać znalezione z uÅŒyciem hasztagów.", "compose_form.lock_disclaimer": "Twoje konto nie jest {locked}. KaÅŒdy, kto Cię obserwuje, moÅŒe wyświetlać Twoje wpisy przeznaczone tylko dla obserwujących.", "compose_form.lock_disclaimer.lock": "zablokowane", - "compose_form.placeholder": "Co Ci chodzi po głowie?", + "compose_form.placeholder": "Co chodzi ci po głowie?", "compose_form.poll.add_option": "Dodaj opcję", "compose_form.poll.duration": "Czas trwania głosowania", "compose_form.poll.option_placeholder": "Opcja {number}", @@ -139,21 +139,21 @@ "compose_form.poll.switch_to_multiple": "Pozwól na wybranie wielu opcji", "compose_form.poll.switch_to_single": "Pozwól na wybranie tylko jednej opcji", "compose_form.publish": "Opublikuj", - "compose_form.publish_form": "Publikuj", + "compose_form.publish_form": "Opublikuj", "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "Zapisz zmiany", "compose_form.sensitive.hide": "{count, plural, one {Oznacz treść multimedialną jako wraÅŒliwą} other {Oznacz treści multimedialne jako wraÅŒliwe}}", "compose_form.sensitive.marked": "{count, plural, one {Treść multimedialna jest oznaczona jako wraÅŒliwa} other {Treści multimedialne są oznaczone jako wraÅŒliwe}}", "compose_form.sensitive.unmarked": "{count, plural, one {Treść multimedialna nie jest oznaczona jako wraÅŒliwa} other {Treści multimedialne nie są oznaczone jako wraÅŒliwe}}", - "compose_form.spoiler.marked": "Tekst jest ukryty za ostrzeÅŒeniem", - "compose_form.spoiler.unmarked": "Tekst nie jest ukryty", - "compose_form.spoiler_placeholder": "Wprowadź swoje ostrzeÅŒenie o zawartości", + "compose_form.spoiler.marked": "Usuń ostrzeÅŒenie o treści", + "compose_form.spoiler.unmarked": "Dodaj ostrzeÅŒenie o treści", + "compose_form.spoiler_placeholder": "Wpisz ostrzeÅŒenie tutaj", "confirmation_modal.cancel": "Anuluj", "confirmations.block.block_and_report": "Zablokuj i zgłoś", "confirmations.block.confirm": "Zablokuj", "confirmations.block.message": "Czy na pewno chcesz zablokować {name}?", - "confirmations.cancel_follow_request.confirm": "Wycofaj Ōądanie", - "confirmations.cancel_follow_request.message": "Czy na pewno chcesz wycofać prośbę o moÅŒliwość obserwacji {name}?", + "confirmations.cancel_follow_request.confirm": "Wycofaj prośbę", + "confirmations.cancel_follow_request.message": "Czy na pewno chcesz wycofać prośbę o moÅŒliwość obserwowania {name}?", "confirmations.delete.confirm": "Usuń", "confirmations.delete.message": "Czy na pewno chcesz usunąć ten wpis?", "confirmations.delete_list.confirm": "Usuń", @@ -175,9 +175,9 @@ "confirmations.reply.message": "W ten sposób utracisz wpis który obecnie tworzysz. Czy na pewno chcesz to zrobić?", "confirmations.unfollow.confirm": "Przestań obserwować", "confirmations.unfollow.message": "Czy na pewno zamierzasz przestać obserwować {name}?", - "conversation.delete": "Usuń rozmowę", + "conversation.delete": "Usuń konwersację", "conversation.mark_as_read": "Oznacz jako przeczytane", - "conversation.open": "Zobacz rozmowę", + "conversation.open": "Zobacz konwersację", "conversation.with": "Z {names}", "copypaste.copied": "Skopiowano", "copypaste.copy": "Kopiuj", @@ -194,7 +194,7 @@ "dismissable_banner.explore_tags": "Te hasztagi obecnie zyskują popularność wśród osób z tego serwera i pozostałych w zdecentralizowanej sieci.", "dismissable_banner.public_timeline": "To są najnowsze publiczne wpisy od osób z tego i innych serwerów zdecentralizowanej sieci, o których ten serwer wie.", "embed.instructions": "Osadź ten wpis na swojej stronie wklejając poniÅŒszy kod.", - "embed.preview": "Tak będzie to wyglądać:", + "embed.preview": "Będzie to wyglądać tak:", "emoji_button.activity": "Aktywność", "emoji_button.clear": "Wyczyść", "emoji_button.custom": "Niestandardowe", @@ -202,8 +202,8 @@ "emoji_button.food": "Å»ywność i napoje", "emoji_button.label": "Wstaw emoji", "emoji_button.nature": "Natura", - "emoji_button.not_found": "Brak emoji!! (╯°□°╯ ┻━┻", - "emoji_button.objects": "Objekty", + "emoji_button.not_found": "Nie znaleziono pasujących emoji", + "emoji_button.objects": "Obiekty", "emoji_button.people": "Ludzie", "emoji_button.recent": "Najczęściej uÅŒywane", "emoji_button.search": "Szukaj
", @@ -217,7 +217,7 @@ "empty_column.bookmarked_statuses": "Nie dodałeś(-aś) ÅŒadnego wpisu do zakładek. Kiedy to zrobisz, pojawi się on tutaj.", "empty_column.community": "Lokalna oś czasu jest pusta. Napisz coś publicznie, aby zagaić!", "empty_column.direct": "Nie masz jeszcze ÅŒadnych prywatnych wzmianek. Kiedy je wyślesz lub otrzymasz, pojawią się tutaj.", - "empty_column.domain_blocks": "Brak ukrytych domen.", + "empty_column.domain_blocks": "Brak zablokowanych domen.", "empty_column.explore_statuses": "Nic nie jest w tej chwili popularne. Sprawdź później!", "empty_column.favourited_statuses": "Nie dodałeś(-aś) ÅŒadnego wpisu do ulubionych. Kiedy to zrobisz, pojawi się on tutaj.", "empty_column.favourites": "Nikt nie dodał tego wpisu do ulubionych. Gdy ktoś to zrobi, pojawi się tutaj.", @@ -236,7 +236,7 @@ "error.unexpected_crash.explanation_addons": "Ta strona nie mogła zostać poprawnie wyświetlona. MoÅŒe to być spowodowane dodatkiem do przeglądarki lub narzędziem do automatycznego tłumaczenia.", "error.unexpected_crash.next_steps": "Spróbuj odświeÅŒyć stronę. Jeśli to nie pomoÅŒe, wciÄ…ÅŒ jesteś w stanie uÅŒywać Mastodona przez inną przeglądarkę lub natywną aplikację.", "error.unexpected_crash.next_steps_addons": "Spróbuj je wyłączyć lub odświeÅŒyć stronę. Jeśli to nie pomoÅŒe, moÅŒesz wciÄ…ÅŒ korzystać z Mastodona w innej przeglądarce lub natywnej aplikacji.", - "errors.unexpected_crash.copy_stacktrace": "Skopiuj ślad stosu do schowka", + "errors.unexpected_crash.copy_stacktrace": "Skopiuj stacktrace do schowka", "errors.unexpected_crash.report_issue": "Zgłoś problem", "explore.search_results": "Wyniki wyszukiwania", "explore.suggested_follows": "Dla Ciebie", @@ -322,7 +322,7 @@ "keyboard_shortcuts.federated": "aby otworzyć oś czasu federacji", "keyboard_shortcuts.heading": "Skróty klawiszowe", "keyboard_shortcuts.home": "aby otworzyć stronę główną", - "keyboard_shortcuts.hotkey": "Klawisz", + "keyboard_shortcuts.hotkey": "Skrót klawiszowy", "keyboard_shortcuts.legend": "aby wyświetlić tę legendę", "keyboard_shortcuts.local": "aby otworzyć lokalną oś czasu", "keyboard_shortcuts.mention": "aby wspomnieć o autorze", @@ -347,7 +347,7 @@ "lightbox.expand": "Rozwiń pole widoku obrazu", "lightbox.next": "Następne", "lightbox.previous": "Poprzednie", - "limited_account_hint.action": "PokaÅŒ profil mimo wszystko", + "limited_account_hint.action": "PokaÅŒ profil mimo to", "limited_account_hint.title": "Ten profil został ukryty przez moderatorów {domain}.", "lists.account.add": "Dodaj do listy", "lists.account.remove": "Usunąć z listy", @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nowa pozycja} other {nowe pozycje}}", "loading_indicator.label": "Ładowanie
", "media_gallery.toggle_visible": "Przełącz widoczność", - "missing_indicator.label": "Nie znaleziono", - "missing_indicator.sublabel": "Nie moÅŒna odnaleźć tego zasobu", "moved_to_account_banner.text": "Twoje konto {disabledAccount} jest obecnie wyłączone, poniewaÅŒ zostało przeniesione na {movedToAccount}.", "mute_modal.duration": "Czas", "mute_modal.hide_notifications": "Chcesz ukryć powiadomienia od tego uÅŒytkownika?", @@ -395,21 +393,21 @@ "navigation_bar.public_timeline": "Globalna oś czasu", "navigation_bar.search": "Szukaj", "navigation_bar.security": "Bezpieczeństwo", - "not_signed_in_indicator.not_signed_in": "Musisz się zalogować, aby otrzymać dostęp do tego zasobu.", + "not_signed_in_indicator.not_signed_in": "Musisz się zalogować, aby uzyskać dostęp do tego zasobu.", "notification.admin.report": "{name} zgłosił {target}", "notification.admin.sign_up": "UÅŒytkownik {name} zarejestrował się", "notification.favourite": "{name} dodaje Twój wpis do ulubionych", "notification.follow": "{name} obserwuje Cię", - "notification.follow_request": "{name} prosi o moÅŒliwość obserwowania Ciebie", + "notification.follow_request": "{name} chce cię zaobserwować", "notification.mention": "Wspomniało o Tobie przez {name}", "notification.own_poll": "Twoje głosowanie zakończyło się", "notification.poll": "Głosowanie w którym brałeś(-aś) udział zakończyło się", "notification.reblog": "Twój post został podbity przez {name}", - "notification.status": "Właśnie umieszczono wpis przez {name}", - "notification.update": "{name} edytował post", + "notification.status": "{name} opublikował(a) nowy wpis", + "notification.update": "{name} edytował(a) post", "notifications.clear": "Wyczyść powiadomienia", "notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunąć wszystkie powiadomienia?", - "notifications.column_settings.admin.report": "Nowe raporty:", + "notifications.column_settings.admin.report": "Nowe zgłoszenia:", "notifications.column_settings.admin.sign_up": "Nowe rejestracje:", "notifications.column_settings.alert": "Powiadomienia na pulpicie", "notifications.column_settings.favourite": "Dodanie do ulubionych:", @@ -432,7 +430,7 @@ "notifications.filter.boosts": "Podbicia", "notifications.filter.favourites": "Ulubione", "notifications.filter.follows": "Obserwacje", - "notifications.filter.mentions": "Wspomienia", + "notifications.filter.mentions": "Wspomnienia", "notifications.filter.polls": "Wyniki głosowania", "notifications.filter.statuses": "Aktualizacje od osób które obserwujesz", "notifications.grant_permission": "Przyznaj uprawnienia.", @@ -521,7 +519,7 @@ "report_notification.categories.other": "Inne", "report_notification.categories.spam": "Spam", "report_notification.categories.violation": "Naruszenie zasad", - "report_notification.open": "Otwórz raport", + "report_notification.open": "Otwórz zgłoszenie", "search.no_recent_searches": "Brak ostatnich wyszukiwań", "search.placeholder": "Szukaj", "search.quick_action.account_search": "Profile pasujące do {x}", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index d10c9a8f75..0f5cc7b55e 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# novo item} other {# novos items}}", "loading_indicator.label": "Carregando...", "media_gallery.toggle_visible": "{number, plural, one {Ocultar mídia} other {Ocultar mídias}}", - "missing_indicator.label": "Não encontrado", - "missing_indicator.sublabel": "Recurso não encontrado", "moved_to_account_banner.text": "Sua conta {disabledAccount} está desativada porque você a moveu para {movedToAccount}.", "mute_modal.duration": "Duração", "mute_modal.hide_notifications": "Ocultar notificações deste usuário?", diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json index e93ff73cf7..5fd52977dc 100644 --- a/app/javascript/mastodon/locales/pt-PT.json +++ b/app/javascript/mastodon/locales/pt-PT.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# novo item} other {# novos itens}}", "loading_indicator.label": "A carregar...", "media_gallery.toggle_visible": "Alternar visibilidade", - "missing_indicator.label": "Não encontrado", - "missing_indicator.sublabel": "Este recurso não foi encontrado", "moved_to_account_banner.text": "A sua conta {disabledAccount} está, no momento, desativada, porque você migrou para {movedToAccount}.", "mute_modal.duration": "Duração", "mute_modal.hide_notifications": "Esconder notificações deste utilizador?", diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json index aa6710685c..e83cae3863 100644 --- a/app/javascript/mastodon/locales/ro.json +++ b/app/javascript/mastodon/locales/ro.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# element nou} other {# elemente noi}}", "loading_indicator.label": "Se încarcă...", "media_gallery.toggle_visible": "{number, plural, one {Ascunde imaginea} other {Ascunde imaginile}}", - "missing_indicator.label": "Nu a fost găsit", - "missing_indicator.sublabel": "Această resursă nu a putut fi găsită", "moved_to_account_banner.text": "Contul tău {disabledAccount} este în acest moment dezactivat deoarece te-ai mutat la {movedToAccount}.", "mute_modal.duration": "Durata", "mute_modal.hide_notifications": "Ascunde notificările de la acest utilizator?", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 4e3a1c627a..74b65009ea 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# МПвый элеЌеМт} few {# МПвых элеЌеМта} other {# МПвых элеЌеМтПв}}", "loading_indicator.label": "Загрузка...", "media_gallery.toggle_visible": "ППказать/скрыть {number, plural, =1 {ОзПбражеМОе} other {ОзПбражеМОя}}", - "missing_indicator.label": "Не МайЎеМП", - "missing_indicator.sublabel": "ЗапрашОваеЌый ресурс Ме МайЎеМ", "moved_to_account_banner.text": "Ваша учетМая запОсь {disabledAccount} в МастПящее вреЌя заЌПрПжеМа, пПтПЌу чтП вы переехалО Ма {movedToAccount}.", "mute_modal.duration": "ПрПЎПлжОтельМПсть", "mute_modal.hide_notifications": "Скрыть увеЎПЌлеМОя Пт этПгП пПльзПвателя?", diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json index 9b16be4f88..d95e46eb49 100644 --- a/app/javascript/mastodon/locales/sa.json +++ b/app/javascript/mastodon/locales/sa.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# à€šà¥‚à€€à€šà€µà€žà¥à€€à¥} other {# à€šà¥‚à€€à€šà€µà€žà¥à€€à¥‚à€šà€¿}}", "loading_indicator.label": "à€†à€°à¥‹à€ªà€¯à€€à€¿...", "media_gallery.toggle_visible": "{number, plural, one {à€šà€¿à€€à¥à€°à€‚ à€ªà¥à€°à€šà¥à€›à€Ÿà€Šà€¯} other {à€šà€¿à€€à¥à€°à€Ÿà€£à€¿ à€ªà¥à€°à€šà¥à€›à€Ÿà€Šà€¯}}", - "missing_indicator.label": "à€šà¥‹à€ªà€²à€¬à¥à€§à€®à¥", - "missing_indicator.sublabel": "à€‰à€ªà€Ÿà€¯à¥‹à€œà€¯à€‚ à€šà¥‹à€ªà€²à€¬à¥à€§à¥à€‚ à€¶à€•à¥à€¯à€€à¥‡", "moved_to_account_banner.text": "à€€à€µ à€à€•à¥Œà€£à¥à€Ÿà¥ {disabledAccount} à€…à€§à¥à€šà€Ÿ à€šà€¿à€·à¥à€•à¥ƒà€€à¥‹ à€¯à€€à¥‹à€¹à€¿ {movedToAccount} à€…à€žà¥à€®à€¿à€šà¥à€€à¥à€µà€®à€žà€Ÿà€°à¥à€·à¥€à€ƒà¥€", "mute_modal.duration": "à€ªà€°à€¿à€®à€Ÿà€£à€®à¥", "mute_modal.hide_notifications": "à€…à€žà¥à€®à€Ÿà€Šà¥à€ªà€­à¥‹à€•à¥à€€à¥à€°à¥à€µà€¿à€œà¥à€žà€Ÿà€ªà€šà€Ÿà€šà€¿ à€ªà¥à€°à€šà¥à€›à€Ÿà€Šà€¯à€¿à€€à¥à€®à€¿à€šà¥à€›à€žà€¿ à€µà€Ÿ?", diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json index 905d457389..a2d625c589 100644 --- a/app/javascript/mastodon/locales/sc.json +++ b/app/javascript/mastodon/locales/sc.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# elementu nou} other {# elementos noos}}", "loading_indicator.label": "Carrighende...", "media_gallery.toggle_visible": "Cua {number, plural, one {immàgine} other {immàgines}}", - "missing_indicator.label": "Perunu resurtadu", - "missing_indicator.sublabel": "Resursa no agatada", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Durada", "mute_modal.hide_notifications": "Boles cuare is notìficas de custa persone?", diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json index 8794806b2f..de78ab5a7c 100644 --- a/app/javascript/mastodon/locales/sco.json +++ b/app/javascript/mastodon/locales/sco.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loadin...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "No fun", - "missing_indicator.sublabel": "This resoorce cuidnae be fun", "moved_to_account_banner.text": "Yer accoont {disabledAccount} is disabilt the noo acause ye flittit tae {movedToAccount}.", "mute_modal.duration": "Lenth", "mute_modal.hide_notifications": "Hide notifications fae this uiser?", diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json index 82366c29cc..a99ad7ca03 100644 --- a/app/javascript/mastodon/locales/si.json +++ b/app/javascript/mastodon/locales/si.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# නව අයිතඞයක්} other {නව අයිතඞ #ක්}}", "loading_indicator.label": "ඎූරණය වෙඞින්...", "media_gallery.toggle_visible": "{number, plural, one {රූඎය සඟවන්න} other {ඎින්තූර සඟවන්න}}", - "missing_indicator.label": "හඞු නොවිණි", - "missing_indicator.sublabel": "ඞෙඞ සඞ්ඎත හඞු නොවිණි", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "ඎරාසය", "mute_modal.hide_notifications": "ඞෙඞ ඎරිශීගකයාගෙන් දැනුඞ්දීඞ් සඟවන්නද?", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index d8c39fabfe..ce97537c8e 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nová poloÅŸka} other {# novÃœch poloÅŸiek}}", "loading_indicator.label": "Načítam...", "media_gallery.toggle_visible": "Zapni/Vypni viditeÄŸnosÅ¥", - "missing_indicator.label": "Nenájdené", - "missing_indicator.sublabel": "Tento zdroj sa eÅ¡te nepodarilo nájsÅ¥", "moved_to_account_banner.text": "VaÅ¡e konto {disabledAccount} je momentálne zablokované, pretoÅŸe ste sa presunuli na {movedToAccount}.", "mute_modal.duration": "Trvanie", "mute_modal.hide_notifications": "Skry oznámenia od tohto pouşívateÄŸa?", @@ -522,17 +520,17 @@ "report_notification.categories.spam": "Spam", "report_notification.categories.violation": "PoruÅ¡enie pravidla", "report_notification.open": "Otvor hlásenie", - "search.no_recent_searches": "No recent searches", + "search.no_recent_searches": "Åœiadne nedávne vyhÄŸadávania", "search.placeholder": "HÄŸadaj", - "search.quick_action.account_search": "Profiles matching {x}", - "search.quick_action.go_to_account": "Go to profile {x}", + "search.quick_action.account_search": "Profily zodpovedajúce {x}", + "search.quick_action.go_to_account": "Prejdi na profil {x}", "search.quick_action.go_to_hashtag": "Go to hashtag {x}", "search.quick_action.open_url": "Open URL in Mastodon", - "search.quick_action.status_search": "Posts matching {x}", + "search.quick_action.status_search": "Príspevky zodpovedajúce {x}", "search.search_or_paste": "HÄŸadaj, alebo vloÅŸ URL adresu", "search_popout.quick_actions": "Quick actions", - "search_popout.recent": "Recent searches", - "search_results.accounts": "Profiles", + "search_popout.recent": "Nedávne vyhÄŸadávania", + "search_results.accounts": "Profily", "search_results.all": "VÅ¡etky", "search_results.hashtags": "HaÅ¡tagy", "search_results.nothing_found": "Pre tieto vÃœrazy nemoÅŸno nič nájsÅ¥", diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json index 3c6da433b1..cbd785d69d 100644 --- a/app/javascript/mastodon/locales/sl.json +++ b/app/javascript/mastodon/locales/sl.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nov element} two {# nova elementa} few {# novi elementi} other {# novih elementov}}", "loading_indicator.label": "Nalaganje ...", "media_gallery.toggle_visible": "{number, plural,one {Skrij sliko} two {Skrij sliki} other {Skrij slike}}", - "missing_indicator.label": "Ni najdeno", - "missing_indicator.sublabel": "Tega vira ni bilo mogoče najti", "moved_to_account_banner.text": "VaÅ¡ račun {disabledAccount} je trenutno onemogočen, ker ste se prestavili na {movedToAccount}.", "mute_modal.duration": "Trajanje", "mute_modal.hide_notifications": "Ali ÅŸelite skriti obvestila tega uporabnika?", @@ -522,16 +520,16 @@ "report_notification.categories.spam": "NeÅŸeleno", "report_notification.categories.violation": "KrÅ¡itev pravila", "report_notification.open": "Odpri prijavo", - "search.no_recent_searches": "No recent searches", + "search.no_recent_searches": "Ni nedavnih iskanj", "search.placeholder": "Iskanje", - "search.quick_action.account_search": "Profiles matching {x}", - "search.quick_action.go_to_account": "Go to profile {x}", - "search.quick_action.go_to_hashtag": "Go to hashtag {x}", - "search.quick_action.open_url": "Open URL in Mastodon", - "search.quick_action.status_search": "Posts matching {x}", + "search.quick_action.account_search": "Profili, ki se ujemajo z {x}", + "search.quick_action.go_to_account": "Pojdi na profil {x}", + "search.quick_action.go_to_hashtag": "Pojdi na ključnik {x}", + "search.quick_action.open_url": "Odpri URL v Mastodonu", + "search.quick_action.status_search": "Objave, ki se ujemajo z {x}", "search.search_or_paste": "Iščite ali prilepite URL", - "search_popout.quick_actions": "Quick actions", - "search_popout.recent": "Recent searches", + "search_popout.quick_actions": "Hitra dejanja", + "search_popout.recent": "Nedavna iskanja", "search_results.accounts": "Profili", "search_results.all": "Vse", "search_results.hashtags": "Ključniki", diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json index 93a00e51ec..91f732ad7e 100644 --- a/app/javascript/mastodon/locales/sq.json +++ b/app/javascript/mastodon/locales/sq.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural,one {# objekt i ri }other {# objekte të rinj }}", "loading_indicator.label": "Po ngarkohet
", "media_gallery.toggle_visible": "Fshihni {number, plural, one {figurë} other {figura}}", - "missing_indicator.label": "S’u gjet", - "missing_indicator.sublabel": "Ky burim s’u gjet dot", "moved_to_account_banner.text": "Llogaria juaj {disabledAccount} aktualisht është e çaktivizuar, ngaqë kaluat te {movedToAccount}.", "mute_modal.duration": "Kohëzgjatje", "mute_modal.hide_notifications": "Të kalohen të fshehura njoftimet prej këtij përdoruesi?", diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json index f35d7025c1..a2e7430a48 100644 --- a/app/javascript/mastodon/locales/sr-Latn.json +++ b/app/javascript/mastodon/locales/sr-Latn.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# nova stavka} few {# nove stavke} other {# novih stavki}}", "loading_indicator.label": "Učitavanje...", "media_gallery.toggle_visible": "{number, plural, one {Sakrij sliku} few {Sakrij slike} other {Sakrij slike}}", - "missing_indicator.label": "Nije pronađeno", - "missing_indicator.sublabel": "Ovaj resurs nije moguće pronaći", "moved_to_account_banner.text": "VaÅ¡ nalog {disabledAccount} je trenutno onemogućen jer ste preÅ¡li na {movedToAccount}.", "mute_modal.duration": "Trajanje", "mute_modal.hide_notifications": "Sakriti obaveÅ¡tenja od ovog korisnika?", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index bfdd031f87..5e2b6601aa 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# МПва ставка} few {# МПве ставке} other {# МПвОх ставкО}}", "loading_indicator.label": "УчОтавање...", "media_gallery.toggle_visible": "{number, plural, one {СакрОј слОку} few {СакрОј слОке} other {СакрОј слОке}}", - "missing_indicator.label": "НОје прПМађеМП", - "missing_indicator.sublabel": "Овај ресурс МОје бОлП ЌПгуће прПМаћО", "moved_to_account_banner.text": "Ваш МалПг {disabledAccount} је треМутМП ПМеЌПгућеМ јер сте прешлО Ма {movedToAccount}.", "mute_modal.duration": "Трајање", "mute_modal.hide_notifications": "СакрОтО Пбавештења ПЎ ПвПг кПрОсМОка?", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index 0b78b78566..a62850c686 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, other {# objekt}}", "loading_indicator.label": "Laddar...", "media_gallery.toggle_visible": "VÀxla synlighet", - "missing_indicator.label": "Hittades inte", - "missing_indicator.sublabel": "Den hÀr resursen kunde inte hittas", "moved_to_account_banner.text": "Ditt konto {disabledAccount} Àr för nÀrvarande inaktiverat eftersom du flyttat till {movedToAccount}.", "mute_modal.duration": "Varaktighet", "mute_modal.hide_notifications": "Dölj aviseringar frÃ¥n denna anvÀndare?", @@ -522,17 +520,17 @@ "report_notification.categories.spam": "SkrÀppost", "report_notification.categories.violation": "RegelövertrÀdelse", "report_notification.open": "Öppna rapport", - "search.no_recent_searches": "No recent searches", + "search.no_recent_searches": "Inga sökningar nyligen", "search.placeholder": "Sök", - "search.quick_action.account_search": "Profiles matching {x}", - "search.quick_action.go_to_account": "Go to profile {x}", - "search.quick_action.go_to_hashtag": "Go to hashtag {x}", - "search.quick_action.open_url": "Open URL in Mastodon", - "search.quick_action.status_search": "Posts matching {x}", + "search.quick_action.account_search": "Profiler som matchar {x}", + "search.quick_action.go_to_account": "GÃ¥ till profil {x}", + "search.quick_action.go_to_hashtag": "GÃ¥ till hashtag {x}", + "search.quick_action.open_url": "Öppna lÀnk i Mastodon", + "search.quick_action.status_search": "InlÀgg som matchar {x}", "search.search_or_paste": "Sök eller klistra in URL", - "search_popout.quick_actions": "Quick actions", - "search_popout.recent": "Recent searches", - "search_results.accounts": "Profiles", + "search_popout.quick_actions": "SnabbÃ¥tgÀrder", + "search_popout.recent": "Senaste sökningarna", + "search_results.accounts": "Profiler", "search_results.all": "Alla", "search_results.hashtags": "Hashtaggar", "search_results.nothing_found": "Kunde inte hitta nÃ¥got för dessa sökord", diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json index c8f0337cb5..5659d37e28 100644 --- a/app/javascript/mastodon/locales/szl.json +++ b/app/javascript/mastodon/locales/szl.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json index 76e1447471..71fd1a92da 100644 --- a/app/javascript/mastodon/locales/ta.json +++ b/app/javascript/mastodon/locales/ta.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural,one {# பு஀ிய஀ு}other {# பு஀ியவை}}", "loading_indicator.label": "ஏற்று஀ல்...", "media_gallery.toggle_visible": "சிலைமடற்று ஀ெரியும்", - "missing_indicator.label": "கிடைக்கவில்லை", - "missing_indicator.sublabel": "இச்஀ ஆ஀டர஀்஀ை கடண முடியவில்லை", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "இச்஀ பயனரின் அறிவிப்புகளை மறைக்கவட?", diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json index e553ac58c6..23c997d13f 100644 --- a/app/javascript/mastodon/locales/tai.json +++ b/app/javascript/mastodon/locales/tai.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json index 1bd8a65bd6..409a44c1d2 100644 --- a/app/javascript/mastodon/locales/te.json +++ b/app/javascript/mastodon/locales/te.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "లోడ్ అవుఀోంఊి...", "media_gallery.toggle_visible": "ఊృశ్యమటచఀచు టోగుల్ చేయండి", - "missing_indicator.label": "ఊొరకలేఊు", - "missing_indicator.sublabel": "ఈ వచరు కచుగొచబడలేఊు", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "ఈ విచియోగఊటరు చుండి చోటిఫికేషచ్లచు ఊటచటలట?", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index cd4c923514..12838ba2df 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, other {# àž£àž²àž¢àžàž²àž£à¹ƒàž«àž¡à¹ˆ}}", "loading_indicator.label": "àžàž³àž¥àž±àž‡à¹‚àž«àž¥àž”...", "media_gallery.toggle_visible": "{number, plural, other {àž‹à¹ˆàž­àž™àž àž²àžž}}", - "missing_indicator.label": "à¹„àž¡à¹ˆàžžàžš", - "missing_indicator.sublabel": "à¹„àž¡à¹ˆàžžàžšàž—àž£àž±àžžàž¢àž²àžàž£àž™àžµà¹‰", "moved_to_account_banner.text": "àž¡àžµàžàž²àž£àž›àžŽàž”à¹ƒàžŠà¹‰àž‡àž²àž™àžšàž±àžàžŠàžµàž‚àž­àž‡àž„àžžàž“ {disabledAccount} à¹ƒàž™àž›àž±àžˆàžˆàžžàžšàž±àž™à¹€àž™àž·à¹ˆàž­àž‡àžˆàž²àžàž„àžžàž“à¹„àž”à¹‰àž¢à¹‰àž²àž¢à¹„àž›àž¢àž±àž‡ {movedToAccount}", "mute_modal.duration": "àž£àž°àž¢àž°à¹€àž§àž¥àž²", "mute_modal.hide_notifications": "àž‹à¹ˆàž­àž™àžàž²àž£à¹àžˆà¹‰àž‡à¹€àž•àž·àž­àž™àžˆàž²àžàžœàž¹à¹‰à¹ƒàžŠà¹‰àž™àžµà¹‰?", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index a7b8cd9161..7d7e64dbc1 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# yeni öğe} other {# yeni öğe}}", "loading_indicator.label": "YÃŒkleniyor...", "media_gallery.toggle_visible": "{number, plural, one {Resmi} other {Resimleri}} gizle", - "missing_indicator.label": "Bulunamadı", - "missing_indicator.sublabel": "Bu kaynak bulunamadı", "moved_to_account_banner.text": "{disabledAccount} hesabınız, {movedToAccount} hesabına taşıdığınız için şu an devre dışı.", "mute_modal.duration": "SÃŒre", "mute_modal.hide_notifications": "Bu kullanıcıdan bildirimler gizlensin mı?", diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json index 64b0840a58..4b55aade8c 100644 --- a/app/javascript/mastodon/locales/tt.json +++ b/app/javascript/mastodon/locales/tt.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Йөкләү...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "ТабылЌаЎы", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "ДәваЌлык", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json index d330c136ca..aacb50a851 100644 --- a/app/javascript/mastodon/locales/ug.json +++ b/app/javascript/mastodon/locales/ug.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index 5278f845fe..2f20cbdc63 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# МПвОй елеЌеМт} other {# МПвОх елеЌеМтів}}", "loading_indicator.label": "ЗаваМтажеММя...", "media_gallery.toggle_visible": "{number, plural, one {ПрОхПватО зПбражеММя} other {ПрОхПватО зПбражеММя}}", - "missing_indicator.label": "Не зМайЎеМП", - "missing_indicator.sublabel": "Ресурс Ме зМайЎеМП", "moved_to_account_banner.text": "Ваш ПблікПвОй запОс {disabledAccount} Маразі вОЌкМеМОй, ПскількО вас переМесеМП ЎП {movedToAccount}.", "mute_modal.duration": "ТрОвалість", "mute_modal.hide_notifications": "СхПватО спПвіщеММя цьПгП кПрОстувача?", diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json index ffb6e1068b..17abb3461d 100644 --- a/app/javascript/mastodon/locales/ur.json +++ b/app/javascript/mastodon/locales/ur.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# new item} other {# new items}}", "loading_indicator.label": "Loading...", "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json index e7502bf239..b58162d41e 100644 --- a/app/javascript/mastodon/locales/uz.json +++ b/app/javascript/mastodon/locales/uz.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# yangi element} other {# yangi elementlar}}", "loading_indicator.label": "Yuklanmoqda...", "media_gallery.toggle_visible": "{number, plural, one {Rasmni yashirish} other {Rasmlarni yashirish}}", - "missing_indicator.label": "Topilmadi", - "missing_indicator.sublabel": "Bu resurs topilmadi", "moved_to_account_banner.text": "{movedToAccount} hisobiga koÊ»chganingiz uchun {disabledAccount} hisobingiz hozirda oÊ»chirib qoÊ»yilgan.", "mute_modal.duration": "Davomiyligi", "mute_modal.hide_notifications": "Bu foydalanuvchidan bildirishnomalar berkitilsinmi?", diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json index 7d51c70557..72bec935f6 100644 --- a/app/javascript/mastodon/locales/vi.json +++ b/app/javascript/mastodon/locales/vi.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# tút mới} other {# tút mới}}", "loading_indicator.label": "Đang tải...", "media_gallery.toggle_visible": "{number, plural, other {ẚn hình ảnh}}", - "missing_indicator.label": "KhÃŽng tìm thấy", - "missing_indicator.sublabel": "Nội dung này khÃŽng còn tồn tại", "moved_to_account_banner.text": "Tài khoản {disabledAccount} của bạn hiện khÃŽng khả dụng vì bạn đã chuyển sang {movedToAccount}.", "mute_modal.duration": "Thời hạn", "mute_modal.hide_notifications": "ẚn thÃŽng báo từ người này?", diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json index f02d1a15de..6d1efc884f 100644 --- a/app/javascript/mastodon/locales/zgh.json +++ b/app/javascript/mastodon/locales/zgh.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# ⵓ⎌ⵔ⎷ⵉⵙ ⎰ⵎ⎰ⵢⵏⵓ} other {# ⵉ⎌ⵔ⎷⎰ⵙ ⵉⵎ⎰ⵢⵏⵓⵜⵏ}}", "loading_indicator.label": "⎰ⵣ⎷⎰ⵎ...", "media_gallery.toggle_visible": "⎌⎌ⵔ {number, plural, one {ⵜ⎰ⵡⵍ⎰⎌ⵜ} other {ⵜⵉⵡⵍ⎰⎌ⵉⵏ}}", - "missing_indicator.label": "Not found", - "missing_indicator.sublabel": "This resource could not be found", "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.", "mute_modal.duration": "Duration", "mute_modal.hide_notifications": "Hide notifications from this user?", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index f9e31c450d..2342324564 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -1,6 +1,6 @@ { "about.blocks": "被限制的服务噚", - "about.contact": "联系方匏:", + "about.contact": "联系方匏", "about.disclaimer": "Mastodon 是自由的匀源蜯件商标由 Mastodon gGmbH 持有。", "about.domain_blocks.no_reason_available": "原因䞍可甚", "about.domain_blocks.preamble": "通垞来诎圚 Mastodon 䞊䜠可以浏览联邊宇宙䞭任䜕䞀台服务噚䞊的内容并䞔和䞊面的甚户互劚。䜆其䞭䞀些圚本服务噚䞊被讟眮䞺䟋倖。", @@ -151,7 +151,7 @@ "confirmation_modal.cancel": "取消", "confirmations.block.block_and_report": "屏蔜䞎䞟报", "confirmations.block.confirm": "屏蔜", - "confirmations.block.message": "䜠确定芁屏蔜 {name} 吗", + "confirmations.block.message": "确定芁屏蔜 {name} 吗", "confirmations.cancel_follow_request.confirm": "撀回请求", "confirmations.cancel_follow_request.message": "确定撀回关泚 {name} 的请求吗", "confirmations.delete.confirm": "删陀", @@ -165,7 +165,7 @@ "confirmations.edit.confirm": "猖蟑", "confirmations.edit.message": "猖蟑歀消息将䌚芆盖圓前正圚撰写的信息。仍芁继续吗", "confirmations.logout.confirm": "登出", - "confirmations.logout.message": "䜠确定芁登出吗", + "confirmations.logout.message": "确定芁退出登圕吗", "confirmations.mute.confirm": "隐藏", "confirmations.mute.explanation": "他们的嘟文以及提到他们的嘟文郜䌚隐藏䜆他们仍然可以看到䜠的嘟文也可以关泚䜠。", "confirmations.mute.message": "䜠确定芁隐藏 {name} 吗", @@ -244,7 +244,7 @@ "explore.trending_links": "新闻", "explore.trending_statuses": "嘟文", "explore.trending_tags": "话题标筟", - "filter_modal.added.context_mismatch_explanation": "歀过滀噚分类䞍适甚访问过嘟文的环境䞭。劂果䜠想芁圚环境䞭过滀嘟文䜠必须猖蟑歀过滀噚。", + "filter_modal.added.context_mismatch_explanation": "歀过滀噚类别䞍适甚访问过嘟文的环境䞭。劂芁圚歀环境䞭过滀嘟文䜠必须猖蟑歀过滀噚。", "filter_modal.added.context_mismatch_title": "环境䞍匹配", "filter_modal.added.expired_explanation": "歀过滀噚类别已过期䜠需芁修改到期日期才胜应甚。", "filter_modal.added.expired_title": "过滀噚已过期", @@ -253,11 +253,11 @@ "filter_modal.added.settings_link": "讟眮页面", "filter_modal.added.short_explanation": "歀嘟文已添加到以䞋过滀噚类别{title}。", "filter_modal.added.title": "过滀噚已添加 ", - "filter_modal.select_filter.context_mismatch": "䞍适甚于这䞪情境", + "filter_modal.select_filter.context_mismatch": "䞍适甚于歀环境", "filter_modal.select_filter.expired": "已过期", "filter_modal.select_filter.prompt_new": "新类别{name}", "filter_modal.select_filter.search": "搜玢或创建", - "filter_modal.select_filter.subtitle": "䜿甚䞀䞪已存圚分类或创建䞀䞪新类别", + "filter_modal.select_filter.subtitle": "䜿甚䞀䞪已存圚类别或创建䞀䞪新类别", "filter_modal.select_filter.title": "过滀歀嘟文", "filter_modal.title.status": "过滀䞀条嘟文", "follow_recommendations.done": "完成", @@ -299,7 +299,7 @@ "interaction_modal.description.reply": "拥有䞀䞪 Mastodon 莊号䜠可以回倍歀嘟文。", "interaction_modal.on_another_server": "圚及䞀服务噚", "interaction_modal.on_this_server": "圚歀服务噚", - "interaction_modal.other_server_instructions": "倍制歀铟接并粘莎到䜠䜿甚的 Mastodon 应甚或者 Mastodon 服务噚眑页版搜玢栏䞭。", + "interaction_modal.other_server_instructions": "倍制歀眑址并粘莎到垞甚的 Mastodon 应甚或 Mastodon 服务噚眑页版搜玢栏䞭。", "interaction_modal.preamble": "基于 Mastodon 去䞭心化的特性劂果䜠圚本站没有莊号也可以䜿甚圚及䞀 Mastodon 服务噚或其他兌容平台䞊的已有莊号。", "interaction_modal.title.favourite": "喜欢 {name} 的嘟文", "interaction_modal.title.follow": "关泚 {name}", @@ -365,8 +365,6 @@ "load_pending": "{count} 项", "loading_indicator.label": "加蜜䞭 ", "media_gallery.toggle_visible": "{number, plural, other {隐藏囟像}}", - "missing_indicator.label": "扟䞍到内容", - "missing_indicator.sublabel": "无法扟到歀资源", "moved_to_account_banner.text": "悚的莊号 {disabledAccount} 已停甚因䞺悚已迁移到 {movedToAccount} 。", "mute_modal.duration": "持续时长", "mute_modal.hide_notifications": "同时隐藏来自这䞪甚户的通知", @@ -527,9 +525,9 @@ "search.quick_action.account_search": "匹配 {x} 的䞪人资料", "search.quick_action.go_to_account": "蜬到 {x} 䞪人资料", "search.quick_action.go_to_hashtag": "蜬到标筟 {x}", - "search.quick_action.open_url": "圚 Mastodon 䞭打匀铟接", + "search.quick_action.open_url": "圚 Mastodon 䞭打匀眑址", "search.quick_action.status_search": "匹配 {x} 的垖子", - "search.search_or_paste": "搜玢或蟓入铟接", + "search.search_or_paste": "搜玢或蟓入眑址", "search_popout.quick_actions": "快捷操䜜", "search_popout.recent": "最近搜玢", "search_results.accounts": "䞪人资料", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index d130662fcf..d57ef9b1b7 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -365,8 +365,6 @@ "load_pending": "{count, plural, other {# 個新項目}}", "loading_indicator.label": "茉入䞭...", "media_gallery.toggle_visible": "隱藏圖片", - "missing_indicator.label": "扟䞍到內容", - "missing_indicator.sublabel": "無法扟到內容", "moved_to_account_banner.text": "悚的垳號 {disabledAccount} 目前已停甚因為悚已搬家至 {movedToAccount}。", "mute_modal.duration": "時間", "mute_modal.hide_notifications": "需芁隱藏這䜿甚者的通知嗎", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index 55f7093402..f4faafabd6 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -28,7 +28,7 @@ "account.endorse": "圚個人檔案掚薊對方", "account.featured_tags.last_status_at": "䞊次嘟文斌 {date}", "account.featured_tags.last_status_never": "沒有嘟文", - "account.featured_tags.title": "{name} 的特色䞻題暙籀", + "account.featured_tags.title": "{name} 的掚薊䞻題暙籀", "account.follow": "è·Ÿéšš", "account.followers": "跟隚者", "account.followers.empty": "尚未有人跟隚這䜍䜿甚者。", @@ -365,8 +365,6 @@ "load_pending": "{count, plural, one {# 個新項目} other {# 個新項目}}", "loading_indicator.label": "讀取䞭...", "media_gallery.toggle_visible": "切換可芋性", - "missing_indicator.label": "扟䞍到", - "missing_indicator.sublabel": "扟䞍到歀資源", "moved_to_account_banner.text": "悚的垳號 {disabledAccount} 目前已停甚因為悚已搬家至 {movedToAccount}。", "mute_modal.duration": "持續時間", "mute_modal.hide_notifications": "是吊隱藏䟆自這䜍䜿甚者的通知", @@ -399,12 +397,12 @@ "notification.admin.report": "{name} 已檢舉 {target}", "notification.admin.sign_up": "{name} 已經蚻冊", "notification.favourite": "{name} 已將悚的嘟文加入最愛", - "notification.follow": "{name} 跟隚了悚", + "notification.follow": "{name} 已跟隚悚", "notification.follow_request": "{name} 芁求跟隚悚", - "notification.mention": "{name} 提到了悚", + "notification.mention": "{name} 已提到悚", "notification.own_poll": "悚的投祚已結束", "notification.poll": "悚曟投過的投祚已經結束", - "notification.reblog": "{name} 蜉嘟了悚的嘟文", + "notification.reblog": "{name} 已蜉嘟悚的嘟文", "notification.status": "{name} 剛剛嘟文", "notification.update": "{name} 已線茯嘟文", "notifications.clear": "枅陀通知", @@ -438,7 +436,7 @@ "notifications.grant_permission": "授予權限", "notifications.group": "{count} 條通知", "notifications.mark_as_read": "將所有通知郜暙蚘為已讀", - "notifications.permission_denied": "由斌之前拒絕了瀏芜噚請求因歀桌面通知䞍可甚", + "notifications.permission_denied": "由斌之前已拒絕瀏芜噚請求因歀桌面通知䞍可甚", "notifications.permission_denied_alert": "由斌之前瀏芜噚權限被拒絕無法啟甚桌面通知", "notifications.permission_required": "由斌尚未授予所需的權限所以桌面通知䞍可甚。", "notifications_permission_banner.enable": "啟甚桌面通知", @@ -583,7 +581,7 @@ "status.read_more": "閱讀曎倚", "status.reblog": "蜉嘟", "status.reblog_private": "䟝照原嘟可芋性蜉嘟", - "status.reblogged_by": "{name} 蜉嘟了", + "status.reblogged_by": "{name} 已蜉嘟", "status.reblogs.empty": "還沒有人蜉嘟過這則嘟文。當有人蜉嘟時它將斌歀顯瀺。", "status.redraft": "刪陀䞊重新線茯", "status.remove_bookmark": "移陀曞籀", diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 0d84c2c90b..bbb779245c 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1642,9 +1642,9 @@ ca: title: Recollida de l'arxiu suspicious_sign_in: change_password: canvia la teva contrasenya - details: 'Aquí estan els detalls del inici de sessió:' + details: 'Aquí estan els detalls de l''inici de sessió:' explanation: Hem detectat un inici de sessió del teu compte des d'una nova adreça IP. - further_actions_html: Si no has estat tu, et recomanem %{action} immediatament i activis l'autenticació de dos-factors per a mantenir el teu compte segur. + further_actions_html: Si no has estat tu, %{action} immediatament i activa l'autenticació de dos-factors per a mantenir el teu compte segur. subject: S'ha accedit al teu compte des d'una adreça IP nova title: Un nou inici de sessió warning: diff --git a/config/locales/de.yml b/config/locales/de.yml index 91e4e84ae4..593499fabd 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1350,7 +1350,7 @@ de: subject: Eine Umfrage von %{name} ist beendet reblog: body: 'Deinen Beitrag hat %{name} geteilt:' - subject: "%{name} hat deinen Beitrag geteilt" + subject: "%{name} teilte deinen Beitrag" title: Dein Beitrag wurde geteilt status: subject: "%{name} veröffentlichte gerade einen Beitrag" diff --git a/config/locales/doorkeeper.ku.yml b/config/locales/doorkeeper.ku.yml index 3f8d7d068f..6d17bcec61 100644 --- a/config/locales/doorkeeper.ku.yml +++ b/config/locales/doorkeeper.ku.yml @@ -122,12 +122,14 @@ ku: admin/accounts: Rêveberiya ajimêran admin/all: Hemû fonksiyonên reveberî admin/reports: Rêveberiya ragihandinan + all: Gihîştina tevahî ya ajimêra te ya Mastodon blocks: Astengkirin bookmarks: Şûnpel conversations: Axaftin crypto: Dawî bi dawî şifrekirî favourites: Bijarte filters: Parzûn + follow: Şopîner, bêdengkirin û astengkirin follows: Dişopîne lists: Lîste media: Pêvekên medya diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index db4f83b936..078a94e261 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -722,7 +722,36 @@ en-GB: settings: about: manage_rules: Manage server rules + preamble: Provide in-depth information about how the server is operated, moderated, funded. + rules_hint: There is a dedicated area for rules that your users are expected to adhere to. + title: About + appearance: + preamble: Customise Mastodon's web interface. + title: Appearance + branding: + preamble: Your server's branding differentiates it from other servers in the network. This information may be displayed across a variety of environments, such as Mastodon's web interface, native applications, in link previews on other websites and within messaging apps, and so on. For this reason, it is best to keep this information clear, short and concise. + title: Branding + content_retention: + preamble: Control how user-generated content is stored in Mastodon. + title: Content retention + default_noindex: + desc_html: Affects all users who have not changed this setting themselves + title: Opt users out of search engine indexing by default + discovery: + follow_recommendations: Follow recommendations + preamble: Surfacing interesting content is instrumental in onboarding new users who may not know anyone Mastodon. Control how various discovery features work on your server. + profile_directory: Profile directory + public_timelines: Public timelines + publish_discovered_servers: Publish discovered servers + publish_statistics: Publish statistics + title: Discovery + trends: Trends + domain_blocks: + all: To everyone + disabled: To no one + users: To logged-in local users registrations: + preamble: Control who can create an account on your server. title: Registrations registrations_mode: modes: @@ -745,8 +774,102 @@ en-GB: favourites: Favourites history: Version history in_reply_to: Replying to + language: Language + media: + title: Media + metadata: Metadata + no_status_selected: No posts were changed as none were selected + open: Open post + original_status: Original post + reblogs: Reblogs + status_changed: Post changed + title: Account posts + trending: Trending + visibility: Visibility + with_media: With media + strikes: + actions: + delete_statuses: "%{name} deleted %{target}'s posts" + disable: "%{name} froze %{target}'s account" + mark_statuses_as_sensitive: "%{name} marked %{target}'s posts as sensitive" + none: "%{name} sent a warning to %{target}" + sensitive: "%{name} marked %{target}'s account as sensitive" + silence: "%{name} limited %{target}'s account" + suspend: "%{name} suspended %{target}'s account" + appeal_approved: Appealed + appeal_pending: Appeal pending + appeal_rejected: Appeal rejected + system_checks: + database_schema_check: + message_html: There are pending database migrations. Please run them to ensure the application behaves as expected + elasticsearch_running_check: + message_html: Could not connect to Elasticsearch. Please check that it is running, or disable full-text search + elasticsearch_version_check: + message_html: 'Incompatible Elasticsearch version: %{value}' + version_comparison: Elasticsearch %{running_version} is running while %{required_version} is required + rules_check: + action: Manage server rules + message_html: You haven't defined any server rules. + sidekiq_process_check: + message_html: No Sidekiq process running for the %{value} queue(s). Please review your Sidekiq configuration + upload_check_privacy_error: + action: Check here for more information + message_html: "Your web server is misconfigured. The privacy of your users is at risk." + upload_check_privacy_error_object_storage: + action: Check here for more information + message_html: "Your object storage is misconfigured. The privacy of your users is at risk." + tags: + review: Review status + updated_msg: Hashtag settings updated successfully + title: Administration trends: + allow: Allow + approved: Approved + disallow: Disallow + links: + allow: Allow link + allow_provider: Allow publisher + description_html: These are links that are currently being shared a lot by accounts that your server sees posts from. It can help your users find out what's going on in the world. No links are displayed publicly until you approve the publisher. You can also allow or reject individual links. + disallow: Disallow link + disallow_provider: Disallow publisher + no_link_selected: No links were changed as none were selected + publishers: + no_publisher_selected: No publishers were changed as none were selected + shared_by_over_week: + one: Shared by one person over the last week + other: Shared by %{count} people over the last week + title: Trending links + usage_comparison: Shared %{today} times today, compared to %{yesterday} yesterday + not_allowed_to_trend: Not allowed to trend + only_allowed: Only allowed + pending_review: Pending review + preview_card_providers: + allowed: Links from this publisher can trend + description_html: These are domains from which links are often shared on your server. Links will not trend publicly unless the domain of the link is approved. Your approval (or rejection) extends to subdomains. + rejected: Links from this publisher won't trend + title: Publishers + rejected: Rejected + statuses: + allow: Allow post + allow_account: Allow author + description_html: These are posts that your server knows about that are currently being shared and favourited a lot at the moment. It can help your new and returning users to find more people to follow. No posts are displayed publicly until you approve the author, and the author allows their account to be suggested to others. You can also allow or reject individual posts. + disallow: Disallow post + disallow_account: Disallow author + no_status_selected: No trending posts were changed as none were selected + not_discoverable: Author has not opted-in to being discoverable + shared_by: + one: Shared or favourited one time + other: Shared and favourited %{friendly_count} times + title: Trending posts tags: + current_score: Current score %{score} + dashboard: + tag_accounts_measure: unique uses + tag_languages_dimension: Top languages + tag_servers_dimension: Top servers + tag_servers_measure: different servers + tag_uses_measure: total uses + description_html: These are hashtags that are currently appearing in a lot of posts that your server sees. It can help your users find out what people are talking the most about at the moment. No hashtags are displayed publicly until you approve them. listable: Can be suggested no_tag_selected: No tags were changed as none were selected not_listable: Won't be suggested diff --git a/config/locales/ko.yml b/config/locales/ko.yml index bbfc6f311e..7a742f0bfa 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1376,7 +1376,7 @@ ko: posting_defaults: 게시묌 Ʞ볞섀정 public_timelines: 공개 타임띌읞 privacy_policy: - title: 개읞정볎처늬방칚 + title: 개읞정볎 처늬방칚 reactions: errors: limit_reached: 늬액션 갯수 제한에 도달했습니닀 diff --git a/config/locales/my.yml b/config/locales/my.yml index 816c5c401b..732b10a6e1 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -218,6 +218,7 @@ my: suspend_account: အကောင့် ရပ်ဆိုင်သပါ unassigned_report: အစီရင်ခံစာ ဖဌုတ်ရန် unblock_email_account: အီသမေသလ်လိပ်စာ ပဌန်ဖလင့်ရန် + unsensitive_account: Force-Sensitive Account မဟုတ်တော့ပါ unsilence_account: ကန့်သတ်အကောင့်ကို မလုပ်တော့ပါ unsuspend_account: အကောင့်ကို ရပ်ဆိုင်သပါ။ update_announcement: ကဌေညာချက်ပဌင်ဆင်ရန် @@ -447,6 +448,8 @@ my: description_html: "အကဌံပဌုချက်မျာသကို အသုံသပဌုသူအသစ်မျာသက လိုက်နာခဌင်သဖဌင့် စိတ်ဝင်စာသစရာအကဌောင်သအရာမျာသကို လျင်မဌန်စလာရဟာဖလေနိုင်စေပါမည်။ အသုံသပဌုသူတစ်ညသက စိတ်ကဌိုက်ပဌင်ဆင်ထာသသည့် အကဌံပဌုချက်မျာသလိုက်နာရန်အတလက် အခဌာသသူမျာသနဟင့် လုံလောက်သောအပဌန်အလဟန်တုံ့ပဌန်ခဌင်သမရဟိပါက ယင်သအစာသ ကအကောင့်မျာသကို အကဌံပဌုလိုပါသည်။ ၎င်သအကောင့်မျာသကို မကဌာသေသမီက ထိတလေ့ဆက်ဆံမဟုအမျာသဆုံသနဟင့် အသုံသပဌုထာသသည့်ဘာသာစကာသမဟတစ်ဆင့် ဒေသတလင်သစောင့်ကဌည့်သူညသရေ အမျာသဆုံသရဟိသော အကောင့်မျာသကိုအခဌေခံ၍ နေ့စဉ် တလက်ချက်ထာသခဌင်သဖဌစ်ပါသည်။" language: ဘာသာစကာသအတလက် status: အခဌေအနေ + suppress: လိုက်နာရမည့်အကဌံပဌုချက်မျာသကို ထိန်သချုပ်ပါ + suppressed: ဖျောက်ထာသသော title: အကဌံပဌုချက်မျာသကို စောင့်ကဌည့်ပါ unsuppress: အကဌံပဌုချက်စောင့်ကဌည့်ခဌင်သအာသ ပဌန်လည်ရယူပါ instances: @@ -624,12 +627,15 @@ my: actions: delete_html: စိတ်အနဟောင့်အယဟက်ဖဌစ်စေသောပို့စ်မျာသကို ဖယ်ရဟာသပါ mark_as_sensitive_html: စိတ်အနဟောင့်အယဟက်ဖဌစ်စေသောပို့စ်မျာသ၏ မီဒီယာကို သတိထာသရသောမီဒီယာအဖဌစ် အမဟတ်အသာသပဌုပါ + silence_html: "၎င်သတို့၏ ပရိုဖိုင်နဟင့် အကဌောင်သအရာမျာသကို ၎င်သတို့ကိုစောင့်ကဌည့်နေသူမျာသသာ မဌင်နိုင်စေခဌင်သ သို့မဟုတ် ပရိုဖိုင်ကဌည့်ရဟုခဌင်သဖဌင့် @%{acct} အကောင့်ရောက်ရဟိမဟုကို ကန့်သတ်ပါ" suspend_html: "@%{acct} ကို ဆိုင်သငံ့ထာသသောကဌောင့် ပရိုဖိုင်နဟင့် အကဌောင်သအရာမျာသအာသ ဝင်ရောက်ခလင့်မရဟိတော့သဖဌင့် အပဌန်အလဟန် တုံ့ပဌန်၍ မရတော့ခဌင်သ" close_report: 'တိုင်ကဌာသစာ #%{id} ကို ဖဌေရဟင်သပဌီသကဌောင်သ အမဟတ်အသာသပဌုပါ' close_reports_html: "@%{acct} နဟင့်ပတ်သက်သည့် အစီရင်ခံစာအာသလုံသ ကို ဖဌေရဟင်သပဌီသကဌောင်သ အမဟတ်အသာသပဌုပါ" delete_data_html: "@%{acct} ၏ ပရိုဖိုင်နဟင့် အကဌောင်သအရာမျာသကို ဆိုင်သငံ့ထာသခဌင်သမရဟိပါက ယခုမဟ ရက်ပေါင်သ ၃၀ အတလင်သ ဖျက်ရန်" preview_preamble_html: "@%{acct} သည် အောက်ပါအကဌောင်သအရာမျာသကဌောင့် သတိပေသချက်ကို လက်ခံရရဟိပါမည် -" + record_strike_html: ကအကောင့်မဟ နောင်လာမည့် ချိုသဖောက်မဟုမျာသအတလက် အရေသယူနိုင်ရန် @%{acct} သတိပေသချက်တစ်ခု မဟတ်တမ်သယူထာသပါ send_email_html: သတိပေသချက် အီသမေသလ်တစ်စောင် @%{acct} ပေသပို့ပါ + warning_placeholder: စိစစ်ခဌင်သအတလက် ရလေသချယ်နိုင်သော ထပ်လောင်သအကဌောင်သပဌချက်။ target_origin: တိုင်ကဌာသထာသသောအကောင့်၏ မူလအစ title: မဟတ်တမ်သမျာသ unassign: တာဝန်မဟဖဌုတ်ရန် @@ -651,6 +657,7 @@ my: description_html: "အသုံသပဌုသူအခန်သကဏ္ဍမျာသဖဌင့် Mastodon အသုံသပဌုသူမျာသ၏ မည်သည့်လုပ်ဆောင်ချက်မျာသနဟင့် နေရာမျာသကိုမဆို သင် စိတ်ကဌိုက်ပဌင်ဆင်နိုင်ပါသည်။" edit: "'%{name} ၏ အခန်သကဏ္ဍကို ပဌင်ဆင်ရန်" everyone: မူလသတ်မဟတ်ထာသသည့် ခလင့်ပဌုချက်မျာသ + everyone_full_description_html: ကသည်မဟာ အခန်သကဏ္ဍတာဝန်ပေသထာသခဌင်သမရဟိသော အသုံသပဌုသူအာသလုံသ အပေါ် သက်ရောက်သည့် အခဌေခံအခန်သကဏ္ဍ ပင်ဖဌစ်သည်။ အခဌာသကဏ္ဍမျာသအာသလုံသမဟာ ၎င်သထံမဟ ခလင့်ပဌုချက်မျာသ ယူရပါသည်။ permissions_count: other: "%{count} ခလင့်ပဌုချက်" privileges: @@ -698,17 +705,21 @@ my: rules: add_new: စည်သမျဉ်သထည့်ပါ delete: ဖျက်ပါ + description_html: စည်သမျဉ်သမျာသဖတ်ရဟုပဌီသ သဘောတူသည်ဟု အမျာသစုကဆိုကဌသော်လည်သ မျာသသောအာသဖဌင့် ပဌဿနာပေါ်ပေါက်လာသည်အထိ မဖတ်ကဌပါ။ သင့်ဆာဗာစည်သမျဉ်သမျာသကို flat bullet point စာရင်သတလင် ထည့်သလင်သခဌင်သဖဌင့် ကဌည့်ရဟု၍ ပိုမိုလလယ်ကူအောင် ဆောင်ရလက်ပါ။ စည်သမျဉ်သတစ်ခုချင်သစီကို တိုတိုနဟင့် ရိုသရိုသရဟင်သရဟင်သထာသပဌီသ ၎င်သတို့ကို သီသခဌာသခလဲထလက်မသလာသစေရန် လုပ်ဆောင်ပါ။ edit: စည်သမျဉ်သကို ပဌင်ဆင်မည် empty: ဆာဗာစည်သမျဉ်သမျာသကို မသတ်မဟတ်ရသေသပါ။ title: ဆာဗာစည်သမျဉ်သမျာသ settings: about: manage_rules: ဆာဗာစည်သမျဉ်သမျာသကို စီမံရန် + preamble: ဆာဗာလည်ပတ်မဟု၊ စိစစ်မဟု၊၊ ငလေကဌေသထောက်ပံ့မဟုတို့အကဌောင်သ အသေသစိတ်အချက်အလက်မျာသ ပေသပါ။ + rules_hint: အသုံသပဌုသူမျာသ လိုက်နာရမည့် စည်သမျဉ်သမျာသအတလက် သီသခဌာသနေရာတစ်ခု ရဟိပါသည်။ title: အကဌောင်သ appearance: preamble: Mastodon ၏ ဝဘ်ပုံစံကို စိတ်ကဌိုက်ပဌင်ဆင်ပါ။ title: ပုံပန်သသဏ္ဌာန် branding: + preamble: သင့်ဆာဗာအကဌောင်သကို ကလန်ရက်အတလင်သရဟိ အခဌာသဆာဗာမျာသနဟင့် ကလဲပဌာသစေရန်ဆောင်ရလက်ပါ။ Mastodon ၏ ဝဘ်အင်တာဖေ့စ်၊ မူရင်သအက်လီကေသရဟင်သမျာသ၊ အခဌာသဝဘ်ဆိုက်မျာသပေါ်ရဟိ လင့်ခ်အစမ်သကဌည့်ရဟုခဌင်သမျာသနဟင့် မက်ဆေ့ခ်ျပေသပို့ခဌင်သအက်ပ်မျာသအတလင်သ အစရဟိသည့် အမျိုသမျိုသတလင် ကအချက်အလက်မျာသကို ပဌသနိုင်ပါသည်။ ထို့ကဌောင့် ကအချက်အလက်မျာသကို တိုတောင်သရဟင်သလင်သစလာ ရေသသင့်ပါသည်။ title: ခေါင်သစဉ်တပ်ခဌင်သ content_retention: preamble: Mastodon တလင် အသုံသပဌုသူဖန်တီသထာသသော အကဌောင်သအရာမျာသ မည်သို့သိမ်သဆည်သမည်ကို ထိန်သချုပ်ပါ။ @@ -718,6 +729,7 @@ my: title: ပုံမဟန်အာသဖဌင့် ရဟာဖလေမဟုအညလဟန်သကိန်သမဟ သုံသစလဲသူမျာသကို ဖယ်ထုတ်ပါ discovery: follow_recommendations: အကဌံပဌုချက်မျာသကို စောင့်ကဌည့်ပါ + preamble: စိတ်ဝင်စာသစရာကောင်သသော အကဌောင်သအရာမျာသပဌထာသခဌင်သမဟာ Mastodon ကို မသိသေသသော သုံသစလဲသူအသစ်မျာသအတလက် အရေသပါပါသည်။ သင့်ဆာဗာတလင် မည်သည့်ရဟာဖလေတလေ့ရဟိမဟုအကဌောင်သအရာမျာသ ပဌထာသမည်ကို ထိန်သချုပ်ပါ။ profile_directory: ပရိုဖိုင်လမ်သညလဟန် public_timelines: အမျာသမဌင်စာမျက်နဟာ publish_discovered_servers: ရဟာဖလေတလေ့ရဟိထာသသော ဆာဗာမျာသကို ထုတ်ပဌန်ပါ @@ -851,6 +863,7 @@ my: not_listable: အကဌံပဌုမည်မဟုတ်ပါ not_trendable: လက်ရဟိခေတ်စာသနေသာပို့စ်မျာသအောက်တလင် ပေါ်လာမည်မဟုတ်ပါ not_usable: အသုံသမပဌုနိုင်ပါ + peaked_on_and_decaying: "%{date} ရက်တလင် ခေတ်စာသခဲ့သော်လည်သ ယခု ခေတ်မစာသတော့ပါ" title: လက်ရဟိခေတ်စာသနေသော hashtag မျာသ trendable: လက်ရဟိခေတ်စာသနေသာပို့စ်မျာသအောက်တလင် ပေါ်လာမည် trending_rank: "#%{rank} ခေတ်စာသနေခဌင်သ" @@ -880,6 +893,7 @@ my: other: ဖလင့်ထာသသောအစီအစဉ်မျာသ %{count} ခု events: ပလဲအစီအစဉ်မျာသ new: webhook အသစ် + rotate_secret: Rotate secret ထာသပါ secret: လျဟို့ဝဟက်လက်မဟတ်ထိုသခဌင်သ status: အခဌေအနေ title: Webhook မျာသ @@ -894,6 +908,7 @@ my: sensitive: "၎င်သတို့၏ အကောင့်မျာသကို သတိထာသရသော အကောင့်မျာသအဖဌစ် အမဟတ်အသာသပဌုရန်" silence: "၎င်သတို့၏ ပို့စ်မျာသကို ကန့်သတ်ရန်" suspend: "၎င်သတို့၏ အကောင့်ကို ရပ်ဆိုင်သရန်" + body: "%{target} သည် %{type} ဖဌစ်သည့် %{date} တလင် %{action_taken_by} ဖဌင့် စိစစ်မဟုတစ်ခုအာသ အယူခံဝင်နေပါသည်။ သူတို့ရေသသာသခဲ့သည် -" next_steps: စိစစ်ဆုံသဖဌတ်ချက်ပဌန်ဖျက်ရန်အတလက် တင်ပဌနိုင်သည် သို့မဟုတ် ၎င်သကို လျစ်လျူရဟုနိုင်သည်။ subject: "%{username} က %{instance} တလင် စိစစ်ဆုံသဖဌတ်ချက်ကို တင်ပဌနေသည်" new_pending_account: @@ -911,6 +926,7 @@ my: title: လက်ရဟိခေတ်စာသနေသော ပို့စ်မျာသ new_trending_tags: no_approved_tags: လက်ရဟိတလင် အတည်ပဌုထာသသော ခေတ်စာသနေသည့် hashtag မျာသမရဟိပါ။ + requirements: 'ကလူမျာသမဟာ %{lowest_tag_score} ရမဟတ်ဖဌင့် လက်ရဟိ #%{lowest_tag_name} ဖဌစ်သည့် ခေတ်စာသနေသော hashtag #%{rank} ကို ကျော်သလာသနိုင်သည်။' title: လက်ရဟိခေတ်စာသနေသော hashtag မျာသ subject: "%{instance} တလင် ပဌန်လည်သုံသသပ်ရမည့် ခေတ်စာသနေသောပို့စ်အသစ်မျာသ" aliases: @@ -918,9 +934,11 @@ my: created_msg: နာမည်တူတစ်ခုကို ဖန်တီသပဌီသပါပဌီ။ အကောင့်ဟောင်သမဟ စတင်ရလဟေ့နိုင်ပါပဌီ။ deleted_msg: နာမည်တူကို ဖယ်ရဟာသထာသပဌီသပါပဌီ။ ထိုအကောင့်မဟ ကအကောင့်သို့ပဌောင်သရန် မဖဌစ်နိုင်တော့ပါ။ empty: သင့်တလင် နာမည်တူမျာသ မရဟိပါ။ + hint_html: အခဌာသအကောင့်မဟ ကအကောင့်သို့ ပဌောင်သရလဟေ့လိုပါက ကနေရာတလင် အကောင့်ဟောင်သမဟ စောင့်ကဌည့်သူမျာသကို ကအကောင့်သို့ မရလဟေ့မီ လိုအပ်သော အမည်တစ်ခု ဖန်တီသနိုင်ပါသည်။ ကလုပ်ဆောင်ချက်မဟာ အန္တရာယ်ကင်သပဌီသ ပဌန်ပဌောင်သလုပ်ဆောင်နိုင်ပါသည်။ အကောင့်ပဌောင်သရလဟေ့ခဌင်သကို အကောင့်ဟောင်သမဟ စတင်လုပ်ဆောင်ပါသည်။ remove: နာမည်တူမျာသကို လင့်ခ်ဖဌုတ်ပါ appearance: advanced_web_interface: အဆင့်မဌင့်ဝဘ်ပုံစံ + advanced_web_interface_hint: အဆင့်မဌင့်ဝဘ်အင်တာဖေ့စ်သည် မျက်နဟာပဌင်အကျယ်တစ်ခုလုံသကို သင် အသုံသပဌုလိုပါက သင်အလိုရဟိသည့်အတိုင်သ အချက်အလက်မျာသကို တစ်ပဌိုင်နက်ကဌည့်ရဟုရန် ကော်လံမျာသစလာဖဌင့် ပဌသနိုင်သည် - ပင်မစာမျက်နဟာ၊ အကဌောင်သကဌာသချက်မျာသ၊ ဖက်ဒီစာမျက်နဟာ၊ စာရင်သအရေအတလက်နဟင့် hashtags မဟန်သမျဟကို ချိန်ညဟိဖော်ပဌနိုင်သည်။ animations_and_accessibility: လဟုပ်ရဟာသမဟုဆိုင်ရာမျာသ confirmation_dialogs: အတည်ပဌုချက် ဒိုင်ယာလော့ခ်မျာသ discovery: ရဟာဖလေတလေ့ရဟိမဟု @@ -959,6 +977,7 @@ my: didnt_get_confirmation: အတည်ပဌုချက်ညလဟန်ကဌာသချက်မျာသကို မရရဟိခဲ့ဘူသလာသ။ dont_have_your_security_key: သင့်တလင် လုံခဌုံရေသကီသ မရဟိဘူသလာသ။ forgot_password: သင့်စကာသဝဟက် မေ့နေပါသလာသ။ + invalid_reset_password_token: စကာသဝဟက်ပဌန်လည်သတ်မဟတ်ခဌင်သတိုကင်မဟာ မမဟန်ကန်ပါ သို့မဟုတ် သက်တမ်သကုန်သလာသပါသည်။ အသစ်တစ်ခုတောင်သဆိုပါ။ link_to_otp: သင့်ဖုန်သမဟ နဟစ်ဆင့်ခံလုံခဌုံရေသကုဒ် သို့မဟုတ် ပဌန်လည်ရယူရေသကုဒ် ထည့်ပါ link_to_webauth: လုံခဌုံရေသကီသ အသုံသပဌုပါ log_in_with: ဖဌင့် ဝင်ရောက်ပါ @@ -974,9 +993,11 @@ my: register: အကောင့်ဖလင့်ရန် registration_closed: "%{instance} သည် အဖလဲ့ဝင်အသစ်မျာသကို လက်ခံထာသခဌင်သမရဟိပါ" resend_confirmation: အတည်ပဌုချက်ညလဟန်ကဌာသမဟုမျာသကို ပဌန်ပို့ရန် + reset_password: စကာသဝဟက် ပဌန်လည်သတ်မဟတ်ပါ rules: accept: လက်ခံပါ back: နောက်သို့ + preamble: "၎င်သတို့ကို %{domain} စိစစ်သူမျာသမဟ အတည်ပဌုပါသည်။" title: အခဌေခံစည်သမျဉ်သအချို့ security: လုံခဌုံရေသ set_new_password: စကာသဝဟက်အသစ် သတ်မဟတ်ပါ။ @@ -988,13 +1009,16 @@ my: preamble_html: သင်၏ %{domain} အထောက်အထာသမျာသဖဌင့် ဝင်ရောက်ပါ။ သင့်အကောင့်ကို အခဌာသဆာဗာတစ်ခုတလင် ဖလင့်ထာသပါက ကနေရာ၌ အကောင့်ဝင်ရောက်နိုင်မည်မဟုတ်ပါ။ title: "%{domain} သို့ အကောင့်ဝင်ရန်" sign_up: + preamble: က Mastodon အကောင့်တစ်ခုဖဌင့် သင်သည် ကလန်ရက်ပေါ်ရဟိ အခဌာသမည်သူ့မဆို မည်သည့်ဆာဗာတလင်ရဟိစေကာမူ သင်စောင့်ကဌည့်နိုင်မည်ဖဌစ်ပါသည်။ title: "%{domain} တလင် ထည့်သလင်သရန်။" status: account_status: အကောင့်အခဌေအနေ confirming: အီသမေသလ်အတည်ပဌုချက် အပဌီသသတ်ရန် စောင့်ဆိုင်သခဌင်သ functional: သင့်အကောင့်မဟာ အပဌည့်အဝလုပ်ဆောင်နေပါပဌီ။ + pending: သင့်အက်ပလီကေသရဟင်သကို ကျလန်ုပ်တို့၏ဝန်ထမ်သမျာသမဟ ပဌန်လည်သုံသသပ်နေပါသည်။ အချိန်အနည်သငယ်ကဌာနိုင်ပါသည်။ သင့်အက်ပလီကေသရဟင်သကို အတည်ပဌုပဌီသပါက အီသမေသလ်တစ်စောင် သင် လက်ခံရရဟိမည်ဖဌစ်သည်။ redirecting_to: သင့်အကောင့်မဟာ လက်ရဟိတလင် %{acct} သို့ ပဌန်ညလဟန်သနေသောကဌောင့် သုံသစလဲ၍မရပါ။ view_strikes: သင့်အကောင့်ကို ဆန့်ကျင်သည့် ယခင်ကလုပ်ဆောင်ချက်မျာသကို ကဌည့်ပါ + too_fast: ဖောင်တင်သည်မဟာ မဌန်နေပါသည်။ ထပ်စမ်သကဌည့်ပါ။ use_security_key: လုံခဌုံရေသကီသကို သုံသပါ authorize_follow: already_following: သင်သည် ကအကောင့်ကို စောင့်ကဌည့်နေပဌီဖဌစ်ပါသည် @@ -1056,6 +1080,7 @@ my: strikes: action_taken: ဆောင်ရလက်ခဲ့သည် appeal: အယူခံဝင်ခဌင်သ + appeal_approved: ကသတိပေသချက်ကို အယူခံဝင်ခဲ့ပဌီသဖဌစ်၍ အကျုံသမဝင်တော့ပါ။ appeal_rejected: တင်သလင်သခဌင်သကို ပယ်ချလိုက်သည် appeal_submitted_at: အယူခံဝင်မဟုကို တင်သလင်သပဌီသချိန် appealed_msg: အယူခံဝင်မဟုကို တင်သလင်သပဌီသဖဌစ်သည်။ အတည်ပဌုပဌီသပါက အကဌောင်သကဌာသပါမည်။ @@ -1105,6 +1130,7 @@ my: archive_takeout: date: ရက်စလဲ download: သင်၏မဟတ်တမ်သကို ဒေါင်သလုဒ်လုပ်ပါ + hint_html: သင့် ပို့စ်မျာသနဟင့် အပ်လုဒ်လုပ်ထာသသော မီဒီယာဖိုင် မဟတ်တမ်သတို့ကို တောင်သဆိုနိုင်သည်။ ထုတ်ယူထာသသောအချက်အလက်မဟာ ActivityPub ပုံစံဖဌစ်ပဌီသ ကိုက်ညီသည့်မည်သည့်ဆော့ဖ်ဝဲလ်ဖဌင့်မဆို ဖတ်နိုင်မည်ဖဌစ်သည်။ သင်သည် ၇ ရက်ပဌည့်တိုင်သ မဟတ်တမ်သတစ်ခု တောင်သဆိုနိုင်သည်။ in_progress: သင့်မဟတ်တမ်သကို ပဌုစုနေသည်... request: မဟတ်တမ်သ တောင်သဆိုရန် size: အရလယ်အစာသ @@ -1119,6 +1145,7 @@ my: add_new: အသစ် ထည့်ပါ errors: limit: ဟက်ရဟ်တဂ်အရေအတလက် အမျာသဆုံသကို ဖော်ပဌပဌီသဖဌစ်သည် + hint_html: " hashtags ဆိုသည်မဟာ အဘယ်နည်သ။ ၎င်သတို့ကို သင်၏ အမျာသမဌင်ပရိုဖိုင်တလင် ပဌသထာသပဌီသ ထို hashtags မျာသအောက်တလင် လူမျာသအာသ သင်၏ အမျာသမဌင်ပို့စ်မျာသကို ကဌည့်ရဟုရန်ခလင့်ပဌုထာသသည်။ ၎င်သတို့သည် ဖန်တီသမဟုလက်ရာမျာသ သို့မဟုတ် ရေရဟည်စီမံကိန်သမျာသ ခဌေရာခံရန်အတလက် အသုံသဝင်ပါသည်။" filters: contexts: account: ပရိုဖိုင်မျာသ @@ -1130,8 +1157,10 @@ my: add_keyword: အဓိကစကာသလုံသ ထည့်ပါ keywords: အဓိကစကာသလုံသမျာသ statuses: တစ်ညသချင်သတင်ထာသသောပို့စ်မျာသ + statuses_hint_html: ကစစ်ထုတ်မဟုမဟာ အောက်ပါအဓိကစာလုံသမျာသနဟင့် ကိုက်ညီမဟုရဟိသည်ဖဌစ်စေ၊ မရဟိသည်ဖဌစ်စေ ရလေသချယ်ထာသသော ပို့စ်တစ်ခုချင်သစီအတလက် အကျုံသဝင်ပါသည်။ စစ်ထုတ်မဟုမဟ ပို့စ်မျာသကို ပဌန်လည်သုံသသပ်ခဌင်သ သို့မဟုတ် ဖယ်ရဟာသခဌင်သ။ title: စစ်ထုတ်ခဌင်သကို ပဌင်ဆင်ရန် errors: + deprecated_api_multiple_keywords: ကအချက်အလက်မျာသမဟာ စစ်ထုတ်ထာသသည့်အဓိကစာလုံသတစ်ခုထက် ပို၍သက်ဆိုင်သောကဌောင့် ကအက်ပလီကေသရဟင်သမဟပဌောင်သ၍မရပါ။ မကဌာသေသမီကအသုံသပဌုထာသသော အက်ပလီကေသရဟင်သ သို့မဟုတ် ဝဘ်အင်တာဖေ့စ်ကို အသုံသပဌုပါ။ invalid_context: ပံ့ပိုသထာသ​သော အ​​ကဌောင်သအရာ မရဟိခဌင်သ သို့မဟုတ် မမဟန်ကန်ခဌင်သ index: contexts: "%{contexts} ရဟိ စစ်ထုတ်ထာသမဟုမျာသ" @@ -1154,6 +1183,7 @@ my: batch: remove: စစ်ထုတ်ခဌင်သမဟ ဖယ်ရဟာသရန် index: + hint: ကစစ်ထုတ်မဟုမဟာ အခဌာသသတ်မဟတ်ချက်မျာသနဟင့်မသက်ဆိုင်ဘဲ တစ်ညသချင်သပို့စ်မျာသအတလက်သာ အကျုံသဝင်ပါသည်။ ဝဘ်အင်တာဖေ့စ်မဟတစ်ဆင့် ကစစ်ထုတ်မဟုတလင် နောက်ထပ်ပို့စ်မျာသ သင်ထပ်ထည့်နိုင်ပါသည်။ title: စစ်ထုတ်ထာသသော ပို့စ်မျာသ generic: all: အာသလုံသ @@ -1241,6 +1271,7 @@ my: missing_also_known_as: ကအကောင့်၏ အမည်တူမဟုတ်ပါ move_to_self: လက်ရဟိအကောင့်မဖဌစ်နိုင်ပါ not_found: ရဟာမတလေ့ပါ + on_cooldown: သင် cooldown အခဌေအနေတလင် ရဟိနေပါသည် followers_count: ပဌောင်သရလဟေ့ချိန်၌ စောင့်ကဌည့်သူမျာသအရေအတလက် incoming_migrations: အခဌာသအကောင့်တစ်ခုမဟ ပဌောင်သရလဟေ့ခဌင်သ incoming_migrations_html: အခဌာသအကောင့်မဟ ကအကောင့်သို့ ရလဟေ့ရန် ညသစလာ သင်သည် အကောင့်အမည်တူတစ်ခု ဖန်တီသရန် လိုအပ်ပါသည်။ @@ -1321,7 +1352,9 @@ my: trillion: T otp_authentication: code_hint: အတည်ပဌုရန်အတလက် အထောက်အထာသစိစစ်အက်ပ်မဟ ထုတ်ပေသသည့်ကုဒ်ကို ထည့်သလင်သပါ + description_html: အထောက်အထာသစိစစ်ခဌင်သအက်ပ်ကို အသုံသပဌု၍ နဟစ်ဆင့်ခံလုံခဌုံရေသစနစ် ဖလင့်ထာသပါက အကောင့်ဝင်ရောက်ရန် သင့်ဖုန်သလက်ဝယ်ရဟိရန် လိုအပ်မည်ဖဌစ်ပဌီသ ၎င်သသည် သင်ဝင်ရောက်ရန်အတလက် တိုကင်မျာသထုတ်ပေသမည်ဖဌစ်သည်။ enable: ဖလင့်ပါ + instructions_html: "က QR ကုဒ်ကို Google Authenticator သို့မဟုတ် အလာသတူ TOTP အက်ပ်ဖဌင့် စကင်န်ဖတ်ပါ။ ယခုအချိန်မဟစ၍ ထိုအက်ပ်သည် သင် အကောင့်ဝင်ရောက်သည့်အခါတိုင်သ ထည့်သလင်သရမည့်တိုကင်မျာသ ထုတ်ပေသမည်ဖဌစ်သည်။" manual_instructions: QR ကုဒ်စကင်န်ဖတ်၍မရပါက ကိုယ်တိုင်ရိုက်ထည့်ရန်လိုအပ်ပဌီသ ကနေရာသည် စာရလက်အလလတ်နေရာဖဌစ်သည်။ setup: သတ်မဟတ်ရန် wrong_code: ထည့်သလင်သထာသသောကုဒ်သည် မမဟန်ကန်ပါ။ ဆာဗာအချိန်နဟင့် စက်အချိန်မဟာ မဟန်ကန်ပါသလာသ။ @@ -1544,8 +1577,9 @@ my: tags: does_not_match_previous_name: ယခင်အမည်နဟင့် မကိုက်ညီပါ themes: - default: Mastodon (အနက်) - mastodon-light: Mastodon (အလင်သနောက်ခံ) + contrast: Mastodon (စာသာသအလင်သပုံစံ) + default: Mastodon (အနက်နောက်ခံပုံစံ) + mastodon-light: Mastodon (အလင်သနောက်ခံပုံစံ) time: formats: default: "%b %d, %Y, %H:%M" @@ -1596,6 +1630,8 @@ my: explanation: delete_statuses: သင့်ပို့စ်အချို့သည် တစ်ခု သို့မဟုတ် တစ်ခုထက်ပိုသော ကလန်မဌူနတီလမ်သညလဟန်ချက်မျာသကို ချိုသဖောက်ကဌောင်သ တလေ့ရဟိပဌီသ %{instance} ၏ ကဌီသကဌပ်သူမျာသမဟ ဖယ်ရဟာသလိုက်ပါသည်။ disable: သင့်အကောင့်ကို အသုံသမပဌုနိုင်တော့သော်လည်သ သင့်ပရိုဖိုင်နဟင့် အခဌာသအချက်အလက်မျာသမဟာ ကျန်ရဟိနေမည်ဖဌစ်သည်။ သင့်အချက်အလက်ကို မိတ္တူကူသရန်၊ အကောင့်သတ်မဟတ်ချက်မျာသကို ပဌောင်သလဲရန် သို့မဟုတ် သင့်အကောင့်ဖျက်သိမ်သရန်တို့အတလက် အရန်သိမ်သဆည်သမဟုအာသ သင် တောင်သဆိုနိုင်သည်။ + mark_statuses_as_sensitive: သင့်ပို့စ်အချို့ကို %{instance} ၏ စိစစ်သူမျာသမဟ သတိထာသရသောပို့စ်မျာသအဖဌစ် အမဟတ်အသာသပဌုထာသသည်။ ဆိုလိုသည်မဟာ လူမျာသသည် အစမ်သကဌည့်ခဌင်သမပဌသမီ ပို့စ်မျာသရဟိ မီဒီယာကိုနဟိပ်ရန် လိုအပ်မည်ဖဌစ်ပါသည်။ နောင်တလင် ပို့စ်တင်သည့်အခါ သင်ကိုယ်တိုင် သတိထာသရသောမီဒီယာအဖဌစ် သတ်မဟတ်နိုင်သည်။ + sensitive: ယခုအချိန်မဟစ၍ သင် အပ်လုဒ်လုပ်ထာသသော မီဒီယာဖိုင်မျာသအာသလုံသကို သတိထာသရသောမီဒီယာအဖဌစ် အမဟတ်အသာသပဌုပဌီသ ကလစ်နဟိပ်၍သတိပေသချက်နောက်တလင် ဖျောက်ထာသပါမည်။ silence: သင့်အကောင့်ကို ဆက်လက်အသုံသပဌုနိုင်သော်လည်သ သင့်စောင့်ကဌည့်သူမျာသသာ ကဆာဗာတလင် သင့်ပို့စ်မျာသကို မဌင်နိုင်မည်ဖဌစ်ပဌီသ အကဌောင်သအရာခေါင်သစဉ်အမျိုသမျိုသမဟ သင့်ကို ဖယ်ထုတ်ထာသနိုင်သည်။ သို့သော် အခဌာသသူမျာသက သင့်ကို စောင့်ကဌည့်နေနိုင်ပါသေသသည်။ suspend: သင့်အကောင့်ကို အသုံသမပဌုနိုင်တော့သည့်အပဌင် ပရိုဖိုင်နဟင့် အခဌာသအချက်အလက်မျာသကိုလည်သ အသုံသပဌု၍မရတော့ပါ။ သင့်အချက်အလက်ကို ရက်ပေါင်သ ၃၀ ခန့်အတလင်သ အပဌည့်အဝ မဖယ်ရဟာသမချင်သ အချက်အလက်မျာသ အရန်ကူသယူရန်အတလက် အကောင့်သို့ ဝင်ရောက်နိုင်ပါသေသသည်။ သို့သော် အကောင့်ရပ်ဆိုင်သထာသမဟုရဟောင်လလဟဲခဌင်သမဟ ကာကလယ်ရန်အတလက် အခဌေခံအချက်အလက်အချို့ကို ကျလန်ုပ်တို့ ထိန်သသိမ်သထာသရပါမည်။ reason: အကဌောင်သပဌချက် - @@ -1634,6 +1670,7 @@ my: seamless_external_login: ပဌင်ပဝန်ဆောင်မဟုမဟတစ်ဆင့် အကောင့်ဝင်ထာသသောကဌောင့် စကာသဝဟက်နဟင့် အီသမေသလ်သတ်မဟတ်ချက်မျာသကို မရနိုင်ပါ။ signed_in_as: အဖဌစ် အကောင့်ဝင်ခဲ့သည် - verification: + explanation_html: သင်သည် သင့်ပရိုဖိုင်မက်တာဒေတာရဟိ လင့်ခ်မျာသ၏ ပိုင်ရဟင်အဖဌစ် သင်ကိုယ်တိုင် အတည်ပဌုနိုင်သည်။ ယင်သအတလက် လင့်ခ်ချိတ်ထာသသော ဝဘ်ဆိုက်တလင် သင်၏ Mastodon ပရိုဖိုင်သို့ ပဌန်သလာသရန် လင့်ခ်တစ်ခု ပါရဟိရပါမည်။ လင့်ခ်ထည့်သလင်သပဌီသနောက် ကနေရာသို့ပဌန်လာရန်နဟင့် အတည်ပဌုနိုင်ရန်အတလက် သင့်ပရိုဖိုင်ကို ပဌန်လည်သိမ်သဆည်သရန် လိုအပ်နိုင်ပါသည်။ နောက်ပဌန်လင့်ခ်တလင် rel="me" ရည်ညလဟန်သချက် ပါရဟိရပါမည်။ လင့်ခ် စာသာသအကဌောင်သအရာမဟာ အရေသမကဌီသပါ။ ကတလင် ဥပမာတစ်ခုရဟိပါသည် - verification: စိစစ်ခဌင်သ webauthn_credentials: add: လုံခဌုံရေသကီသအသစ်ထည့်ပါ diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 771a1623e3..36e34b786e 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -148,7 +148,7 @@ pl: sensitized: Oznaczono jako wraÅŒliwe shared_inbox_url: Adres udostępnianej skrzynki show: - created_reports: Zgłoszenia tego uÅŒytkownika + created_reports: Zgłoszeń targeted_reports: Zgłoszenia dotyczące tego uÅŒytkownika silence: Wycisz silenced: Wyciszono @@ -363,7 +363,7 @@ pl: pending_reports_html: few: "%{count} oczekujące raporty" many: "%{count} oczekujących raportów" - one: "%{count} oczekujący raport" + one: "%{count} oczekujące zgłoszenie" other: "%{count} oczekujących raportów" pending_tags_html: few: "%{count} oczekujące hashtagi" @@ -597,7 +597,7 @@ pl: many: "%{count} notatek" one: "%{count} notatka" other: "%{count} notatki" - action_log: Dziennik audytu + action_log: Dziennik zdarzeń action_taken_by: Działanie podjęte przez actions: delete_description_html: Zgłoszone posty zostaną usunięte, a zdarzenie zostanie zapisane, aby pomóc w eskalacji przyszłych wykroczeń na tym samym koncie. @@ -608,7 +608,7 @@ pl: suspend_description_html: Konto i cała jego zawartość będą niedostępne i ostatecznie usunięte, a interakcja z nim będzie niemoÅŒliwa. MoÅŒliwość odwrócenia w ciągu 30 dni. Zamyka wszelkie zgłoszenia dotyczące tego konta. actions_description_html: Zdecyduj, jakie działania naleÅŒy podjąć, aby rozstrzygnąć niniejsze zgłoszenie. Jeśli podejmiesz działania karne przeciwko zgłoszonemu kontowi, zostanie do nich wysłane powiadomienie e-mail, chyba ÅŒe wybrano kategorię Spam. actions_description_remote_html: Zdecyduj, jakie działanie naleÅŒy podjąć, aby rozwiązać to zgłoszenie. Będzie to miało wpływ jedynie na sposób, w jaki Twój serwer komunikuje się z tym kontem zdalnym i obsługuje jego zawartość. - add_to_report: Dodaj więcej do raportu + add_to_report: Dodaj więcej do zgłoszenia are_you_sure: Czy na pewno? assign_to_self: Przypisz do siebie assigned: Przypisany moderator @@ -628,7 +628,7 @@ pl: mark_as_resolved: Oznacz jako rozwiązane mark_as_sensitive: Oznacz jako wraÅŒliwe mark_as_unresolved: Oznacz jako nierozwiązane - no_one_assigned: Nikt nie + no_one_assigned: Nikt notes: create: Utwórz notatkę create_and_resolve: RozwiÄ…ÅŒ i pozostaw notatkę @@ -637,7 +637,7 @@ pl: placeholder: Opisz wykonane akcje i inne szczegóły dotyczące tego zgłoszenia
 title: Notatki notes_description_html: Przeglądaj i zostaw notatki innym moderatorom i sobie samemu - processed_msg: 'Raport #%{id} został pomyślnie przetworzony' + processed_msg: 'Zgłoszenie #%{id} zostało pomyślnie przetworzone' quick_actions_description_html: 'Wykonaj szybkie działanie lub przewiń w dół, aby zobaczyć zgłoszoną zawartość:' remote_user_placeholder: zdalny uÅŒytkownik z %{instance} reopen: Otwórz ponownie @@ -657,11 +657,11 @@ pl: silence_html: 'Zamierzasz ograniczyć konto @%{acct}. To spowoduje:' suspend_html: 'Zamierzasz zawiesić konto @%{acct}. To spowoduje:' actions: - delete_html: Usuń obraÅŒające posty + delete_html: Usuń zgłoszone posty mark_as_sensitive_html: Oznacz obraźliwe media postów jako wraÅŒliwe silence_html: Znacząco ogranicz zasięg @%{acct}, aby ich profil i zawartość były widoczne tylko dla osób, które je juÅŒ obserwują lub ręcznie wyszukują jego profil suspend_html: Zawieś @%{acct}, co sprawia, ÅŒe ich profil i zawartość są niedostępne i niemoÅŒliwe do interakcji z - close_report: 'Oznacz raport #%{id} jako rozwiązany' + close_report: 'Oznacz zgłoszenie #%{id} jako rozwiązane' close_reports_html: Oznacz wszystkie zgłoszenia dotyczące @%{acct} jako rozwiązane delete_data_html: Usuń profil i zawartość @%{acct} za 30 dni, chyba ÅŒe w tym czasie zostanie zawieszony preview_preamble_html: "@%{acct} otrzyma ostrzeÅŒenie o następującej treści:" @@ -717,8 +717,8 @@ pl: manage_federation_description: Pozwala uÅŒytkownikom na blokowanie lub zezwalanie federacji z innymi domenami i kontrolowanie doręczania manage_invites: Zarządzaj zaproszeniami manage_invites_description: Pozwala uÅŒytkownikom przeglądać i dezaktywować linki z zaproszeniami - manage_reports: Zarządzaj raportami - manage_reports_description: Pozwala uÅŒytkownikom przeglądać raporty i wykonywać przeciwko nim działania moderacyjne + manage_reports: Zarządzaj zgłoszeniami + manage_reports_description: Pozwala uÅŒytkownikom przeglądać zgłoszenia i wykonywać przeciwko nim działania moderacyjne manage_roles: Zarządzaj rolami manage_roles_description: Pozwala uÅŒytkownikom zarządzać rolami i przypisywać role poniÅŒej ich własnych manage_rules: Zarządzaj regułami @@ -1074,7 +1074,7 @@ pl: already_following: JuÅŒ obserwujesz to konto already_requested: JuÅŒ wysłałeś(-aś) prośbę o moÅŒliwość obserwowania tego konta error: Niestety, podczas sprawdzania zdalnego konta wystąpił błąd - follow: Obsewuj + follow: Obserwuj follow_request: 'Wysłano prośbę o moÅŒliwość obserwowania:' following: 'Pomyślnie! Od teraz obserwujesz:' post_follow: @@ -1137,7 +1137,7 @@ pl: appeals: submit: Zgłoś odwołanie approve_appeal: Zatwierdź odwołanie - associated_report: Powiązany raport + associated_report: Powiązane zgłoszenie created_at: Data description_html: Są to działania podjęte przeciwko Twojemu kontu i ostrzeÅŒenia wysłane do ciebie przez administrację %{instance}. recipient: Adresowane do @@ -1377,7 +1377,7 @@ pl: notification_mailer: admin: report: - subject: "%{name} wysłał raport" + subject: "%{name} wysłał zgłoszenie" sign_up: subject: "%{name} zarejestrował(-a) się" favourite: diff --git a/config/locales/simple_form.my.yml b/config/locales/simple_form.my.yml index 5f1624819f..d3594307a2 100644 --- a/config/locales/simple_form.my.yml +++ b/config/locales/simple_form.my.yml @@ -2,6 +2,10 @@ my: simple_form: hints: + account_alias: + acct: ပဌောင်သရလဟေ့မည့်အကောင့်မဟ username@domain ကို သတ်မဟတ်ပါ + account_migration: + acct: ပဌောင်သရလဟေ့လိုသောအကောင့်၏ username@domain ကို သတ်မဟတ်ပါ account_warning_preset: text: URLs၊ hashtags နဟင့် mentions မျာသကဲ့သို့ ပို့စ်ကို သုံသနိုင်သည် title: လက်ခံသူမဟ မဌင်နိုင်၊ မမဌင်နိုင် ရလေသချယ်ခလင့် @@ -42,6 +46,7 @@ my: locale: အသုံသပဌုသူမဟ လက်ရဟိသုံသနေသည့်ဘာသာစကာသ၊ အီသမေသလ်မျာသနဟင့် ရရဟိစေရန်ပေသပို့သည့် အသိပေသချက်မျာသ locked: စောင့်ကဌည့်ရန်အတလက် တောင်သဆိုမဟုမျာသကို အတည်ပဌုခဌင်သဖဌင့် စောင့်ကဌည့်သူမျာသကို ထိန်သချုပ်နိုင်သည် password: အနည်သဆုံသ စာလုံသ ၈ လုံသ အသုံသပဌုပါ။ + phrase: ပို့စ်တစ်ခု၏ စာသာသ သို့မဟုတ် အကဌောင်သအရာသတိပေသချက်တလင် စာသာသသတ်မဟတ်ထာသမဟုမရဟိဘဲ ကိုက်ညီရပါမည် scopes: API အက်ပလီကေသရဟင်သမျာသကို ဝင်ရောက်ကဌည့်ရဟုခလင့်ပဌုပါမည်။ ထိပ်တန်သအဆင့်နယ်ပယ်ကို ရလေသချယ်ထာသပါက တစ်ခုချင်သစီရလေသချယ်ရန် မလိုအပ်တော့ပါ။ setting_aggregate_reblogs: မကဌာသေသခင်က Boost လုပ်ထာသသောပို့စ်မျာသအတလက် Boost အသစ်မျာသကို မပဌပါနဟင့် (အသစ်ရရဟိထာသသော Boost မျာသကိုသာ ပဌသပါရန်) setting_always_send_emails: Mastodon ကို လက်ရဟိအသုံသပဌုနေချိန်တလင် ပုံမဟန်အာသဖဌင့် အီသမေသလ်အသိပေသချက်မျာသကို ပေသပို့မည်မဟုတ်ပါ @@ -52,6 +57,8 @@ my: setting_hide_network: သင်စောင့်ကဌည့်မည့်သူမျာသနဟင့် သင့်ကိုစောင့်ကဌည့်မည့်သူမျာသကို သင့်ပရိုဖိုင်တလင် ဖျောက်ထာသနိုင်ပါသည် setting_noindex: သင်၏ အမျာသမဌင်သည့်ပရိုဖိုင်နဟင့် ပို့စ်စာမျက်နဟာမျာသကို အကျိုသသက်ရောက်သည် setting_show_application: ပို့စ်တင်ရန်အတလက် သင်အသုံသပဌုသည့် အက်ပလီကေသရဟင်သကို သင့်ပို့စ်မျာသ၏ အသေသစိတ်ကဌည့်ရဟုမဟုတလင် ပဌသမည်ဖဌစ်သည် + setting_use_blurhash: Gradients မဟာ ဖျောက်ထာသသောရုပ်ပုံမျာသ၏ အရောင်မျာသကိုအခဌေခံသော်လည်သ မည်သည့်အသေသစိတ်အချက်အလက်ကိုမဆို ရဟုပ်ထလေသစေနိုင်ပါသည်။ + setting_use_pending_items: အပေါ်အောက်လဟိမ့်မည့်အစာသ ကလစ်တစ်ခုနောက်တလင် စာမျက်နဟာအပ်ဒိတ်မျာသကို ဖျောက်ထာသပါ။ username: "%{domain} ရဟိ သင့်အသုံသပဌုသူအမည်မဟာ တူညီ၍မရပါ" whole_word: အဓိကစကာသလုံသ သို့မဟုတ် စကာသစုသည် အက္ခရာဂဏန်သမျာသသာဖဌစ်ပါကစကာသလုံသတစ်ခုလုံသနဟင့် ကိုက်ညီမဟသာ အသုံသပဌုနိုင်မည်ဖဌစ်သည် domain_allow: @@ -75,6 +82,7 @@ my: custom_css: Mastodon ဝဘ်ဗာသရဟင်သတလင် စိတ်ကဌိုက်စတိုင်မျာသကို အသုံသပဌုနိုင်ပါသည်။ mascot: အဆင့်မဌင့် ဝဘ်ပုံစံတလင်တလင် ရုပ်ပုံဖဌင့်ဖော်ပဌထာသသည်။ media_cache_retention_period: သတ်မဟတ်ထာသသောရက်မျာသပဌီသနောက် ဒေါင်သလုဒ်လုပ်ထာသသော မီဒီယာဖိုင်မျာသကို ဖျက်လိုက်ပါမည်။ တောင်သဆိုပါက ပဌန်လည်ဒေါင်သလုဒ် လုပ်ခလင့်ရဟိသည်။ + peers_api_enabled: ကဆာဗာမဟတလေ့ရသော ဖက်ဒီနယ်ပယ်ပေါင်သစုံရဟိ ဒိုမိန်သအမည်မျာသစာရင်သ။ ဖက်ဒီနယ်ပယ်မျာသမဟာ သင်အသုံသပဌုနေသည့်ဆာဗာနဟင့် ပေါင်သစပ်ခဌင်သရဟိသည်ဖဌစ်စေ၊ မရဟိသည်ဖဌစ်စေ ကနေရာတလင် အချက်အလက်မျာသကို မပဌသထာသပါ။ ယေဘုယျအာသဖဌင့် ဖက်ဒရယ်ဆိုင်ရာ စာရင်သအင်သမျာသစုဆောင်သသည့် ဝန်ဆောင်မဟုကိုသာ အသုံသပဌုထာသသည်။ profile_directory: ပရိုဖိုင်လမ်သညလဟန်တလင် ရဟာဖလေ‌နိုင်သည့်အသုံသပဌုသူအာသလုံသကို စာရင်သပဌုစုထာသသည်။ require_invite_text: အကောင့်ဖလင့်ရာတလင် လူကိုယ်တိုင်ခလင့်ပဌုချက်လိုအပ်သောအခါ “ဘာကဌောင့်ပါဝင်ချင်သလဲ” ဟုလုပ်ပါ။ စိတ်ကဌိုက်ရလေသချယ်မည့်အစာသ စာသာသထည့်သလင်သရန်မဖဌစ်မနေထည့်သလင်သပါ။ site_contact_email: ဥပဒေရေသရာ သို့မဟုတ် အကူအညီ စုံစမ်သမေသမဌန်သရန် လူမျာသက သင့်ထံ မည်သို့ဆက်သလယ်နိုင်မည်နည်သ။ diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml index b6d351cb22..48f1fb745f 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -285,7 +285,7 @@ pl: mention: Powiadamiaj mnie e-mailem, gdy ktoś o mnie wspomni pending_account: Wyślij e-mail kiedy nowe konto potrzebuje recenzji reblog: Powiadamiaj mnie e-mailem, gdy ktoś podbije mój wpis - report: Nowy raport został wysłany + report: Nowe zgłoszenie zostało wysłane trending_tag: Nowe popularne wymagają przeglądu rule: text: Zasada diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 09e051cb53..8de23085dd 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -33,7 +33,7 @@ zh-CN: autofollow: 通过邀请铟接泚册的甚户将䌚自劚关泚䜠 avatar: 文件倧小限制 %{size}只支持 PNG、GIF 或 JPG 栌匏。囟片分蟚率将䌚压猩至 %{dimensions}px bot: 来自这䞪莊户的绝倧倚数操䜜郜是自劚进行的并䞔可胜无人监控 - context: 过滀噚的应甚场景 + context: 过滀噚的应甚环境 current_password: 䞺了安党起见请蟓入圓前莊号的密码 current_username: 请蟓入圓前莊号的甚户名以确讀 digest: 仅圚䜠长时闎未登圕䞔收到了私信时发送 @@ -171,7 +171,7 @@ zh-CN: chosen_languages: 语蚀过滀 confirm_new_password: 确讀新密码 confirm_password: 确讀密码 - context: 过滀场景 + context: 过滀环境 current_password: 圓前密码 data: 数据文件 discoverable: 圚本站甚户目圕䞭收圕歀莊号 @@ -253,7 +253,7 @@ zh-CN: site_short_description: 本站简介 site_terms: 隐私政策 site_title: 本站名称 - status_page_url: 静态页面地址 + status_page_url: 状态页眑址 theme: 默讀䞻题 thumbnail: 本站猩略囟 timeline_preview: 时闎蜎预览 diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml index 28aacb92e1..882f1d3ffc 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -227,7 +227,7 @@ zh-TW: email_domain_block: with_dns_records: 包括網域的 MX 蚘錄和 IP 䜍址 featured_tag: - name: "「#」暙籀" + name: "「#」䞻題暙籀" filters: actions: hide: 完党隱藏 diff --git a/config/locales/th.yml b/config/locales/th.yml index 574ca91e4f..deb79d1b62 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -568,7 +568,7 @@ th: mark_as_sensitive_description_html: àžˆàž°àž—àž³à¹€àž„àž£àž·à¹ˆàž­àž‡àž«àž¡àž²àž¢àžªàž·à¹ˆàž­à¹ƒàž™à¹‚àžžàžªàž•à¹Œàž—àžµà¹ˆàž£àž²àž¢àž‡àž²àž™àž§à¹ˆàž²àž¥àž°à¹€àž­àžµàž¢àž”àž­à¹ˆàž­àž™à¹àž¥àž°àžˆàž°àžšàž±àž™àž—àž¶àžàžàž²àž£àž”àž³à¹€àž™àžŽàž™àžàž²àž£à¹€àžžàž·à¹ˆàž­àžŠà¹ˆàž§àž¢à¹ƒàž«à¹‰àž„àžžàž“à¹€àž¥àž·à¹ˆàž­àž™àž£àž°àž”àž±àžšàžàž²àž£àž¥àž°à¹€àž¡àžŽàž”à¹ƒàž™àž­àž™àž²àž„àž•à¹‚àž”àž¢àžšàž±àžàžŠàžµà¹€àž”àžµàž¢àž§àžàž±àž™ other_description_html: àž”àž¹àž•àž±àž§à¹€àž¥àž·àž­àžà¹€àžžàžŽà¹ˆàž¡à¹€àž•àžŽàž¡àžªàž³àž«àž£àž±àžšàžàž²àž£àž„àž§àžšàž„àžžàž¡àžžàž€àž•àžŽàžàž£àž£àž¡àž‚àž­àž‡àžšàž±àžàžŠàžµà¹àž¥àž°àž›àž£àž±àžšà¹àž•à¹ˆàž‡àžàž²àž£àžªàž·à¹ˆàž­àžªàž²àž£à¹„àž›àž¢àž±àž‡àžšàž±àžàžŠàžµàž—àžµà¹ˆàž£àž²àž¢àž‡àž²àž™ resolve_description_html: àžˆàž°à¹„àž¡à¹ˆà¹ƒàžŠà¹‰àžàž²àž£àžàž£àž°àž—àž³àž•à¹ˆàž­àžšàž±àžàžŠàžµàž—àžµà¹ˆàž£àž²àž¢àž‡àž²àž™ à¹„àž¡à¹ˆàž¡àžµàžàž²àž£àžšàž±àž™àž—àž¶àžàžàž²àž£àž”àž³à¹€àž™àžŽàž™àžàž²àž£ à¹àž¥àž°àžˆàž°àž›àžŽàž”àž£àž²àž¢àž‡àž²àž™ - silence_description_html: àžšàž±àžàžŠàžµàžˆàž°àž›àž£àž²àžàžà¹àžà¹ˆà¹€àž‰àžžàž²àž°àžœàž¹à¹‰àž—àžµà¹ˆàž•àžŽàž”àž•àž²àž¡à¹‚àž›àž£à¹„àžŸàž¥à¹Œàž­àž¢àž¹à¹ˆà¹àž¥à¹‰àž§àž«àž£àž·àž­àž„à¹‰àž™àž«àž²à¹‚àž›àž£à¹„àžŸàž¥à¹Œàž”à¹‰àž§àž¢àž•àž™à¹€àž­àž‡à¹€àž—à¹ˆàž²àž™àž±à¹‰àž™ àžˆàž³àžàž±àž”àžàž²àž£à¹€àž‚à¹‰àž²àž–àž¶àž‡à¹‚àž›àž£à¹„àžŸàž¥à¹Œàž­àž¢à¹ˆàž²àž‡àž¡àž²àž àžªàž²àž¡àž²àž£àž–à¹àž›àž¥àž‡àžàž¥àž±àžšà¹„àž”à¹‰à¹€àžªàž¡àž­ àž›àžŽàž”àž£àž²àž¢àž‡àž²àž™àž•à¹ˆàž­àžšàž±àžàžŠàžµàž™àžµà¹‰àž—àž±à¹‰àž‡àž«àž¡àž” + silence_description_html: àžšàž±àžàžŠàžµàžˆàž°àž›àž£àž²àžàžà¹àžà¹ˆà¹€àž‰àžžàž²àž°àžœàž¹à¹‰àž—àžµà¹ˆàž•àžŽàž”àž•àž²àž¡à¹‚àž›àž£à¹„àžŸàž¥à¹Œàž­àž¢àž¹à¹ˆà¹àž¥à¹‰àž§àž«àž£àž·àž­àž„à¹‰àž™àž«àž²à¹‚àž›àž£à¹„àžŸàž¥à¹Œàž”à¹‰àž§àž¢àž•àž™à¹€àž­àž‡à¹€àž—à¹ˆàž²àž™àž±à¹‰àž™ àžˆàž³àžàž±àž”àžàž²àž£à¹€àž‚à¹‰àž²àž–àž¶àž‡àž‚àž­àž‡à¹‚àž›àž£à¹„àžŸàž¥à¹Œàž­àž¢à¹ˆàž²àž‡àž¡àž²àž àžªàž²àž¡àž²àž£àž–à¹àž›àž¥àž‡àžàž¥àž±àžšà¹„àž”à¹‰à¹€àžªàž¡àž­ àž›àžŽàž”àž£àž²àž¢àž‡àž²àž™àž•à¹ˆàž­àžšàž±àžàžŠàžµàž™àžµà¹‰àž—àž±à¹‰àž‡àž«àž¡àž” suspend_description_html: àžšàž±àžàžŠàžµà¹àž¥àž°à¹€àž™àž·à¹‰àž­àž«àž²àž‚àž­àž‡àžšàž±àžàžŠàžµàž—àž±à¹‰àž‡àž«àž¡àž”àžˆàž°à¹€àž‚à¹‰àž²àž–àž¶àž‡à¹„àž¡à¹ˆà¹„àž”à¹‰à¹àž¥àž°à¹„àž”à¹‰àž£àž±àžšàžàž²àž£àž¥àžšà¹ƒàž™àž—àžµà¹ˆàžªàžžàž” à¹àž¥àž°àžàž²àž£à¹‚àž•à¹‰àž•àž­àžšàžàž±àžšàžšàž±àžàžŠàžµàžˆàž°à¹€àž›à¹‡àž™à¹„àž›à¹„àž¡à¹ˆà¹„àž”à¹‰ à¹àž›àž¥àž‡àžàž¥àž±àžšà¹„àž”à¹‰àž àž²àž¢à¹ƒàž™ 30 àž§àž±àž™ àž›àžŽàž”àž£àž²àž¢àž‡àž²àž™àž•à¹ˆàž­àžšàž±àžàžŠàžµàž™àžµà¹‰àž—àž±à¹‰àž‡àž«àž¡àž” actions_description_html: àž•àž±àž”àžªàžŽàž™à¹ƒàžˆàž§à¹ˆàž²àžàž²àž£àžàž£àž°àž—àž³à¹ƒàž”àž—àžµà¹ˆàžˆàž°à¹ƒàžŠà¹‰à¹€àžžàž·à¹ˆàž­à¹àžà¹‰àž›àž±àžàž«àž²àž£àž²àž¢àž‡àž²àž™àž™àžµà¹‰ àž«àž²àžàž„àžžàž“à¹ƒàžŠà¹‰àžàž²àž£àžàž£àž°àž—àž³àž—àžµà¹ˆà¹€àž›à¹‡àž™àžàž²àž£àž¥àž‡à¹‚àž—àž©àž•à¹ˆàž­àžšàž±àžàžŠàžµàž—àžµà¹ˆàž£àž²àž¢àž‡àž²àž™ àžˆàž°àžªà¹ˆàž‡àžàž²àž£à¹àžˆà¹‰àž‡à¹€àž•àž·àž­àž™àž­àžµà¹€àž¡àž¥àž–àž¶àž‡à¹€àž‚àž² àž¢àžà¹€àž§à¹‰àž™à¹€àž¡àž·à¹ˆàž­àž¡àžµàžàž²àž£à¹€àž¥àž·àž­àžàž«àž¡àž§àž”àž«àž¡àž¹à¹ˆ àžªà¹àž›àž¡ actions_description_remote_html: àž•àž±àž”àžªàžŽàž™à¹ƒàžˆàž§à¹ˆàž²àžàž²àž£àžàž£àž°àž—àž³à¹ƒàž”àž—àžµà¹ˆàžˆàž°à¹ƒàžŠà¹‰à¹€àžžàž·à¹ˆàž­à¹àžà¹‰àž›àž±àžàž«àž²àž£àž²àž¢àž‡àž²àž™àž™àžµà¹‰ àž™àžµà¹ˆàžˆàž°àž¡àžµàžœàž¥àž•à¹ˆàž­àž§àžŽàž˜àžµàž—àžµà¹ˆà¹€àž‹àžŽàž£à¹ŒàžŸà¹€àž§àž­àž£à¹Œ àž‚àž­àž‡àž„àžžàž“ àžªàž·à¹ˆàž­àžªàž²àž£àžàž±àžšàžšàž±àžàžŠàžµàž£àž°àž¢àž°à¹„àžàž¥àž™àžµà¹‰à¹àž¥àž°àžˆàž±àž”àžàž²àž£à¹€àž™àž·à¹‰àž­àž«àž²àž‚àž­àž‡àžšàž±àžàžŠàžµà¹€àž—à¹ˆàž²àž™àž±à¹‰àž™ diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index f85c6c73ac..743b560ace 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1157,7 +1157,7 @@ zh-CN: title: 猖蟑过滀噚 errors: deprecated_api_multiple_keywords: 这些参数䞍胜从歀应甚皋序曎改因䞺它们应甚于䞀䞪以䞊的过滀关键字。 䜿甚蟃新的应甚皋序或眑页界面。 - invalid_context: 过滀噚场景没有或无效 + invalid_context: 提䟛的过滀噚环境没有或无效 index: contexts: 圚 %{contexts} 䞭的过滀噚 delete: 删陀 @@ -1175,7 +1175,7 @@ zh-CN: save: 保存新过滀噚 title: 添加新的过滀噚 statuses: - back_to_filter: 返回至过滀噚 + back_to_filter: 返回过滀噚 batch: remove: 从过滀噚䞭移陀 index: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index ef027e8f2a..9e138cb600 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -820,7 +820,7 @@ zh-TW: description_html: 這些連結是正圚被悚䌺服噚䞊看到該嘟文之垳號倧量分享。這些連結可以幫助悚的䜿甚者探玢珟圚䞖界䞊正圚癌生的事情。陀非悚栞准該癌行者連結將䞍被公開展瀺。悚也可以栞准或駁回個別連結。 disallow: 䞍允蚱連結 disallow_provider: 䞍允蚱癌行者 - no_link_selected: 因未遞取任䜕鏈結所以什麌事郜沒癌生 + no_link_selected: 因未遞取任䜕連結所以什麌事郜沒癌生 publishers: no_publisher_selected: 因未遞取任䜕癌行者所以什麌事郜沒癌生 shared_by_over_week: @@ -1142,7 +1142,7 @@ zh-TW: featured_tags: add_new: 新增 errors: - limit: 悚所掚薊的䞻題暙籀敞量已達䞊限 + limit: 悚所掚薊之䞻題暙籀敞量已達䞊限 hint_html: "掚薊䞻題暙籀是什麌 這些䞻題暙籀將顯瀺斌悚的公開個人檔案頁蚪客可以藉歀閱芜悚暙瀺了這些暙籀的嘟文拿䟆展瀺創意䜜品或者長期曎新的專案埈奜甚唷" filters: contexts: @@ -1326,7 +1326,7 @@ zh-TW: subject: 由 %{name} 癌起的投祚已結束 reblog: body: 悚的嘟文被 %{name} 蜉嘟 - subject: "%{name} 蜉嘟了悚的嘟文" + subject: "%{name} 已蜉嘟悚的嘟文" title: 新的蜉嘟 status: subject: "%{name} 剛剛嘟文" @@ -1472,7 +1472,7 @@ zh-TW: development: 開癌者 edit_profile: 線茯個人檔案 export: 匯出 - featured_tags: 掚薊暙籀 + featured_tags: 掚薊䞻題暙籀 import: 匯入 import_and_export: 匯入及匯出 migrate: 垳號搬遷 @@ -1594,7 +1594,7 @@ zh-TW: otp: 驗證應甚皋匏 recovery_codes: 備仜備甚驗證碌 recovery_codes_regenerated: 成功產生新的備甚驗證碌 - recovery_instructions_html: 若悚的手機無法䜿甚悚可以䜿甚䞋列任意䞀個備甚驗證碌䟆重新獲埗垳號的蚪問權。請劥善保管奜悚的備甚驗證碌䟋劂可以將它們列印出䟆與悚的其他重芁文件攟圚䞀起。 + recovery_instructions_html: 若悚的手機無法䜿甚悚可以䜿甚䞋列任意䞀個備甚驗證碌䟆重新獲埗垳號的存取權。請劥善保管奜悚的備甚驗證碌䟋劂可以將它們列印出䟆與悚的其他重芁文件攟圚䞀起。 webauthn: 安党金鑰 user_mailer: appeal_approved: @@ -1662,7 +1662,7 @@ zh-TW: follow_limit_reached: 悚無法跟隚倚斌 %{limit} 個人 go_to_sso_account_settings: 前埀悚的身分提䟛商 (identity provider) 之垳號蚭定 invalid_otp_token: 兩階段認證碌䞍正確 - otp_lost_help_html: 劂果悚無法蚪問這兩者可以透過 %{email} 與我們聯繫 + otp_lost_help_html: 劂果悚無法存取這兩者悚可以透過 %{email} 與我們聯繫 seamless_external_login: 由斌悚是由倖郚系統登入所以䞍胜蚭定密碌與電子郵件。 signed_in_as: 目前登入的垳號 verification: From 722c0011d124e9b17769494c5b8512ba1e5ea64f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 13:47:38 +0200 Subject: [PATCH 29/33] Bump chewy from 7.2.7 to 7.3.0 (#24507) 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 3e8e643880..4488f77e13 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem 'addressable', '~> 2.8' gem 'bootsnap', '~> 1.16.0', require: false gem 'browser' gem 'charlock_holmes', '~> 0.7.7' -gem 'chewy', '~> 7.2' +gem 'chewy', '~> 7.3' gem 'devise', '~> 4.9' gem 'devise-two-factor', '~> 4.0' diff --git a/Gemfile.lock b/Gemfile.lock index 1b4e7d503a..5f2a5a51d6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,7 +179,7 @@ GEM activesupport cbor (0.5.9.6) charlock_holmes (0.7.7) - chewy (7.2.7) + chewy (7.3.0) activesupport (>= 5.2) elasticsearch (>= 7.12.0, < 7.14.0) elasticsearch-dsl @@ -783,7 +783,7 @@ DEPENDENCIES capistrano-yarn (~> 2.0) capybara (~> 3.39) charlock_holmes (~> 0.7.7) - chewy (~> 7.2) + chewy (~> 7.3) climate_control cocoon (~> 1.2) color_diff (~> 0.1) From 86ad43173f4f2fead5791fe6ae09144cbebee7c1 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 12 Apr 2023 14:50:02 +0200 Subject: [PATCH 30/33] =?UTF-8?q?Add=20=E2=80=9CIn=20Memoriam=E2=80=9D=20b?= =?UTF-8?q?anner=20back=20to=20profiles=20(#23614)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/account_timeline/components/header.jsx | 2 ++ .../account_timeline/components/memorial_note.jsx | 12 ++++++++++++ app/javascript/styles/mastodon/components.scss | 7 ++++++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 app/javascript/mastodon/features/account_timeline/components/memorial_note.jsx diff --git a/app/javascript/mastodon/features/account_timeline/components/header.jsx b/app/javascript/mastodon/features/account_timeline/components/header.jsx index bffa5554b3..c008f0342d 100644 --- a/app/javascript/mastodon/features/account_timeline/components/header.jsx +++ b/app/javascript/mastodon/features/account_timeline/components/header.jsx @@ -3,6 +3,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; import InnerHeader from '../../account/components/header'; import ImmutablePureComponent from 'react-immutable-pure-component'; +import MemorialNote from './memorial_note'; import MovedNote from './moved_note'; import { FormattedMessage } from 'react-intl'; import { NavLink } from 'react-router-dom'; @@ -115,6 +116,7 @@ export default class Header extends ImmutablePureComponent { return (
+ {(!hidden && account.get('memorial')) && } {(!hidden && account.get('moved')) && } ( +
+
+ +
+
+); + +export default MemorialNote; diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 0fee136cfb..c887ae8b14 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -6963,7 +6963,8 @@ noscript { } .moved-account-banner, -.follow-request-banner { +.follow-request-banner, +.account-memorial-banner { padding: 20px; background: lighten($ui-base-color, 4%); display: flex; @@ -6998,6 +6999,10 @@ noscript { width: 100%; } +.account-memorial-banner__message { + margin-bottom: 0; +} + .column-inline-form { padding: 15px; display: flex; From 7a0a79e6b38afa36020840b3753f47948587861c Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 12 Apr 2023 15:24:30 +0200 Subject: [PATCH 31/33] Fix check-i18n when there are missing strings in other languages than english (#24519) --- .github/workflows/check-i18n.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-i18n.yml b/.github/workflows/check-i18n.yml index 1349803224..e282e2ab72 100644 --- a/.github/workflows/check-i18n.yml +++ b/.github/workflows/check-i18n.yml @@ -42,8 +42,8 @@ jobs: - name: Check for missing strings in English JSON run: | yarn build:development - yarn manage:translations - git diff --exit-code -- app/javascript/mastodon/locales/defaultMessages.json app/javascript/mastodon/locales/en.json + yarn manage:translations en + git diff --exit-code - name: Check locale file normalization run: bundle exec i18n-tasks check-normalized From 8f0b0435ab6f936715231b6dfda19555c3b28517 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 12 Apr 2023 15:24:45 +0200 Subject: [PATCH 32/33] Fix missing translation strings in en.json and defaultMessages.json (#24518) --- app/javascript/mastodon/locales/defaultMessages.json | 9 +++++++++ app/javascript/mastodon/locales/en.json | 1 + 2 files changed, 10 insertions(+) diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index f7832eddcd..1351945eb8 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -947,6 +947,15 @@ ], "path": "app/javascript/mastodon/features/account_timeline/components/limited_account_hint.json" }, + { + "descriptors": [ + { + "defaultMessage": "In Memoriam.", + "id": "account.in_memoriam" + } + ], + "path": "app/javascript/mastodon/features/account_timeline/components/memorial_note.json" + }, { "descriptors": [ { diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index c85f6d009f..ae2d5a9996 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -39,6 +39,7 @@ "account.follows_you": "Follows you", "account.go_to_profile": "Go to profile", "account.hide_reblogs": "Hide boosts from @{name}", + "account.in_memoriam": "In Memoriam.", "account.joined_short": "Joined", "account.languages": "Change subscribed languages", "account.link_verified_on": "Ownership of this link was checked on {date}", From af49d93fd6168c089530240a9ab4eccb975b8c42 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 12 Apr 2023 16:01:49 +0200 Subject: [PATCH 33/33] Fix tab arrows on RTL layouts (#24520) --- app/javascript/styles/mastodon/components.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index c887ae8b14..a496e73b81 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -6685,7 +6685,7 @@ a.status-card.compact:hover { content: ''; position: absolute; bottom: 0; - inset-inline-start: 50%; + left: 50%; width: 0; height: 0; transform: translateX(-50%);