From b923a4c7557ca0967d80dbe892b1517fcd0e9a41 Mon Sep 17 00:00:00 2001 From: Terence Eden Date: Sun, 16 Jul 2023 09:06:33 +0100 Subject: [PATCH 001/557] Prevent split line between icon and number on reposts & favourites (#26004) --- app/javascript/styles/mastodon/components.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 2ac04beb2f..da15989ca2 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1423,6 +1423,7 @@ body > [data-popper-placement] { .detailed-status__link { color: inherit; text-decoration: none; + white-space: nowrap; } .detailed-status__favorites, From 23197cebce60708ff9b3965f1ac4446ad03730a0 Mon Sep 17 00:00:00 2001 From: Claire Date: Sun, 16 Jul 2023 18:23:07 +0200 Subject: [PATCH 002/557] Reduce dropdown menu margin and padding (#2301) * Reduce dropdown menu margin and padding * Change horizontal padding back to what it was * Reduce separator vertical margins for consistency --- .../flavours/glitch/styles/components/misc.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/components/misc.scss b/app/javascript/flavours/glitch/styles/components/misc.scss index 52cce42e81..bcddfdcd38 100644 --- a/app/javascript/flavours/glitch/styles/components/misc.scss +++ b/app/javascript/flavours/glitch/styles/components/misc.scss @@ -537,14 +537,14 @@ body > [data-popper-placement] { .dropdown-menu__separator { border-bottom: 1px solid var(--dropdown-border-color); - margin: 5px 0; + margin: 2px 0; height: 0; } .dropdown-menu { background: var(--dropdown-background-color); border: 1px solid var(--dropdown-border-color); - padding: 4px; + padding: 2px; border-radius: 4px; box-shadow: var(--dropdown-shadow); z-index: 9999; @@ -568,8 +568,8 @@ body > [data-popper-placement] { &__container { &__header { border-bottom: 1px solid var(--dropdown-border-color); - padding: 10px 14px; - padding-bottom: 14px; + padding: 6px 14px; + padding-bottom: 12px; margin-bottom: 4px; font-size: 13px; line-height: 18px; @@ -609,7 +609,7 @@ body > [data-popper-placement] { font: inherit; display: block; width: 100%; - padding: 10px 14px; + padding: 6px 14px; border: 0; margin: 0; background: transparent; From 26e522ac55d4147b0418abcf7e16bb70cd3f0af5 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 17 Jul 2023 08:26:52 +0200 Subject: [PATCH 003/557] Fix not actually connecting to the configured replica (#25977) --- app/helpers/database_helper.rb | 4 +-- app/models/application_record.rb | 2 ++ config/database.yml | 42 +++++++++++++++++++++++--------- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/app/helpers/database_helper.rb b/app/helpers/database_helper.rb index 965eeaf41d..79227bb109 100644 --- a/app/helpers/database_helper.rb +++ b/app/helpers/database_helper.rb @@ -2,10 +2,10 @@ module DatabaseHelper def with_read_replica(&block) - ApplicationRecord.connected_to(role: :read, prevent_writes: true, &block) + ApplicationRecord.connected_to(role: :reading, prevent_writes: true, &block) end def with_primary(&block) - ApplicationRecord.connected_to(role: :primary, &block) + ApplicationRecord.connected_to(role: :writing, &block) end end diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 5d7d3a0961..23e0af3a2a 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -5,6 +5,8 @@ class ApplicationRecord < ActiveRecord::Base include Remotable + connects_to database: { writing: :primary, reading: :read } + class << self def update_index(_type_name, *_args, &_block) super if Chewy.enabled? diff --git a/config/database.yml b/config/database.yml index f7ecbd9814..d1fd65a0fb 100644 --- a/config/database.yml +++ b/config/database.yml @@ -8,23 +8,41 @@ default: &default application_name: '' development: - <<: *default - database: <%= ENV['DB_NAME'] || 'mastodon_development' %> - username: <%= ENV['DB_USER'] %> - password: <%= (ENV['DB_PASS'] || '').to_json %> - host: <%= ENV['DB_HOST'] %> - port: <%= ENV['DB_PORT'] %> + primary: + <<: *default + database: <%= ENV['DB_NAME'] || 'mastodon_development' %> + username: <%= ENV['DB_USER'] %> + password: <%= (ENV['DB_PASS'] || '').to_json %> + host: <%= ENV['DB_HOST'] %> + port: <%= ENV['DB_PORT'] %> + read: + <<: *default + database: <%= ENV['DB_NAME'] || 'mastodon_development' %> + username: <%= ENV['DB_USER'] %> + password: <%= (ENV['DB_PASS'] || '').to_json %> + host: <%= ENV['DB_HOST'] %> + port: <%= ENV['DB_PORT'] %> + replica: true # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: - <<: *default - database: <%= ENV['DB_NAME'] || 'mastodon' %>_test<%= ENV['TEST_ENV_NUMBER'] %> - username: <%= ENV['DB_USER'] %> - password: <%= (ENV['DB_PASS'] || '').to_json %> - host: <%= ENV['DB_HOST'] %> - port: <%= ENV['DB_PORT'] %> + primary: + <<: *default + database: <%= ENV['DB_NAME'] || 'mastodon' %>_test<%= ENV['TEST_ENV_NUMBER'] %> + username: <%= ENV['DB_USER'] %> + password: <%= (ENV['DB_PASS'] || '').to_json %> + host: <%= ENV['DB_HOST'] %> + port: <%= ENV['DB_PORT'] %> + read: + <<: *default + database: <%= ENV['DB_NAME'] || 'mastodon' %>_test<%= ENV['TEST_ENV_NUMBER'] %> + username: <%= ENV['DB_USER'] %> + password: <%= (ENV['DB_PASS'] || '').to_json %> + host: <%= ENV['DB_HOST'] %> + port: <%= ENV['DB_PORT'] %> + replica: true production: primary: From 84ce94b100e033cfb1eed194a037f8869b219d43 Mon Sep 17 00:00:00 2001 From: Renaud Chaput Date: Mon, 17 Jul 2023 09:33:22 +0200 Subject: [PATCH 004/557] Try to improve Renovatebot config (#26005) --- .github/renovate.json5 | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 0dddc3e290..78530d65b4 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -9,7 +9,9 @@ ], stabilityDays: 3, // Wait 3 days after the package has been published before upgrading it // packageRules order is important, they are applied from top to bottom and are merged, - // so for example grouping rules needs to be at the bottom + // meaning the most important ones must be at the bottom, for example grouping rules + // If we do not want a package to be grouped with others, we need to set its groupName + // to `null` after any other rule set it to something. packageRules: [ { // Ignore major version bumps for these node packages @@ -45,6 +47,7 @@ // Ignore major version bumps for these Ruby packages matchManagers: ['bundler'], matchPackageNames: [ + 'rack', // Needs to be synced with Rails version 'sprockets', // Requires manual upgrade https://github.com/rails/sprockets/blob/master/UPGRADING.md#guide-to-upgrading-from-sprockets-3x-to-4x 'strong_migrations', // Requires manual upgrade 'sidekiq', // Requires manual upgrade @@ -84,12 +87,17 @@ // Update devDependencies every week, with one grouped PR matchDepTypes: 'devDependencies', matchUpdateTypes: ['patch', 'minor'], - excludePackageNames: [ - 'typescript', // Typescript has many changes in minor versions, needs to be checked every time - ], groupName: 'devDependencies (non-major)', extends: ['schedule:weekly'], }, + { + // Group all eslint-related packages with `eslint` in the same PR + matchManagers: ['npm'], + matchPackageNames: ['eslint'], + matchPackagePrefixes: ['eslint-', '@typescript-eslint/'], + matchUpdateTypes: ['patch', 'minor'], + groupName: 'eslint (non-major)', + }, { // Update @types/* packages every week, with one grouped PR matchPackagePrefixes: '@types/', @@ -98,6 +106,14 @@ extends: ['schedule:weekly'], addLabels: ['typescript'], }, + { + // We want those packages to always have their own PR + matchManagers: ['npm'], + matchPackageNames: [ + 'typescript', // Typescript has code-impacting changes in minor versions + ], + groupName: null, // We dont want them to belong to any group + }, // Add labels depending on package manager { matchManagers: ['npm', 'nvm'], addLabels: ['javascript'] }, { matchManagers: ['bundler', 'ruby-version'], addLabels: ['ruby'] }, From cdaca7a08b29e4a13ec04a9dbb845e9f28490abf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 09:38:11 +0200 Subject: [PATCH 005/557] Update babel monorepo to v7.22.9 (#26017) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 144 +++++++++++++++++++++++++++++------------------------- 1 file changed, 78 insertions(+), 66 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8a8cf7e65a..bf3c3ecef3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -31,33 +31,33 @@ dependencies: "@babel/highlight" "^7.22.5" -"@babel/compat-data@^7.22.5", "@babel/compat-data@^7.22.6": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.6.tgz#15606a20341de59ba02cd2fcc5086fcbe73bf544" - integrity sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg== +"@babel/compat-data@^7.22.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730" + integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ== "@babel/core@^7.10.4", "@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.22.1": - version "7.22.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.8.tgz#386470abe884302db9c82e8e5e87be9e46c86785" - integrity sha512-75+KxFB4CZqYRXjx4NlR4J7yGvKumBuZTmV4NV6v09dVXXkuYVYLT68N6HCzLvfJ+fWCxQsntNzKwwIXL4bHnw== + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.9.tgz#bd96492c68822198f33e8a256061da3cf391f58f" + integrity sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.22.5" - "@babel/generator" "^7.22.7" - "@babel/helper-compilation-targets" "^7.22.6" - "@babel/helper-module-transforms" "^7.22.5" + "@babel/generator" "^7.22.9" + "@babel/helper-compilation-targets" "^7.22.9" + "@babel/helper-module-transforms" "^7.22.9" "@babel/helpers" "^7.22.6" "@babel/parser" "^7.22.7" "@babel/template" "^7.22.5" "@babel/traverse" "^7.22.8" "@babel/types" "^7.22.5" - "@nicolo-ribaudo/semver-v6" "^6.3.3" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.2" + semver "^6.3.1" -"@babel/generator@^7.22.5", "@babel/generator@^7.22.7": +"@babel/generator@^7.22.5": version "7.22.7" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.7.tgz#a6b8152d5a621893f2c9dacf9a4e286d520633d5" integrity sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ== @@ -67,6 +67,16 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" +"@babel/generator@^7.22.7", "@babel/generator@^7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d" + integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw== + dependencies: + "@babel/types" "^7.22.5" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + "@babel/generator@^7.7.2": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7" @@ -99,40 +109,40 @@ "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/types" "^7.22.5" -"@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.6.tgz#e30d61abe9480aa5a83232eb31c111be922d2e52" - integrity sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA== +"@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz#f9d0a7aaaa7cd32a3f31c9316a69f5a9bcacb892" + integrity sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw== dependencies: - "@babel/compat-data" "^7.22.6" + "@babel/compat-data" "^7.22.9" "@babel/helper-validator-option" "^7.22.5" - "@nicolo-ribaudo/semver-v6" "^6.3.3" browserslist "^4.21.9" lru-cache "^5.1.1" + semver "^6.3.1" "@babel/helper-create-class-features-plugin@^7.22.5": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.6.tgz#58564873c889a6fea05a538e23f9f6d201f10950" - integrity sha512-iwdzgtSiBxF6ni6mzVnZCF3xt5qE6cEA0J7nFt8QOAWZ0zjCFceEgpn3vtb2V7WFR6QzP2jmIFOHMTRo7eNJjQ== + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz#c36ea240bb3348f942f08b0fbe28d6d979fab236" + integrity sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/helper-environment-visitor" "^7.22.5" "@babel/helper-function-name" "^7.22.5" "@babel/helper-member-expression-to-functions" "^7.22.5" "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.5" + "@babel/helper-replace-supers" "^7.22.9" "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/helper-split-export-declaration" "^7.22.6" - "@nicolo-ribaudo/semver-v6" "^6.3.3" + semver "^6.3.1" "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.6.tgz#87afd63012688ad792de430ceb3b6dc28e4e7a40" - integrity sha512-nBookhLKxAWo/TUCmhnaEJyLz2dekjQvv5SRpE9epWQBcpedWLKt8aZdsuT9XV5ovzR3fENLjRXVT0GsSlGGhA== + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz#9d8e61a8d9366fe66198f57c40565663de0825f6" + integrity sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" - "@nicolo-ribaudo/semver-v6" "^6.3.3" regexpu-core "^5.3.1" + semver "^6.3.1" "@babel/helper-define-polyfill-provider@^0.4.1": version "0.4.1" @@ -179,19 +189,16 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-module-transforms@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef" - integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw== +"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz#92dfcb1fbbb2bc62529024f72d942a8c97142129" + integrity sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ== dependencies: "@babel/helper-environment-visitor" "^7.22.5" "@babel/helper-module-imports" "^7.22.5" "@babel/helper-simple-access" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" "@babel/helper-validator-identifier" "^7.22.5" - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" - "@babel/types" "^7.22.5" "@babel/helper-optimise-call-expression@^7.22.5": version "7.22.5" @@ -206,26 +213,22 @@ integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== "@babel/helper-remap-async-to-generator@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz#14a38141a7bf2165ad38da61d61cf27b43015da2" - integrity sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g== + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz#53a25b7484e722d7efb9c350c75c032d4628de82" + integrity sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-wrap-function" "^7.22.5" - "@babel/types" "^7.22.5" + "@babel/helper-wrap-function" "^7.22.9" -"@babel/helper-replace-supers@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc" - integrity sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg== +"@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz#cbdc27d6d8d18cd22c81ae4293765a5d9afd0779" + integrity sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg== dependencies: "@babel/helper-environment-visitor" "^7.22.5" "@babel/helper-member-expression-to-functions" "^7.22.5" "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" - "@babel/types" "^7.22.5" "@babel/helper-simple-access@^7.22.5": version "7.22.5" @@ -263,14 +266,13 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac" integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw== -"@babel/helper-wrap-function@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz#44d205af19ed8d872b4eefb0d2fa65f45eb34f06" - integrity sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw== +"@babel/helper-wrap-function@^7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.9.tgz#189937248c45b0182c1dcf32f3444ca153944cb9" + integrity sha512-sZ+QzfauuUEfxSEjKFmi3qDSHgLsTPK/pEpoD/qonZKOtTPTLbf59oabPQ4rKekt9lFcj/hTZaOhWwFYrgjk+Q== dependencies: "@babel/helper-function-name" "^7.22.5" "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" "@babel/types" "^7.22.5" "@babel/helpers@^7.22.6": @@ -841,16 +843,16 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-transform-runtime@^7.22.4": - version "7.22.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.7.tgz#eb9094b5fb756cc2d98d398b2c88aeefa9205de9" - integrity sha512-o02xM7iY7mSPI+TvaYDH0aYl+lg3+KT7qrD705JlsB/GrZSNaYO/4i+aDFKPiJ7ubq3hgv8NNLCdyB5MFxT8mg== + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.9.tgz#a87b11e170cbbfb018e6a2bf91f5c6e533b9e027" + integrity sha512-9KjBH61AGJetCPYp/IEyLEp47SyybZb0nDRpBvmtEkm+rUIwxdlKpyNHI1TmsGkeuLclJdleQHRZ8XLBnnh8CQ== dependencies: "@babel/helper-module-imports" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" - "@nicolo-ribaudo/semver-v6" "^6.3.3" babel-plugin-polyfill-corejs2 "^0.4.4" babel-plugin-polyfill-corejs3 "^0.8.2" babel-plugin-polyfill-regenerator "^0.5.1" + semver "^6.3.1" "@babel/plugin-transform-shorthand-properties@^7.22.5": version "7.22.5" @@ -930,12 +932,12 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/preset-env@^7.11.0", "@babel/preset-env@^7.22.4": - version "7.22.7" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.7.tgz#a1ef34b64a80653c22ce4d9c25603cfa76fc168a" - integrity sha512-1whfDtW+CzhETuzYXfcgZAh8/GFMeEbz0V5dVgya8YeJyCU6Y/P2Gnx4Qb3MylK68Zu9UiwUvbPMPTpFAOJ+sQ== + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.9.tgz#57f17108eb5dfd4c5c25a44c1977eba1df310ac7" + integrity sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g== dependencies: - "@babel/compat-data" "^7.22.6" - "@babel/helper-compilation-targets" "^7.22.6" + "@babel/compat-data" "^7.22.9" + "@babel/helper-compilation-targets" "^7.22.9" "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-validator-option" "^7.22.5" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5" @@ -1009,11 +1011,11 @@ "@babel/plugin-transform-unicode-sets-regex" "^7.22.5" "@babel/preset-modules" "^0.1.5" "@babel/types" "^7.22.5" - "@nicolo-ribaudo/semver-v6" "^6.3.3" babel-plugin-polyfill-corejs2 "^0.4.4" babel-plugin-polyfill-corejs3 "^0.8.2" babel-plugin-polyfill-regenerator "^0.5.1" core-js-compat "^3.31.0" + semver "^6.3.1" "@babel/preset-modules@^0.1.5": version "0.1.5" @@ -1093,7 +1095,7 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/traverse@^7.22.5", "@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8": +"@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8": version "7.22.8" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.8.tgz#4d4451d31bc34efeae01eac222b514a77aa4000e" integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw== @@ -3740,11 +3742,16 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001464: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001503.tgz#88b6ff1b2cf735f1f3361dc1a15b59f0561aa398" integrity sha512-Sf9NiF+wZxPfzv8Z3iS0rXM1Do+iOy2Lxvib38glFX+08TCYYYGR5fRJXk4d77C4AYwhUjgYgMsMudbh2TqCKw== -caniuse-lite@^1.0.30001502, caniuse-lite@^1.0.30001503: +caniuse-lite@^1.0.30001502: version "1.0.30001515" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001515.tgz#418aefeed9d024cd3129bfae0ccc782d4cb8f12b" integrity sha512-eEFDwUOZbE24sb+Ecsx3+OvNETqjWIdabMy52oOkIgcUtAsQifjUG9q4U9dgTHJM2mfk4uEPxc0+xuFdJ629QA== +caniuse-lite@^1.0.30001503: + version "1.0.30001516" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001516.tgz#621b1be7d85a8843ee7d210fd9d87b52e3daab3a" + integrity sha512-Wmec9pCBY8CWbmI4HsjBeQLqDTqV91nFVR83DnZpYyRnPI1wePDsTg0bGLPC5VU/3OIZV1fmxEea1b+tFKe86g== + chalk@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3" @@ -4805,11 +4812,16 @@ ejs@^3.1.6: dependencies: jake "^10.8.5" -electron-to-chromium@^1.4.428, electron-to-chromium@^1.4.431: +electron-to-chromium@^1.4.428: version "1.4.457" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.457.tgz#3fdc7b4f97d628ac6b51e8b4b385befb362fe343" integrity sha512-/g3UyNDmDd6ebeWapmAoiyy+Sy2HyJ+/X8KyvNeHfKRFfHaA2W8oF5fxD5F3tjBDcjpwo0iek6YNgxNXDBoEtA== +electron-to-chromium@^1.4.431: + version "1.4.461" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.461.tgz#6b14af66042732bf883ab63a4d82cac8f35eb252" + integrity sha512-1JkvV2sgEGTDXjdsaQCeSwYYuhLRphRpc+g6EHTFELJXEiznLt3/0pZ9JuAOQ5p2rI3YxKTbivtvajirIfhrEQ== + elliptic@^6.5.3: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" @@ -10305,7 +10317,7 @@ semver@^6.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^6.3.0: +semver@^6.3.0, semver@^6.3.1: version "6.3.1" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== From f17acbca33a9f1304a9bd4fc4318055d518d3dbf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 11:39:35 +0200 Subject: [PATCH 006/557] Update dependency immutable to v4.3.1 (#26029) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index bf3c3ecef3..823ab96ab0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6385,9 +6385,9 @@ immutable@^3.8.2: integrity sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg== 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== + version "4.3.1" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.1.tgz#17988b356097ab0719e2f741d56f3ec6c317f9dc" + integrity sha512-lj9cnmB/kVS0QHsJnYKD1uo3o39nrbKxszjnqS9Fr6NB7bZzW45U6WSGBPKXDL/CvDKqDNPA4r3DoDQ8GTxo2A== import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" From 97ce47e45100548f258644fc14314dbf3db94973 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Mon, 17 Jul 2023 04:51:00 -0500 Subject: [PATCH 007/557] Fix for "follows you" indicator in light web UI not readable (#25993) --- 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 da15989ca2..beff07daa4 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -4390,7 +4390,7 @@ a.status-card.compact:hover { } .relationship-tag { - color: $primary-text-color; + color: $white; margin-bottom: 4px; display: block; background-color: rgba($black, 0.45); From c667fc5a4a018128c03f73e4e4661fd2b5bd9701 Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 17 Jul 2023 12:10:50 +0200 Subject: [PATCH 008/557] Fix ArgumentError in mailers when a user's timezone is blank (#26025) --- app/views/notification_mailer/_status.html.haml | 2 +- app/views/user_mailer/appeal_approved.html.haml | 2 +- app/views/user_mailer/appeal_approved.text.erb | 2 +- app/views/user_mailer/appeal_rejected.html.haml | 2 +- app/views/user_mailer/appeal_rejected.text.erb | 2 +- app/views/user_mailer/suspicious_sign_in.html.haml | 2 +- app/views/user_mailer/suspicious_sign_in.text.erb | 2 +- app/views/user_mailer/warning.html.haml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml index d8aa38b112..4ea3d2c45e 100644 --- a/app/views/notification_mailer/_status.html.haml +++ b/app/views/notification_mailer/_status.html.haml @@ -42,4 +42,4 @@ = link_to a.remote_url, a.remote_url %p.status-footer - = link_to l(status.created_at.in_time_zone(time_zone)), web_url("@#{status.account.pretty_acct}/#{status.id}") + = link_to l(status.created_at.in_time_zone(time_zone.presence)), web_url("@#{status.account.pretty_acct}/#{status.id}") diff --git a/app/views/user_mailer/appeal_approved.html.haml b/app/views/user_mailer/appeal_approved.html.haml index d62789a067..1bbd8ae75a 100644 --- a/app/views/user_mailer/appeal_approved.html.haml +++ b/app/views/user_mailer/appeal_approved.html.haml @@ -36,7 +36,7 @@ %tbody %tr %td.column-cell.text-center - %p= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone)) + %p= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence)) %table.email-table{ cellspacing: 0, cellpadding: 0 } %tbody diff --git a/app/views/user_mailer/appeal_approved.text.erb b/app/views/user_mailer/appeal_approved.text.erb index 99596605aa..9a4bd81c3d 100644 --- a/app/views/user_mailer/appeal_approved.text.erb +++ b/app/views/user_mailer/appeal_approved.text.erb @@ -2,6 +2,6 @@ === -<%= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone)) %> +<%= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence)) %> => <%= root_url %> diff --git a/app/views/user_mailer/appeal_rejected.html.haml b/app/views/user_mailer/appeal_rejected.html.haml index ae60775b01..22e3f62df6 100644 --- a/app/views/user_mailer/appeal_rejected.html.haml +++ b/app/views/user_mailer/appeal_rejected.html.haml @@ -36,7 +36,7 @@ %tbody %tr %td.column-cell.text-center - %p= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone)) + %p= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence)) %table.email-table{ cellspacing: 0, cellpadding: 0 } %tbody diff --git a/app/views/user_mailer/appeal_rejected.text.erb b/app/views/user_mailer/appeal_rejected.text.erb index 3c93777180..3b063e19df 100644 --- a/app/views/user_mailer/appeal_rejected.text.erb +++ b/app/views/user_mailer/appeal_rejected.text.erb @@ -2,6 +2,6 @@ === -<%= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone)) %> +<%= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence)) %> => <%= root_url %> diff --git a/app/views/user_mailer/suspicious_sign_in.html.haml b/app/views/user_mailer/suspicious_sign_in.html.haml index 6ebba3fa55..3dbec61ffe 100644 --- a/app/views/user_mailer/suspicious_sign_in.html.haml +++ b/app/views/user_mailer/suspicious_sign_in.html.haml @@ -47,7 +47,7 @@ %strong= "#{t('sessions.browser')}:" %span{ title: @user_agent }= t 'sessions.description', browser: t("sessions.browsers.#{@detection.id}", default: @detection.id.to_s), platform: t("sessions.platforms.#{@detection.platform.id}", default: @detection.platform.id.to_s) %br/ - = l(@timestamp.in_time_zone(@resource.time_zone)) + = l(@timestamp.in_time_zone(@resource.time_zone.presence)) %table.email-table{ cellspacing: 0, cellpadding: 0 } %tbody diff --git a/app/views/user_mailer/suspicious_sign_in.text.erb b/app/views/user_mailer/suspicious_sign_in.text.erb index 956071e774..ed01e54fa2 100644 --- a/app/views/user_mailer/suspicious_sign_in.text.erb +++ b/app/views/user_mailer/suspicious_sign_in.text.erb @@ -8,7 +8,7 @@ <%= t('sessions.ip') %>: <%= @remote_ip %> <%= t('sessions.browser') %>: <%= t('sessions.description', browser: t("sessions.browsers.#{@detection.id}", default: "#{@detection.id}"), platform: t("sessions.platforms.#{@detection.platform.id}", default: "#{@detection.platform.id}")) %> -<%= l(@timestamp.in_time_zone(@resource.time_zone)) %> +<%= l(@timestamp.in_time_zone(@resource.time_zone.presence)) %> <%= t 'user_mailer.suspicious_sign_in.further_actions_html', action: t('user_mailer.suspicious_sign_in.change_password') %> diff --git a/app/views/user_mailer/warning.html.haml b/app/views/user_mailer/warning.html.haml index 9cb73b0fee..8a878bead6 100644 --- a/app/views/user_mailer/warning.html.haml +++ b/app/views/user_mailer/warning.html.haml @@ -58,7 +58,7 @@ - unless @statuses.empty? - @statuses.each_with_index do |status, i| - = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true, time_zone: @resource.time_zone + = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true, time_zone: @resource.time_zone.presence %table.email-table{ cellspacing: 0, cellpadding: 0 } %tbody From 7b7a26c895dff20735abb64859e0b98072aaaa9e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 12:13:01 +0200 Subject: [PATCH 009/557] Update dependency postcss to v8.4.26 (#26030) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 823ab96ab0..6f31752b08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9248,9 +9248,9 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== postcss@^8.2.15, postcss@^8.4.24: - version "8.4.25" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.25.tgz#4a133f5e379eda7f61e906c3b1aaa9b81292726f" - integrity sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw== + version "8.4.26" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.26.tgz#1bc62ab19f8e1e5463d98cf74af39702a00a9e94" + integrity sha512-jrXHFF8iTloAenySjM/ob3gSj7pCu0Ji49hnjqzsgSRa50hkWCKD0HQ+gMNJkW38jBI68MpAAg7ZWwHwX8NMMw== dependencies: nanoid "^3.3.6" picocolors "^1.0.0" From ee8c8dbc6ff52f2cebfd2b59501a95793ce140d8 Mon Sep 17 00:00:00 2001 From: fusagiko / takayamaki <24884114+takayamaki@users.noreply.github.com> Date: Mon, 17 Jul 2023 19:15:32 +0900 Subject: [PATCH 010/557] remove some file paths from rubocop_tobo.yml (#26022) --- .rubocop_todo.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 0f8fa67709..3c743842e2 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -194,7 +194,6 @@ RSpec/AnyInstance: - 'spec/models/account_spec.rb' - 'spec/models/setting_spec.rb' - 'spec/services/activitypub/process_collection_service_spec.rb' - - 'spec/validators/blacklisted_email_validator_spec.rb' - 'spec/validators/follow_limit_validator_spec.rb' - 'spec/workers/activitypub/delivery_worker_spec.rb' - 'spec/workers/web/push_notification_worker_spec.rb' @@ -333,11 +332,7 @@ RSpec/MessageChain: RSpec/MessageSpies: Exclude: - 'spec/controllers/admin/accounts_controller_spec.rb' - - 'spec/controllers/api/base_controller_spec.rb' - - 'spec/controllers/auth/registrations_controller_spec.rb' - 'spec/helpers/admin/account_moderation_notes_helper_spec.rb' - - 'spec/helpers/application_helper_spec.rb' - - 'spec/lib/status_finder_spec.rb' - 'spec/lib/webfinger_resource_spec.rb' - 'spec/models/admin/account_action_spec.rb' - 'spec/models/concerns/remotable_spec.rb' @@ -802,7 +797,6 @@ Style/MutableConstant: Exclude: - 'app/models/tag.rb' - 'app/services/delete_account_service.rb' - - 'config/initializers/twitter_regex.rb' - 'lib/mastodon/migration_warning.rb' # This cop supports safe autocorrection (--autocorrect). From cf18bfa090df8c89254ee3ac5a2d54bbf8d9d4c4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 12:39:50 +0200 Subject: [PATCH 011/557] Update dependency aws-sdk-s3 to v1.130.0 (#25967) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 87d8ef7d25..c534914956 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,20 +103,20 @@ GEM attr_required (1.0.1) awrence (1.2.1) aws-eventstream (1.2.0) - aws-partitions (1.780.0) - aws-sdk-core (3.175.0) + aws-partitions (1.786.0) + aws-sdk-core (3.178.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.67.0) - aws-sdk-core (~> 3, >= 3.174.0) + aws-sdk-kms (1.71.0) + aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.126.0) - aws-sdk-core (~> 3, >= 3.174.0) + aws-sdk-s3 (1.130.0) + aws-sdk-core (~> 3, >= 3.177.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.6) + aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.18) better_errors (2.10.1) From bf9c1a65fa37827c99769cb7e39283f7b72feeaf Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 17 Jul 2023 06:40:27 -0400 Subject: [PATCH 012/557] Update rubocop 1.54.2 (#26002) --- .rubocop_todo.yml | 6 +++--- Gemfile.lock | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 3c743842e2..960d548f06 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp` -# using RuboCop version 1.54.1. +# using RuboCop version 1.54.2. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -367,7 +367,7 @@ Rails/ApplicationController: # Configuration parameters: Database, Include. # SupportedDatabases: mysql, postgresql -# Include: db/migrate/*.rb +# Include: db/**/*.rb Rails/BulkChangeTable: Exclude: - 'db/migrate/20160222143943_add_profile_fields_to_accounts.rb' @@ -403,7 +403,7 @@ Rails/BulkChangeTable: - 'db/migrate/20220824164433_add_human_identifier_to_admin_action_logs.rb' # Configuration parameters: Include. -# Include: db/migrate/*.rb +# Include: db/**/*.rb Rails/CreateTableWithTimestamps: Exclude: - 'db/migrate/20170508230434_create_conversation_mutes.rb' diff --git a/Gemfile.lock b/Gemfile.lock index c534914956..a298c87c8b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -596,7 +596,7 @@ GEM sidekiq (>= 2.4.0) rspec-support (3.12.0) rspec_chunked (0.6) - rubocop (1.54.1) + rubocop (1.54.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) From 626f9cf83199b75424f09589439ac4e92d1badc6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 12:40:54 +0200 Subject: [PATCH 013/557] Update dependency public_suffix to v5.0.3 (#26032) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a298c87c8b..1d43b687d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -493,7 +493,7 @@ GEM net-smtp premailer (~> 1.7, >= 1.7.9) private_address_check (0.5.0) - public_suffix (5.0.1) + public_suffix (5.0.3) puma (6.3.0) nio4r (~> 2.0) pundit (2.3.0) From 27f7e5b0f307f92b649ac39d121b9ae588d7b3e0 Mon Sep 17 00:00:00 2001 From: Terence Eden Date: Sun, 16 Jul 2023 09:06:33 +0100 Subject: [PATCH 014/557] [Glitch] Prevent split line between icon and number on reposts & favourites Port b923a4c7557ca0967d80dbe892b1517fcd0e9a41 to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/styles/components/status.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index 0b2035ff64..065acebaf2 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -604,6 +604,7 @@ .detailed-status__link { color: inherit; text-decoration: none; + white-space: nowrap; } .detailed-status__favorites, From 12e7f5fabd2e648e55bfc34e5cb35b5ac0156a2b Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Mon, 17 Jul 2023 04:51:00 -0500 Subject: [PATCH 015/557] [Glitch] Fix for "follows you" indicator in light web UI not readable Port 97ce47e45100548f258644fc14314dbf3db94973 to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/styles/components/accounts.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/flavours/glitch/styles/components/accounts.scss b/app/javascript/flavours/glitch/styles/components/accounts.scss index f5b4659927..590b8f1811 100644 --- a/app/javascript/flavours/glitch/styles/components/accounts.scss +++ b/app/javascript/flavours/glitch/styles/components/accounts.scss @@ -316,7 +316,7 @@ } .relationship-tag { - color: $primary-text-color; + color: $white; margin-bottom: 4px; display: block; background-color: $base-overlay-background; From f18618d7f92553c33bbd0b09bf52401000b7b8e6 Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 17 Jul 2023 13:13:43 +0200 Subject: [PATCH 016/557] Fix some incorrect tests (#26035) --- spec/services/batched_remove_status_service_spec.rb | 4 ++-- spec/services/remove_status_service_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/services/batched_remove_status_service_spec.rb b/spec/services/batched_remove_status_service_spec.rb index 1363c81d05..8201c9d51f 100644 --- a/spec/services/batched_remove_status_service_spec.rb +++ b/spec/services/batched_remove_status_service_spec.rb @@ -34,11 +34,11 @@ RSpec.describe BatchedRemoveStatusService, type: :service do end it 'removes statuses from author\'s home feed' do - expect(HomeFeed.new(alice).get(10)).to_not include([status_alice_hello.id, status_alice_other.id]) + expect(HomeFeed.new(alice).get(10).pluck(:id)).to_not include(status_alice_hello.id, status_alice_other.id) end it 'removes statuses from local follower\'s home feed' do - expect(HomeFeed.new(jeff).get(10)).to_not include([status_alice_hello.id, status_alice_other.id]) + expect(HomeFeed.new(jeff).get(10).pluck(:id)).to_not include(status_alice_hello.id, status_alice_other.id) end it 'notifies streaming API of followers' do diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb index 77b01d3072..c19b4fac15 100644 --- a/spec/services/remove_status_service_spec.rb +++ b/spec/services/remove_status_service_spec.rb @@ -28,12 +28,12 @@ RSpec.describe RemoveStatusService, type: :service do it 'removes status from author\'s home feed' do subject.call(@status) - expect(HomeFeed.new(alice).get(10)).to_not include(@status.id) + expect(HomeFeed.new(alice).get(10).pluck(:id)).to_not include(@status.id) end it 'removes status from local follower\'s home feed' do subject.call(@status) - expect(HomeFeed.new(jeff).get(10)).to_not include(@status.id) + expect(HomeFeed.new(jeff).get(10).pluck(:id)).to_not include(@status.id) end it 'sends Delete activity to followers' do From 943f27f4377cd74bc07794f15299ad05ef8a7d4f Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 17 Jul 2023 13:56:28 +0200 Subject: [PATCH 017/557] Remove unfollowed hashtag posts from home feed (#26028) --- app/controllers/api/v1/tags_controller.rb | 1 + app/lib/feed_manager.rb | 20 ++++++++++++ app/workers/tag_unmerge_worker.rb | 21 ++++++++++++ spec/workers/tag_unmerge_worker_spec.rb | 39 +++++++++++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 app/workers/tag_unmerge_worker.rb create mode 100644 spec/workers/tag_unmerge_worker_spec.rb diff --git a/app/controllers/api/v1/tags_controller.rb b/app/controllers/api/v1/tags_controller.rb index 284ec85937..672535a018 100644 --- a/app/controllers/api/v1/tags_controller.rb +++ b/app/controllers/api/v1/tags_controller.rb @@ -19,6 +19,7 @@ class Api::V1::TagsController < Api::BaseController def unfollow TagFollow.find_by(account: current_account, tag: @tag)&.destroy! + TagUnmergeWorker.perform_async(@tag.id, current_account.id) render json: @tag, serializer: REST::TagSerializer end diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 7423d2d092..ad686c1f1a 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -180,6 +180,26 @@ class FeedManager end end + # Remove a tag's statuses from a home feed + # @param [Tag] from_tag + # @param [Account] into_account + # @return [void] + def unmerge_tag_from_home(from_tag, into_account) + timeline_key = key(:home, into_account.id) + timeline_status_ids = redis.zrange(timeline_key, 0, -1) + + # This is a bit tricky because we need posts tagged with this hashtag that are not + # also tagged with another followed hashtag or from a followed user + scope = from_tag.statuses + .where(id: timeline_status_ids) + .where.not(account: into_account.following) + .tagged_with_none(TagFollow.where(account: into_account).pluck(:tag_id)) + + scope.select('id, reblog_of_id').reorder(nil).find_each do |status| + remove_from_feed(:home, into_account.id, status, aggregate_reblogs: into_account.user&.aggregates_reblogs?) + end + end + # Clear all statuses from or mentioning target_account from a home feed # @param [Account] account # @param [Account] target_account diff --git a/app/workers/tag_unmerge_worker.rb b/app/workers/tag_unmerge_worker.rb new file mode 100644 index 0000000000..1c2a6d1e76 --- /dev/null +++ b/app/workers/tag_unmerge_worker.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class TagUnmergeWorker + include Sidekiq::Worker + include DatabaseHelper + + sidekiq_options queue: 'pull' + + def perform(from_tag_id, into_account_id) + with_primary do + @from_tag = Tag.find(from_tag_id) + @into_account = Account.find(into_account_id) + end + + with_read_replica do + FeedManager.instance.unmerge_tag_from_home(@from_tag, @into_account) + end + rescue ActiveRecord::RecordNotFound + true + end +end diff --git a/spec/workers/tag_unmerge_worker_spec.rb b/spec/workers/tag_unmerge_worker_spec.rb new file mode 100644 index 0000000000..5d3a12c449 --- /dev/null +++ b/spec/workers/tag_unmerge_worker_spec.rb @@ -0,0 +1,39 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe TagUnmergeWorker do + subject { described_class.new } + + describe 'perform' do + let(:follower) { Fabricate(:account) } + let(:followed) { Fabricate(:account) } + let(:followed_tag) { Fabricate(:tag) } + let(:unchanged_followed_tag) { Fabricate(:tag) } + let(:status_from_followed) { Fabricate(:status, created_at: 2.hours.ago, account: followed) } + let(:tagged_status) { Fabricate(:status, created_at: 1.hour.ago) } + let(:unchanged_tagged_status) { Fabricate(:status) } + + before do + tagged_status.tags << followed_tag + unchanged_tagged_status.tags << followed_tag + unchanged_tagged_status.tags << unchanged_followed_tag + + tag_follow = TagFollow.create_with(rate_limit: false).find_or_create_by!(tag: followed_tag, account: follower) + TagFollow.create_with(rate_limit: false).find_or_create_by!(tag: unchanged_followed_tag, account: follower) + + FeedManager.instance.push_to_home(follower, status_from_followed, update: false) + FeedManager.instance.push_to_home(follower, tagged_status, update: false) + FeedManager.instance.push_to_home(follower, unchanged_tagged_status, update: false) + + tag_follow.destroy! + end + + it 'removes the expected status from the feed' do + expect { subject.perform(followed_tag.id, follower.id) } + .to change { HomeFeed.new(follower).get(10).pluck(:id) } + .from([unchanged_tagged_status.id, tagged_status.id, status_from_followed.id]) + .to([unchanged_tagged_status.id, status_from_followed.id]) + end + end +end From 2a9063e36ad107b021b85b0ce937b95974a9cd70 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 14:07:36 +0200 Subject: [PATCH 018/557] Update dependency react-select to v5.7.4 (#26033) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6f31752b08..0523961667 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1279,17 +1279,17 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.42.0.tgz#484a1d638de2911e6f5a30c12f49c7e4a3270fb6" integrity sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw== -"@floating-ui/core@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.3.0.tgz#113bc85fa102cf890ae801668f43ee265c547a09" - integrity sha512-vX1WVAdPjZg9DkDkC+zEx/tKtnST6/qcNpwcjeBgco3XRNHz5PUA+ivi/yr6G3o0kMR60uKBJcfOdfzOFI7PMQ== +"@floating-ui/core@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.3.1.tgz#4d795b649cc3b1cbb760d191c80dcb4353c9a366" + integrity sha512-Bu+AMaXNjrpjh41znzHqaz3r2Nr8hHuHZT6V2LBKMhyMl0FgKA62PNYbqnfgmzOhoWZj70Zecisbo4H1rotP5g== "@floating-ui/dom@^1.0.1": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.3.0.tgz#69456f2164fc3d33eb40837686eaf71537235ac9" - integrity sha512-qIAwejE3r6NeA107u4ELDKkH8+VtgRKdXqtSPaKflL2S2V+doyN+Wt9s5oHKXPDo4E8TaVXaHT3+6BbagH31xw== + version "1.4.5" + resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.4.5.tgz#336dfb9870c98b471ff5802002982e489b8bd1c5" + integrity sha512-96KnRWkRnuBSSFbj0sFGwwOUd8EkiecINVl0O9wiZlZ64EkpyAOG3Xc2vKKNJmru0Z7RqWNymA+6b8OZqjgyyw== dependencies: - "@floating-ui/core" "^1.3.0" + "@floating-ui/core" "^1.3.1" "@formatjs/cli@^6.1.1": version "6.1.3" @@ -9686,9 +9686,9 @@ react-router@^4.3.1: warning "^4.0.1" react-select@*, react-select@^5.7.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.7.3.tgz#fa0dc9a23cad6ff3871ad3829f6083a4b54961a2" - integrity sha512-z8i3NCuFFWL3w27xq92rBkVI2onT0jzIIPe480HlBjXJ3b5o6Q+Clp4ydyeKrj9DZZ3lrjawwLC5NGl0FSvUDg== + version "5.7.4" + resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.7.4.tgz#d8cad96e7bc9d6c8e2709bdda8f4363c5dd7ea7d" + integrity sha512-NhuE56X+p9QDFh4BgeygHFIvJJszO1i1KSkg/JPcIJrbovyRtI+GuOEa4XzFCEpZRAEoEI8u/cAHK+jG/PgUzQ== dependencies: "@babel/runtime" "^7.12.0" "@emotion/cache" "^11.4.0" From 5096deb818f416c9afa8d5b612fabe267e546239 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 17 Jul 2023 08:08:56 -0400 Subject: [PATCH 019/557] Fix haml lint Rubocop `Style/RedundantStringCoercion` cop (#25975) --- .haml-lint_todo.yml | 4 ++-- app/views/settings/imports/show.html.haml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml index 31b79f7db2..ce214bfa51 100644 --- a/.haml-lint_todo.yml +++ b/.haml-lint_todo.yml @@ -1,13 +1,13 @@ # This configuration was generated by # `haml-lint --auto-gen-config` -# on 2023-07-11 23:58:05 +0200 using Haml-Lint version 0.48.0. +# on 2023-07-13 11:24:52 -0400 using Haml-Lint version 0.48.0. # The point is for the user to remove these configuration records # one by one as the lints are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of Haml-Lint, may require this file to be generated again. linters: - # Offense count: 94 + # Offense count: 93 RuboCop: enabled: false diff --git a/app/views/settings/imports/show.html.haml b/app/views/settings/imports/show.html.haml index 65954e3e1e..893c5c8d29 100644 --- a/app/views/settings/imports/show.html.haml +++ b/app/views/settings/imports/show.html.haml @@ -1,13 +1,13 @@ - content_for :page_title do - = t("imports.titles.#{@bulk_import.type.to_s}") + = t("imports.titles.#{@bulk_import.type}") - if @bulk_import.likely_mismatched? .flash-message.warning= t("imports.mismatched_types_warning") - if @bulk_import.overwrite? - %p.hint= t("imports.overwrite_preambles.#{@bulk_import.type.to_s}_html", filename: @bulk_import.original_filename, total_items: @bulk_import.total_items) + %p.hint= t("imports.overwrite_preambles.#{@bulk_import.type}_html", filename: @bulk_import.original_filename, total_items: @bulk_import.total_items) - else - %p.hint= t("imports.preambles.#{@bulk_import.type.to_s}_html", filename: @bulk_import.original_filename, total_items: @bulk_import.total_items) + %p.hint= t("imports.preambles.#{@bulk_import.type}_html", filename: @bulk_import.original_filename, total_items: @bulk_import.total_items) .simple_form .actions From 361dd432354279281cde6a6fdf99eae68787a421 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 17 Jul 2023 09:07:29 -0400 Subject: [PATCH 020/557] Fix haml-lint Rubocop `lambda` cop (#25946) --- .haml-lint_todo.yml | 4 ++-- app/views/admin/domain_blocks/edit.html.haml | 2 +- app/views/admin/domain_blocks/new.html.haml | 2 +- app/views/admin/ip_blocks/new.html.haml | 4 ++-- app/views/admin/roles/_form.html.haml | 2 +- app/views/admin/settings/about/show.html.haml | 4 ++-- app/views/admin/settings/appearance/show.html.haml | 2 +- app/views/admin/settings/registrations/show.html.haml | 2 +- app/views/filters/_filter_fields.html.haml | 4 ++-- app/views/invites/_form.html.haml | 4 ++-- app/views/settings/applications/_fields.html.haml | 2 +- app/views/settings/preferences/appearance/show.html.haml | 6 +++--- app/views/settings/preferences/other/show.html.haml | 6 +++--- app/views/statuses_cleanup/show.html.haml | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml index ce214bfa51..f13be210b7 100644 --- a/.haml-lint_todo.yml +++ b/.haml-lint_todo.yml @@ -1,13 +1,13 @@ # This configuration was generated by # `haml-lint --auto-gen-config` -# on 2023-07-13 11:24:52 -0400 using Haml-Lint version 0.48.0. +# on 2023-07-17 08:54:02 -0400 using Haml-Lint version 0.48.0. # The point is for the user to remove these configuration records # one by one as the lints are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of Haml-Lint, may require this file to be generated again. linters: - # Offense count: 93 + # Offense count: 71 RuboCop: enabled: false diff --git a/app/views/admin/domain_blocks/edit.html.haml b/app/views/admin/domain_blocks/edit.html.haml index 39c6d108a7..66bc0e241a 100644 --- a/app/views/admin/domain_blocks/edit.html.haml +++ b/app/views/admin/domain_blocks/edit.html.haml @@ -12,7 +12,7 @@ = f.input :domain, wrapper: :with_label, label: t('admin.domain_blocks.domain'), hint: t('admin.domain_blocks.new.hint'), required: true, readonly: true, disabled: true .fields-row__column.fields-row__column-6.fields-group - = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| t("admin.domain_blocks.new.severity.#{type}") }, hint: t('admin.domain_blocks.new.severity.desc_html') + = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: ->(type) { t("admin.domain_blocks.new.severity.#{type}") }, hint: t('admin.domain_blocks.new.severity.desc_html') .fields-group = f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_media'), hint: I18n.t('admin.domain_blocks.reject_media_hint') diff --git a/app/views/admin/domain_blocks/new.html.haml b/app/views/admin/domain_blocks/new.html.haml index bcaa331b56..5c28508cfa 100644 --- a/app/views/admin/domain_blocks/new.html.haml +++ b/app/views/admin/domain_blocks/new.html.haml @@ -12,7 +12,7 @@ = f.input :domain, wrapper: :with_label, label: t('admin.domain_blocks.domain'), hint: t('.hint'), required: true .fields-row__column.fields-row__column-6.fields-group - = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| t(".severity.#{type}") }, hint: t('.severity.desc_html') + = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: ->(type) { t(".severity.#{type}") }, hint: t('.severity.desc_html') .fields-group = f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_media'), hint: I18n.t('admin.domain_blocks.reject_media_hint') diff --git a/app/views/admin/ip_blocks/new.html.haml b/app/views/admin/ip_blocks/new.html.haml index 69f6b98b9b..405c73c90e 100644 --- a/app/views/admin/ip_blocks/new.html.haml +++ b/app/views/admin/ip_blocks/new.html.haml @@ -8,10 +8,10 @@ = f.input :ip, as: :string, wrapper: :with_block_label, input_html: { placeholder: '192.0.2.0/24' } .fields-group - = f.input :expires_in, wrapper: :with_block_label, collection: [1.day, 2.weeks, 1.month, 6.months, 1.year, 3.years].map(&:to_i), label_method: lambda { |i| I18n.t("admin.ip_blocks.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt') + = f.input :expires_in, wrapper: :with_block_label, collection: [1.day, 2.weeks, 1.month, 6.months, 1.year, 3.years].map(&:to_i), label_method: ->(i) { I18n.t("admin.ip_blocks.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt') .fields-group - = f.input :severity, as: :radio_buttons, collection: IpBlock.severities.keys, include_blank: false, wrapper: :with_block_label, label_method: lambda { |severity| safe_join([I18n.t("simple_form.labels.ip_block.severities.#{severity}"), content_tag(:span, I18n.t("simple_form.hints.ip_block.severities.#{severity}"), class: 'hint')]) } + = f.input :severity, as: :radio_buttons, collection: IpBlock.severities.keys, include_blank: false, wrapper: :with_block_label, label_method: ->(severity) { safe_join([I18n.t("simple_form.labels.ip_block.severities.#{severity}"), content_tag(:span, I18n.t("simple_form.hints.ip_block.severities.#{severity}"), class: 'hint')]) } .fields-group = f.input :comment, as: :string, wrapper: :with_block_label diff --git a/app/views/admin/roles/_form.html.haml b/app/views/admin/roles/_form.html.haml index 31f78f2405..3cbec0d0b5 100644 --- a/app/views/admin/roles/_form.html.haml +++ b/app/views/admin/roles/_form.html.haml @@ -32,7 +32,7 @@ - (@role.everyone? ? UserRole::Flags::CATEGORIES.slice(:invites) : UserRole::Flags::CATEGORIES).each do |category, permissions| %h4= t(category, scope: 'admin.roles.categories') - = f.input :permissions_as_keys, collection: permissions, wrapper: :with_block_label, include_blank: false, label_method: lambda { |privilege| safe_join([t("admin.roles.privileges.#{privilege}"), content_tag(:span, t("admin.roles.privileges.#{privilege}_description"), class: 'hint')]) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label: false, hint: false, disabled: permissions.filter { |privilege| UserRole::FLAGS[privilege] & current_user.role.computed_permissions == 0 } + = f.input :permissions_as_keys, collection: permissions, wrapper: :with_block_label, include_blank: false, label_method: ->(privilege) { safe_join([t("admin.roles.privileges.#{privilege}"), content_tag(:span, t("admin.roles.privileges.#{privilege}_description"), class: 'hint')]) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label: false, hint: false, disabled: permissions.filter { |privilege| UserRole::FLAGS[privilege] & current_user.role.computed_permissions == 0 } %hr.spacer/ diff --git a/app/views/admin/settings/about/show.html.haml b/app/views/admin/settings/about/show.html.haml index 2aaa64abe7..7b1b907ee2 100644 --- a/app/views/admin/settings/about/show.html.haml +++ b/app/views/admin/settings/about/show.html.haml @@ -22,9 +22,9 @@ .fields-row .fields-row__column.fields-row__column-6.fields-group - = f.input :show_domain_blocks, wrapper: :with_label, collection: %i(disabled users all), label_method: lambda { |value| t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' + = f.input :show_domain_blocks, wrapper: :with_label, collection: %i(disabled users all), label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' .fields-row__column.fields-row__column-6.fields-group - = f.input :show_domain_blocks_rationale, wrapper: :with_label, collection: %i(disabled users all), label_method: lambda { |value| t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' + = f.input :show_domain_blocks_rationale, wrapper: :with_label, collection: %i(disabled users all), label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' .fields-group = f.input :status_page_url, wrapper: :with_block_label, input_html: { placeholder: "https://status.#{Rails.configuration.x.local_domain}" } diff --git a/app/views/admin/settings/appearance/show.html.haml b/app/views/admin/settings/appearance/show.html.haml index d321c4b04b..1e73ab0a24 100644 --- a/app/views/admin/settings/appearance/show.html.haml +++ b/app/views/admin/settings/appearance/show.html.haml @@ -14,7 +14,7 @@ %p.lead= t('admin.settings.appearance.preamble') .fields-group - = f.input :theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false + = f.input :theme, collection: Themes.instance.names, label_method: ->(theme) { I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false .fields-group = f.input :custom_css, wrapper: :with_block_label, as: :text, input_html: { rows: 8 } diff --git a/app/views/admin/settings/registrations/show.html.haml b/app/views/admin/settings/registrations/show.html.haml index 84492a08a1..e06385bc81 100644 --- a/app/views/admin/settings/registrations/show.html.haml +++ b/app/views/admin/settings/registrations/show.html.haml @@ -15,7 +15,7 @@ .fields-row .fields-row__column.fields-row__column-6.fields-group - = f.input :registrations_mode, collection: %w(open approved none), wrapper: :with_label, include_blank: false, label_method: lambda { |mode| I18n.t("admin.settings.registrations_mode.modes.#{mode}") } + = f.input :registrations_mode, collection: %w(open approved none), wrapper: :with_label, include_blank: false, label_method: ->(mode) { I18n.t("admin.settings.registrations_mode.modes.#{mode}") } .fields-row__column.fields-row__column-6.fields-group = f.input :require_invite_text, as: :boolean, wrapper: :with_label, disabled: !approved_registrations? diff --git a/app/views/filters/_filter_fields.html.haml b/app/views/filters/_filter_fields.html.haml index a554b55ff6..0690e8dd59 100644 --- a/app/views/filters/_filter_fields.html.haml +++ b/app/views/filters/_filter_fields.html.haml @@ -2,10 +2,10 @@ .fields-row__column.fields-row__column-6.fields-group = f.input :title, as: :string, wrapper: :with_label, hint: false .fields-row__column.fields-row__column-6.fields-group - = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: lambda { |i| I18n.t("invites.expires_in.#{i}") }, include_blank: I18n.t('invites.expires_in_prompt') + = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: ->(i) { I18n.t("invites.expires_in.#{i}") }, include_blank: I18n.t('invites.expires_in_prompt') .fields-group - = f.input :context, wrapper: :with_block_label, collection: CustomFilter::VALID_CONTEXTS, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label_method: lambda { |context| I18n.t("filters.contexts.#{context}") }, include_blank: false + = f.input :context, wrapper: :with_block_label, collection: CustomFilter::VALID_CONTEXTS, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label_method: ->(context) { I18n.t("filters.contexts.#{context}") }, include_blank: false %hr.spacer/ diff --git a/app/views/invites/_form.html.haml b/app/views/invites/_form.html.haml index 3a2a5ef0e1..7ea521ebc7 100644 --- a/app/views/invites/_form.html.haml +++ b/app/views/invites/_form.html.haml @@ -3,9 +3,9 @@ .fields-row .fields-row__column.fields-row__column-6.fields-group - = f.input :max_uses, wrapper: :with_label, collection: [1, 5, 10, 25, 50, 100], label_method: lambda { |num| I18n.t('invites.max_uses', count: num) }, prompt: I18n.t('invites.max_uses_prompt') + = f.input :max_uses, wrapper: :with_label, collection: [1, 5, 10, 25, 50, 100], label_method: ->(num) { I18n.t('invites.max_uses', count: num) }, prompt: I18n.t('invites.max_uses_prompt') .fields-row__column.fields-row__column-6.fields-group - = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: lambda { |i| I18n.t("invites.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt') + = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: ->(i) { I18n.t("invites.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt') .fields-group = f.input :autofollow, wrapper: :with_label diff --git a/app/views/settings/applications/_fields.html.haml b/app/views/settings/applications/_fields.html.haml index ffd2491d29..f4deb5b6ff 100644 --- a/app/views/settings/applications/_fields.html.haml +++ b/app/views/settings/applications/_fields.html.haml @@ -15,4 +15,4 @@ %span.hint= t('simple_form.hints.defaults.scopes') - Doorkeeper.configuration.scopes.group_by { |s| s.split(':').first }.each do |k, v| - = f.input :scopes, label: false, hint: false, collection: v.sort, wrapper: :with_block_label, include_blank: false, label_method: lambda { |scope| safe_join([content_tag(:samp, scope, class: class_for_scope(scope)), content_tag(:span, t("doorkeeper.scopes.#{scope}"), class: 'hint')]) }, selected: f.object.scopes.all, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' + = f.input :scopes, label: false, hint: false, collection: v.sort, wrapper: :with_block_label, include_blank: false, label_method: ->(scope) { safe_join([content_tag(:samp, scope, class: class_for_scope(scope)), content_tag(:span, t("doorkeeper.scopes.#{scope}"), class: 'hint')]) }, selected: f.object.scopes.all, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml index ce3a30c5ee..ec7a3d1401 100644 --- a/app/views/settings/preferences/appearance/show.html.haml +++ b/app/views/settings/preferences/appearance/show.html.haml @@ -7,13 +7,13 @@ = simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f| .fields-row .fields-group.fields-row__column.fields-row__column-6 - = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| native_locale_name(locale) }, selected: I18n.locale, hint: false + = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: ->(locale) { native_locale_name(locale) }, selected: I18n.locale, hint: false .fields-group.fields-row__column.fields-row__column-6 = f.input :time_zone, wrapper: :with_label, collection: ActiveSupport::TimeZone.all.map { |tz| ["(GMT#{tz.formatted_offset}) #{tz.name}", tz.tzinfo.name] }, hint: false .fields-group = f.simple_fields_for :settings, current_user.settings do |ff| - = ff.input :theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_theme'), include_blank: false, hint: false + = ff.input :theme, collection: Themes.instance.names, label_method: ->(theme) { I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_theme'), include_blank: false, hint: false - unless I18n.locale == :en .flash-message.translation-prompt @@ -57,7 +57,7 @@ %h4= t 'appearance.sensitive_content' .fields-group - = ff.input :'web.display_media', collection: ['default', 'show_all', 'hide_all'],label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', wrapper: :with_floating_label, label: I18n.t('simple_form.labels.defaults.setting_display_media') + = ff.input :'web.display_media', collection: ['default', 'show_all', 'hide_all'], label_method: ->(item) { t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', wrapper: :with_floating_label, label: I18n.t('simple_form.labels.defaults.setting_display_media') .fields-group = ff.input :'web.use_blurhash', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_use_blurhash'), hint: I18n.t('simple_form.hints.defaults.setting_use_blurhash') diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml index 6590ec7c21..b8beed394c 100644 --- a/app/views/settings/preferences/other/show.html.haml +++ b/app/views/settings/preferences/other/show.html.haml @@ -18,10 +18,10 @@ .fields-row .fields-group.fields-row__column.fields-row__column-6 - = ff.input :default_privacy, collection: Status.selectable_visibilities, wrapper: :with_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') }, required: false, hint: false, label: I18n.t('simple_form.labels.defaults.setting_default_privacy') + = ff.input :default_privacy, collection: Status.selectable_visibilities, wrapper: :with_label, include_blank: false, label_method: ->(visibility) { safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') }, required: false, hint: false, label: I18n.t('simple_form.labels.defaults.setting_default_privacy') .fields-group.fields-row__column.fields-row__column-6 - = ff.input :default_language, collection: [nil] + filterable_languages, wrapper: :with_label, label_method: lambda { |locale| locale.nil? ? I18n.t('statuses.default_language') : native_locale_name(locale) }, required: false, include_blank: false, hint: false, label: I18n.t('simple_form.labels.defaults.setting_default_language') + = ff.input :default_language, collection: [nil] + filterable_languages, wrapper: :with_label, label_method: ->(locale) { locale.nil? ? I18n.t('statuses.default_language') : native_locale_name(locale) }, required: false, include_blank: false, hint: false, label: I18n.t('simple_form.labels.defaults.setting_default_language') .fields-group = ff.input :default_sensitive, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'), hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive') @@ -32,7 +32,7 @@ %h4= t 'preferences.public_timelines' .fields-group - = f.input :chosen_languages, collection: filterable_languages, wrapper: :with_block_label, include_blank: false, label_method: lambda { |locale| native_locale_name(locale) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' + = f.input :chosen_languages, collection: filterable_languages, wrapper: :with_block_label, include_blank: false, label_method: ->(locale) { native_locale_name(locale) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' .actions = f.button :button, t('generic.save_changes'), type: :submit diff --git a/app/views/statuses_cleanup/show.html.haml b/app/views/statuses_cleanup/show.html.haml index 59de4b5aa6..99b9ddab93 100644 --- a/app/views/statuses_cleanup/show.html.haml +++ b/app/views/statuses_cleanup/show.html.haml @@ -10,7 +10,7 @@ .fields-row__column.fields-row__column-6.fields-group = f.input :enabled, as: :boolean, wrapper: :with_label, label: t('statuses_cleanup.enabled'), hint: t('statuses_cleanup.enabled_hint') .fields-row__column.fields-row__column-6.fields-group - = f.input :min_status_age, wrapper: :with_label, label: t('statuses_cleanup.min_age_label'), collection: AccountStatusesCleanupPolicy::ALLOWED_MIN_STATUS_AGE.map(&:to_i), label_method: lambda { |i| t("statuses_cleanup.min_age.#{i}") }, include_blank: false, hint: false + = f.input :min_status_age, wrapper: :with_label, label: t('statuses_cleanup.min_age_label'), collection: AccountStatusesCleanupPolicy::ALLOWED_MIN_STATUS_AGE.map(&:to_i), label_method: ->(i) { t("statuses_cleanup.min_age.#{i}") }, include_blank: false, hint: false .flash-message= t('statuses_cleanup.explanation') From bd33efdf1624d484c82bb328a56df1f1ab8a878a Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 17 Jul 2023 09:38:04 -0400 Subject: [PATCH 021/557] Fix haml-lint Rubocop `Style/MinMaxComparison` cop (#25974) --- .haml-lint_todo.yml | 6 +++--- app/views/statuses/_poll.html.haml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml index f13be210b7..e1314742a6 100644 --- a/.haml-lint_todo.yml +++ b/.haml-lint_todo.yml @@ -1,17 +1,17 @@ # This configuration was generated by # `haml-lint --auto-gen-config` -# on 2023-07-17 08:54:02 -0400 using Haml-Lint version 0.48.0. +# on 2023-07-17 09:15:24 -0400 using Haml-Lint version 0.48.0. # The point is for the user to remove these configuration records # one by one as the lints are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of Haml-Lint, may require this file to be generated again. linters: - # Offense count: 71 + # Offense count: 70 RuboCop: enabled: false - # Offense count: 960 + # Offense count: 959 LineLength: enabled: false diff --git a/app/views/statuses/_poll.html.haml b/app/views/statuses/_poll.html.haml index 248c6058cb..0805c48958 100644 --- a/app/views/statuses/_poll.html.haml +++ b/app/views/statuses/_poll.html.haml @@ -17,7 +17,7 @@ %span.poll__voted %i.poll__voted__mark.fa.fa-check - %progress{ max: 100, value: percent < 1 ? 1 : percent, 'aria-hidden': 'true' } + %progress{ max: 100, value: [percent, 1].max, 'aria-hidden': 'true' } %span.poll__chart - else %label.poll__option>< From 664b0ca8cb10383c4c64964f830c41ddef4acb27 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Mon, 17 Jul 2023 22:51:30 +0900 Subject: [PATCH 022/557] Check if json body is null on Activitipub::ProcessingWorker (#26021) --- app/services/activitypub/process_collection_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/activitypub/process_collection_service.rb b/app/services/activitypub/process_collection_service.rb index 52f48bd49d..4f049a5ae9 100644 --- a/app/services/activitypub/process_collection_service.rb +++ b/app/services/activitypub/process_collection_service.rb @@ -8,6 +8,8 @@ class ActivityPub::ProcessCollectionService < BaseService @json = original_json = Oj.load(body, mode: :strict) @options = options + return unless @json.is_a?(Hash) + begin @json = compact(@json) if @json['signature'].is_a?(Hash) rescue JSON::LD::JsonLdError => e From c80ecf2ff776ba14df0bff5e72e36da621cefc2b Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 17 Jul 2023 10:10:43 -0400 Subject: [PATCH 023/557] Increase PR Rebase job retries (#25926) --- .github/workflows/rebase-needed.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rebase-needed.yml b/.github/workflows/rebase-needed.yml index 295039c414..06d835c090 100644 --- a/.github/workflows/rebase-needed.yml +++ b/.github/workflows/rebase-needed.yml @@ -23,5 +23,5 @@ jobs: repoToken: '${{ secrets.GITHUB_TOKEN }}' commentOnClean: This pull request has resolved merge conflicts and is ready for review. commentOnDirty: This pull request has merge conflicts that must be resolved before it can be merged. - retryMax: 10 + retryMax: 30 continueOnMissingPermissions: false From 8a1aabaac1f22684bd80512f734636ec5d8a3642 Mon Sep 17 00:00:00 2001 From: Daniel M Brasil Date: Mon, 17 Jul 2023 11:20:11 -0300 Subject: [PATCH 024/557] Migrate to request specs in `/api/v1/timelines/home` (#25743) --- .../api/v1/timelines/home_controller_spec.rb | 44 -------- spec/requests/api/v1/timelines/home_spec.rb | 101 ++++++++++++++++++ 2 files changed, 101 insertions(+), 44 deletions(-) delete mode 100644 spec/controllers/api/v1/timelines/home_controller_spec.rb create mode 100644 spec/requests/api/v1/timelines/home_spec.rb diff --git a/spec/controllers/api/v1/timelines/home_controller_spec.rb b/spec/controllers/api/v1/timelines/home_controller_spec.rb deleted file mode 100644 index bb46d0aba4..0000000000 --- a/spec/controllers/api/v1/timelines/home_controller_spec.rb +++ /dev/null @@ -1,44 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe Api::V1::Timelines::HomeController do - render_views - - let(:user) { Fabricate(:user, current_sign_in_at: 1.day.ago) } - - before do - allow(controller).to receive(:doorkeeper_token) { token } - end - - context 'with a user context' do - let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses') } - - describe 'GET #show' do - before do - follow = Fabricate(:follow, account: user.account) - PostStatusService.new.call(follow.target_account, text: 'New status for user home timeline.') - end - - it 'returns http success' do - get :show - - expect(response).to have_http_status(200) - expect(response.headers['Link'].links.size).to eq(2) - end - end - end - - context 'without a user context' do - let(:token) { Fabricate(:accessible_access_token, resource_owner_id: nil, scopes: 'read') } - - describe 'GET #show' do - it 'returns http unprocessable entity' do - get :show - - expect(response).to have_http_status(422) - expect(response.headers['Link']).to be_nil - end - end - end -end diff --git a/spec/requests/api/v1/timelines/home_spec.rb b/spec/requests/api/v1/timelines/home_spec.rb new file mode 100644 index 0000000000..5834b90955 --- /dev/null +++ b/spec/requests/api/v1/timelines/home_spec.rb @@ -0,0 +1,101 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'Home' do + let(:user) { Fabricate(:user) } + let(:scopes) { 'read:statuses' } + let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) } + let(:headers) { { 'Authorization' => "Bearer #{token.token}" } } + + describe 'GET /api/v1/timelines/home' do + subject do + get '/api/v1/timelines/home', headers: headers, params: params + end + + let(:params) { {} } + + it_behaves_like 'forbidden for wrong scope', 'write write:statuses' + + context 'when the timeline is available' do + let(:home_statuses) { bob.statuses + ana.statuses } + let!(:bob) { Fabricate(:account) } + let!(:tim) { Fabricate(:account) } + let!(:ana) { Fabricate(:account) } + + before do + user.account.follow!(bob) + user.account.follow!(ana) + PostStatusService.new.call(bob, text: 'New toot from bob.') + PostStatusService.new.call(tim, text: 'New toot from tim.') + PostStatusService.new.call(ana, text: 'New toot from ana.') + end + + it 'returns http success' do + subject + + expect(response).to have_http_status(200) + end + + it 'returns the statuses of followed users' do + subject + + expect(body_as_json.pluck(:id)).to match_array(home_statuses.map { |status| status.id.to_s }) + end + + context 'with limit param' do + let(:params) { { limit: 1 } } + + it 'returns only the requested number of statuses' do + subject + + expect(body_as_json.size).to eq(params[:limit]) + end + + it 'sets the correct pagination headers', :aggregate_failures do + subject + + headers = response.headers['Link'] + + expect(headers.find_link(%w(rel prev)).href).to eq(api_v1_timelines_home_url(limit: 1, min_id: ana.statuses.first.id.to_s)) + expect(headers.find_link(%w(rel next)).href).to eq(api_v1_timelines_home_url(limit: 1, max_id: ana.statuses.first.id.to_s)) + end + end + end + + context 'when the timeline is regenerating' do + let(:timeline) { instance_double(HomeFeed, regenerating?: true, get: []) } + + before do + allow(HomeFeed).to receive(:new).and_return(timeline) + end + + it 'returns http partial content' do + subject + + expect(response).to have_http_status(206) + end + end + + context 'without an authorization header' do + let(:headers) { {} } + + it 'returns http unauthorized' do + subject + + expect(response).to have_http_status(401) + end + end + + context 'without a user context' do + let(:token) { Fabricate(:accessible_access_token, resource_owner_id: nil, scopes: scopes) } + + it 'returns http unprocessable entity', :aggregate_failures do + subject + + expect(response).to have_http_status(422) + expect(response.headers['Link']).to be_nil + end + end + end +end From 6cdc8408a9ac9d0fd157d18b1ff173c8f416cb8d Mon Sep 17 00:00:00 2001 From: Daniel M Brasil Date: Mon, 17 Jul 2023 11:22:33 -0300 Subject: [PATCH 025/557] Migrate to request specs in `/api/v1/emails/confirmations` (#25686) --- .../api/v1/emails/confirmations_spec.rb} | 124 +++++++++++------- 1 file changed, 75 insertions(+), 49 deletions(-) rename spec/{controllers/api/v1/emails/confirmations_controller_spec.rb => requests/api/v1/emails/confirmations_spec.rb} (50%) diff --git a/spec/controllers/api/v1/emails/confirmations_controller_spec.rb b/spec/requests/api/v1/emails/confirmations_spec.rb similarity index 50% rename from spec/controllers/api/v1/emails/confirmations_controller_spec.rb rename to spec/requests/api/v1/emails/confirmations_spec.rb index 80d6c8799d..8f5171ee78 100644 --- a/spec/controllers/api/v1/emails/confirmations_controller_spec.rb +++ b/spec/requests/api/v1/emails/confirmations_spec.rb @@ -2,27 +2,34 @@ require 'rails_helper' -RSpec.describe Api::V1::Emails::ConfirmationsController do +RSpec.describe 'Confirmations' do let(:confirmed_at) { nil } let(:user) { Fabricate(:user, confirmed_at: confirmed_at) } - let(:app) { Fabricate(:application) } - let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes, application: app) } - let(:scopes) { 'write' } + let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) } + let(:scopes) { 'read:accounts write:accounts' } + let(:headers) { { 'Authorization' => "Bearer #{token.token}" } } + + describe 'POST /api/v1/emails/confirmations' do + subject do + post '/api/v1/emails/confirmations', headers: headers, params: params + end + + let(:params) { {} } + + it_behaves_like 'forbidden for wrong scope', 'read read:accounts' - describe '#create' do context 'with an oauth token' do - before do - allow(controller).to receive(:doorkeeper_token) { token } - end + context 'when user was created by a different application' do + let(:user) { Fabricate(:user, confirmed_at: confirmed_at, created_by_application: Fabricate(:application)) } - context 'when from a random app' do it 'returns http forbidden' do - post :create + subject + expect(response).to have_http_status(403) end end - context 'when from an app that created the account' do + context 'when user was created by the same application' do before do user.update(created_by_application: token.application) end @@ -31,55 +38,79 @@ RSpec.describe Api::V1::Emails::ConfirmationsController do let(:confirmed_at) { Time.now.utc } it 'returns http forbidden' do - post :create + subject + expect(response).to have_http_status(403) end - context 'with user changed e-mail and has not confirmed it' do + context 'when user changed e-mail and has not confirmed it' do before do user.update(email: 'foo@bar.com') end it 'returns http success' do - post :create - expect(response).to have_http_status(:success) + subject + + expect(response).to have_http_status(200) end end end context 'when the account is unconfirmed' do it 'returns http success' do - post :create - expect(response).to have_http_status(:success) + subject + + expect(response).to have_http_status(200) + end + end + + context 'with email param' do + let(:params) { { email: 'foo@bar.com' } } + + it "updates the user's e-mail address", :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(user.reload.unconfirmed_email).to eq('foo@bar.com') + end + end + + context 'with invalid email param' do + let(:params) { { email: 'invalid' } } + + it 'returns http unprocessable entity' do + subject + + expect(response).to have_http_status(422) end end end end context 'without an oauth token' do + let(:headers) { {} } + it 'returns http unauthorized' do - post :create + subject + expect(response).to have_http_status(401) end end end - describe '#check' do - let(:scopes) { 'read' } + describe 'GET /api/v1/emails/check_confirmation' do + subject do + get '/api/v1/emails/check_confirmation', headers: headers + end + + it_behaves_like 'forbidden for wrong scope', 'write' context 'with an oauth token' do - before do - allow(controller).to receive(:doorkeeper_token) { token } - end - context 'when the account is not confirmed' do - it 'returns http success' do - get :check - expect(response).to have_http_status(200) - end + it 'returns the confirmation status successfully', :aggregate_failures do + subject - it 'returns false' do - get :check + expect(response).to have_http_status(200) expect(body_as_json).to be false end end @@ -87,31 +118,27 @@ RSpec.describe Api::V1::Emails::ConfirmationsController do context 'when the account is confirmed' do let(:confirmed_at) { Time.now.utc } - it 'returns http success' do - get :check - expect(response).to have_http_status(200) - end + it 'returns the confirmation status successfully', :aggregate_failures do + subject - it 'returns true' do - get :check + expect(response).to have_http_status(200) expect(body_as_json).to be true end end end context 'with an authentication cookie' do + let(:headers) { {} } + before do sign_in user, scope: :user end context 'when the account is not confirmed' do - it 'returns http success' do - get :check - expect(response).to have_http_status(200) - end + it 'returns the confirmation status successfully', :aggregate_failures do + subject - it 'returns false' do - get :check + expect(response).to have_http_status(200) expect(body_as_json).to be false end end @@ -119,21 +146,20 @@ RSpec.describe Api::V1::Emails::ConfirmationsController do context 'when the account is confirmed' do let(:confirmed_at) { Time.now.utc } - it 'returns http success' do - get :check - expect(response).to have_http_status(200) - end + it 'returns the confirmation status successfully', :aggregate_failures do + subject - it 'returns true' do - get :check + expect(response).to have_http_status(200) expect(body_as_json).to be true end end end context 'without an oauth token and an authentication cookie' do + let(:headers) { {} } + it 'returns http unauthorized' do - get :check + subject expect(response).to have_http_status(401) end From 1aea938d3d43207b82ac59e0c0f982583875c5ea Mon Sep 17 00:00:00 2001 From: Daniel M Brasil Date: Mon, 17 Jul 2023 11:24:05 -0300 Subject: [PATCH 026/557] Migrate to request specs in `/api/v1/statuses/:status_id/pin` (#25635) --- .../api/v1/statuses/pins_controller_spec.rb | 57 -------- spec/requests/api/v1/statuses/pins_spec.rb | 131 ++++++++++++++++++ 2 files changed, 131 insertions(+), 57 deletions(-) delete mode 100644 spec/controllers/api/v1/statuses/pins_controller_spec.rb create mode 100644 spec/requests/api/v1/statuses/pins_spec.rb diff --git a/spec/controllers/api/v1/statuses/pins_controller_spec.rb b/spec/controllers/api/v1/statuses/pins_controller_spec.rb deleted file mode 100644 index 8bdaf8b548..0000000000 --- a/spec/controllers/api/v1/statuses/pins_controller_spec.rb +++ /dev/null @@ -1,57 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe Api::V1::Statuses::PinsController do - render_views - - let(:user) { Fabricate(:user) } - let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') } - let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:accounts', application: app) } - - context 'with an oauth token' do - before do - allow(controller).to receive(:doorkeeper_token) { token } - end - - describe 'POST #create' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - post :create, params: { status_id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(200) - end - - it 'updates the pinned attribute' do - expect(user.account.pinned?(status)).to be true - end - - it 'return json with updated attributes' do - hash_body = body_as_json - - expect(hash_body[:id]).to eq status.id.to_s - expect(hash_body[:pinned]).to be true - end - end - - describe 'POST #destroy' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - Fabricate(:status_pin, status: status, account: user.account) - post :destroy, params: { status_id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(200) - end - - it 'updates the pinned attribute' do - expect(user.account.pinned?(status)).to be false - end - end - end -end diff --git a/spec/requests/api/v1/statuses/pins_spec.rb b/spec/requests/api/v1/statuses/pins_spec.rb new file mode 100644 index 0000000000..db07fa424f --- /dev/null +++ b/spec/requests/api/v1/statuses/pins_spec.rb @@ -0,0 +1,131 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'Pins' do + let(:user) { Fabricate(:user) } + let(:scopes) { 'write:accounts' } + let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) } + let(:headers) { { 'Authorization' => "Bearer #{token.token}" } } + + describe 'POST /api/v1/statuses/:status_id/pin' do + subject do + post "/api/v1/statuses/#{status.id}/pin", headers: headers + end + + let(:status) { Fabricate(:status, account: user.account) } + + it_behaves_like 'forbidden for wrong scope', 'read read:accounts' + + context 'when the status is public' do + it 'pins the status successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(user.account.pinned?(status)).to be true + end + + it 'return json with updated attributes' do + subject + + expect(body_as_json).to match( + a_hash_including(id: status.id.to_s, pinned: true) + ) + end + end + + context 'when the status is private' do + let(:status) { Fabricate(:status, account: user.account, visibility: :private) } + + it 'pins the status successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(user.account.pinned?(status)).to be true + end + end + + context 'when the status belongs to somebody else' do + let(:status) { Fabricate(:status) } + + it 'returns http unprocessable entity' do + subject + + expect(response).to have_http_status(422) + end + end + + context 'when the status does not exist' do + it 'returns http not found' do + post '/api/v1/statuses/-1/pin', headers: headers + + expect(response).to have_http_status(404) + end + end + + context 'without an authorization header' do + let(:headers) { {} } + + it 'returns http unauthorized' do + subject + + expect(response).to have_http_status(401) + end + end + end + + describe 'POST /api/v1/statuses/:status_id/unpin' do + subject do + post "/api/v1/statuses/#{status.id}/unpin", headers: headers + end + + let(:status) { Fabricate(:status, account: user.account) } + + context 'when the status is pinned' do + before do + Fabricate(:status_pin, status: status, account: user.account) + end + + it 'unpins the status successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(user.account.pinned?(status)).to be false + end + + it 'return json with updated attributes' do + subject + + expect(body_as_json).to match( + a_hash_including(id: status.id.to_s, pinned: false) + ) + end + end + + context 'when the status is not pinned' do + it 'returns http success' do + subject + + expect(response).to have_http_status(200) + end + end + + context 'when the status does not exist' do + it 'returns http not found' do + post '/api/v1/statuses/-1/unpin', headers: headers + + expect(response).to have_http_status(404) + end + end + + context 'without an authorization header' do + let(:headers) { {} } + + it 'returns http unauthorized' do + subject + + expect(response).to have_http_status(401) + end + end + end +end From 4859958a0c1b405bb7a16646430d044e82f5e923 Mon Sep 17 00:00:00 2001 From: Daniel M Brasil Date: Mon, 17 Jul 2023 11:50:00 -0300 Subject: [PATCH 027/557] Migrate to request specs in `/api/v1/polls` (#25596) --- .../api/v1/polls_controller_spec.rb | 37 --------------- spec/requests/api/v1/polls_spec.rb | 47 +++++++++++++++++++ 2 files changed, 47 insertions(+), 37 deletions(-) delete mode 100644 spec/controllers/api/v1/polls_controller_spec.rb create mode 100644 spec/requests/api/v1/polls_spec.rb diff --git a/spec/controllers/api/v1/polls_controller_spec.rb b/spec/controllers/api/v1/polls_controller_spec.rb deleted file mode 100644 index 3aae5496db..0000000000 --- a/spec/controllers/api/v1/polls_controller_spec.rb +++ /dev/null @@ -1,37 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Api::V1::PollsController do - render_views - - let(:user) { Fabricate(:user) } - let(:scopes) { 'read:statuses' } - let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) } - - before { allow(controller).to receive(:doorkeeper_token) { token } } - - describe 'GET #show' do - let(:poll) { Fabricate(:poll, status: Fabricate(:status, visibility: visibility)) } - - before do - get :show, params: { id: poll.id } - end - - context 'when parent status is public' do - let(:visibility) { 'public' } - - it 'returns http success' do - expect(response).to have_http_status(200) - end - end - - context 'when parent status is private' do - let(:visibility) { 'private' } - - it 'returns http not found' do - expect(response).to have_http_status(404) - end - end - end -end diff --git a/spec/requests/api/v1/polls_spec.rb b/spec/requests/api/v1/polls_spec.rb new file mode 100644 index 0000000000..1c8a818d59 --- /dev/null +++ b/spec/requests/api/v1/polls_spec.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe 'Polls' do + let(:user) { Fabricate(:user) } + let(:scopes) { 'read:statuses' } + let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) } + let(:headers) { { 'Authorization' => "Bearer #{token.token}" } } + + describe 'GET /api/v1/polls/:id' do + subject do + get "/api/v1/polls/#{poll.id}", headers: headers + end + + let(:poll) { Fabricate(:poll, status: Fabricate(:status, visibility: visibility)) } + let(:visibility) { 'public' } + + it_behaves_like 'forbidden for wrong scope', 'write write:statuses' + + context 'when parent status is public' do + it 'returns the poll data successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(body_as_json).to match( + a_hash_including( + id: poll.id.to_s, + voted: false, + voters_count: poll.voters_count, + votes_count: poll.votes_count + ) + ) + end + end + + context 'when parent status is private' do + let(:visibility) { 'private' } + + it 'returns http not found' do + subject + + expect(response).to have_http_status(404) + end + end + end +end From 6fb4a756ffa97197c47859f09acb5ff29ef0175a Mon Sep 17 00:00:00 2001 From: Daniel M Brasil Date: Mon, 17 Jul 2023 11:51:49 -0300 Subject: [PATCH 028/557] Migrate to request specs in `/api/v1/statuses/:status_id/bookmark` (#25624) --- .../v1/statuses/bookmarks_controller_spec.rb | 113 ------------- .../api/v1/statuses/bookmarks_spec.rb | 155 ++++++++++++++++++ 2 files changed, 155 insertions(+), 113 deletions(-) delete mode 100644 spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb create mode 100644 spec/requests/api/v1/statuses/bookmarks_spec.rb diff --git a/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb b/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb deleted file mode 100644 index 46d7b6c0a5..0000000000 --- a/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb +++ /dev/null @@ -1,113 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe Api::V1::Statuses::BookmarksController do - render_views - - let(:user) { Fabricate(:user) } - let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') } - let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:bookmarks', application: app) } - - context 'with an oauth token' do - before do - allow(controller).to receive(:doorkeeper_token) { token } - end - - describe 'POST #create' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - post :create, params: { status_id: status.id } - end - - context 'with public status' do - it 'returns http success' do - expect(response).to have_http_status(:success) - end - - it 'updates the bookmarked attribute' do - expect(user.account.bookmarked?(status)).to be true - end - - it 'returns json with updated attributes' do - hash_body = body_as_json - - expect(hash_body[:id]).to eq status.id.to_s - expect(hash_body[:bookmarked]).to be true - end - end - - context 'with private status of not-followed account' do - let(:status) { Fabricate(:status, visibility: :private) } - - it 'returns http not found' do - expect(response).to have_http_status(404) - end - end - end - - describe 'POST #destroy' do - context 'with public status' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - Bookmark.find_or_create_by!(account: user.account, status: status) - post :destroy, params: { status_id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(:success) - end - - it 'updates the bookmarked attribute' do - expect(user.account.bookmarked?(status)).to be false - end - - it 'returns json with updated attributes' do - hash_body = body_as_json - - expect(hash_body[:id]).to eq status.id.to_s - expect(hash_body[:bookmarked]).to be false - end - end - - context 'with public status when blocked by its author' do - let(:status) { Fabricate(:status) } - - before do - Bookmark.find_or_create_by!(account: user.account, status: status) - status.account.block!(user.account) - post :destroy, params: { status_id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(200) - end - - it 'updates the bookmarked attribute' do - expect(user.account.bookmarked?(status)).to be false - end - - it 'returns json with updated attributes' do - hash_body = body_as_json - - expect(hash_body[:id]).to eq status.id.to_s - expect(hash_body[:bookmarked]).to be false - end - end - - context 'with private status that was not bookmarked' do - let(:status) { Fabricate(:status, visibility: :private) } - - before do - post :destroy, params: { status_id: status.id } - end - - it 'returns http not found' do - expect(response).to have_http_status(404) - end - end - end - end -end diff --git a/spec/requests/api/v1/statuses/bookmarks_spec.rb b/spec/requests/api/v1/statuses/bookmarks_spec.rb new file mode 100644 index 0000000000..d3007740a5 --- /dev/null +++ b/spec/requests/api/v1/statuses/bookmarks_spec.rb @@ -0,0 +1,155 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe 'Bookmarks' do + let(:user) { Fabricate(:user) } + let(:scopes) { 'write:bookmarks' } + let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) } + let(:headers) { { 'Authorization' => "Bearer #{token.token}" } } + + describe 'POST /api/v1/statuses/:status_id/bookmark' do + subject do + post "/api/v1/statuses/#{status.id}/bookmark", headers: headers + end + + let(:status) { Fabricate(:status) } + + it_behaves_like 'forbidden for wrong scope', 'read' + + context 'with public status' do + it 'bookmarks the status successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(user.account.bookmarked?(status)).to be true + end + + it 'returns json with updated attributes' do + subject + + expect(body_as_json).to match( + a_hash_including(id: status.id.to_s, bookmarked: true) + ) + end + end + + context 'with private status of not-followed account' do + let(:status) { Fabricate(:status, visibility: :private) } + + it 'returns http not found' do + subject + + expect(response).to have_http_status(404) + end + end + + context 'with private status of followed account' do + let(:status) { Fabricate(:status, visibility: :private) } + + before do + user.account.follow!(status.account) + end + + it 'bookmarks the status successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(user.account.bookmarked?(status)).to be true + end + end + + context 'when the status does not exist' do + it 'returns http not found' do + post '/api/v1/statuses/-1/bookmark', headers: headers + + expect(response).to have_http_status(404) + end + end + + context 'without an authorization header' do + let(:headers) { {} } + + it 'returns http unauthorized' do + subject + + expect(response).to have_http_status(401) + end + end + end + + describe 'POST /api/v1/statuses/:status_id/unbookmark' do + subject do + post "/api/v1/statuses/#{status.id}/unbookmark", headers: headers + end + + let(:status) { Fabricate(:status) } + + it_behaves_like 'forbidden for wrong scope', 'read' + + context 'with public status' do + context 'when the status was previously bookmarked' do + before do + Bookmark.find_or_create_by!(account: user.account, status: status) + end + + it 'unbookmarks the status successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(user.account.bookmarked?(status)).to be false + end + + it 'returns json with updated attributes' do + subject + + expect(body_as_json).to match( + a_hash_including(id: status.id.to_s, bookmarked: false) + ) + end + end + + context 'when the requesting user was blocked by the status author' do + let(:status) { Fabricate(:status) } + + before do + Bookmark.find_or_create_by!(account: user.account, status: status) + status.account.block!(user.account) + end + + it 'unbookmarks the status successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(user.account.bookmarked?(status)).to be false + end + + it 'returns json with updated attributes' do + subject + + expect(body_as_json).to match( + a_hash_including(id: status.id.to_s, bookmarked: false) + ) + end + end + + context 'when the status is not bookmarked' do + it 'returns http success' do + subject + + expect(response).to have_http_status(200) + end + end + end + + context 'with private status that was not bookmarked' do + let(:status) { Fabricate(:status, visibility: :private) } + + it 'returns http not found' do + subject + + expect(response).to have_http_status(404) + end + end + end +end From 19208aa4226cf257aedc20dfae5971f1076b1f24 Mon Sep 17 00:00:00 2001 From: Daniel M Brasil Date: Mon, 17 Jul 2023 11:53:57 -0300 Subject: [PATCH 029/557] Migrate to request specs in `/api/v1/statuses/:status_id/favourite` (#25626) --- .../v1/statuses/favourites_controller_spec.rb | 123 --------------- .../api/v1/statuses/favourites_spec.rb | 143 ++++++++++++++++++ 2 files changed, 143 insertions(+), 123 deletions(-) delete mode 100644 spec/controllers/api/v1/statuses/favourites_controller_spec.rb create mode 100644 spec/requests/api/v1/statuses/favourites_spec.rb diff --git a/spec/controllers/api/v1/statuses/favourites_controller_spec.rb b/spec/controllers/api/v1/statuses/favourites_controller_spec.rb deleted file mode 100644 index 609957e3ef..0000000000 --- a/spec/controllers/api/v1/statuses/favourites_controller_spec.rb +++ /dev/null @@ -1,123 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe Api::V1::Statuses::FavouritesController do - render_views - - let(:user) { Fabricate(:user) } - let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') } - let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:favourites', application: app) } - - context 'with an oauth token' do - before do - allow(controller).to receive(:doorkeeper_token) { token } - end - - describe 'POST #create' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - post :create, params: { status_id: status.id } - end - - context 'with public status' do - it 'returns http success' do - expect(response).to have_http_status(200) - end - - it 'updates the favourites count' do - expect(status.favourites.count).to eq 1 - end - - it 'updates the favourited attribute' do - expect(user.account.favourited?(status)).to be true - end - - it 'returns json with updated attributes' do - hash_body = body_as_json - - expect(hash_body[:id]).to eq status.id.to_s - expect(hash_body[:favourites_count]).to eq 1 - expect(hash_body[:favourited]).to be true - end - end - - context 'with private status of not-followed account' do - let(:status) { Fabricate(:status, visibility: :private) } - - it 'returns http not found' do - expect(response).to have_http_status(404) - end - end - end - - describe 'POST #destroy' do - context 'with public status' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - FavouriteService.new.call(user.account, status) - post :destroy, params: { status_id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(200) - end - - it 'updates the favourites count' do - expect(status.favourites.count).to eq 0 - end - - it 'updates the favourited attribute' do - expect(user.account.favourited?(status)).to be false - end - - it 'returns json with updated attributes' do - hash_body = body_as_json - - expect(hash_body[:id]).to eq status.id.to_s - expect(hash_body[:favourites_count]).to eq 0 - expect(hash_body[:favourited]).to be false - end - end - - context 'with public status when blocked by its author' do - let(:status) { Fabricate(:status) } - - before do - FavouriteService.new.call(user.account, status) - status.account.block!(user.account) - post :destroy, params: { status_id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(200) - end - - it 'updates the favourite attribute' do - expect(user.account.favourited?(status)).to be false - end - - it 'returns json with updated attributes' do - hash_body = body_as_json - - expect(hash_body[:id]).to eq status.id.to_s - expect(hash_body[:favourited]).to be false - end - end - - context 'with private status that was not favourited' do - let(:status) { Fabricate(:status, visibility: :private) } - - before do - post :destroy, params: { status_id: status.id } - end - - it 'returns http not found' do - expect(response).to have_http_status(404) - end - end - end - end -end diff --git a/spec/requests/api/v1/statuses/favourites_spec.rb b/spec/requests/api/v1/statuses/favourites_spec.rb new file mode 100644 index 0000000000..021b8806ed --- /dev/null +++ b/spec/requests/api/v1/statuses/favourites_spec.rb @@ -0,0 +1,143 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe 'Favourites' do + let(:user) { Fabricate(:user) } + let(:scopes) { 'write:favourites' } + let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) } + let(:headers) { { 'Authorization' => "Bearer #{token.token}" } } + + describe 'POST /api/v1/statuses/:status_id/favourite' do + subject do + post "/api/v1/statuses/#{status.id}/favourite", headers: headers + end + + let(:status) { Fabricate(:status) } + + it_behaves_like 'forbidden for wrong scope', 'read read:favourites' + + context 'with public status' do + it 'favourites the status successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(user.account.favourited?(status)).to be true + end + + it 'returns json with updated attributes' do + subject + + expect(body_as_json).to match( + a_hash_including(id: status.id.to_s, favourites_count: 1, favourited: true) + ) + end + end + + context 'with private status of not-followed account' do + let(:status) { Fabricate(:status, visibility: :private) } + + it 'returns http not found' do + subject + + expect(response).to have_http_status(404) + end + end + + context 'with private status of followed account' do + let(:status) { Fabricate(:status, visibility: :private) } + + before do + user.account.follow!(status.account) + end + + it 'favourites the status successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(user.account.favourited?(status)).to be true + end + end + + context 'without an authorization header' do + let(:headers) { {} } + + it 'returns http unauthorized' do + subject + + expect(response).to have_http_status(401) + end + end + end + + describe 'POST /api/v1/statuses/:status_id/unfavourite' do + subject do + post "/api/v1/statuses/#{status.id}/unfavourite", headers: headers + end + + let(:status) { Fabricate(:status) } + + it_behaves_like 'forbidden for wrong scope', 'read read:favourites' + + context 'with public status' do + before do + FavouriteService.new.call(user.account, status) + end + + it 'unfavourites the status successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(user.account.favourited?(status)).to be false + end + + it 'returns json with updated attributes' do + subject + + expect(body_as_json).to match( + a_hash_including(id: status.id.to_s, favourites_count: 0, favourited: false) + ) + end + end + + context 'when the requesting user was blocked by the status author' do + before do + FavouriteService.new.call(user.account, status) + status.account.block!(user.account) + end + + it 'unfavourites the status successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(user.account.favourited?(status)).to be false + end + + it 'returns json with updated attributes' do + subject + + expect(body_as_json).to match( + a_hash_including(id: status.id.to_s, favourites_count: 0, favourited: false) + ) + end + end + + context 'when status is not favourited' do + it 'returns http success' do + subject + + expect(response).to have_http_status(200) + end + end + + context 'with private status that was not favourited' do + let(:status) { Fabricate(:status, visibility: :private) } + + it 'returns http not found' do + subject + + expect(response).to have_http_status(404) + end + end + end +end From d0f00206dc115cb3a21281b532c59a166c21ce71 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 17 Jul 2023 10:57:18 -0400 Subject: [PATCH 030/557] Fix haml-lint Rubocop `Style/StringLiterals` cop (#25948) --- .haml-lint_todo.yml | 4 ++-- app/views/settings/imports/show.html.haml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml index e1314742a6..f9debfd129 100644 --- a/.haml-lint_todo.yml +++ b/.haml-lint_todo.yml @@ -1,13 +1,13 @@ # This configuration was generated by # `haml-lint --auto-gen-config` -# on 2023-07-17 09:15:24 -0400 using Haml-Lint version 0.48.0. +# on 2023-07-17 09:59:21 -0400 using Haml-Lint version 0.48.0. # The point is for the user to remove these configuration records # one by one as the lints are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of Haml-Lint, may require this file to be generated again. linters: - # Offense count: 70 + # Offense count: 69 RuboCop: enabled: false diff --git a/app/views/settings/imports/show.html.haml b/app/views/settings/imports/show.html.haml index 893c5c8d29..4d50049d3d 100644 --- a/app/views/settings/imports/show.html.haml +++ b/app/views/settings/imports/show.html.haml @@ -2,7 +2,7 @@ = t("imports.titles.#{@bulk_import.type}") - if @bulk_import.likely_mismatched? - .flash-message.warning= t("imports.mismatched_types_warning") + .flash-message.warning= t('imports.mismatched_types_warning') - if @bulk_import.overwrite? %p.hint= t("imports.overwrite_preambles.#{@bulk_import.type}_html", filename: @bulk_import.original_filename, total_items: @bulk_import.total_items) From a442a1d1c69e5d477ca1c05f0bc5fc0f6894b223 Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 17 Jul 2023 17:32:46 +0200 Subject: [PATCH 031/557] =?UTF-8?q?Fix=20=E2=80=9CBack=E2=80=9D=20button?= =?UTF-8?q?=20sometimes=20redirecting=20out=20of=20Mastodon=20(#25281)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/column_back_button.jsx | 4 +-- .../mastodon/components/column_header.jsx | 11 ++++--- app/javascript/mastodon/components/router.tsx | 31 ++++++++++++++++--- app/javascript/mastodon/features/ui/index.jsx | 8 +++-- 4 files changed, 40 insertions(+), 14 deletions(-) diff --git a/app/javascript/mastodon/components/column_back_button.jsx b/app/javascript/mastodon/components/column_back_button.jsx index 38ffa607a9..74a03b093a 100644 --- a/app/javascript/mastodon/components/column_back_button.jsx +++ b/app/javascript/mastodon/components/column_back_button.jsx @@ -23,9 +23,7 @@ export default class ColumnBackButton extends PureComponent { if (onClick) { onClick(); - // Check if there is a previous page in the app to go back to per https://stackoverflow.com/a/70532858/9703201 - // When upgrading to V6, check `location.key !== 'default'` instead per https://github.com/remix-run/history/blob/main/docs/api-reference.md#location - } else if (router.route.location.key) { + } else if (router.history.location?.state?.fromMastodon) { router.history.goBack(); } else { router.history.push('/'); diff --git a/app/javascript/mastodon/components/column_header.jsx b/app/javascript/mastodon/components/column_header.jsx index 89eade262e..9d29bbae03 100644 --- a/app/javascript/mastodon/components/column_header.jsx +++ b/app/javascript/mastodon/components/column_header.jsx @@ -63,10 +63,12 @@ class ColumnHeader extends PureComponent { }; handleBackClick = () => { - if (window.history && window.history.state) { - this.context.router.history.goBack(); + const { router } = this.context; + + if (router.history.location?.state?.fromMastodon) { + router.history.goBack(); } else { - this.context.router.history.push('/'); + router.history.push('/'); } }; @@ -83,6 +85,7 @@ class ColumnHeader extends PureComponent { }; render () { + const { router } = this.context; const { title, icon, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues } = this.props; const { collapsed, animating } = this.state; @@ -126,7 +129,7 @@ class ColumnHeader extends PureComponent { pinButton = ; } - if (!pinned && (multiColumn || showBackButton)) { + if (!pinned && ((multiColumn && router.history.location?.state?.fromMastodon) || showBackButton)) { backButton = ( ; } - if (!pinned && (multiColumn || showBackButton)) { + if (!pinned && ((multiColumn && router.history.location?.state?.fromMastodon) || showBackButton)) { backButton = ( ); else return null; } diff --git a/app/javascript/flavours/glitch/styles/components/local_settings.scss b/app/javascript/flavours/glitch/styles/components/local_settings.scss index cb0b401b49..48e41b2c2f 100644 --- a/app/javascript/flavours/glitch/styles/components/local_settings.scss +++ b/app/javascript/flavours/glitch/styles/components/local_settings.scss @@ -56,11 +56,16 @@ padding: 15px 20px; color: inherit; background: lighten($ui-secondary-color, 8%); + border: 0; border-bottom: 1px $ui-secondary-color solid; cursor: pointer; text-decoration: none; outline: none; transition: background 0.3s; + box-sizing: border-box; + width: 100%; + text-align: start; + font-size: inherit; .text-icon-button { color: inherit; From 9ec43107f288f3283aea692d8c286d3b9855c0a3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 23 Jul 2023 14:31:38 +0200 Subject: [PATCH 082/557] New Crowdin translations (#2319) Co-authored-by: GitHub Actions --- app/javascript/flavours/glitch/locales/zh-CN.json | 6 +++--- config/locales-glitch/zh-CN.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/javascript/flavours/glitch/locales/zh-CN.json b/app/javascript/flavours/glitch/locales/zh-CN.json index 941bd2a512..1dee961caf 100644 --- a/app/javascript/flavours/glitch/locales/zh-CN.json +++ b/app/javascript/flavours/glitch/locales/zh-CN.json @@ -50,7 +50,7 @@ "content-type.change": "内容类型 ", "direct.group_by_conversations": "按对话分组", "empty_column.follow_recommendations": "似乎无法为你生成任何建议。你可以尝试使用搜索寻找你可能知道的人或探索热门标签。", - "endorsed_accounts_editor.endorsed_accounts": "精选帐户", + "endorsed_accounts_editor.endorsed_accounts": "精选账户", "favourite_modal.combo": "下次你可以按 {combo} 跳过这个", "firehose.column_settings.allow_local_only": "在“全部”中显示仅本站可见的嘟文", "follow_recommendations.done": "完成", @@ -65,7 +65,7 @@ "keyboard_shortcuts.secondary_toot": "使用另一隐私设置发送嘟文", "keyboard_shortcuts.toggle_collapse": "折叠或展开嘟文", "media_gallery.sensitive": "敏感内容", - "moved_to_warning": "此帐户已被标记为移至 {moved_to_link}，并且似乎没有收到新粉丝。", + "moved_to_warning": "此账户已被标记为移至 {moved_to_link}，并且似乎没有收到新粉丝。", "navigation_bar.app_settings": "应用设置", "navigation_bar.featured_users": "推荐用户", "navigation_bar.keyboard_shortcuts": "键盘快捷键", @@ -168,7 +168,7 @@ "settings.show_reply_counter": "显示回复的大致数量", "settings.side_arm": "辅助发嘟按钮：", "settings.side_arm.none": "无", - "settings.side_arm_reply_mode": "当回复嘟文时，辅助发嘟按钮会：", + "settings.side_arm_reply_mode": "当回复嘟文时，另一发嘟按钮会：", "settings.side_arm_reply_mode.copy": "复制被回复嘟文的隐私设置", "settings.side_arm_reply_mode.keep": "保留辅助发嘟按钮以设置隐私", "settings.side_arm_reply_mode.restrict": "将隐私设置限制为正在回复的那条嘟文", diff --git a/config/locales-glitch/zh-CN.yml b/config/locales-glitch/zh-CN.yml index c4ea5db92e..41a153ae10 100644 --- a/config/locales-glitch/zh-CN.yml +++ b/config/locales-glitch/zh-CN.yml @@ -7,7 +7,7 @@ zh-CN: settings: captcha_enabled: desc_html: 这依赖于来自hCaptcha的外部脚本，这可能是一个安全和隐私问题。 此外， 这可能使得某些人(尤其是残疾人)的注册简单程度大幅减少。 出于这些原因，请考虑采取其他措施，例如基于审核或邀请的注册。
通过限定邀请链接注册的用户将不需要解决验证码问题 - title: 要求新用户解决验证码以确认他们的帐户 + title: 要求新用户解决验证码以确认他们的账户 flavour_and_skin: title: 风格与皮肤 hide_followers_count: From 944c29033d24015f1e7aed72c60efc78a77efea6 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Sun, 23 Jul 2023 21:40:37 +0900 Subject: [PATCH 083/557] Fix relationship-tag background color (#2322) --- app/javascript/flavours/glitch/styles/components/accounts.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/flavours/glitch/styles/components/accounts.scss b/app/javascript/flavours/glitch/styles/components/accounts.scss index 590b8f1811..7f8f39ee94 100644 --- a/app/javascript/flavours/glitch/styles/components/accounts.scss +++ b/app/javascript/flavours/glitch/styles/components/accounts.scss @@ -319,7 +319,7 @@ color: $white; margin-bottom: 4px; display: block; - background-color: $base-overlay-background; + background-color: rgba($black, 0.45); text-transform: uppercase; font-size: 11px; font-weight: 500; From db310f383d5730f3245f5f9f361ad09d63b0a3ef Mon Sep 17 00:00:00 2001 From: mogaminsk Date: Sun, 23 Jul 2023 22:57:57 +0900 Subject: [PATCH 084/557] Fix missing translation strings for importing lists (#26120) --- config/i18n-tasks.yml | 4 ++-- config/locales/en.yml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index b3bb336ed2..d0677b80fb 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -65,8 +65,8 @@ ignore_unused: - 'move_handler.carry_{mutes,blocks}_over_text' - 'admin_mailer.*.subject' - 'notification_mailer.*' - - 'imports.overwrite_preambles.{following,blocking,muting,domain_blocking,bookmarks}_html' - - 'imports.preambles.{following,blocking,muting,domain_blocking,bookmarks}_html' + - 'imports.overwrite_preambles.{following,blocking,muting,domain_blocking,bookmarks,lists}_html' + - 'imports.preambles.{following,blocking,muting,domain_blocking,bookmarks,lists}_html' - 'mail_subscriptions.unsubscribe.emails.*' - 'preferences.other' # some locales are missing other keys, therefore leading i18n-tasks to detect `preferences` as plural and not finding use diff --git a/config/locales/en.yml b/config/locales/en.yml index 9e54c2d8dd..d31da27284 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1278,12 +1278,14 @@ en: bookmarks_html: You are about to replace your bookmarks with up to %{total_items} posts from %{filename}. domain_blocking_html: You are about to replace your domain block list with up to %{total_items} domains from %{filename}. following_html: You are about to follow up to %{total_items} accounts from %{filename} and stop following anyone else. + lists_html: You are about to replace your lists with contents of %{filename}. Up to %{total_items} accounts will be added to new lists. muting_html: You are about to replace your list of muted accounts with up to %{total_items} accounts from %{filename}. preambles: blocking_html: You are about to block up to %{total_items} accounts from %{filename}. bookmarks_html: You are about to add up to %{total_items} posts from %{filename} to your bookmarks. domain_blocking_html: You are about to block up to %{total_items} domains from %{filename}. following_html: You are about to follow up to %{total_items} accounts from %{filename}. + lists_html: You are about to add up to %{total_items} accounts from %{filename} to your lists. New lists will be created if there is no list to add to. muting_html: You are about to mute up to %{total_items} accounts from %{filename}. preface: You can import data that you have exported from another server, such as a list of the people you are following or blocking. recent_imports: Recent imports @@ -1300,6 +1302,7 @@ en: bookmarks: Importing bookmarks domain_blocking: Importing blocked domains following: Importing followed accounts + lists: Importing lists muting: Importing muted accounts type: Import type type_groups: @@ -1310,6 +1313,7 @@ en: bookmarks: Bookmarks domain_blocking: Domain blocking list following: Following list + lists: Lists muting: Muting list upload: Upload invites: From 3abe0fc5c850bf6ac625e168b33d92641a534700 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sun, 23 Jul 2023 15:58:19 +0200 Subject: [PATCH 085/557] Use valid email address for first account (#26114) --- db/seeds/04_admin.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/db/seeds/04_admin.rb b/db/seeds/04_admin.rb index ec0287a454..c9b0369c9f 100644 --- a/db/seeds/04_admin.rb +++ b/db/seeds/04_admin.rb @@ -2,6 +2,7 @@ if Rails.env.development? domain = ENV['LOCAL_DOMAIN'] || Rails.configuration.x.local_domain + domain = domain.gsub(/:\d+$/, '') admin = Account.where(username: 'admin').first_or_initialize(username: 'admin') admin.save(validate: false) From 51311c1978d5a38935b6898cd52c5d0dc3a8e3e7 Mon Sep 17 00:00:00 2001 From: Plastikmensch Date: Sun, 23 Jul 2023 17:19:09 +0200 Subject: [PATCH 086/557] Fix CW icon being on wrong side in app settings in RTL languages (#2324) Signed-off-by: Plastikmensch --- .../flavours/glitch/styles/components/local_settings.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/javascript/flavours/glitch/styles/components/local_settings.scss b/app/javascript/flavours/glitch/styles/components/local_settings.scss index 48e41b2c2f..784b06b00c 100644 --- a/app/javascript/flavours/glitch/styles/components/local_settings.scss +++ b/app/javascript/flavours/glitch/styles/components/local_settings.scss @@ -70,6 +70,7 @@ .text-icon-button { color: inherit; transition: unset; + unicode-bidi: embed; } &:hover { From 67016dd29db51e640544806e972d0031829a09e3 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sun, 23 Jul 2023 11:48:16 -0400 Subject: [PATCH 087/557] Update haml-lint 0.49.1 (#26118) --- Gemfile.lock | 2 +- app/views/admin/announcements/index.html.haml | 1 - app/views/admin/custom_emojis/index.html.haml | 1 - app/views/admin/ip_blocks/index.html.haml | 1 - app/views/admin/relays/index.html.haml | 1 - app/views/admin/roles/edit.html.haml | 1 - app/views/settings/applications/show.html.haml | 1 - 7 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 63a9388ee2..bc4f3522bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -307,7 +307,7 @@ GEM activesupport (>= 5.1) haml (>= 4.0.6) railties (>= 5.1) - haml_lint (0.48.0) + haml_lint (0.49.1) haml (>= 4.0, < 6.2) parallel (~> 1.10) rainbow diff --git a/app/views/admin/announcements/index.html.haml b/app/views/admin/announcements/index.html.haml index ce520f59d3..72227b0457 100644 --- a/app/views/admin/announcements/index.html.haml +++ b/app/views/admin/announcements/index.html.haml @@ -19,4 +19,3 @@ = render partial: 'announcement', collection: @announcements = paginate @announcements - diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml index 6ded4b4332..eb41563ee6 100644 --- a/app/views/admin/custom_emojis/index.html.haml +++ b/app/views/admin/custom_emojis/index.html.haml @@ -85,4 +85,3 @@ = render partial: 'custom_emoji', collection: @custom_emojis, locals: { f: f } = paginate @custom_emojis - diff --git a/app/views/admin/ip_blocks/index.html.haml b/app/views/admin/ip_blocks/index.html.haml index d5b983de9e..675c0aaad0 100644 --- a/app/views/admin/ip_blocks/index.html.haml +++ b/app/views/admin/ip_blocks/index.html.haml @@ -25,4 +25,3 @@ = render partial: 'ip_block', collection: @ip_blocks, locals: { f: f } = paginate @ip_blocks - diff --git a/app/views/admin/relays/index.html.haml b/app/views/admin/relays/index.html.haml index 1636a53f85..47f8d6f360 100644 --- a/app/views/admin/relays/index.html.haml +++ b/app/views/admin/relays/index.html.haml @@ -17,4 +17,3 @@ %th %tbody = render @relays - diff --git a/app/views/admin/roles/edit.html.haml b/app/views/admin/roles/edit.html.haml index 659ccb8dce..5688b69b1f 100644 --- a/app/views/admin/roles/edit.html.haml +++ b/app/views/admin/roles/edit.html.haml @@ -5,4 +5,3 @@ = link_to t('admin.roles.delete'), admin_role_path(@role), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:destroy, @role) = render partial: 'form' - diff --git a/app/views/settings/applications/show.html.haml b/app/views/settings/applications/show.html.haml index 466a8ba340..be1d13eae6 100644 --- a/app/views/settings/applications/show.html.haml +++ b/app/views/settings/applications/show.html.haml @@ -28,4 +28,3 @@ .actions = f.button :button, t('generic.save_changes'), type: :submit - From cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 23 Jul 2023 17:55:13 +0200 Subject: [PATCH 088/557] Fix focus and hover styles in web UI (#26125) --- .../intersection_observer_article.jsx | 4 +- .../styles/mastodon/components.scss | 74 ++++++++++--------- 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/app/javascript/mastodon/components/intersection_observer_article.jsx b/app/javascript/mastodon/components/intersection_observer_article.jsx index 7b03ffb88e..8efa969f9b 100644 --- a/app/javascript/mastodon/components/intersection_observer_article.jsx +++ b/app/javascript/mastodon/components/intersection_observer_article.jsx @@ -114,7 +114,7 @@ export default class IntersectionObserverArticle extends Component { aria-setsize={listLength} style={{ height: `${this.height || cachedHeight}px`, opacity: 0, overflow: 'hidden' }} data-id={id} - tabIndex={0} + tabIndex={-1} > {children && cloneElement(children, { hidden: true })} @@ -122,7 +122,7 @@ export default class IntersectionObserverArticle extends Component { } return ( -
+
{children && cloneElement(children, { hidden: false })}
); diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index d08cb28038..bb0febaaef 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -74,7 +74,7 @@ background-color: $ui-button-focus-background-color; } - &:focus { + &:focus-visible { outline: $ui-button-icon-focus-outline; } @@ -191,8 +191,6 @@ border-radius: 4px; background: transparent; cursor: pointer; - transition: all 100ms ease-out; - transition-property: background-color, color; text-decoration: none; a { @@ -203,11 +201,11 @@ &:hover, &:active, &:focus { - color: lighten($action-button-color, 20%); - background-color: $ui-button-icon-hover-background-color; + color: lighten($action-button-color, 7%); + background-color: rgba($action-button-color, 0.15); } - &:focus { + &:focus-visible { outline: $ui-button-icon-focus-outline; } @@ -224,10 +222,10 @@ &:active, &:focus { color: darken($lighter-text-color, 7%); - background-color: $ui-button-icon-hover-background-color; + background-color: rgba($lighter-text-color, 0.15); } - &:focus { + &:focus-visible { outline: $ui-button-icon-focus-outline; } @@ -239,6 +237,13 @@ &.active { color: $highlight-text-color; + &:hover, + &:active, + &:focus { + color: $highlight-text-color; + background-color: transparent; + } + &.disabled { color: lighten($highlight-text-color, 13%); } @@ -283,19 +288,15 @@ font-size: 11px; padding: 0 3px; line-height: 27px; - transition: all 100ms ease-in; - transition-property: background-color, color; &:hover, &:active, &:focus { color: darken($lighter-text-color, 7%); - background-color: $ui-button-icon-hover-background-color; - transition: all 200ms ease-out; - transition-property: background-color, color; + background-color: rgba($lighter-text-color, 0.15); } - &:focus { + &:focus-visible { outline: $ui-button-icon-focus-outline; } @@ -307,6 +308,13 @@ &.active { color: $highlight-text-color; + + &:hover, + &:active, + &:focus { + color: $highlight-text-color; + background-color: transparent; + } } } @@ -1975,7 +1983,7 @@ a.account__display-name { font-size: inherit; line-height: inherit; - &:focus { + &:focus-visible { outline: 1px dotted; } } @@ -3838,7 +3846,6 @@ a.status-card.compact:hover { position: relative; z-index: 2; outline: 0; - overflow: hidden; & > button { margin: 0; @@ -3853,6 +3860,10 @@ a.status-card.compact:hover { overflow: hidden; white-space: nowrap; flex: 1; + + &:focus-visible { + outline: $ui-button-icon-focus-outline; + } } & > .column-header__back-button { @@ -3893,10 +3904,18 @@ a.status-card.compact:hover { font-size: 16px; padding: 0 15px; + &:last-child { + border-start-end-radius: 4px; + } + &:hover { color: lighten($darker-text-color, 4%); } + &:focus-visible { + outline: $ui-button-icon-focus-outline; + } + &.active { color: $primary-text-color; background: lighten($ui-base-color, 4%); @@ -4542,7 +4561,7 @@ a.status-card.compact:hover { .emoji-picker-dropdown__menu { background: $simple-background-color; position: relative; - box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4); + box-shadow: var(--dropdown-shadow); border-radius: 4px; margin-top: 5px; z-index: 2; @@ -4720,7 +4739,7 @@ a.status-card.compact:hover { } } - &:focus { + &:focus-visible { img { outline: $ui-button-icon-focus-outline; } @@ -4734,7 +4753,7 @@ a.status-card.compact:hover { .privacy-dropdown__dropdown { background: $simple-background-color; - box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4); + box-shadow: var(--dropdown-shadow); border-radius: 4px; overflow: hidden; z-index: 2; @@ -4811,19 +4830,6 @@ a.status-card.compact:hover { .privacy-dropdown__value { background: $simple-background-color; border-radius: 4px 4px 0 0; - box-shadow: 0 -4px 4px rgba($base-shadow-color, 0.1); - - .icon-button { - transition: none; - } - - &.active { - background: $ui-highlight-color; - - .icon-button { - color: $primary-text-color; - } - } } &.top .privacy-dropdown__value { @@ -4832,14 +4838,14 @@ a.status-card.compact:hover { .privacy-dropdown__dropdown { display: block; - box-shadow: 2px 4px 6px rgba($base-shadow-color, 0.1); + box-shadow: var(--dropdown-shadow); } } .language-dropdown { &__dropdown { background: $simple-background-color; - box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4); + box-shadow: var(--dropdown-shadow); border-radius: 4px; overflow: hidden; z-index: 2; From 5e8cbb5f82ab0df0de80539650a6e55d7cf7a3a5 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 23 Jul 2023 17:55:20 +0200 Subject: [PATCH 089/557] Remove back button from bookmarks, favourites and lists screens in web UI (#26126) --- app/javascript/mastodon/features/bookmarked_statuses/index.jsx | 1 - app/javascript/mastodon/features/favourited_statuses/index.jsx | 1 - app/javascript/mastodon/features/lists/index.jsx | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx index 936dee12e3..b0c90a4302 100644 --- a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx +++ b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx @@ -86,7 +86,6 @@ class Bookmarks extends ImmutablePureComponent { onClick={this.handleHeaderClick} pinned={pinned} multiColumn={multiColumn} - showBackButton /> - + From cf9affdeac275cd4057dc57c3b16bf4fa5e9405a Mon Sep 17 00:00:00 2001 From: Plastikmensch Date: Sun, 23 Jul 2023 18:50:24 +0200 Subject: [PATCH 090/557] Apply padding to all notifications in notif-cleaning mode (#2325) * Add missing padding to notif-cleaning for admin-sign-up Signed-off-by: Plastikmensch * Apply padding to all notification types instead Signed-off-by: Plastikmensch --------- Signed-off-by: Plastikmensch --- app/javascript/flavours/glitch/styles/components/status.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index 065acebaf2..7542002622 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -175,8 +175,7 @@ .notif-cleaning { .status, - .notification-follow, - .notification-follow-request { + .notification { padding-inline-end: ($dismiss-overlay-width + 0.5rem); } } From 4d01d1a1eeef7a851b77def9c5bfc2ce4d7a271c Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 24 Jul 2023 13:46:55 +0200 Subject: [PATCH 091/557] Remove 16:9 cropping from web UI (#26132) --- .../mastodon/components/media_gallery.jsx | 15 +- .../picture_in_picture_placeholder.jsx | 5 +- app/javascript/mastodon/components/status.jsx | 50 +++-- .../status/components/detailed_status.jsx | 28 ++- .../features/ui/components/media_modal.jsx | 1 + .../features/ui/components/video_modal.jsx | 1 + .../mastodon/features/video/index.jsx | 172 +++++++++--------- app/javascript/mastodon/initial_state.js | 2 - .../styles/mastodon/components.scss | 23 +-- app/models/concerns/has_user_settings.rb | 4 - app/models/user_settings.rb | 1 - app/serializers/initial_state_serializer.rb | 2 - .../preferences/appearance/show.html.haml | 5 - config/locales/an.yml | 1 - config/locales/ar.yml | 1 - config/locales/ast.yml | 1 - config/locales/be.yml | 1 - config/locales/bg.yml | 1 - config/locales/ca.yml | 1 - config/locales/ckb.yml | 1 - config/locales/co.yml | 1 - config/locales/cs.yml | 1 - config/locales/cy.yml | 1 - config/locales/da.yml | 1 - config/locales/de.yml | 1 - config/locales/el.yml | 1 - config/locales/en-GB.yml | 1 - config/locales/en.yml | 1 - config/locales/eo.yml | 1 - config/locales/es-AR.yml | 1 - config/locales/es-MX.yml | 1 - config/locales/es.yml | 1 - config/locales/et.yml | 1 - config/locales/eu.yml | 1 - config/locales/fa.yml | 1 - config/locales/fi.yml | 1 - config/locales/fo.yml | 1 - config/locales/fr-QC.yml | 1 - config/locales/fr.yml | 1 - config/locales/fy.yml | 1 - config/locales/gd.yml | 1 - config/locales/gl.yml | 1 - config/locales/he.yml | 1 - config/locales/hu.yml | 1 - config/locales/id.yml | 1 - config/locales/io.yml | 1 - config/locales/is.yml | 1 - config/locales/it.yml | 1 - config/locales/ja.yml | 1 - config/locales/kk.yml | 1 - config/locales/ko.yml | 1 - config/locales/ku.yml | 1 - config/locales/lv.yml | 1 - config/locales/my.yml | 1 - config/locales/nl.yml | 1 - config/locales/nn.yml | 1 - config/locales/no.yml | 1 - config/locales/oc.yml | 1 - config/locales/pl.yml | 1 - config/locales/pt-BR.yml | 1 - config/locales/pt-PT.yml | 1 - config/locales/ro.yml | 1 - config/locales/ru.yml | 1 - config/locales/sc.yml | 1 - config/locales/sco.yml | 1 - config/locales/si.yml | 1 - config/locales/simple_form.an.yml | 1 - config/locales/simple_form.ar.yml | 1 - config/locales/simple_form.ast.yml | 1 - config/locales/simple_form.be.yml | 1 - config/locales/simple_form.bg.yml | 1 - config/locales/simple_form.ca.yml | 1 - config/locales/simple_form.ckb.yml | 1 - config/locales/simple_form.co.yml | 1 - config/locales/simple_form.cs.yml | 1 - config/locales/simple_form.cy.yml | 1 - config/locales/simple_form.da.yml | 1 - config/locales/simple_form.de.yml | 1 - config/locales/simple_form.el.yml | 1 - config/locales/simple_form.en-GB.yml | 1 - config/locales/simple_form.en.yml | 1 - config/locales/simple_form.eo.yml | 1 - config/locales/simple_form.es-AR.yml | 1 - config/locales/simple_form.es-MX.yml | 1 - config/locales/simple_form.es.yml | 1 - config/locales/simple_form.et.yml | 1 - config/locales/simple_form.eu.yml | 1 - config/locales/simple_form.fa.yml | 1 - config/locales/simple_form.fi.yml | 1 - config/locales/simple_form.fo.yml | 1 - config/locales/simple_form.fr-QC.yml | 1 - config/locales/simple_form.fr.yml | 1 - config/locales/simple_form.fy.yml | 1 - config/locales/simple_form.gd.yml | 1 - config/locales/simple_form.gl.yml | 1 - config/locales/simple_form.he.yml | 1 - config/locales/simple_form.hu.yml | 1 - config/locales/simple_form.hy.yml | 1 - config/locales/simple_form.id.yml | 1 - config/locales/simple_form.io.yml | 1 - config/locales/simple_form.is.yml | 1 - config/locales/simple_form.it.yml | 1 - config/locales/simple_form.ja.yml | 1 - config/locales/simple_form.kk.yml | 1 - config/locales/simple_form.ko.yml | 1 - config/locales/simple_form.ku.yml | 1 - config/locales/simple_form.lv.yml | 1 - config/locales/simple_form.my.yml | 1 - config/locales/simple_form.nl.yml | 1 - config/locales/simple_form.nn.yml | 1 - config/locales/simple_form.no.yml | 1 - config/locales/simple_form.oc.yml | 1 - config/locales/simple_form.pl.yml | 1 - config/locales/simple_form.pt-BR.yml | 1 - config/locales/simple_form.pt-PT.yml | 1 - config/locales/simple_form.ro.yml | 1 - config/locales/simple_form.ru.yml | 1 - config/locales/simple_form.sc.yml | 1 - config/locales/simple_form.sco.yml | 1 - config/locales/simple_form.si.yml | 1 - config/locales/simple_form.sk.yml | 1 - config/locales/simple_form.sl.yml | 1 - config/locales/simple_form.sq.yml | 1 - config/locales/simple_form.sr-Latn.yml | 1 - config/locales/simple_form.sr.yml | 1 - config/locales/simple_form.sv.yml | 1 - config/locales/simple_form.th.yml | 1 - config/locales/simple_form.tr.yml | 1 - config/locales/simple_form.uk.yml | 1 - config/locales/simple_form.vi.yml | 1 - config/locales/simple_form.zh-CN.yml | 1 - config/locales/simple_form.zh-HK.yml | 1 - config/locales/simple_form.zh-TW.yml | 1 - config/locales/sk.yml | 1 - config/locales/sl.yml | 1 - config/locales/sq.yml | 1 - config/locales/sr-Latn.yml | 1 - config/locales/sr.yml | 1 - config/locales/sv.yml | 1 - config/locales/th.yml | 1 - config/locales/tr.yml | 1 - config/locales/uk.yml | 1 - config/locales/vi.yml | 1 - config/locales/zh-CN.yml | 1 - config/locales/zh-HK.yml | 1 - config/locales/zh-TW.yml | 1 - 146 files changed, 158 insertions(+), 284 deletions(-) diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx index e3c0065c95..0b633a5b40 100644 --- a/app/javascript/mastodon/components/media_gallery.jsx +++ b/app/javascript/mastodon/components/media_gallery.jsx @@ -12,7 +12,7 @@ import { debounce } from 'lodash'; import { Blurhash } from 'mastodon/components/blurhash'; -import { autoPlayGif, cropImages, displayMedia, useBlurhash } from '../initial_state'; +import { autoPlayGif, displayMedia, useBlurhash } from '../initial_state'; import { IconButton } from './icon_button'; @@ -209,7 +209,6 @@ class MediaGallery extends PureComponent { static propTypes = { sensitive: PropTypes.bool, - standalone: PropTypes.bool, media: ImmutablePropTypes.list.isRequired, lang: PropTypes.string, size: PropTypes.object, @@ -223,10 +222,6 @@ class MediaGallery extends PureComponent { onToggleVisibility: PropTypes.func, }; - static defaultProps = { - standalone: false, - }; - state = { visible: this.props.visible !== undefined ? this.props.visible : (displayMedia !== 'hide_all' && !this.props.sensitive || displayMedia === 'show_all'), width: this.props.defaultWidth, @@ -295,7 +290,7 @@ class MediaGallery extends PureComponent { } render () { - const { media, lang, intl, sensitive, defaultWidth, standalone, autoplay } = this.props; + const { media, lang, intl, sensitive, defaultWidth, autoplay } = this.props; const { visible } = this.state; const width = this.state.width || defaultWidth; @@ -303,16 +298,16 @@ class MediaGallery extends PureComponent { const style = {}; - if (this.isFullSizeEligible() && (standalone || !cropImages)) { + if (this.isFullSizeEligible()) { style.aspectRatio = `${this.props.media.getIn([0, 'meta', 'small', 'aspect'])}`; } else { - style.aspectRatio = '16 / 9'; + style.aspectRatio = '3 / 2'; } const size = media.take(4).size; const uncached = media.every(attachment => attachment.get('type') === 'unknown'); - if (standalone && this.isFullSizeEligible()) { + if (this.isFullSizeEligible()) { children = ; } else { children = media.take(4).map((attachment, i) => ); diff --git a/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx b/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx index 756a977224..c65bd494f3 100644 --- a/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx +++ b/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx @@ -12,6 +12,7 @@ class PictureInPicturePlaceholder extends PureComponent { static propTypes = { dispatch: PropTypes.func.isRequired, + aspectRatio: PropTypes.string, }; handleClick = () => { @@ -20,8 +21,10 @@ class PictureInPicturePlaceholder extends PureComponent { }; render () { + const { aspectRatio } = this.props; + return ( -
+
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx index 8f188a638c..37951d5782 100644 --- a/app/javascript/mastodon/components/status.jsx +++ b/app/javascript/mastodon/components/status.jsx @@ -19,7 +19,6 @@ import Bundle from '../features/ui/components/bundle'; import { MediaGallery, Video, Audio } from '../features/ui/util/async-components'; import { displayMedia } from '../initial_state'; -import AttachmentList from './attachment_list'; import { Avatar } from './avatar'; import { AvatarOverlay } from './avatar_overlay'; import { DisplayName } from './display_name'; @@ -191,17 +190,35 @@ class Status extends ImmutablePureComponent { this.props.onTranslate(this._properStatus()); }; - renderLoadingMediaGallery () { - return
; + getAttachmentAspectRatio () { + const attachments = this._properStatus().get('media_attachments'); + + if (attachments.getIn([0, 'type']) === 'video') { + return `${attachments.getIn([0, 'meta', 'original', 'width'])} / ${attachments.getIn([0, 'meta', 'original', 'height'])}`; + } else if (attachments.getIn([0, 'type']) === 'audio') { + return '16 / 9'; + } else { + return (attachments.size === 1 && attachments.getIn([0, 'meta', 'small', 'aspect'])) ? attachments.getIn([0, 'meta', 'small', 'aspect']) : '3 / 2' + } } - renderLoadingVideoPlayer () { - return
; - } + renderLoadingMediaGallery = () => { + return ( +
+ ); + }; - renderLoadingAudioPlayer () { - return
; - } + renderLoadingVideoPlayer = () => { + return ( +
+ ); + }; + + renderLoadingAudioPlayer = () => { + return ( +
+ ); + }; handleOpenVideo = (options) => { const status = this._properStatus(); @@ -426,18 +443,11 @@ class Status extends ImmutablePureComponent { } if (pictureInPicture.get('inUse')) { - media = ; + media = ; } else if (status.get('media_attachments').size > 0) { const language = status.getIn(['translation', 'language']) || status.get('language'); - if (this.props.muted) { - media = ( - - ); - } else if (status.getIn(['media_attachments', 0, 'type']) === 'audio') { + if (status.getIn(['media_attachments', 0, 'type']) === 'audio') { const attachment = status.getIn(['media_attachments', 0]); const description = attachment.getIn(['translation', 'description']) || attachment.get('description'); @@ -475,11 +485,11 @@ class Status extends ImmutablePureComponent { ); } - } else if (status.get('spoiler_text').length === 0 && status.get('card') && !this.props.muted) { + } else if (status.get('spoiler_text').length === 0 && status.get('card')) { media = ( ; + media = ; } else if (status.get('media_attachments').size > 0) { if (status.getIn(['media_attachments', 0, 'type']) === 'audio') { const attachment = status.getIn(['media_attachments', 0]); @@ -167,13 +189,13 @@ class DetailedStatus extends ImmutablePureComponent {
- - - {(revealed || editable) &&
} + > + -
- -
+ {(revealed || editable) &&
-
-
-
- - +
+
-
-
- - +
+
+
+
-
-
- - -
- - {(detailed || fullscreen) && ( - - {formatTime(Math.floor(currentTime))} - / - {formatTime(Math.floor(duration))} - - )} +
-
- {(!onCloseVideo && !editable && !fullscreen && !this.props.alwaysVisible) && } - {(!fullscreen && onOpenVideo) && } - {onCloseVideo && } - +
+
+ + + +
+
+ + +
+ + {(detailed || fullscreen) && ( + + {formatTime(Math.floor(currentTime))} + / + {formatTime(Math.floor(duration))} + + )} +
+ +
+ {(!onCloseVideo && !editable && !fullscreen && !this.props.alwaysVisible) && } + {(!fullscreen && onOpenVideo) && } + {onCloseVideo && } + +
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js index 67fb068432..1ada5bfb93 100644 --- a/app/javascript/mastodon/initial_state.js +++ b/app/javascript/mastodon/initial_state.js @@ -51,7 +51,6 @@ * @property {boolean} activity_api_enabled * @property {string} admin * @property {boolean=} boost_modal - * @property {boolean} crop_images * @property {boolean=} delete_modal * @property {boolean=} disable_swiping * @property {string=} disabled_account_id @@ -111,7 +110,6 @@ const getMeta = (prop) => initialState?.meta && initialState.meta[prop]; export const activityApiEnabled = getMeta('activity_api_enabled'); export const autoPlayGif = getMeta('auto_play_gif'); export const boostModal = getMeta('boost_modal'); -export const cropImages = getMeta('crop_images'); export const deleteModal = getMeta('delete_modal'); export const disableSwiping = getMeta('disable_swiping'); export const disabledAccountId = getMeta('disabled_account_id'); diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index bb0febaaef..64c245de34 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -5172,9 +5172,9 @@ a.status-card.compact:hover { display: flex; } -.video-modal__container { +.video-modal .video-player { + max-height: 80vh; max-width: 100vw; - max-height: 100vh; } .audio-modal__container { @@ -6192,7 +6192,7 @@ a.status-card.compact:hover { box-sizing: border-box; margin-top: 8px; overflow: hidden; - border-radius: 4px; + border-radius: 8px; position: relative; width: 100%; min-height: 64px; @@ -6207,7 +6207,7 @@ a.status-card.compact:hover { box-sizing: border-box; display: block; position: relative; - border-radius: 4px; + border-radius: 8px; overflow: hidden; &--tall { @@ -6293,7 +6293,7 @@ a.status-card.compact:hover { box-sizing: border-box; position: relative; background: darken($ui-base-color, 8%); - border-radius: 4px; + border-radius: 8px; padding-bottom: 44px; width: 100%; @@ -6360,7 +6360,7 @@ a.status-card.compact:hover { position: relative; background: $base-shadow-color; max-width: 100%; - border-radius: 4px; + border-radius: 8px; box-sizing: border-box; color: $white; display: flex; @@ -6377,8 +6377,6 @@ a.status-card.compact:hover { video { display: block; - max-width: 100vw; - max-height: 80vh; z-index: 1; } @@ -6386,22 +6384,15 @@ a.status-card.compact:hover { width: 100% !important; height: 100% !important; margin: 0; + aspect-ratio: auto !important; video { - max-width: 100% !important; - max-height: 100% !important; width: 100% !important; height: 100% !important; outline: 0; } } - &.inline { - video { - object-fit: contain; - } - } - &__controls { position: absolute; direction: ltr; diff --git a/app/models/concerns/has_user_settings.rb b/app/models/concerns/has_user_settings.rb index b3fa1f683b..5d05019f6b 100644 --- a/app/models/concerns/has_user_settings.rb +++ b/app/models/concerns/has_user_settings.rb @@ -91,10 +91,6 @@ module HasUserSettings settings['web.trends'] end - def setting_crop_images - settings['web.crop_images'] - end - def setting_disable_swiping settings['web.disable_swiping'] end diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb index 71af7aaeb0..a707e28ce9 100644 --- a/app/models/user_settings.rb +++ b/app/models/user_settings.rb @@ -17,7 +17,6 @@ class UserSettings setting :default_privacy, default: nil, in: %w(public unlisted private) namespace :web do - setting :crop_images, default: true setting :advanced_layout, default: false setting :trends, default: true setting :use_blurhash, default: true diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index b333eaf997..b90db4f58f 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -48,13 +48,11 @@ class InitialStateSerializer < ActiveModel::Serializer store[:use_blurhash] = object.current_account.user.setting_use_blurhash store[:use_pending_items] = object.current_account.user.setting_use_pending_items store[:show_trends] = Setting.trends && object.current_account.user.setting_trends - store[:crop_images] = object.current_account.user.setting_crop_images else store[:auto_play_gif] = Setting.auto_play_gif store[:display_media] = Setting.display_media store[:reduce_motion] = Setting.reduce_motion store[:use_blurhash] = Setting.use_blurhash - store[:crop_images] = Setting.crop_images end store[:disabled_account_id] = object.disabled_account.id.to_s if object.disabled_account diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml index 2f194d689c..ea33487c3c 100644 --- a/app/views/settings/preferences/appearance/show.html.haml +++ b/app/views/settings/preferences/appearance/show.html.haml @@ -37,11 +37,6 @@ = ff.input :'web.disable_swiping', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_disable_swiping') = ff.input :'web.use_system_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_font_ui') - %h4= t 'appearance.toot_layout' - - .fields-group - = ff.input :'web.crop_images', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_crop_images') - %h4= t 'appearance.discovery' .fields-group diff --git a/config/locales/an.yml b/config/locales/an.yml index d643c556b6..2b71c2f58e 100644 --- a/config/locales/an.yml +++ b/config/locales/an.yml @@ -923,7 +923,6 @@ an: guide_link: https://crowdin.com/project/mastodon guide_link_text: Totz pueden contribuyir. sensitive_content: Conteniu sensible - toot_layout: Disenyo d'as publicacions application_mailer: notification_preferences: Cambiar preferencias de correu electronico salutation: "%{name}:" diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 538b040203..302304f5a3 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -982,7 +982,6 @@ ar: guide_link: https://crowdin.com/project/mastodon guide_link_text: يمكن للجميع المساهمة. sensitive_content: المحتوى الحساس - toot_layout: شكل المنشور application_mailer: notification_preferences: تعديل تفضيلات البريد الإلكتروني salutation: "%{name}،" diff --git a/config/locales/ast.yml b/config/locales/ast.yml index cdb7a38e8f..660ea4e238 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -439,7 +439,6 @@ ast: guide_link: https://crowdin.com/project/mastodon guide_link_text: tol mundu pue collaborar. sensitive_content: Conteníu sensible - toot_layout: Distribución de los artículos application_mailer: notification_preferences: Camudar les preferencies de los mensaxes de corréu electrónicu applications: diff --git a/config/locales/be.yml b/config/locales/be.yml index 712f0bacdb..00f66f5814 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -1009,7 +1009,6 @@ be: guide_link: https://be.crowdin.com/project/mastodon/be guide_link_text: Кожны можа зрабіць унёсак. sensitive_content: Далікатны змест - toot_layout: Макет допісу application_mailer: notification_preferences: Змяніць налады эл. пошты salutation: "%{name}," diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 8c530cedb1..1ebd38787a 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -973,7 +973,6 @@ bg: guide_link: https://ru.crowdin.com/project/mastodon guide_link_text: Всеки може да участва. sensitive_content: Деликатно съдържание - toot_layout: Оформление на публикацията application_mailer: notification_preferences: Промяна на предпочитанията за имейл salutation: "%{name}," diff --git a/config/locales/ca.yml b/config/locales/ca.yml index fc82484f42..d105f53a6e 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -973,7 +973,6 @@ ca: guide_link: https://crowdin.com/project/mastodon guide_link_text: Tothom hi pot contribuir. sensitive_content: Contingut sensible - toot_layout: Disseny dels tuts application_mailer: notification_preferences: Canvia les preferències de correu salutation: "%{name}," diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml index ad0af9a3d0..a9020a84e0 100644 --- a/config/locales/ckb.yml +++ b/config/locales/ckb.yml @@ -571,7 +571,6 @@ ckb: body: ماستۆدۆن لەلایەن خۆبەخشەوە وەردەگێڕێت. guide_link_text: هەموو کەسێک دەتوانێت بەشداری بکات. sensitive_content: ناوەڕۆکی هەستیار - toot_layout: لۆی توت application_mailer: notification_preferences: گۆڕینی پەسەندکراوەکانی ئیمەیڵ salutation: "%{name}," diff --git a/config/locales/co.yml b/config/locales/co.yml index ebd7ab6649..26907ca7b5 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -537,7 +537,6 @@ co: guide_link: https://fr.crowdin.com/project/mastodon guide_link_text: Tuttu u mondu pò participà. sensitive_content: Cuntinutu sensibile - toot_layout: Urganizazione application_mailer: notification_preferences: Cambià e priferenze e-mail salutation: "%{name}," diff --git a/config/locales/cs.yml b/config/locales/cs.yml index b32a0c69f2..d7059c55db 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -997,7 +997,6 @@ cs: guide_link: https://cs.crowdin.com/project/mastodon guide_link_text: Zapojit se může každý. sensitive_content: Citlivý obsah - toot_layout: Rozložení příspěvků application_mailer: notification_preferences: Změnit předvolby e-mailů salutation: "%{name}," diff --git a/config/locales/cy.yml b/config/locales/cy.yml index be0c2737d5..8ac9895b3b 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -1045,7 +1045,6 @@ cy: guide_link: https://crowdin.com/project/mastodon guide_link_text: Gall pawb gyfrannu. sensitive_content: Cynnwys sensitif - toot_layout: Cynllun postiad application_mailer: notification_preferences: Newid gosodiadau e-bost salutation: "%{name}," diff --git a/config/locales/da.yml b/config/locales/da.yml index da41e7ac58..a5bc68c04e 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -973,7 +973,6 @@ da: guide_link: https://da.crowdin.com/project/mastodon guide_link_text: Alle kan bidrage. sensitive_content: Sensitivt indhold - toot_layout: Indlægslayout application_mailer: notification_preferences: Skift e-mailpræferencer salutation: "%{name}" diff --git a/config/locales/de.yml b/config/locales/de.yml index 56dcd3da64..945c25cbf1 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -973,7 +973,6 @@ de: guide_link: https://de.crowdin.com/project/mastodon/de guide_link_text: Alle können mitmachen und etwas dazu beitragen. sensitive_content: Inhaltswarnung - toot_layout: Timeline-Layout application_mailer: notification_preferences: E-Mail-Einstellungen ändern salutation: "%{name}," diff --git a/config/locales/el.yml b/config/locales/el.yml index 024be1551b..43af651772 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -961,7 +961,6 @@ el: guide_link: https://crowdin.com/project/mastodon guide_link_text: Μπορεί να συνεισφέρει ο οποιοσδήποτε. sensitive_content: Ευαίσθητο περιεχόμενο - toot_layout: Διαρρύθμιση αναρτήσεων application_mailer: notification_preferences: Αλλαγή προτιμήσεων email salutation: "%{name}," diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 1f06ad078b..190fd44261 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -973,7 +973,6 @@ en-GB: guide_link: https://crowdin.com/project/mastodon guide_link_text: Everyone can contribute. sensitive_content: Sensitive content - toot_layout: Post layout application_mailer: notification_preferences: Change e-mail preferences salutation: "%{name}," diff --git a/config/locales/en.yml b/config/locales/en.yml index d31da27284..10b6867afa 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -973,7 +973,6 @@ en: guide_link: https://crowdin.com/project/mastodon guide_link_text: Everyone can contribute. sensitive_content: Sensitive content - toot_layout: Post layout application_mailer: notification_preferences: Change e-mail preferences salutation: "%{name}," diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 16b6882703..c5956cbd96 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -973,7 +973,6 @@ eo: guide_link: https://crowdin.com/project/mastodon guide_link_text: Ĉiu povas kontribui. sensitive_content: Tikla enhavo - toot_layout: Mesaĝo aranĝo application_mailer: notification_preferences: Ŝanĝi retmesaĝajn preferojn salutation: "%{name}," diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml index 5fe0ef4f77..a64d643432 100644 --- a/config/locales/es-AR.yml +++ b/config/locales/es-AR.yml @@ -973,7 +973,6 @@ es-AR: guide_link: https://es.crowdin.com/project/mastodon guide_link_text: Todos pueden contribuir. sensitive_content: Contenido sensible - toot_layout: Diseño del mensaje application_mailer: notification_preferences: Cambiar configuración de correo electrónico salutation: "%{name}:" diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml index a733189f41..cc94b68843 100644 --- a/config/locales/es-MX.yml +++ b/config/locales/es-MX.yml @@ -973,7 +973,6 @@ es-MX: guide_link: https://es.crowdin.com/project/mastodon guide_link_text: Todos pueden contribuir. sensitive_content: Contenido sensible - toot_layout: Diseño de los toots application_mailer: notification_preferences: Cambiar preferencias de correo electrónico salutation: "%{name}:" diff --git a/config/locales/es.yml b/config/locales/es.yml index b9ddeaed0e..209e41b35a 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -973,7 +973,6 @@ es: guide_link: https://es.crowdin.com/project/mastodon guide_link_text: Todos pueden contribuir. sensitive_content: Contenido sensible - toot_layout: Diseño de las publicaciones application_mailer: notification_preferences: Cambiar preferencias de correo electrónico salutation: "%{name}:" diff --git a/config/locales/et.yml b/config/locales/et.yml index 9d5508dcf3..554070c6a3 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -973,7 +973,6 @@ et: guide_link: https://crowdin.com/project/mastodon/et guide_link_text: Panustada võib igaüks! sensitive_content: Tundlik sisu - toot_layout: Postituse väljanägemine application_mailer: notification_preferences: Muuda e-kirjade eelistusi salutation: "%{name}!" diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 0cf19a6636..f6aeae0326 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -972,7 +972,6 @@ eu: guide_link: https://crowdin.com/project/mastodon guide_link_text: Edonork lagundu dezake. sensitive_content: Eduki hunkigarria - toot_layout: Bidalketen diseinua application_mailer: notification_preferences: Aldatu e-mail hobespenak salutation: "%{name}," diff --git a/config/locales/fa.yml b/config/locales/fa.yml index ae7cb3cdaf..3744fc73ba 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -821,7 +821,6 @@ fa: guide_link: https://crowdin.com/project/mastodon guide_link_text: همه می‌توانند کمک کنند. sensitive_content: محتوای حساس - toot_layout: آرایش فرسته application_mailer: notification_preferences: تغییر ترجیحات ایمیل salutation: "%{name}،" diff --git a/config/locales/fi.yml b/config/locales/fi.yml index f9ec015c74..df513af8ff 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -973,7 +973,6 @@ fi: guide_link: https://crowdin.com/project/mastodon guide_link_text: Kaikki voivat osallistua. sensitive_content: Arkaluonteinen sisältö - toot_layout: Viestin asettelu application_mailer: notification_preferences: Muuta sähköpostiasetuksia salutation: "%{name}," diff --git a/config/locales/fo.yml b/config/locales/fo.yml index e11cc10b30..4e1e9d9c7d 100644 --- a/config/locales/fo.yml +++ b/config/locales/fo.yml @@ -973,7 +973,6 @@ fo: guide_link: https://crowdin.com/project/mastodon guide_link_text: Øll kunnu geva íkast. sensitive_content: Viðkvæmt innihald - toot_layout: Uppseting av postum application_mailer: notification_preferences: Broyt teldupostastillingar salutation: "%{name}" diff --git a/config/locales/fr-QC.yml b/config/locales/fr-QC.yml index 056433a721..408bc62a3b 100644 --- a/config/locales/fr-QC.yml +++ b/config/locales/fr-QC.yml @@ -973,7 +973,6 @@ fr-QC: guide_link: https://fr.crowdin.com/project/mastodon guide_link_text: Tout le monde peut y contribuer. sensitive_content: Contenu sensible - toot_layout: Agencement des messages application_mailer: notification_preferences: Modifier les préférences de courriel salutation: "%{name}," diff --git a/config/locales/fr.yml b/config/locales/fr.yml index a64d8edc04..bfd1e242d1 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -973,7 +973,6 @@ fr: guide_link: https://fr.crowdin.com/project/mastodon guide_link_text: Tout le monde peut y contribuer. sensitive_content: Contenu sensible - toot_layout: Agencement des messages application_mailer: notification_preferences: Modifier les préférences de courriel salutation: "%{name}," diff --git a/config/locales/fy.yml b/config/locales/fy.yml index 77d41e0919..62d41663ff 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -973,7 +973,6 @@ fy: guide_link: https://crowdin.com/project/mastodon/fy guide_link_text: Elkenien kin bydrage. sensitive_content: Gefoelige ynhâld - toot_layout: Lay-out fan berjochten application_mailer: notification_preferences: E-mailynstellingen wizigje salutation: "%{name}," diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 7ff820c296..8ba79c3329 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -1009,7 +1009,6 @@ gd: guide_link: https://crowdin.com/project/mastodon guide_link_text: "’S urrainn do neach sam bith cuideachadh." sensitive_content: Susbaint fhrionasach - toot_layout: Co-dhealbhachd nam postaichean application_mailer: notification_preferences: Atharraich roghainnean a’ phuist-d salutation: "%{name}," diff --git a/config/locales/gl.yml b/config/locales/gl.yml index abde828b33..b823a9f08b 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -973,7 +973,6 @@ gl: guide_link: https://crowdin.com/project/mastodon guide_link_text: Todas podemos contribuír. sensitive_content: Contido sensible - toot_layout: Disposición da publicación application_mailer: notification_preferences: Cambiar os axustes de email salutation: "%{name}," diff --git a/config/locales/he.yml b/config/locales/he.yml index ead8feb8f3..9e8e7d8848 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1009,7 +1009,6 @@ he: guide_link: https://crowdin.com/project/mastodon guide_link_text: כולם יכולים לתרום. sensitive_content: תוכן רגיש - toot_layout: פריסת הודעה application_mailer: notification_preferences: שינוי העדפות דוא"ל salutation: "%{name}," diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 10b5ae3d7f..4b620896a5 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -973,7 +973,6 @@ hu: guide_link: https://crowdin.com/project/mastodon guide_link_text: Bárki közreműködhet. sensitive_content: Kényes tartalom - toot_layout: Bejegyzések elrendezése application_mailer: notification_preferences: E-mail beállítások módosítása salutation: "%{name}!" diff --git a/config/locales/id.yml b/config/locales/id.yml index 5eb453cc94..69298c4b13 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -901,7 +901,6 @@ id: guide_link: https://crowdin.com/project/mastodon guide_link_text: Siapa saja bisa berkontribusi. sensitive_content: Konten sensitif - toot_layout: Tata letak kiriman application_mailer: notification_preferences: Ubah pilihan email salutation: "%{name}," diff --git a/config/locales/io.yml b/config/locales/io.yml index 1873fdaee5..ce37eda4ee 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -880,7 +880,6 @@ io: guide_link: https://crowdin.com/project/mastodon guide_link_text: Omnu povas kontributar. sensitive_content: Sentoza kontenajo - toot_layout: Postostrukturo application_mailer: notification_preferences: Chanjez retpostopreferaji salutation: "%{name}," diff --git a/config/locales/is.yml b/config/locales/is.yml index 4306321e97..0311296d96 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -975,7 +975,6 @@ is: guide_link: https://crowdin.com/project/mastodon/is guide_link_text: Allir geta tekið þátt. sensitive_content: Viðkvæmt efni - toot_layout: Framsetning færslu application_mailer: notification_preferences: Breyta kjörstillingum tölvupósts salutation: "%{name}," diff --git a/config/locales/it.yml b/config/locales/it.yml index ad73707c26..22c628e7d4 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -975,7 +975,6 @@ it: guide_link: https://it.crowdin.com/project/mastodon guide_link_text: Tutti possono contribuire. sensitive_content: Contenuto sensibile - toot_layout: Layout dei toot application_mailer: notification_preferences: Cambia preferenze email salutation: "%{name}," diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 14a8584e70..5a52dff8bf 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -955,7 +955,6 @@ ja: guide_link: https://ja.crowdin.com/project/mastodon guide_link_text: 誰でも参加することができます。 sensitive_content: 閲覧注意コンテンツ - toot_layout: 投稿のレイアウト application_mailer: notification_preferences: メール設定の変更 salutation: "%{name}さん" diff --git a/config/locales/kk.yml b/config/locales/kk.yml index a38c9407d7..d891dfa37b 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -320,7 +320,6 @@ kk: confirmation_dialogs: Пікірталас диалогтары discovery: Пікірталас sensitive_content: Нәзік контент - toot_layout: Жазба формасы application_mailer: notification_preferences: Change e-mail prеferences settings: 'Change e-mail preferеnces: %{link}' diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 1e9b5a28e0..f78fa8c0e5 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -957,7 +957,6 @@ ko: guide_link: https://crowdin.com/project/mastodon guide_link_text: 누구나 기여할 수 있습니다. sensitive_content: 민감한 내용 - toot_layout: 게시물 레이아웃 application_mailer: notification_preferences: 메일 설정 변경 salutation: "%{name} 님," diff --git a/config/locales/ku.yml b/config/locales/ku.yml index 7c639c6340..bfa9db1d22 100644 --- a/config/locales/ku.yml +++ b/config/locales/ku.yml @@ -920,7 +920,6 @@ ku: guide_link: https://crowdin.com/project/mastodon guide_link_text: Herkes dikare beşdar bibe. sensitive_content: Naveroka hestiyarî - toot_layout: Xêzkirina şandîya application_mailer: notification_preferences: Sazkariyên e-nameyê biguherîne salutation: "%{name}," diff --git a/config/locales/lv.yml b/config/locales/lv.yml index a74b7d62ca..b951855595 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -979,7 +979,6 @@ lv: guide_link: https://crowdin.com/project/mastodon guide_link_text: Ikviens var piedalīties. sensitive_content: Sensitīvs saturs - toot_layout: Ziņas izskats application_mailer: notification_preferences: Mainīt e-pasta uztādījumus salutation: "%{name}," diff --git a/config/locales/my.yml b/config/locales/my.yml index b47c1f4300..439d1eabea 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -955,7 +955,6 @@ my: guide_link: https://crowdin.com/project/mastodon guide_link_text: လူတိုင်းပါဝင်ကူညီနိုင်ပါတယ်။ sensitive_content: သတိထားရသော အကြောင်းအရာ - toot_layout: ပို့စ်အပြင်အဆင် application_mailer: notification_preferences: အီးမေးလ် သတ်မှတ်ချက်များကို ပြောင်းပါ salutation: "%{name}" diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 3c192dd3e6..5949fcdca3 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -973,7 +973,6 @@ nl: guide_link: https://crowdin.com/project/mastodon/nl guide_link_text: Iedereen kan bijdragen. sensitive_content: Gevoelige inhoud - toot_layout: Lay-out van berichten application_mailer: notification_preferences: E-mailvoorkeuren wijzigen salutation: "%{name}," diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 05151bc5f7..393b48037c 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -965,7 +965,6 @@ nn: guide_link: https://crowdin.com/project/mastodon guide_link_text: Alle kan bidra. sensitive_content: Ømtolig innhald - toot_layout: Tutoppsett application_mailer: notification_preferences: Endr e-post-innstillingane salutation: Hei %{name}, diff --git a/config/locales/no.yml b/config/locales/no.yml index 7ab60e588c..cc6b4b2aa8 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -914,7 +914,6 @@ guide_link: https://crowdin.com/project/mastodon guide_link_text: Alle kan bidra. sensitive_content: Følsomt innhold - toot_layout: Innleggsoppsett application_mailer: notification_preferences: Endre E-postinnstillingene salutation: "%{name}," diff --git a/config/locales/oc.yml b/config/locales/oc.yml index b867245628..e531a91f42 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -459,7 +459,6 @@ oc: body: Mastodon es traduch per de benevòls. guide_link_text: Tot lo monde pòt contribuïr. sensitive_content: Contengut sensible - toot_layout: Disposicion del tut application_mailer: notification_preferences: Cambiar las preferéncias de corrièl salutation: "%{name}," diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 5f4b57e296..dd35e06f47 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1009,7 +1009,6 @@ pl: guide_link: https://pl.crowdin.com/project/mastodon guide_link_text: Każdy może wnieść swój wkład. sensitive_content: Wrażliwa zawartość - toot_layout: Wygląd wpisów application_mailer: notification_preferences: Zmień ustawienia e-maili salutation: "%{name}," diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index b38596cd1f..8195d42758 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -973,7 +973,6 @@ pt-BR: guide_link: https://br.crowdin.com/project/mastodon guide_link_text: Todos podem contribuir. sensitive_content: Conteúdo sensível - toot_layout: Formato da publicação application_mailer: notification_preferences: Alterar preferências de e-mail salutation: "%{name}," diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 379f1ecd90..eedc115a8f 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -973,7 +973,6 @@ pt-PT: guide_link: https://pt.crowdin.com/project/mastodon/ guide_link_text: Todos podem contribuir. sensitive_content: Conteúdo problemático - toot_layout: Disposição da publicação application_mailer: notification_preferences: Alterar preferências de e-mail salutation: "%{name}," diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 587e7d390c..ae32b11772 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -408,7 +408,6 @@ ro: localization: guide_link_text: Toată lumea poate contribui. sensitive_content: Conținut sensibil - toot_layout: Aspect postare application_mailer: notification_preferences: Modifică preferințe e-mail settings: 'Modifică preferințe e-mail: %{link}' diff --git a/config/locales/ru.yml b/config/locales/ru.yml index fe698c0629..98112f6ee9 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1009,7 +1009,6 @@ ru: guide_link: https://ru.crowdin.com/project/mastodon guide_link_text: Каждый может внести свой вклад. sensitive_content: Содержимое деликатного характера - toot_layout: Структура постов application_mailer: notification_preferences: Настроить уведомления можно здесь salutation: "%{name}," diff --git a/config/locales/sc.yml b/config/locales/sc.yml index bbbdd5d258..b67d673912 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -491,7 +491,6 @@ sc: guide_link: https://crowdin.com/project/mastodon guide_link_text: Chie si siat podet contribuire. sensitive_content: Cuntenutu sensìbile - toot_layout: Dispositzione de is tuts application_mailer: notification_preferences: Muda is preferèntzias de posta salutation: "%{name}," diff --git a/config/locales/sco.yml b/config/locales/sco.yml index 4922303e12..b53f715d69 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -913,7 +913,6 @@ sco: guide_link: https://crowdin.com/project/mastodon guide_link_text: Awbody kin contribute. sensitive_content: Sensitive content - toot_layout: Post leyoot application_mailer: notification_preferences: Chynge email preferences salutation: "%{name}," diff --git a/config/locales/si.yml b/config/locales/si.yml index 974728a058..11804ef09b 100644 --- a/config/locales/si.yml +++ b/config/locales/si.yml @@ -757,7 +757,6 @@ si: guide_link: https://crowdin.com/project/mastodon guide_link_text: සෑම කෙනෙකුටම දායක විය හැකිය. sensitive_content: සංවේදී අන්තර්ගතය - toot_layout: පෝස්ට් පිරිසැලසුම application_mailer: notification_preferences: ඊමේල් මනාප වෙනස් කරන්න salutation: "%{name}," diff --git a/config/locales/simple_form.an.yml b/config/locales/simple_form.an.yml index 53e99b9e06..51e7910786 100644 --- a/config/locales/simple_form.an.yml +++ b/config/locales/simple_form.an.yml @@ -192,7 +192,6 @@ an: setting_always_send_emails: Ninviar siempre notificacions per correu setting_auto_play_gif: Reproducir automaticament los GIFs animaus setting_boost_modal: Amostrar finestra de confirmación antes de retutar - setting_crop_images: Retallar a 16x9 las imachens d'as publicacions no expandidas setting_default_language: Idioma de publicación setting_default_privacy: Privacidat de publicacions setting_default_sensitive: Marcar siempre imachens como sensibles diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml index dd875123cd..907221cdd7 100644 --- a/config/locales/simple_form.ar.yml +++ b/config/locales/simple_form.ar.yml @@ -200,7 +200,6 @@ ar: setting_always_send_emails: ارسل إشعارات البريد الإلكتروني دائماً setting_auto_play_gif: تشغيل تلقائي لِوَسائط جيف المتحركة setting_boost_modal: إظهار مربع حوار التأكيد قبل إعادة مشاركة أي منشور - setting_crop_images: قص الصور في المنشورات غير الموسعة إلى 16x9 setting_default_language: لغة النشر setting_default_privacy: خصوصية المنشور setting_default_sensitive: اعتبر الوسائط دائما كمحتوى حساس diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml index 213b9dfbe2..3269605618 100644 --- a/config/locales/simple_form.ast.yml +++ b/config/locales/simple_form.ast.yml @@ -111,7 +111,6 @@ ast: setting_always_send_emails: Unviar siempres los avisos per corréu electrónicu setting_auto_play_gif: Reproducir automáticamente los GIFs setting_boost_modal: Amosar el diálogu de confirmación enantes de compartir un artículu - setting_crop_images: Recortar les imáxenes de los artículos ensin espander a la proporción 16:9 setting_default_language: Llingua de los artículos setting_default_privacy: Privacidá de los artículos setting_default_sensitive: Marcar siempres tol conteníu como sensible diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml index c692a96d6c..3298745c4c 100644 --- a/config/locales/simple_form.be.yml +++ b/config/locales/simple_form.be.yml @@ -200,7 +200,6 @@ be: setting_always_send_emails: Заўжды дасылаць для апавяшчэнні эл. пошты setting_auto_play_gif: Аўтапрайграванне анімаваных GIF setting_boost_modal: Паказваць акно пацвярджэння перад пашырэннем - setting_crop_images: У неразгорнутых допісах абразаць відарысы да 16:9 setting_default_language: Мова допісаў setting_default_privacy: Прыватнасць допісаў setting_default_sensitive: Заўсёды пазначаць кантэнт як далікатны diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml index d8057e0968..6b319e2721 100644 --- a/config/locales/simple_form.bg.yml +++ b/config/locales/simple_form.bg.yml @@ -200,7 +200,6 @@ bg: setting_always_send_emails: Все да се пращат известия по имейла setting_auto_play_gif: Самопускащи се анимирани гифчета setting_boost_modal: Показване на прозорец за потвърждение преди подсилване - setting_crop_images: Изрязване на образи в неразгънати публикации до 16x9 setting_default_language: Език на публикуване setting_default_privacy: Поверителност на публикуване setting_default_sensitive: Все да се бележи мултимедията като деликатна diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml index c86509631a..3c6635c0f0 100644 --- a/config/locales/simple_form.ca.yml +++ b/config/locales/simple_form.ca.yml @@ -200,7 +200,6 @@ ca: setting_always_send_emails: Envia'm sempre notificacions per correu electrònic setting_auto_play_gif: Reprodueix automàticament els GIF animats setting_boost_modal: Mostra la finestra de confirmació abans d'impulsar - setting_crop_images: Retalla les imatges en tuts no ampliats a 16x9 setting_default_language: Llengua dels tuts setting_default_privacy: Privacitat dels tuts setting_default_sensitive: Marcar sempre el contingut gràfic com a sensible diff --git a/config/locales/simple_form.ckb.yml b/config/locales/simple_form.ckb.yml index b649541f4f..0d129dd702 100644 --- a/config/locales/simple_form.ckb.yml +++ b/config/locales/simple_form.ckb.yml @@ -136,7 +136,6 @@ ckb: setting_aggregate_reblogs: گرووپی توتەکان یەکبخە setting_auto_play_gif: خۆکاربەخشکردنی GIFــەکان setting_boost_modal: پیشاندانی دیالۆگی دووپاتکردنەوە پێش دوبارە توتاندن - setting_crop_images: لە تووتی نەکراوە،وینەکان لە ئەندازی ۱٦×۹ ببڕە setting_default_language: زمانی نووسراوەکانتان setting_default_privacy: چوارچێوەی تایبەتێتی ئێوە setting_default_sensitive: هەمیشە نیشانکردنی میدیا وەک هەستیار diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml index 9ad1751a90..105c67efbf 100644 --- a/config/locales/simple_form.co.yml +++ b/config/locales/simple_form.co.yml @@ -137,7 +137,6 @@ co: setting_aggregate_reblogs: Gruppà e spartere indè e linee setting_auto_play_gif: Lettura autumatica di i GIF animati setting_boost_modal: Mustrà una cunfirmazione per sparte un statutu - setting_crop_images: Riquatrà i ritratti in 16x9 indè i statuti micca selezziunati setting_default_language: Lingua di pubblicazione setting_default_privacy: Cunfidenzialità di i statuti setting_default_sensitive: Sempre cunsiderà media cum’è sensibili diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml index 0148911867..05dd9c54b1 100644 --- a/config/locales/simple_form.cs.yml +++ b/config/locales/simple_form.cs.yml @@ -195,7 +195,6 @@ cs: setting_always_send_emails: Vždy posílat e-mailová oznámení setting_auto_play_gif: Automaticky přehrávat animace GIF setting_boost_modal: Před boostnutím zobrazovat potvrzovací okno - setting_crop_images: Ořezávat obrázky v nerozbalených příspěvcích na 16x9 setting_default_language: Jazyk příspěvků setting_default_privacy: Soukromí příspěvků setting_default_sensitive: Vždy označovat média jako citlivá diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml index e58b3d1be2..0c85f0667a 100644 --- a/config/locales/simple_form.cy.yml +++ b/config/locales/simple_form.cy.yml @@ -200,7 +200,6 @@ cy: setting_always_send_emails: Anfonwch hysbysiadau e-bost bob amser setting_auto_play_gif: Chwarae GIFs wedi'u hanimeiddio yn awtomatig setting_boost_modal: Dangos deialog cadarnhau cyn rhoi hwb - setting_crop_images: Tocio delweddau o fewn postiadau nad ydynt wedi'u hehangu i 16x9 setting_default_language: Iaith postio setting_default_privacy: Preifatrwydd cyhoeddi setting_default_sensitive: Marcio cyfryngau fel eu bod yn sensitif bob tro diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index cda0f759d1..d99750faab 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -200,7 +200,6 @@ da: setting_always_send_emails: Send altid en e-mailnotifikationer setting_auto_play_gif: Autoafspil animerede GIF'er setting_boost_modal: Vis bekræftelsesdialog inden boosting - setting_crop_images: Beskær billeder i ikke-ekspanderede indlæg til 16x9 setting_default_language: Sprog for indlæg setting_default_privacy: Fortrolighed for indlæg setting_default_sensitive: Markér altid medier som sensitive diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 0db5bccffa..150c07bcf5 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -200,7 +200,6 @@ de: setting_always_send_emails: Benachrichtigungen immer senden setting_auto_play_gif: Animierte GIFs automatisch abspielen setting_boost_modal: Bestätigungsdialog beim Teilen eines Beitrags anzeigen - setting_crop_images: Bilder in nicht ausgeklappten Beiträgen auf 16:9 zuschneiden setting_default_language: Beitragssprache setting_default_privacy: Beitragssichtbarkeit setting_default_sensitive: Eigene Medien immer mit einer Inhaltswarnung versehen diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml index b9e8ce3b5a..339b4b5303 100644 --- a/config/locales/simple_form.el.yml +++ b/config/locales/simple_form.el.yml @@ -195,7 +195,6 @@ el: setting_always_send_emails: Πάντα να αποστέλλονται ειδοποίησεις μέσω email setting_auto_play_gif: Αυτόματη αναπαραγωγή των GIF setting_boost_modal: Επιβεβαίωση πριν την προώθηση - setting_crop_images: Περιορισμός των εικόνων σε μη-ανεπτυγμένα τουτ σε αναλογία 16x9 setting_default_language: Γλώσσα δημοσιεύσεων setting_default_privacy: Ιδιωτικότητα δημοσιεύσεων setting_default_sensitive: Σημείωση όλων των πολυμέσων ως ευαίσθητου περιεχομένου diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml index 689a544964..150ce85023 100644 --- a/config/locales/simple_form.en-GB.yml +++ b/config/locales/simple_form.en-GB.yml @@ -200,7 +200,6 @@ en-GB: setting_always_send_emails: Always send e-mail notifications setting_auto_play_gif: Auto-play animated GIFs setting_boost_modal: Show confirmation dialogue before boosting - setting_crop_images: Crop images in non-expanded posts to 16x9 setting_default_language: Posting language setting_default_privacy: Posting privacy setting_default_sensitive: Always mark media as sensitive diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index a81b6627a0..4307d65e9b 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -200,7 +200,6 @@ en: setting_always_send_emails: Always send e-mail notifications setting_auto_play_gif: Auto-play animated GIFs setting_boost_modal: Show confirmation dialog before boosting - setting_crop_images: Crop images in non-expanded posts to 16x9 setting_default_language: Posting language setting_default_privacy: Posting privacy setting_default_sensitive: Always mark media as sensitive diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml index 76b2af96d4..f7adede7c7 100644 --- a/config/locales/simple_form.eo.yml +++ b/config/locales/simple_form.eo.yml @@ -200,7 +200,6 @@ eo: setting_always_send_emails: Ĉiam sendi la sciigojn per retpoŝto setting_auto_play_gif: Aŭtomate ekigi GIF-ojn setting_boost_modal: Montri konfirman fenestron antaŭ ol diskonigi mesaĝon - setting_crop_images: Stuci bildojn en negrandigitaj mesaĝoj al 16x9 setting_default_language: Publikada lingvo setting_default_privacy: Privateco de afiŝado setting_default_sensitive: Ĉiam marki plurmediojn kiel tiklaj diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml index 3f5498e9f5..ec00f5dd1d 100644 --- a/config/locales/simple_form.es-AR.yml +++ b/config/locales/simple_form.es-AR.yml @@ -200,7 +200,6 @@ es-AR: setting_always_send_emails: Siempre enviar notificaciones por correo electrónico setting_auto_play_gif: Reproducir automáticamente los GIFs animados setting_boost_modal: Mostrar diálogo de confirmación antes de adherir - setting_crop_images: Recortar imágenes en mensajes no expandidos a 16x9 setting_default_language: Idioma de tus mensajes setting_default_privacy: Privacidad de mensajes setting_default_sensitive: Siempre marcar medios como sensibles diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml index 010c1436f7..7a1577cdb0 100644 --- a/config/locales/simple_form.es-MX.yml +++ b/config/locales/simple_form.es-MX.yml @@ -200,7 +200,6 @@ es-MX: setting_always_send_emails: Enviar siempre notificaciones por correo setting_auto_play_gif: Reproducir automáticamente los GIFs animados setting_boost_modal: Mostrar ventana de confirmación antes de un Retoot - setting_crop_images: Recortar a 16x9 las imágenes de los toots no expandidos setting_default_language: Idioma de publicación setting_default_privacy: Privacidad de publicaciones setting_default_sensitive: Marcar siempre imágenes como sensibles diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index 1f11eeee97..e314bb4557 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -200,7 +200,6 @@ es: setting_always_send_emails: Enviar siempre notificaciones por correo setting_auto_play_gif: Reproducir automáticamente los GIFs animados setting_boost_modal: Mostrar ventana de confirmación antes de impulsar - setting_crop_images: Recortar a 16x9 las imágenes de las publicaciones no expandidas setting_default_language: Idioma de publicación setting_default_privacy: Privacidad de publicaciones setting_default_sensitive: Marcar siempre imágenes como sensibles diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml index 4a89adfa92..65cafb7d19 100644 --- a/config/locales/simple_form.et.yml +++ b/config/locales/simple_form.et.yml @@ -200,7 +200,6 @@ et: setting_always_send_emails: Edasta kõik teavitused meilile setting_auto_play_gif: Esita GIF-e automaatselt setting_boost_modal: Näita enne jagamist kinnitusdialoogi - setting_crop_images: Laiendamata postitustes kärbi pildid 16:9 küljesuhtesse setting_default_language: Postituse keel setting_default_privacy: Postituse nähtavus setting_default_sensitive: Alati märgista meedia tundlikuks diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml index 5e8c395690..5ab8ab612d 100644 --- a/config/locales/simple_form.eu.yml +++ b/config/locales/simple_form.eu.yml @@ -195,7 +195,6 @@ eu: setting_always_send_emails: Bidali beti eposta jakinarazpenak setting_auto_play_gif: Erreproduzitu GIF animatuak automatikoki setting_boost_modal: Erakutsi baieztapen elkarrizketa-koadroa bultzada eman aurretik - setting_crop_images: Moztu irudiak hedatu gabeko tootetan 16x9 proportzioan setting_default_language: Argitalpenen hizkuntza setting_default_privacy: Mezuen pribatutasuna setting_default_sensitive: Beti markatu edukiak hunkigarri gisa diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml index 408e16b576..0d6cf3e565 100644 --- a/config/locales/simple_form.fa.yml +++ b/config/locales/simple_form.fa.yml @@ -169,7 +169,6 @@ fa: setting_always_send_emails: فرستادن همیشگی آگاهی‌های رایانامه‌ای setting_auto_play_gif: پخش خودکار تصویرهای متحرک setting_boost_modal: نمایش پیغام تأیید پیش از تقویت کردن - setting_crop_images: در فرسته‌های ناگسترده، تصویرها را به ابعاد ‎۱۶×۹ کوچک کن setting_default_language: زبان نوشته‌های شما setting_default_privacy: حریم خصوصی نوشته‌ها setting_default_sensitive: همیشه تصاویر را به عنوان حساس علامت بزن diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml index 396af1ee86..e89583eadc 100644 --- a/config/locales/simple_form.fi.yml +++ b/config/locales/simple_form.fi.yml @@ -200,7 +200,6 @@ fi: setting_always_send_emails: Lähetä aina sähköposti-ilmoituksia setting_auto_play_gif: Toista GIF-animaatiot automaattisesti setting_boost_modal: Kysy vahvistus ennen tehostusta - setting_crop_images: Rajaa kuvat avaamattomissa tuuttauksissa 16:9 kuvasuhteeseen setting_default_language: Julkaisujen kieli setting_default_privacy: Viestin näkyvyys setting_default_sensitive: Merkitse media aina arkaluontoiseksi diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml index fc3169502b..27edf181bd 100644 --- a/config/locales/simple_form.fo.yml +++ b/config/locales/simple_form.fo.yml @@ -200,7 +200,6 @@ fo: setting_always_send_emails: Send altíð fráboðanir við telduposti setting_auto_play_gif: Spæl teknimyndagjørdar GIFar sjálvvirkandi setting_boost_modal: Vís váttanarmynd, áðrenn tú stimbrar postar - setting_crop_images: Sker myndir til lutfallið 16x9 í postum, sum ikki eru víðkaðir setting_default_language: Mál, sum verður brúkt til postar setting_default_privacy: Hvussu privatir eru postar? setting_default_sensitive: Merk altíð miðlafílur sum viðkvæmar diff --git a/config/locales/simple_form.fr-QC.yml b/config/locales/simple_form.fr-QC.yml index 35ff5d9b4a..010e534045 100644 --- a/config/locales/simple_form.fr-QC.yml +++ b/config/locales/simple_form.fr-QC.yml @@ -200,7 +200,6 @@ fr-QC: setting_always_send_emails: Toujours envoyer les notifications par courriel setting_auto_play_gif: Lire automatiquement les GIFs animés setting_boost_modal: Demander confirmation avant de partager un message - setting_crop_images: Recadrer en 16x9 les images des messages qui ne sont pas ouverts en vue détaillée setting_default_language: Langue de publication setting_default_privacy: Confidentialité des messages setting_default_sensitive: Toujours marquer les médias comme sensibles diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index 756e686650..45494e8748 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -200,7 +200,6 @@ fr: setting_always_send_emails: Toujours envoyer les notifications par courriel setting_auto_play_gif: Lire automatiquement les GIFs animés setting_boost_modal: Demander confirmation avant de partager un message - setting_crop_images: Recadrer en 16x9 les images des messages qui ne sont pas ouverts en vue détaillée setting_default_language: Langue de publication setting_default_privacy: Confidentialité des messages setting_default_sensitive: Toujours marquer les médias comme sensibles diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml index cc453c2389..ea50164bcb 100644 --- a/config/locales/simple_form.fy.yml +++ b/config/locales/simple_form.fy.yml @@ -200,7 +200,6 @@ fy: setting_always_send_emails: Altyd e-mailmeldingen ferstjoere setting_auto_play_gif: Spylje animearre GIF’s automatysk ôf setting_boost_modal: Freegje foar it boosten fan in berjocht in befêstiging - setting_crop_images: Ofbyldingen bysnije oant 16x9 yn berjochten op tiidlinen setting_default_language: Taal fan jo berjochten setting_default_privacy: Sichtberheid fan nije berjochten setting_default_sensitive: Media altyd as gefoelich markearje diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml index 2f31a1c68c..f1b1e06ad1 100644 --- a/config/locales/simple_form.gd.yml +++ b/config/locales/simple_form.gd.yml @@ -200,7 +200,6 @@ gd: setting_always_send_emails: Cuir brathan puist-d an-còmhnaidh setting_auto_play_gif: Cluich GIFs beòthaichte gu fèin-obrachail setting_boost_modal: Seall còmhradh dearbhaidh mus dèan thu brosnachadh - setting_crop_images: Beàrr na dealbhan sna postaichean gun leudachadh air 16x9 setting_default_language: Cànan postaidh setting_default_privacy: Prìobhaideachd postaidh setting_default_sensitive: Cuir comharra ri meadhanan an-còmhnaidh gu bheil iad frionasach diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml index 8183020d46..6ca24a2dcd 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -200,7 +200,6 @@ gl: setting_always_send_emails: Enviar sempre notificacións por correo electrónico setting_auto_play_gif: Reprodución automática de GIFs animados setting_boost_modal: Solicitar confirmación antes de promover - setting_crop_images: Recortar imaxes a 16x9 en publicacións non despregadas setting_default_language: Idioma de publicación setting_default_privacy: Privacidade da publicación setting_default_sensitive: Marcar sempre multimedia como sensible diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml index 11cb4cea83..994f4bd5d4 100644 --- a/config/locales/simple_form.he.yml +++ b/config/locales/simple_form.he.yml @@ -200,7 +200,6 @@ he: setting_always_send_emails: תמיד שלח התראות לדוא"ל setting_auto_play_gif: ניגון אוטומטי של גיפים setting_boost_modal: הצגת דיאלוג אישור לפני הדהוד - setting_crop_images: קטום תמונות בהודעות לא מורחבות ל 16 על 9 setting_default_language: שפת ברירת מחדל להודעה setting_default_privacy: פרטיות ההודעות setting_default_sensitive: תמיד לתת סימון "רגיש" למדיה diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml index b34d8d119a..c9680fd012 100644 --- a/config/locales/simple_form.hu.yml +++ b/config/locales/simple_form.hu.yml @@ -200,7 +200,6 @@ hu: setting_always_send_emails: E-mail értesítések küldése mindig setting_auto_play_gif: GIF-ek automatikus lejátszása setting_boost_modal: Megerősítés kérése megtolás előtt - setting_crop_images: Képek 16x9-re vágása nem kinyitott bejegyzéseknél setting_default_language: Bejegyzések nyelve setting_default_privacy: Bejegyzések láthatósága setting_default_sensitive: Minden médiafájl megjelölése kényesként diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml index e8eb741183..c16a0a74f0 100644 --- a/config/locales/simple_form.hy.yml +++ b/config/locales/simple_form.hy.yml @@ -135,7 +135,6 @@ hy: setting_aggregate_reblogs: Տարծածները խմբաւորել հոսքում setting_auto_play_gif: Աւտոմատ մեկնարկել GIFs անիմացիաները setting_boost_modal: Ցուցադրել հաստատման պատուհանը տարածելուց առաջ - setting_crop_images: Ցոյց տալ գրառման նկարը 16x9 համամասնութեամբ setting_default_language: Հրապարակման լեզու setting_default_privacy: Հրապարակման գաղտնիութիւն setting_default_sensitive: Միշտ նշել մեդիան որպէս դիւրազգաց diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml index 4e20b6d964..ae99a256b4 100644 --- a/config/locales/simple_form.id.yml +++ b/config/locales/simple_form.id.yml @@ -188,7 +188,6 @@ id: setting_always_send_emails: Selalu kirim notifikasi email setting_auto_play_gif: Mainkan otomatis animasi GIF setting_boost_modal: Tampilkan dialog konfirmasi dialog sebelum boost - setting_crop_images: Potong gambar ke 16x9 pada toot yang tidak dibentangkan setting_default_language: Bahasa posting setting_default_privacy: Privasi postingan setting_default_sensitive: Selalu tandai media sebagai sensitif diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml index 913fc3b2f1..3291ba4cff 100644 --- a/config/locales/simple_form.io.yml +++ b/config/locales/simple_form.io.yml @@ -186,7 +186,6 @@ io: setting_always_send_emails: Sempre sendez retpostoavizi setting_auto_play_gif: Automate pleez animigita GIFi setting_boost_modal: Montrez konfirmdialogo ante bustar - setting_crop_images: Ektranchez imaji en neexpansigita posti a 16x9 setting_default_language: Postolinguo setting_default_privacy: Videbleso di la mesaji setting_default_sensitive: Sempre markizez medii quale sentoza diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml index 3f42da693b..63f6c436e0 100644 --- a/config/locales/simple_form.is.yml +++ b/config/locales/simple_form.is.yml @@ -200,7 +200,6 @@ is: setting_always_send_emails: Alltaf senda tilkynningar í tölvupósti setting_auto_play_gif: Spila sjálfkrafa GIF-hreyfimyndir setting_boost_modal: Sýna staðfestingarglugga fyrir endurbirtingu - setting_crop_images: Utansníða myndir í ekki-útfelldum færslum í 16x9 setting_default_language: Tungumál sem skrifað er á setting_default_privacy: Gagnaleynd færslna setting_default_sensitive: Alltaf merkja myndefni sem viðkvæmt diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml index 2bca829d30..1bd93243fa 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -200,7 +200,6 @@ it: setting_always_send_emails: Manda sempre notifiche via email setting_auto_play_gif: Riproduci automaticamente le GIF animate setting_boost_modal: Mostra dialogo di conferma prima del boost - setting_crop_images: Ritaglia immagini in post non espansi a 16x9 setting_default_language: Lingua dei post setting_default_privacy: Privacy dei post setting_default_sensitive: Segna sempre i media come sensibili diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 1eb077c815..4169a9abca 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -200,7 +200,6 @@ ja: setting_always_send_emails: 常にメール通知を送信する setting_auto_play_gif: アニメーションGIFを自動再生する setting_boost_modal: ブーストする前に確認ダイアログを表示する - setting_crop_images: 投稿の詳細以外では画像を16:9に切り抜く setting_default_language: 投稿する言語 setting_default_privacy: 投稿の公開範囲 setting_default_sensitive: メディアを常に閲覧注意としてマークする diff --git a/config/locales/simple_form.kk.yml b/config/locales/simple_form.kk.yml index 7932e54beb..c1c7b4c2fd 100644 --- a/config/locales/simple_form.kk.yml +++ b/config/locales/simple_form.kk.yml @@ -46,7 +46,6 @@ kk: setting_advanced_layout: Кеңейтілген веб-интерфейс қосу setting_auto_play_gif: GIF анимацияларды бірден қосу setting_boost_modal: Бөлісу алдында растау диалогын көрсету - setting_crop_images: Кеңейтілмеген жазбаларда суреттерді 16х9 көлеміне кес setting_default_language: Жазба тілі setting_default_privacy: Жазба құпиялылығы setting_default_sensitive: Медиаларды әрдайым нәзік ретінде белгілеу diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index 6ac99f3a8c..0caecbb992 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -200,7 +200,6 @@ ko: setting_always_send_emails: 항상 이메일 알림 보내기 setting_auto_play_gif: 애니메이션 GIF를 자동 재생 setting_boost_modal: 부스트 전 확인 창을 표시 - setting_crop_images: 확장되지 않은 게시물의 이미지를 16x9로 자르기 setting_default_language: 게시물 언어 setting_default_privacy: 게시물 프라이버시 setting_default_sensitive: 미디어를 언제나 민감한 콘텐츠로 설정 diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml index 295de7aff9..9194c8b122 100644 --- a/config/locales/simple_form.ku.yml +++ b/config/locales/simple_form.ku.yml @@ -190,7 +190,6 @@ ku: setting_always_send_emails: Her dem agahdariya e-nameyê bişîne setting_auto_play_gif: GIF ên livok bi xweber bilîzine setting_boost_modal: Gotûbêja pejirandinê nîşan bide berî ku şandî werê bilindkirin - setting_crop_images: Wêneyên di nav şandiyên ku nehatine berfireh kirin wek 16×9 jê bike setting_default_language: Zimanê weşanê setting_default_privacy: Ewlehiya weşanê setting_default_sensitive: Her dem medya wek hestyar bide nîşan diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml index 746e4bab80..ab0decf986 100644 --- a/config/locales/simple_form.lv.yml +++ b/config/locales/simple_form.lv.yml @@ -195,7 +195,6 @@ lv: setting_always_send_emails: Vienmēr sūtīt e-pasta paziņojumus setting_auto_play_gif: Automātiski atskaņot animētos GIF setting_boost_modal: Rādīt apstiprinājuma dialogu pirms izcelšanas - setting_crop_images: Apgrieziet attēlus neizvērstajās ziņās līdz 16x9 setting_default_language: Publicēšanas valoda setting_default_privacy: Publicēšanas privātums setting_default_sensitive: Atļaut atzīmēt multividi kā sensitīvu diff --git a/config/locales/simple_form.my.yml b/config/locales/simple_form.my.yml index 0f374739b6..fc41c27f81 100644 --- a/config/locales/simple_form.my.yml +++ b/config/locales/simple_form.my.yml @@ -200,7 +200,6 @@ my: setting_always_send_emails: အီးမေးလ်သတိပေးချက်များကို အမြဲပို့ပါ setting_auto_play_gif: ကာတွန်း GIF များကို အလိုအလျောက်ဖွင့်ပါ setting_boost_modal: Boost မလုပ်မီ အတည်ပြုချက်ပြပါ - setting_crop_images: အကျယ်မချဲ့ထားသော စာစုများတွင် ပုံများကို ၁၆း၉ အရွယ် ဖြတ်တောက်ပါ။ setting_default_language: ပို့စ်တင်မည့်ဘာသာစကား setting_default_privacy: ပို့စ်ကို ဘယ်သူမြင်နိုင်မလဲ setting_default_sensitive: သတိထားရသောမီဒီယာအဖြစ် အမြဲအမှတ်အသားပြုပါ diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index 6e53821e83..d58a55e9ad 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -200,7 +200,6 @@ nl: setting_always_send_emails: Altijd e-mailmeldingen verzenden setting_auto_play_gif: Geanimeerde GIF's automatisch afspelen setting_boost_modal: Vraag voor het boosten van een bericht een bevestiging - setting_crop_images: Afbeeldingen in tijdlijnberichten bijsnijden tot 16x9 setting_default_language: Taal van jouw berichten setting_default_privacy: Zichtbaarheid van nieuwe berichten setting_default_sensitive: Media altijd als gevoelig markeren diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml index 79e8af774a..a8e9f474bc 100644 --- a/config/locales/simple_form.nn.yml +++ b/config/locales/simple_form.nn.yml @@ -195,7 +195,6 @@ nn: setting_always_send_emails: Alltid send epostvarsel setting_auto_play_gif: Spel av animerte GIF-ar automatisk setting_boost_modal: Vis stadfesting før framheving - setting_crop_images: Skjer bilete i ikkje-utvida tut til 16x9 setting_default_language: Språk på innlegg setting_default_privacy: Privatliv setting_default_sensitive: Merk alltid media som nærtakande diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml index 41866f6839..6889638fa5 100644 --- a/config/locales/simple_form.no.yml +++ b/config/locales/simple_form.no.yml @@ -183,7 +183,6 @@ setting_always_send_emails: Alltid send e-postvarslinger setting_auto_play_gif: Autoavspill animert GIF-filer setting_boost_modal: Vis bekreftelse før fremheving - setting_crop_images: Klipp bilder i ikke-utvidede innlegg til 16:9 setting_default_language: Innleggsspråk setting_default_privacy: Postintegritet setting_default_sensitive: Merk alltid media som følsomt diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index 6b5f2e2ddd..32ecbf34cf 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -139,7 +139,6 @@ oc: setting_always_send_emails: Totjorn enviar los corrièls de notificacion setting_auto_play_gif: Lectura automatica dels GIFS animats setting_boost_modal: Mostrar una fenèstra de confirmacion abans de partejar un estatut - setting_crop_images: Retalhar los imatges dins los tuts pas desplegats a 16x9 setting_default_language: Lenga de publicacion setting_default_privacy: Confidencialitat dels tuts setting_default_sensitive: Totjorn marcar los mèdias coma sensibles diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml index 89c8f3d7ae..64acdb09ac 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -200,7 +200,6 @@ pl: setting_always_send_emails: Zawsze wysyłaj powiadomienia e-mail setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy setting_boost_modal: Pytaj o potwierdzenie przed podbiciem - setting_crop_images: Przycinaj obrazki w nierozwiniętych wpisach do 16x9 setting_default_language: Język wpisów setting_default_privacy: Widoczność wpisów setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml index 0af041dd98..46cf516032 100644 --- a/config/locales/simple_form.pt-BR.yml +++ b/config/locales/simple_form.pt-BR.yml @@ -200,7 +200,6 @@ pt-BR: setting_always_send_emails: Sempre enviar notificações por e-mail setting_auto_play_gif: Reproduzir GIFs automaticamente setting_boost_modal: Solicitar confirmação antes de dar boost - setting_crop_images: Cortar imagens no formato 16x9 em publicações não expandidas setting_default_language: Idioma dos toots setting_default_privacy: Privacidade dos toots setting_default_sensitive: Sempre marcar mídia como sensível diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml index dbdf77c9b1..951a3850bf 100644 --- a/config/locales/simple_form.pt-PT.yml +++ b/config/locales/simple_form.pt-PT.yml @@ -200,7 +200,6 @@ pt-PT: setting_always_send_emails: Enviar sempre notificações de email setting_auto_play_gif: Reproduzir GIF automaticamente setting_boost_modal: Solicitar confirmação antes de partilhar uma publicação - setting_crop_images: Recortar imagens para o formato 16x9 nas publicações não expandidas setting_default_language: Língua de publicação setting_default_privacy: Privacidade da publicação setting_default_sensitive: Marcar sempre os media como problemáticos diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml index c76cf89cf1..d894cc0cea 100644 --- a/config/locales/simple_form.ro.yml +++ b/config/locales/simple_form.ro.yml @@ -124,7 +124,6 @@ ro: setting_aggregate_reblogs: Grupează impulsurile în fluxuri setting_auto_play_gif: Redă automat animațiile GIF setting_boost_modal: Arată dialogul de confirmare înainte de a impulsiona - setting_crop_images: Decupează imaginile în postările non-extinse la 16x9 setting_default_language: În ce limbă postezi setting_default_privacy: Cine vede postările tale setting_default_sensitive: Întotdeauna marchează conținutul media ca fiind sensibil diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml index e23fef979c..a848a4b11c 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -195,7 +195,6 @@ ru: setting_always_send_emails: Всегда отправлять уведомления по электронной почте setting_auto_play_gif: Автоматически проигрывать GIF анимации setting_boost_modal: Всегда спрашивать перед продвижением - setting_crop_images: Кадрировать изображения в нераскрытых постах до 16:9 setting_default_language: Язык публикуемых постов setting_default_privacy: Видимость постов setting_default_sensitive: Всегда отмечать медиафайлы как «деликатного характера» diff --git a/config/locales/simple_form.sc.yml b/config/locales/simple_form.sc.yml index ad768a66d8..09a55eed5b 100644 --- a/config/locales/simple_form.sc.yml +++ b/config/locales/simple_form.sc.yml @@ -141,7 +141,6 @@ sc: setting_aggregate_reblogs: Agrupa is cumpartziduras in is lìnias de tempus setting_auto_play_gif: Riprodui is GIF animadas in automàticu setting_boost_modal: Ammustra unu diàlogu de cunfirma in antis de cumpartzire - setting_crop_images: Retàllia a 16x9 is immàgines de is tuts no ismanniados setting_default_language: Idioma de publicatzione setting_default_privacy: Riservadesa de is publicatziones setting_default_sensitive: Marca semper is elementos multimediales comente sensìbiles diff --git a/config/locales/simple_form.sco.yml b/config/locales/simple_form.sco.yml index b061aa76d7..eb8128cd4a 100644 --- a/config/locales/simple_form.sco.yml +++ b/config/locales/simple_form.sco.yml @@ -188,7 +188,6 @@ sco: setting_always_send_emails: Aye sen email notifications setting_auto_play_gif: Auto-pley animatit GIFs setting_boost_modal: Shaw confirmation dialog afore heezin - setting_crop_images: Crap images in non-expandit posts tae 16x9 setting_default_language: Postin leid setting_default_privacy: Postin privacy setting_default_sensitive: Aye mairk media as sensitive diff --git a/config/locales/simple_form.si.yml b/config/locales/simple_form.si.yml index a2571dcb1e..9835b126a2 100644 --- a/config/locales/simple_form.si.yml +++ b/config/locales/simple_form.si.yml @@ -157,7 +157,6 @@ si: setting_always_send_emails: සෑම විටම විද්‍යුත් තැපැල් දැනුම්දීම් යවන්න setting_auto_play_gif: සජීවිකරණ GIF ස්වයංක්‍රීයව ධාවනය කරන්න setting_boost_modal: වැඩි කිරීමට පෙර තහවුරු කිරීමේ සංවාදය පෙන්වන්න - setting_crop_images: ප්‍රසාරණය නොකළ පළ කිරීම් වල පින්තූර 16x9 දක්වා කප්පාදු කරන්න setting_default_language: පළ කිරීමේ භාෂාව setting_default_privacy: පුද්ගලිකත්වය පළ කිරීම setting_default_sensitive: සෑම විටම මාධ්‍ය සංවේදී ලෙස සලකුණු කරන්න diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index 3cadada4fa..fe9f16eb92 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -117,7 +117,6 @@ sk: setting_aggregate_reblogs: Zoskupuj vyzdvihnutia v časovej osi setting_auto_play_gif: Automaticky prehrávaj animované GIFy setting_boost_modal: Zobrazuj potvrdzovacie okno pred povýšením - setting_crop_images: Orež obrázky v nerozbalených príspevkoch na 16x9 setting_default_language: Píšeš v jazyku setting_default_privacy: Súkromie príspevkov setting_default_sensitive: Označ všetky mediálne súbory ako chúlostivé diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml index c1f5c64488..180835c37c 100644 --- a/config/locales/simple_form.sl.yml +++ b/config/locales/simple_form.sl.yml @@ -198,7 +198,6 @@ sl: setting_always_send_emails: Vedno pošlji e-obvestila setting_auto_play_gif: Samodejno predvajanje animiranih GIF-ov setting_boost_modal: Pred izpostavljanjem pokaži potrditveno okno - setting_crop_images: Obreži slike v nerazširjenih objavah v razmerju 16:9 setting_default_language: Jezik objavljanja setting_default_privacy: Zasebnost objave setting_default_sensitive: Vedno označi medije kot občutljive diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml index ea022a493c..496d752ebf 100644 --- a/config/locales/simple_form.sq.yml +++ b/config/locales/simple_form.sq.yml @@ -200,7 +200,6 @@ sq: setting_always_send_emails: Dërgo përherë njoftime me email setting_auto_play_gif: Vetëluaji GIF-et e animuar setting_boost_modal: Shfaq dialog ripohimi përpara përforcimi - setting_crop_images: Në mesazhe jo të zgjerueshëm, qethi figurat në 16x9 setting_default_language: Gjuhë postimi setting_default_privacy: Privatësi postimi setting_default_sensitive: Mediave vëru përherë shenjë si rezervat diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml index 5289f66067..d7e05ecb84 100644 --- a/config/locales/simple_form.sr-Latn.yml +++ b/config/locales/simple_form.sr-Latn.yml @@ -200,7 +200,6 @@ sr-Latn: setting_always_send_emails: Uvek šalji obaveštenja e-poštom setting_auto_play_gif: Automatski reprodukuj animirane GIF-ove setting_boost_modal: Prikaži dijalog za potvrdu pre davanja podrške - setting_crop_images: Izreži slike u neproširenim objavama na 16x9 setting_default_language: Jezik objavljivanja setting_default_privacy: Privatnost objava setting_default_sensitive: Uvek označi multimediju kao osetljivu diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml index 800e2d56b0..b4a96f9808 100644 --- a/config/locales/simple_form.sr.yml +++ b/config/locales/simple_form.sr.yml @@ -200,7 +200,6 @@ sr: setting_always_send_emails: Увек шаљи обавештења е-поштом setting_auto_play_gif: Аутоматски репродукуј анимиране GIF-ове setting_boost_modal: Прикажи дијалог за потврду пре давања подршке - setting_crop_images: Изрежи слике у непроширеним објавама на 16x9 setting_default_language: Језик објављивања setting_default_privacy: Приватност објава setting_default_sensitive: Увек означи мултимедију као осетљиву diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml index bad46443f6..b4b8f262f1 100644 --- a/config/locales/simple_form.sv.yml +++ b/config/locales/simple_form.sv.yml @@ -195,7 +195,6 @@ sv: setting_always_send_emails: Skicka alltid e-postnotiser setting_auto_play_gif: Spela upp GIF:ar automatiskt setting_boost_modal: Visa bekräftelsedialog innan boostning - setting_crop_images: Beskär bilder i icke-utökade inlägg till 16x9 setting_default_language: Inläggsspråk setting_default_privacy: Inläggsintegritet setting_default_sensitive: Markera alltid media som känsligt diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml index 9d20263c78..b752f0d002 100644 --- a/config/locales/simple_form.th.yml +++ b/config/locales/simple_form.th.yml @@ -200,7 +200,6 @@ th: setting_always_send_emails: ส่งการแจ้งเตือนอีเมลเสมอ setting_auto_play_gif: เล่น GIF แบบเคลื่อนไหวโดยอัตโนมัติ setting_boost_modal: แสดงกล่องโต้ตอบการยืนยันก่อนดัน - setting_crop_images: ครอบตัดภาพในโพสต์ที่ไม่ได้ขยายเป็น 16x9 setting_default_language: ภาษาของการโพสต์ setting_default_privacy: ความเป็นส่วนตัวของการโพสต์ setting_default_sensitive: ทำเครื่องหมายสื่อว่าละเอียดอ่อนเสมอ diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml index ec71034d51..778b3df487 100644 --- a/config/locales/simple_form.tr.yml +++ b/config/locales/simple_form.tr.yml @@ -200,7 +200,6 @@ tr: setting_always_send_emails: Her zaman e-posta bildirimleri gönder setting_auto_play_gif: Hareketli GIF'leri otomatik oynat setting_boost_modal: Boostlamadan önce onay iletişim kutusu göster - setting_crop_images: Genişletilmemiş gönderilerdeki resimleri 16x9 olarak kırp setting_default_language: Gönderi dili setting_default_privacy: Gönderi gizliliği setting_default_sensitive: Medyayı her zaman hassas olarak işaretle diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml index 0fd4a5e967..e1401f4d41 100644 --- a/config/locales/simple_form.uk.yml +++ b/config/locales/simple_form.uk.yml @@ -203,7 +203,6 @@ uk: setting_always_send_emails: Завжди надсилати сповіщення електронною поштою setting_auto_play_gif: Автоматично відтворювати анімовані GIF setting_boost_modal: Показувати діалог підтвердження під час поширення - setting_crop_images: Обрізати зображення в нерозгорнутих дописах до 16x9 setting_default_language: Мова дописів setting_default_privacy: Видимість дописів setting_default_sensitive: Позначати медіа делікатними diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml index fa17b05b17..243d7a133b 100644 --- a/config/locales/simple_form.vi.yml +++ b/config/locales/simple_form.vi.yml @@ -200,7 +200,6 @@ vi: setting_always_send_emails: Luôn gửi email thông báo setting_auto_play_gif: Tự động phát ảnh GIF setting_boost_modal: Yêu cầu xác nhận trước khi đăng lại tút - setting_crop_images: Hiển thị ảnh theo tỉ lệ 16x9 setting_default_language: Ngôn ngữ đăng setting_default_privacy: Kiểu đăng setting_default_sensitive: Ảnh/video là nội dung nhạy cảm diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 5579423364..607c4ac2c8 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -200,7 +200,6 @@ zh-CN: setting_always_send_emails: 总是发送电子邮件通知 setting_auto_play_gif: 自动播放 GIF 动画 setting_boost_modal: 在转嘟前询问我 - setting_crop_images: 把未展开嘟文中的图片裁剪到 16x9 setting_default_language: 发布语言 setting_default_privacy: 嘟文默认可见范围 setting_default_sensitive: 始终标记媒体为敏感内容 diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml index 0f18d1fc9d..92b7b906e7 100644 --- a/config/locales/simple_form.zh-HK.yml +++ b/config/locales/simple_form.zh-HK.yml @@ -194,7 +194,6 @@ zh-HK: setting_always_send_emails: 總是傳送電郵通知 setting_auto_play_gif: 自動播放 GIF setting_boost_modal: 在轉推前詢問我 - setting_crop_images: 將未展開文章中的圖片裁剪到 16x9 setting_default_language: 文章語言 setting_default_privacy: 文章預設為 setting_default_sensitive: 預設我的內容為敏感內容 diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml index f705cd8e76..1485e23f4d 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -200,7 +200,6 @@ zh-TW: setting_always_send_emails: 總是發送電子郵件通知 setting_auto_play_gif: 自動播放 GIF 動畫 setting_boost_modal: 轉嘟前先詢問我 - setting_crop_images: 將未展開嘟文中的圖片裁剪至 16x9 setting_default_language: 嘟文語言 setting_default_privacy: 嘟文可見範圍 setting_default_sensitive: 總是將媒體標記為敏感內容 diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 2838d86489..a98a97d1c5 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -684,7 +684,6 @@ sk: body: Mastodon je prekladaný dobrovoľníkmi. guide_link_text: Prispievať môže každý. sensitive_content: Chúlostivý obsah - toot_layout: Rozloženie príspevkov application_mailer: notification_preferences: Zmeň emailové voľby settings: 'Zmeň emailové voľby: %{link}' diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 2f6e3551d8..8295425540 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1002,7 +1002,6 @@ sl: guide_link: https://crowdin.com/project/mastodon guide_link_text: Vsakdo lahko prispeva. sensitive_content: Občutljiva vsebina - toot_layout: Postavitev objave application_mailer: notification_preferences: Spremenite e-poštne nastavitve salutation: "%{name}," diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 7994029c2f..11b9a7f4c8 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -973,7 +973,6 @@ sq: guide_link: https://crowdin.com/project/mastodon guide_link_text: Çdokush mund të kontribuojë. sensitive_content: Lëndë rezervat - toot_layout: Skemë mesazhesh application_mailer: notification_preferences: Ndryshoni parapëlqime email-i salutation: "%{name}," diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 3c055392b8..f34692b579 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -991,7 +991,6 @@ sr-Latn: guide_link: https://crowdin.com/project/mastodon guide_link_text: Svako može doprineti. sensitive_content: Osetljiv sadržaj - toot_layout: Raspored objava application_mailer: notification_preferences: Promeni preference E-pošte salutation: Poštovani %{name}, diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 132e9468b7..bd216aff42 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -991,7 +991,6 @@ sr: guide_link: https://crowdin.com/project/mastodon guide_link_text: Свако може допринети. sensitive_content: Осетљив садржај - toot_layout: Распоред објава application_mailer: notification_preferences: Промени преференце Е-поште salutation: Поштовани %{name}, diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 5836d21bfb..c8c1e4868f 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -963,7 +963,6 @@ sv: guide_link: https://crowdin.com/project/mastodon guide_link_text: Alla kan bidra. sensitive_content: Känsligt innehåll - toot_layout: Inläggslayout application_mailer: notification_preferences: Ändra e-postinställningar salutation: "%{name}," diff --git a/config/locales/th.yml b/config/locales/th.yml index 2ceadc9b0f..9a034126ad 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -955,7 +955,6 @@ th: guide_link: https://crowdin.com/project/mastodon/th guide_link_text: ทุกคนสามารถมีส่วนร่วม sensitive_content: เนื้อหาที่ละเอียดอ่อน - toot_layout: เค้าโครงโพสต์ application_mailer: notification_preferences: เปลี่ยนการกำหนดลักษณะอีเมล salutation: "%{name}," diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 71b76c8934..e16ba9abbc 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -973,7 +973,6 @@ tr: guide_link: https://crowdin.com/project/mastodon guide_link_text: Herkes katkıda bulunabilir. sensitive_content: Hassas içerik - toot_layout: Gönderi düzeni application_mailer: notification_preferences: E-posta tercihlerini değiştir salutation: "%{name}," diff --git a/config/locales/uk.yml b/config/locales/uk.yml index b0df7108fe..280b423cb0 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1009,7 +1009,6 @@ uk: guide_link: https://uk.crowdin.com/project/mastodon guide_link_text: Кожен може взяти участь. sensitive_content: Дражливий зміст - toot_layout: Зовнішній вигляд дописів application_mailer: notification_preferences: Змінити налаштування електронної пошти salutation: "%{name}," diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 7a64be31ed..5ee9761745 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -955,7 +955,6 @@ vi: guide_link: https://crowdin.com/project/mastodon guide_link_text: Ai cũng có thể đóng góp. sensitive_content: Nội dung nhạy cảm - toot_layout: Tút application_mailer: notification_preferences: Thay đổi tùy chọn email salutation: "%{name}," diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 8f7c7a5ce6..a6b77fc667 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -955,7 +955,6 @@ zh-CN: guide_link: https://crowdin.com/project/mastodon guide_link_text: 每个人都可以参与翻译。 sensitive_content: 敏感内容 - toot_layout: 嘟文布局 application_mailer: notification_preferences: 更改电子邮件首选项 salutation: "%{name}：" diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index 37023eede7..23de5f830b 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -941,7 +941,6 @@ zh-HK: guide_link: https://crowdin.com/project/mastodon guide_link_text: 每個人都能貢獻。 sensitive_content: 敏感內容 - toot_layout: 發文介面 application_mailer: notification_preferences: 更改電郵設定 salutation: "%{name}：" diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 349970cd47..833fba11fb 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -959,7 +959,6 @@ zh-TW: guide_link: https://crowdin.com/project/mastodon guide_link_text: 每個人都能貢獻。 sensitive_content: 敏感內容 - toot_layout: 嘟文排版 application_mailer: notification_preferences: 變更電子郵件設定 salutation: "%{name}、" From 6b2952d1dd2c21a8a8854f1df5fa532f8fed5af4 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 24 Jul 2023 13:47:28 +0200 Subject: [PATCH 092/557] Change design of link previews in web UI (#26136) --- .../features/status/components/card.jsx | 39 +++--- app/javascript/mastodon/locales/en.json | 1 + .../styles/mastodon-light/diff.scss | 6 +- .../styles/mastodon-light/variables.scss | 2 +- .../styles/mastodon/components.scss | 130 ++++++++---------- app/lib/link_details_extractor.rb | 5 + .../rest/preview_card_serializer.rb | 6 +- 7 files changed, 90 insertions(+), 99 deletions(-) diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx index d23bbf16a7..7cf324760e 100644 --- a/app/javascript/mastodon/features/status/components/card.jsx +++ b/app/javascript/mastodon/features/status/components/card.jsx @@ -12,6 +12,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import { Blurhash } from 'mastodon/components/blurhash'; import { Icon } from 'mastodon/components/icon'; +import { RelativeTimestamp } from 'mastodon/components/relative_timestamp'; import { useBlurhash } from 'mastodon/initial_state'; const IDNA_PREFIX = 'xn--'; @@ -57,14 +58,9 @@ export default class Card extends PureComponent { static propTypes = { card: ImmutablePropTypes.map, onOpenMedia: PropTypes.func.isRequired, - compact: PropTypes.bool, sensitive: PropTypes.bool, }; - static defaultProps = { - compact: false, - }; - state = { previewLoaded: false, embedded: false, @@ -148,7 +144,7 @@ export default class Card extends PureComponent { } render () { - const { card, compact } = this.props; + const { card } = this.props; const { embedded, revealed } = this.state; if (card === null) { @@ -156,29 +152,24 @@ export default class Card extends PureComponent { } const provider = card.get('provider_name').length === 0 ? decodeIDNA(getHostname(card.get('url'))) : card.get('provider_name'); - const horizontal = (!compact && card.get('width') > card.get('height')) || card.get('type') !== 'link' || embedded; const interactive = card.get('type') !== 'link'; - const className = classnames('status-card', { horizontal, compact, interactive }); - const title = interactive ? {card.get('title')} : {card.get('title')}; const language = card.get('language') || ''; const description = (
- {title} - {!(horizontal || compact) &&

{card.get('description')}

} - {provider} + {provider}{card.get('published_at') && <> · } + {card.get('title')} + {card.get('author_name').length > 0 && {card.get('author_name')} }} />}
); const thumbnailStyle = { - visibility: revealed? null : 'hidden', + visibility: revealed ? null : 'hidden', + aspectRatio: `${card.get('width')} / ${card.get('height')}` }; - if (horizontal) { - thumbnailStyle.aspectRatio = (compact && !embedded) ? '16 / 9' : `${card.get('width')} / ${card.get('height')}`; - } + let embed; - let embed = ''; let canvas = ( ); + let thumbnail = ; + let spoilerButton = ( ); + spoilerButton = (
{spoilerButton} @@ -219,19 +213,20 @@ export default class Card extends PureComponent {
- {horizontal && } +
)} + {!revealed && spoilerButton}
); } return ( -
+
{embed} - {!compact && description} + {description}
); } else if (card.get('image')) { @@ -243,14 +238,14 @@ export default class Card extends PureComponent { ); } else { embed = ( -
+
); } return ( - + {embed} {description} diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index cf4e802eb4..cc9bffd80f 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -363,6 +363,7 @@ "lightbox.previous": "Previous", "limited_account_hint.action": "Show profile anyway", "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.", + "link_preview.author": "By {name}", "lists.account.add": "Add to list", "lists.account.remove": "Remove from list", "lists.delete": "Delete list", diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index f7835ac2f4..df89d9a5a5 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -77,6 +77,10 @@ html { background: $white; } +.column-header { + border-bottom: 0; +} + .column-header__button.active { color: $ui-highlight-color; @@ -414,7 +418,7 @@ html { .column-header__collapsible-inner { background: darken($ui-base-color, 4%); border: 1px solid lighten($ui-base-color, 8%); - border-top: 0; + border-bottom: 0; } .dashboard__quick-access, diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss index 250e200fc6..ac8a831215 100644 --- a/app/javascript/styles/mastodon-light/variables.scss +++ b/app/javascript/styles/mastodon-light/variables.scss @@ -5,7 +5,7 @@ $white: #ffffff; $classic-base-color: #282c37; $classic-primary-color: #9baec8; $classic-secondary-color: #d9e1e8; -$classic-highlight-color: #6364ff; +$classic-highlight-color: #858afa; $blurple-600: #563acc; // Iris $blurple-500: #6364ff; // Brand purple diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 64c245de34..b06a7130f8 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -252,13 +252,14 @@ &.overlayed { box-sizing: content-box; - background: rgba($base-overlay-background, 0.6); - color: rgba($primary-text-color, 0.7); + background: rgba($black, 0.65); + backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%); + color: rgba($white, 0.7); border-radius: 4px; padding: 2px; &:hover { - background: rgba($base-overlay-background, 0.9); + background: rgba($black, 0.9); } } @@ -1352,6 +1353,10 @@ body > [data-popper-placement] { } } +.scrollable > div:first-child .detailed-status { + border-top: 0; +} + .detailed-status__meta { margin-top: 16px; color: $dark-text-color; @@ -3504,12 +3509,10 @@ button.icon-button.active i.fa-retweet { } .status-card { + display: block; position: relative; - display: flex; font-size: 14px; - border: 1px solid lighten($ui-base-color, 8%); - border-radius: 4px; - color: $dark-text-color; + color: $darker-text-color; margin-top: 14px; text-decoration: none; overflow: hidden; @@ -3563,8 +3566,29 @@ button.icon-button.active i.fa-retweet { a.status-card { cursor: pointer; - &:hover { - background: lighten($ui-base-color, 8%); + &:hover, + &:focus, + &:active { + .status-card__title, + .status-card__host, + .status-card__author { + color: $highlight-text-color; + } + } +} + +.status-card a { + color: inherit; + text-decoration: none; + + &:hover, + &:focus, + &:active { + .status-card__title, + .status-card__host, + .status-card__author { + color: $highlight-text-color; + } } } @@ -3590,42 +3614,42 @@ a.status-card { .status-card__title { display: block; - font-weight: 500; - margin-bottom: 5px; - color: $darker-text-color; + font-weight: 700; + font-size: 19px; + line-height: 24px; + color: $primary-text-color; overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - text-decoration: none; } .status-card__content { flex: 1 1 auto; overflow: hidden; - padding: 14px 14px 14px 8px; -} - -.status-card__description { - color: $darker-text-color; - overflow: hidden; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; + padding: 15px 0; + padding-bottom: 0; } .status-card__host { display: block; - margin-top: 5px; - font-size: 13px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + font-size: 14px; + margin-bottom: 8px; +} + +.status-card__author { + display: block; + margin-top: 8px; + font-size: 14px; + color: $primary-text-color; + + strong { + font-weight: 500; + } } .status-card__image { - flex: 0 0 100px; + width: 100%; background: lighten($ui-base-color, 8%); position: relative; + border-radius: 8px; & > .fa { font-size: 21px; @@ -3637,50 +3661,8 @@ a.status-card { } } -.status-card.horizontal { - display: block; - - .status-card__image { - width: 100%; - } - - .status-card__image-image, - .status-card__image-preview { - border-radius: 4px 4px 0 0; - } - - .status-card__title { - white-space: inherit; - } -} - -.status-card.compact { - border-color: lighten($ui-base-color, 4%); - - &.interactive { - border: 0; - } - - .status-card__content { - padding: 8px; - padding-top: 10px; - } - - .status-card__title { - white-space: nowrap; - } - - .status-card__image { - flex: 0 0 60px; - } -} - -a.status-card.compact:hover { - background-color: lighten($ui-base-color, 4%); -} - .status-card__image-image { - border-radius: 4px 0 0 4px; + border-radius: 8px; display: block; margin: 0; width: 100%; @@ -3691,7 +3673,7 @@ a.status-card.compact:hover { } .status-card__image-preview { - border-radius: 4px 0 0 4px; + border-radius: 8px; display: block; margin: 0; width: 100%; diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb index f0aeec0b3e..a350cadf90 100644 --- a/app/lib/link_details_extractor.rb +++ b/app/lib/link_details_extractor.rb @@ -124,6 +124,7 @@ class LinkDetailsExtractor author_url: author_url || '', embed_url: embed_url || '', language: language, + created_at: published_at, } end @@ -159,6 +160,10 @@ class LinkDetailsExtractor html_entities.decode(structured_data&.description || opengraph_tag('og:description') || meta_tag('description')) end + def published_at + structured_data&.date_published || opengraph_tag('article:published_time') + end + def image valid_url_or_nil(opengraph_tag('og:image')) end diff --git a/app/serializers/rest/preview_card_serializer.rb b/app/serializers/rest/preview_card_serializer.rb index 08bc07edd4..db44abb382 100644 --- a/app/serializers/rest/preview_card_serializer.rb +++ b/app/serializers/rest/preview_card_serializer.rb @@ -6,7 +6,7 @@ class REST::PreviewCardSerializer < ActiveModel::Serializer attributes :url, :title, :description, :language, :type, :author_name, :author_url, :provider_name, :provider_url, :html, :width, :height, - :image, :embed_url, :blurhash + :image, :embed_url, :blurhash, :published_at def image object.image? ? full_asset_url(object.image.url(:original)) : nil @@ -15,4 +15,8 @@ class REST::PreviewCardSerializer < ActiveModel::Serializer def html Sanitize.fragment(object.html, Sanitize::Config::MASTODON_OEMBED) end + + def published_at + object.created_at + end end From 80809ef33efcb80e18ff2193eb6ec30b3bb0fdf7 Mon Sep 17 00:00:00 2001 From: Trevor Wolf Date: Mon, 24 Jul 2023 21:48:09 +1000 Subject: [PATCH 093/557] change poll form element colors to fit with the rest of the ui (#26139) --- app/javascript/styles/mastodon/basics.scss | 4 ++++ app/javascript/styles/mastodon/polls.scss | 17 ++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss index 234c703f23..a77f8425dd 100644 --- a/app/javascript/styles/mastodon/basics.scss +++ b/app/javascript/styles/mastodon/basics.scss @@ -175,6 +175,10 @@ a { button { font-family: inherit; cursor: pointer; + + &:focus:not(:focus-visible) { + outline: none; + } } .app-holder { diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss index bdb87d7cfa..bcc8cfaaec 100644 --- a/app/javascript/styles/mastodon/polls.scss +++ b/app/javascript/styles/mastodon/polls.scss @@ -105,7 +105,7 @@ &__input { display: inline-block; position: relative; - border: 1px solid $ui-primary-color; + border: 1px solid $ui-button-background-color; box-sizing: border-box; width: 18px; height: 18px; @@ -121,15 +121,10 @@ border-radius: 4px; } - &.active { - border-color: $valid-value-color; - background: $valid-value-color; - } - &:active, &:focus, &:hover { - border-color: lighten($valid-value-color, 15%); + border-color: $ui-button-focus-background-color; border-width: 4px; } @@ -241,6 +236,14 @@ color: $action-button-color; border-color: $action-button-color; margin-inline-end: 5px; + + &:hover, + &:focus, + &.active { + border-color: $action-button-color; + background-color: $action-button-color; + color: $ui-button-color; + } } li { From 76fce34ebb455d88a34290154ad8f02f582a67c0 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Mon, 24 Jul 2023 13:48:23 +0200 Subject: [PATCH 094/557] Add `lang` attribute to trending links (#26111) --- .../mastodon/features/explore/components/story.jsx | 7 ++++--- app/javascript/mastodon/features/explore/links.jsx | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/javascript/mastodon/features/explore/components/story.jsx b/app/javascript/mastodon/features/explore/components/story.jsx index 73ec99c14b..42b65e7dcc 100644 --- a/app/javascript/mastodon/features/explore/components/story.jsx +++ b/app/javascript/mastodon/features/explore/components/story.jsx @@ -13,6 +13,7 @@ export default class Story extends PureComponent { static propTypes = { url: PropTypes.string, title: PropTypes.string, + lang: PropTypes.string, publisher: PropTypes.string, sharedTimes: PropTypes.number, thumbnail: PropTypes.string, @@ -26,15 +27,15 @@ export default class Story extends PureComponent { handleImageLoad = () => this.setState({ thumbnailLoaded: true }); render () { - const { url, title, publisher, sharedTimes, thumbnail, blurhash } = this.props; + const { url, title, lang, publisher, sharedTimes, thumbnail, blurhash } = this.props; const { thumbnailLoaded } = this.state; return (
-
{publisher ? publisher : }
-
{title ? title : }
+
{publisher ? publisher : }
+
{title ? title : }
{typeof sharedTimes === 'number' ? : }
diff --git a/app/javascript/mastodon/features/explore/links.jsx b/app/javascript/mastodon/features/explore/links.jsx index 8b199bf47c..6f402decbf 100644 --- a/app/javascript/mastodon/features/explore/links.jsx +++ b/app/javascript/mastodon/features/explore/links.jsx @@ -58,6 +58,7 @@ class Links extends PureComponent { {isLoading ? () : links.map(link => ( Date: Mon, 24 Jul 2023 14:05:12 +0200 Subject: [PATCH 095/557] Update dependency rdf-normalize to v0.6.1 (#26130) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index bc4f3522bb..42a0d410e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -569,7 +569,7 @@ GEM rake (13.0.6) rdf (3.2.11) link_header (~> 0.0, >= 0.0.8) - rdf-normalize (0.6.0) + rdf-normalize (0.6.1) rdf (~> 3.2) redcarpet (3.6.0) redis (4.8.1) From e56dc936e332e8c64b59665416d61ced6f2ae018 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 15:43:08 +0200 Subject: [PATCH 096/557] Update dependency brakeman to v6.0.1 (#26141) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 42a0d410e9..fb3fd05da7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,7 +144,7 @@ GEM blurhash (0.1.7) bootsnap (1.16.0) msgpack (~> 1.2) - brakeman (6.0.0) + brakeman (6.0.1) browser (5.3.1) brpoplpush-redis_script (0.1.3) concurrent-ruby (~> 1.0, >= 1.0.5) From 3cbc69f13d4ed4186a57634ffdf5ac6deca856c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 16:03:49 +0200 Subject: [PATCH 097/557] Update dependency postcss to v8.4.27 (#26144) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0523961667..0789a5f6de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9248,9 +9248,9 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== postcss@^8.2.15, postcss@^8.4.24: - version "8.4.26" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.26.tgz#1bc62ab19f8e1e5463d98cf74af39702a00a9e94" - integrity sha512-jrXHFF8iTloAenySjM/ob3gSj7pCu0Ji49hnjqzsgSRa50hkWCKD0HQ+gMNJkW38jBI68MpAAg7ZWwHwX8NMMw== + version "8.4.27" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.27.tgz#234d7e4b72e34ba5a92c29636734349e0d9c3057" + integrity sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ== dependencies: nanoid "^3.3.6" picocolors "^1.0.0" From b629e21515d54cf933d9167003b2a08d57192c80 Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 24 Jul 2023 16:06:32 +0200 Subject: [PATCH 098/557] Fix unexpected redirection to /explore after sign-in (#26143) --- app/controllers/auth/sessions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index 1380e6f283..06a3deee2b 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -108,7 +108,7 @@ class Auth::SessionsController < Devise::SessionsController end def home_paths(resource) - paths = [about_path] + paths = [about_path, '/explore'] paths << short_account_path(username: resource.account) if single_user_mode? && resource.is_a?(User) From 173a268025255879b6a251d7e7f484a759aa28b5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 16:18:19 +0200 Subject: [PATCH 099/557] Update dependency aws-sdk-s3 to v1.131.0 (#26145) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fb3fd05da7..d308192e8b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,7 +103,7 @@ GEM attr_required (1.0.1) awrence (1.2.1) aws-eventstream (1.2.0) - aws-partitions (1.786.0) + aws-partitions (1.791.0) aws-sdk-core (3.178.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -112,7 +112,7 @@ GEM aws-sdk-kms (1.71.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.130.0) + aws-sdk-s3 (1.131.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) From 394d1f19b1d45c386dff021b1a333f4c020c0cb5 Mon Sep 17 00:00:00 2001 From: Vyr Cossont Date: Mon, 24 Jul 2023 08:37:38 -0700 Subject: [PATCH 100/557] Add report.updated webhook (#24211) --- app/models/report.rb | 9 +++++++-- app/models/webhook.rb | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/models/report.rb b/app/models/report.rb index 533e3f72ab..f6fd23cf3a 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -58,7 +58,8 @@ class Report < ApplicationRecord before_validation :set_uri, only: :create - after_create_commit :trigger_webhooks + after_create_commit :trigger_create_webhooks + after_update_commit :trigger_update_webhooks def object_type :flag @@ -155,7 +156,11 @@ class Report < ApplicationRecord errors.add(:rule_ids, I18n.t('reports.errors.invalid_rules')) unless rules.size == rule_ids&.size end - def trigger_webhooks + def trigger_create_webhooks TriggerWebhookWorker.perform_async('report.created', 'Report', id) end + + def trigger_update_webhooks + TriggerWebhookWorker.perform_async('report.updated', 'Report', id) + end end diff --git a/app/models/webhook.rb b/app/models/webhook.rb index 14f33c5fc4..044097921e 100644 --- a/app/models/webhook.rb +++ b/app/models/webhook.rb @@ -20,6 +20,7 @@ class Webhook < ApplicationRecord account.created account.updated report.created + report.updated status.created status.updated ).freeze @@ -59,7 +60,7 @@ class Webhook < ApplicationRecord case event when 'account.approved', 'account.created', 'account.updated' :manage_users - when 'report.created' + when 'report.created', 'report.updated' :manage_reports when 'status.created', 'status.updated' :view_devops From 2dfa8f797a50364268c0e8434e37a29f9eeb652c Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 24 Jul 2023 17:55:36 +0200 Subject: [PATCH 101/557] Fix LinkCrawlWorker crashing on `null` `created_at` (#26151) --- app/lib/link_details_extractor.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb index a350cadf90..ffb25db2c1 100644 --- a/app/lib/link_details_extractor.rb +++ b/app/lib/link_details_extractor.rb @@ -124,7 +124,7 @@ class LinkDetailsExtractor author_url: author_url || '', embed_url: embed_url || '', language: language, - created_at: published_at, + created_at: published_at.presence || Time.now.utc, } end From 9a567ec1d1fdb50573c882b7e454285ef7f4200c Mon Sep 17 00:00:00 2001 From: gol-cha Date: Tue, 25 Jul 2023 00:56:20 +0900 Subject: [PATCH 102/557] Fix UI Overlap with the loupe icon in the Explore Tab (#26113) --- 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 b06a7130f8..91c2a0f641 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -5015,7 +5015,6 @@ a.status-card { position: absolute; top: 16px; inset-inline-end: 10px; - z-index: 2; display: inline-block; opacity: 0; transition: all 100ms linear; @@ -8136,6 +8135,7 @@ noscript { .search__input { border: 1px solid lighten($ui-base-color, 8%); padding: 10px; + padding-inline-end: 28px; } .search__popout { From d1a9f601c7eac36f94e91814d3b28ecebaf6ff32 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 24 Jul 2023 19:53:33 +0200 Subject: [PATCH 103/557] Fix missing border on error screen in light theme in web UI (#26152) --- app/javascript/styles/mastodon-light/diff.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index df89d9a5a5..601d515765 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -24,13 +24,16 @@ html { .column > .scrollable, .getting-started, .column-inline-form, -.error-column, .regeneration-indicator { background: $white; border: 1px solid lighten($ui-base-color, 8%); border-top: 0; } +.error-column { + border: 1px solid lighten($ui-base-color, 8%); +} + .column > .scrollable.about { border-top: 1px solid lighten($ui-base-color, 8%); } From 714a20697f5e2f7994df012a5a8bbb49bc56f2e7 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 24 Jul 2023 22:04:38 +0200 Subject: [PATCH 104/557] Fix missing action label on sensitive videos and embeds in web UI (#26135) --- app/javascript/mastodon/features/audio/index.jsx | 6 +++++- app/javascript/mastodon/features/status/components/card.jsx | 5 ++++- app/javascript/mastodon/features/video/index.jsx | 5 ++++- app/javascript/styles/mastodon/components.scss | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/javascript/mastodon/features/audio/index.jsx b/app/javascript/mastodon/features/audio/index.jsx index 72e76413b8..3f642bc74e 100644 --- a/app/javascript/mastodon/features/audio/index.jsx +++ b/app/javascript/mastodon/features/audio/index.jsx @@ -470,6 +470,7 @@ class Audio extends PureComponent { const progress = Math.min((currentTime / duration) * 100, 100); let warning; + if (sensitive) { warning = ; } else { @@ -515,7 +516,10 @@ class Audio extends PureComponent {
diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx index 7cf324760e..dcc699e385 100644 --- a/app/javascript/mastodon/features/status/components/card.jsx +++ b/app/javascript/mastodon/features/status/components/card.jsx @@ -184,7 +184,10 @@ export default class Card extends PureComponent { let spoilerButton = ( ); diff --git a/app/javascript/mastodon/features/video/index.jsx b/app/javascript/mastodon/features/video/index.jsx index b6a024c6e7..3f7e0ada14 100644 --- a/app/javascript/mastodon/features/video/index.jsx +++ b/app/javascript/mastodon/features/video/index.jsx @@ -567,7 +567,10 @@ class Video extends PureComponent {
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 91c2a0f641..e75e55fb33 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -4186,6 +4186,7 @@ a.status-card { margin: 0; border: 0; border-radius: 4px; + color: $white; &__label { display: flex; @@ -4193,7 +4194,6 @@ a.status-card { justify-content: center; gap: 8px; flex-direction: column; - color: $primary-text-color; font-weight: 500; font-size: 14px; } From 42992084872a74cfe6be2b56b35cf3d3cfa69c9f Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Mon, 24 Jul 2023 23:01:31 +0200 Subject: [PATCH 105/557] Fix `lang` for UI texts in link preview (#26149) --- .../mastodon/features/status/components/card.jsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx index dcc699e385..29a12c87bf 100644 --- a/app/javascript/mastodon/features/status/components/card.jsx +++ b/app/javascript/mastodon/features/status/components/card.jsx @@ -156,9 +156,12 @@ export default class Card extends PureComponent { const language = card.get('language') || ''; const description = ( -
- {provider}{card.get('published_at') && <> · } - {card.get('title')} +
+ + {provider} + {card.get('published_at') && <> · } + + {card.get('title')} {card.get('author_name').length > 0 && {card.get('author_name')} }} />}
); From f826a95f6e98b36841a87389590a65e79877fc7d Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 25 Jul 2023 00:57:15 +0200 Subject: [PATCH 106/557] Add published date and author to news on the explore screen in web UI (#26155) --- .../features/explore/components/story.jsx | 14 +++++-- .../mastodon/features/explore/links.jsx | 5 ++- .../styles/mastodon/components.scss | 41 +++++++++++++++---- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/app/javascript/mastodon/features/explore/components/story.jsx b/app/javascript/mastodon/features/explore/components/story.jsx index 42b65e7dcc..92eb41cff8 100644 --- a/app/javascript/mastodon/features/explore/components/story.jsx +++ b/app/javascript/mastodon/features/explore/components/story.jsx @@ -1,10 +1,13 @@ import PropTypes from 'prop-types'; import { PureComponent } from 'react'; +import { FormattedMessage } from 'react-intl'; + import classNames from 'classnames'; import { Blurhash } from 'mastodon/components/blurhash'; import { accountsCountRenderer } from 'mastodon/components/hashtag'; +import { RelativeTimestamp } from 'mastodon/components/relative_timestamp'; import { ShortNumber } from 'mastodon/components/short_number'; import { Skeleton } from 'mastodon/components/skeleton'; @@ -15,9 +18,12 @@ export default class Story extends PureComponent { title: PropTypes.string, lang: PropTypes.string, publisher: PropTypes.string, + publishedAt: PropTypes.string, + author: PropTypes.string, sharedTimes: PropTypes.number, thumbnail: PropTypes.string, blurhash: PropTypes.string, + expanded: PropTypes.bool, }; state = { @@ -27,16 +33,16 @@ export default class Story extends PureComponent { handleImageLoad = () => this.setState({ thumbnailLoaded: true }); render () { - const { url, title, lang, publisher, sharedTimes, thumbnail, blurhash } = this.props; + const { expanded, url, title, lang, publisher, author, publishedAt, sharedTimes, thumbnail, blurhash } = this.props; const { thumbnailLoaded } = this.state; return ( - +
-
{publisher ? publisher : }
+
{publisher ? {publisher} : }{publishedAt && <> · }
{title ? title : }
-
{typeof sharedTimes === 'number' ? : }
+
{author && <>{author} }} /> · }{typeof sharedTimes === 'number' ? : }
diff --git a/app/javascript/mastodon/features/explore/links.jsx b/app/javascript/mastodon/features/explore/links.jsx index 6f402decbf..489ab6dd61 100644 --- a/app/javascript/mastodon/features/explore/links.jsx +++ b/app/javascript/mastodon/features/explore/links.jsx @@ -55,13 +55,16 @@ class Links extends PureComponent {
{banner} - {isLoading ? () : links.map(link => ( + {isLoading ? () : links.map((link, i) => ( Date: Tue, 25 Jul 2023 03:46:57 -0400 Subject: [PATCH 107/557] Coverage for `Auth::OmniauthCallbacks` controller (#26147) --- .github/workflows/test-ruby.yml | 4 + .../auth/omniauth_callbacks_controller.rb | 39 ++++-- spec/requests/omniauth_callbacks_spec.rb | 124 ++++++++++++++++++ spec/support/omniauth_mocks.rb | 7 + 4 files changed, 163 insertions(+), 11 deletions(-) create mode 100644 spec/requests/omniauth_callbacks_spec.rb create mode 100644 spec/support/omniauth_mocks.rb diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml index 07cb1d41f8..ee9eefd458 100644 --- a/.github/workflows/test-ruby.yml +++ b/.github/workflows/test-ruby.yml @@ -107,6 +107,10 @@ jobs: PAM_ENABLED: true PAM_DEFAULT_SERVICE: pam_test PAM_CONTROLLED_SERVICE: pam_test_controlled + OIDC_ENABLED: true + OIDC_SCOPE: read + SAML_ENABLED: true + CAS_ENABLED: true BUNDLE_WITH: 'pam_authentication test' CI_JOBS: ${{ matrix.ci_job }}/4 diff --git a/app/controllers/auth/omniauth_callbacks_controller.rb b/app/controllers/auth/omniauth_callbacks_controller.rb index 9e0fb942aa..4723806b92 100644 --- a/app/controllers/auth/omniauth_callbacks_controller.rb +++ b/app/controllers/auth/omniauth_callbacks_controller.rb @@ -5,21 +5,13 @@ class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController def self.provides_callback_for(provider) define_method provider do + @provider = provider @user = User.find_for_oauth(request.env['omniauth.auth'], current_user) if @user.persisted? - LoginActivity.create( - user: @user, - success: true, - authentication_method: :omniauth, - provider: provider, - ip: request.remote_ip, - user_agent: request.user_agent - ) - + record_login_activity sign_in_and_redirect @user, event: :authentication - label = Devise.omniauth_configs[provider]&.strategy&.display_name.presence || I18n.t("auth.providers.#{provider}", default: provider.to_s.chomp('_oauth2').capitalize) - set_flash_message(:notice, :success, kind: label) if is_navigational_format? + set_flash_message(:notice, :success, kind: label_for_provider) if is_navigational_format? else session["devise.#{provider}_data"] = request.env['omniauth.auth'] redirect_to new_user_registration_url @@ -38,4 +30,29 @@ class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController auth_setup_path(missing_email: '1') end end + + private + + def record_login_activity + LoginActivity.create( + user: @user, + success: true, + authentication_method: :omniauth, + provider: @provider, + ip: request.remote_ip, + user_agent: request.user_agent + ) + end + + def label_for_provider + provider_display_name || configured_provider_name + end + + def provider_display_name + Devise.omniauth_configs[@provider]&.strategy&.display_name.presence + end + + def configured_provider_name + I18n.t("auth.providers.#{@provider}", default: @provider.to_s.chomp('_oauth2').capitalize) + end end diff --git a/spec/requests/omniauth_callbacks_spec.rb b/spec/requests/omniauth_callbacks_spec.rb new file mode 100644 index 0000000000..27aa5ec506 --- /dev/null +++ b/spec/requests/omniauth_callbacks_spec.rb @@ -0,0 +1,124 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'OmniAuth callbacks' do + shared_examples 'omniauth provider callbacks' do |provider| + subject { post send "user_#{provider}_omniauth_callback_path" } + + context 'with full information in response' do + before do + mock_omniauth(provider, { + provider: provider.to_s, + uid: '123', + info: { + verified: 'true', + email: 'user@host.example', + }, + }) + end + + context 'without a matching user' do + it 'creates a user and an identity and redirects to root path' do + expect { subject } + .to change(User, :count) + .by(1) + .and change(Identity, :count) + .by(1) + .and change(LoginActivity, :count) + .by(1) + + expect(User.last.email).to eq('user@host.example') + expect(Identity.find_by(user: User.last).uid).to eq('123') + expect(response).to redirect_to(root_path) + end + end + + context 'with a matching user and no matching identity' do + before do + Fabricate(:user, email: 'user@host.example') + end + + it 'matches the existing user, creates an identity, and redirects to root path' do + expect { subject } + .to not_change(User, :count) + .and change(Identity, :count) + .by(1) + .and change(LoginActivity, :count) + .by(1) + + expect(Identity.find_by(user: User.last).uid).to eq('123') + expect(response).to redirect_to(root_path) + end + end + + context 'with a matching user and a matching identity' do + before do + user = Fabricate(:user, email: 'user@host.example') + Fabricate(:identity, user: user, uid: '123', provider: provider) + end + + it 'matches the existing records and redirects to root path' do + expect { subject } + .to not_change(User, :count) + .and not_change(Identity, :count) + .and change(LoginActivity, :count) + .by(1) + + expect(response).to redirect_to(root_path) + end + end + end + + context 'with a response missing email address' do + before do + mock_omniauth(provider, { + provider: provider.to_s, + uid: '123', + info: { + verified: 'true', + }, + }) + end + + it 'redirects to the auth setup page' do + expect { subject } + .to change(User, :count) + .by(1) + .and change(Identity, :count) + .by(1) + .and change(LoginActivity, :count) + .by(1) + + expect(response).to redirect_to(auth_setup_path(missing_email: '1')) + end + end + + context 'when a user cannot be built' do + before do + allow(User).to receive(:find_for_oauth).and_return(User.new) + end + + it 'redirects to the new user signup page' do + expect { subject } + .to not_change(User, :count) + .and not_change(Identity, :count) + .and not_change(LoginActivity, :count) + + expect(response).to redirect_to(new_user_registration_url) + end + end + end + + describe '#openid_connect', if: ENV['OIDC_ENABLED'] == 'true' && ENV['OIDC_SCOPE'].present? do + include_examples 'omniauth provider callbacks', :openid_connect + end + + describe '#cas', if: ENV['CAS_ENABLED'] == 'true' do + include_examples 'omniauth provider callbacks', :cas + end + + describe '#saml', if: ENV['SAML_ENABLED'] == 'true' do + include_examples 'omniauth provider callbacks', :saml + end +end diff --git a/spec/support/omniauth_mocks.rb b/spec/support/omniauth_mocks.rb new file mode 100644 index 0000000000..9883adec7a --- /dev/null +++ b/spec/support/omniauth_mocks.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +OmniAuth.config.test_mode = true + +def mock_omniauth(provider, data) + OmniAuth.config.mock_auth[provider] = OmniAuth::AuthHash.new(data) +end From 49d2e8979fa43596e992719435117e368ab76254 Mon Sep 17 00:00:00 2001 From: Trevor Wolf Date: Tue, 25 Jul 2023 21:39:15 +1000 Subject: [PATCH 108/557] fix poll input active style (#26162) --- app/javascript/styles/mastodon/polls.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss index bcc8cfaaec..5bc017524d 100644 --- a/app/javascript/styles/mastodon/polls.scss +++ b/app/javascript/styles/mastodon/polls.scss @@ -128,6 +128,11 @@ border-width: 4px; } + &.active { + background-color: $ui-button-focus-background-color; + border-color: $ui-button-focus-background-color; + } + &::-moz-focus-inner { outline: 0 !important; border: 0; From 7bd8ef355cc5d9ab3409b602431d67f865a12103 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 25 Jul 2023 13:40:35 +0200 Subject: [PATCH 109/557] Add `published_at` attribute to preview cards (#26153) --- app/lib/link_details_extractor.rb | 2 +- app/models/preview_card.rb | 1 + .../rest/preview_card_serializer.rb | 4 - ...60715_add_published_at_to_preview_cards.rb | 7 + db/schema.rb | 432 +++++++++--------- 5 files changed, 225 insertions(+), 221 deletions(-) create mode 100644 db/migrate/20230724160715_add_published_at_to_preview_cards.rb diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb index ffb25db2c1..4ee07acdc0 100644 --- a/app/lib/link_details_extractor.rb +++ b/app/lib/link_details_extractor.rb @@ -124,7 +124,7 @@ class LinkDetailsExtractor author_url: author_url || '', embed_url: embed_url || '', language: language, - created_at: published_at.presence || Time.now.utc, + published_at: published_at.presence, } end diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb index a738940be8..d9ddd3ba0d 100644 --- a/app/models/preview_card.rb +++ b/app/models/preview_card.rb @@ -30,6 +30,7 @@ # max_score_at :datetime # trendable :boolean # link_type :integer +# published_at :datetime # class PreviewCard < ApplicationRecord diff --git a/app/serializers/rest/preview_card_serializer.rb b/app/serializers/rest/preview_card_serializer.rb index db44abb382..cf700ff24e 100644 --- a/app/serializers/rest/preview_card_serializer.rb +++ b/app/serializers/rest/preview_card_serializer.rb @@ -15,8 +15,4 @@ class REST::PreviewCardSerializer < ActiveModel::Serializer def html Sanitize.fragment(object.html, Sanitize::Config::MASTODON_OEMBED) end - - def published_at - object.created_at - end end diff --git a/db/migrate/20230724160715_add_published_at_to_preview_cards.rb b/db/migrate/20230724160715_add_published_at_to_preview_cards.rb new file mode 100644 index 0000000000..a1571b3b2a --- /dev/null +++ b/db/migrate/20230724160715_add_published_at_to_preview_cards.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddPublishedAtToPreviewCards < ActiveRecord::Migration[7.0] + def change + add_column :preview_cards, :published_at, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index ce064c3b5e..59ab9dbedf 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,8 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do - +ActiveRecord::Schema[7.0].define(version: 2023_07_24_160715) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -19,8 +18,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "account_id" t.string "acct", default: "", null: false t.string "uri", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["account_id"], name: "index_account_aliases_on_account_id" end @@ -38,15 +37,15 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "account_deletion_requests", force: :cascade do |t| t.bigint "account_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["account_id"], name: "index_account_deletion_requests_on_account_id" end create_table "account_domain_blocks", force: :cascade do |t| t.string "domain" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "account_id" t.index ["account_id", "domain"], name: "index_account_domain_blocks_on_account_id_and_domain", unique: true end @@ -56,8 +55,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "acct", default: "", null: false t.bigint "followers_count", default: 0, null: false t.bigint "target_account_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["account_id"], name: "index_account_migrations_on_account_id" t.index ["target_account_id"], name: "index_account_migrations_on_target_account_id", where: "(target_account_id IS NOT NULL)" end @@ -66,8 +65,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.text "content", null: false t.bigint "account_id", null: false t.bigint "target_account_id", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["account_id"], name: "index_account_moderation_notes_on_account_id" t.index ["target_account_id"], name: "index_account_moderation_notes_on_target_account_id" end @@ -76,8 +75,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "account_id" t.bigint "target_account_id" t.text "comment", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["account_id", "target_account_id"], name: "index_account_notes_on_account_id_and_target_account_id", unique: true t.index ["target_account_id"], name: "index_account_notes_on_target_account_id" end @@ -85,8 +84,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "account_pins", force: :cascade do |t| t.bigint "account_id" t.bigint "target_account_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["account_id", "target_account_id"], name: "index_account_pins_on_account_id_and_target_account_id", unique: true t.index ["target_account_id"], name: "index_account_pins_on_target_account_id" end @@ -96,9 +95,9 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "statuses_count", default: 0, null: false t.bigint "following_count", default: 0, null: false t.bigint "followers_count", default: 0, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.datetime "last_status_at" + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false + t.datetime "last_status_at", precision: nil t.index ["account_id"], name: "index_account_stats_on_account_id", unique: true end @@ -114,15 +113,15 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.boolean "keep_self_bookmark", default: true, null: false t.integer "min_favs" t.integer "min_reblogs" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["account_id"], name: "index_account_statuses_cleanup_policies_on_account_id" end create_table "account_warning_presets", force: :cascade do |t| t.text "text", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.string "title", default: "", null: false end @@ -131,11 +130,11 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "target_account_id" t.integer "action", default: 0, null: false t.text "text", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "report_id" t.string "status_ids", array: true - t.datetime "overruled_at" + t.datetime "overruled_at", precision: nil t.index ["account_id"], name: "index_account_warnings_on_account_id" t.index ["target_account_id"], name: "index_account_warnings_on_target_account_id" end @@ -145,8 +144,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "domain" t.text "private_key" t.text "public_key", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.text "note", default: "", null: false t.string "display_name", default: "", null: false t.string "uri", default: "", null: false @@ -154,15 +153,15 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "avatar_file_name" t.string "avatar_content_type" t.integer "avatar_file_size" - t.datetime "avatar_updated_at" + t.datetime "avatar_updated_at", precision: nil t.string "header_file_name" t.string "header_content_type" t.integer "header_file_size" - t.datetime "header_updated_at" + t.datetime "header_updated_at", precision: nil t.string "avatar_remote_url" t.boolean "locked", default: false, null: false t.string "header_remote_url", default: "", null: false - t.datetime "last_webfingered_at" + t.datetime "last_webfingered_at", precision: nil t.string "inbox_url", default: "", null: false t.string "outbox_url", default: "", null: false t.string "shared_inbox_url", default: "", null: false @@ -175,17 +174,17 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "actor_type" t.boolean "discoverable" t.string "also_known_as", array: true - t.datetime "silenced_at" - t.datetime "suspended_at" + t.datetime "silenced_at", precision: nil + t.datetime "suspended_at", precision: nil t.boolean "hide_collections" t.integer "avatar_storage_schema_version" t.integer "header_storage_schema_version" t.string "devices_url" t.integer "suspension_origin" - t.datetime "sensitized_at" + t.datetime "sensitized_at", precision: nil t.boolean "trendable" - t.datetime "reviewed_at" - t.datetime "requested_review_at" + t.datetime "reviewed_at", precision: nil + t.datetime "requested_review_at", precision: nil t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin t.index "lower((username)::text), COALESCE(lower((domain)::text), ''::text)", name: "index_accounts_on_username_and_domain_lower", unique: true t.index ["domain", "id"], name: "index_accounts_on_domain_and_id" @@ -205,8 +204,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "action", default: "", null: false t.string "target_type" t.bigint "target_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.string "human_identifier" t.string "route_param" t.string "permalink" @@ -217,8 +216,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "announcement_mutes", force: :cascade do |t| t.bigint "account_id" t.bigint "announcement_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["account_id", "announcement_id"], name: "index_announcement_mutes_on_account_id_and_announcement_id", unique: true t.index ["announcement_id"], name: "index_announcement_mutes_on_announcement_id" end @@ -228,8 +227,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "announcement_id" t.string "name", default: "", null: false t.bigint "custom_emoji_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["account_id", "announcement_id", "name"], name: "index_announcement_reactions_on_account_id_and_announcement_id", unique: true t.index ["announcement_id"], name: "index_announcement_reactions_on_announcement_id" t.index ["custom_emoji_id"], name: "index_announcement_reactions_on_custom_emoji_id", where: "(custom_emoji_id IS NOT NULL)" @@ -239,12 +238,12 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.text "text", default: "", null: false t.boolean "published", default: false, null: false t.boolean "all_day", default: false, null: false - t.datetime "scheduled_at" - t.datetime "starts_at" - t.datetime "ends_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.datetime "published_at" + t.datetime "scheduled_at", precision: nil + t.datetime "starts_at", precision: nil + t.datetime "ends_at", precision: nil + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false + t.datetime "published_at", precision: nil t.bigint "status_ids", array: true end @@ -252,12 +251,12 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "account_id", null: false t.bigint "account_warning_id", null: false t.text "text", default: "", null: false - t.datetime "approved_at" + t.datetime "approved_at", precision: nil t.bigint "approved_by_account_id" - t.datetime "rejected_at" + t.datetime "rejected_at", precision: nil t.bigint "rejected_by_account_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["account_id"], name: "index_appeals_on_account_id" t.index ["account_warning_id"], name: "index_appeals_on_account_warning_id", unique: true t.index ["approved_by_account_id"], name: "index_appeals_on_approved_by_account_id", where: "(approved_by_account_id IS NOT NULL)" @@ -268,17 +267,17 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "user_id" t.string "dump_file_name" t.string "dump_content_type" - t.datetime "dump_updated_at" + t.datetime "dump_updated_at", precision: nil t.boolean "processed", default: false, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "dump_file_size" t.index ["user_id"], name: "index_backups_on_user_id" end create_table "blocks", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "account_id", null: false t.bigint "target_account_id", null: false t.string "uri" @@ -289,8 +288,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "bookmarks", force: :cascade do |t| t.bigint "account_id", null: false t.bigint "status_id", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["account_id", "status_id"], name: "index_bookmarks_on_account_id_and_status_id", unique: true t.index ["status_id"], name: "index_bookmarks_on_status_id" end @@ -298,8 +297,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "bulk_import_rows", force: :cascade do |t| t.bigint "bulk_import_id", null: false t.jsonb "data" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["bulk_import_id"], name: "index_bulk_import_rows_on_bulk_import_id" end @@ -309,13 +308,13 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.integer "total_items", default: 0, null: false t.integer "imported_items", default: 0, null: false t.integer "processed_items", default: 0, null: false - t.datetime "finished_at" + t.datetime "finished_at", precision: nil t.boolean "overwrite", default: false, null: false t.boolean "likely_mismatched", default: false, null: false t.string "original_filename", default: "", null: false t.bigint "account_id", null: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["account_id"], name: "index_bulk_imports_on_account_id" t.index ["id"], name: "index_bulk_imports_unconfirmed", where: "(state = 0)" end @@ -323,8 +322,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "canonical_email_blocks", force: :cascade do |t| t.string "canonical_email_hash", default: "", null: false t.bigint "reference_account_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["canonical_email_hash"], name: "index_canonical_email_blocks_on_canonical_email_hash", unique: true t.index ["reference_account_id"], name: "index_canonical_email_blocks_on_reference_account_id" end @@ -337,15 +336,15 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "conversations", force: :cascade do |t| t.string "uri" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["uri"], name: "index_conversations_on_uri", unique: true, opclass: :text_pattern_ops, where: "(uri IS NOT NULL)" end create_table "custom_emoji_categories", force: :cascade do |t| t.string "name" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["name"], name: "index_custom_emoji_categories_on_name", unique: true end @@ -355,9 +354,9 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "image_file_name" t.string "image_content_type" t.integer "image_file_size" - t.datetime "image_updated_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "image_updated_at", precision: nil + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.boolean "disabled", default: false, null: false t.string "uri" t.string "image_remote_url" @@ -371,27 +370,27 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "custom_filter_id", null: false t.text "keyword", default: "", null: false t.boolean "whole_word", default: true, null: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["custom_filter_id"], name: "index_custom_filter_keywords_on_custom_filter_id" end create_table "custom_filter_statuses", force: :cascade do |t| t.bigint "custom_filter_id", null: false t.bigint "status_id", null: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["custom_filter_id"], name: "index_custom_filter_statuses_on_custom_filter_id" t.index ["status_id"], name: "index_custom_filter_statuses_on_status_id" end create_table "custom_filters", force: :cascade do |t| t.bigint "account_id" - t.datetime "expires_at" + t.datetime "expires_at", precision: nil t.text "phrase", default: "", null: false t.string "context", default: [], null: false, array: true - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.integer "action", default: 0, null: false t.index ["account_id"], name: "index_custom_filters_on_account_id" end @@ -403,23 +402,23 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "name", default: "", null: false t.text "fingerprint_key", default: "", null: false t.text "identity_key", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["access_token_id"], name: "index_devices_on_access_token_id" t.index ["account_id"], name: "index_devices_on_account_id" end create_table "domain_allows", force: :cascade do |t| t.string "domain", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["domain"], name: "index_domain_allows_on_domain", unique: true end create_table "domain_blocks", force: :cascade do |t| t.string "domain", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.integer "severity", default: 0 t.boolean "reject_media", default: false, null: false t.boolean "reject_reports", default: false, null: false @@ -431,8 +430,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "email_domain_blocks", force: :cascade do |t| t.string "domain", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "parent_id" t.index ["domain"], name: "index_email_domain_blocks_on_domain", unique: true end @@ -445,15 +444,15 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.text "body", default: "", null: false t.text "digest", default: "", null: false t.text "message_franking", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["device_id"], name: "index_encrypted_messages_on_device_id" t.index ["from_account_id"], name: "index_encrypted_messages_on_from_account_id" end create_table "favourites", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "account_id", null: false t.bigint "status_id", null: false t.index ["account_id", "id"], name: "index_favourites_on_account_id_and_id" @@ -465,9 +464,9 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "account_id", null: false t.bigint "tag_id", null: false t.bigint "statuses_count", default: 0, null: false - t.datetime "last_status_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "last_status_at", precision: nil + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.string "name" t.index ["account_id", "tag_id"], name: "index_featured_tags_on_account_id_and_tag_id", unique: true t.index ["tag_id"], name: "index_featured_tags_on_tag_id" @@ -475,14 +474,14 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "follow_recommendation_suppressions", force: :cascade do |t| t.bigint "account_id", null: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["account_id"], name: "index_follow_recommendation_suppressions_on_account_id", unique: true end create_table "follow_requests", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "account_id", null: false t.bigint "target_account_id", null: false t.boolean "show_reblogs", default: true, null: false @@ -493,8 +492,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do end create_table "follows", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "account_id", null: false t.bigint "target_account_id", null: false t.boolean "show_reblogs", default: true, null: false @@ -508,8 +507,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "identities", force: :cascade do |t| t.string "provider", default: "", null: false t.string "uid", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "user_id" t.index ["user_id"], name: "index_identities_on_user_id" end @@ -517,12 +516,12 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "imports", force: :cascade do |t| t.integer "type", null: false t.boolean "approved", default: false, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.string "data_file_name" t.string "data_content_type" t.integer "data_file_size" - t.datetime "data_updated_at" + t.datetime "data_updated_at", precision: nil t.bigint "account_id", null: false t.boolean "overwrite", default: false, null: false end @@ -530,11 +529,11 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "invites", force: :cascade do |t| t.bigint "user_id", null: false t.string "code", default: "", null: false - t.datetime "expires_at" + t.datetime "expires_at", precision: nil t.integer "max_uses" t.integer "uses", default: 0, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.boolean "autofollow", default: false, null: false t.text "comment" t.index ["code"], name: "index_invites_on_code", unique: true @@ -542,9 +541,9 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do end create_table "ip_blocks", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.datetime "expires_at" + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false + t.datetime "expires_at", precision: nil t.inet "ip", default: "0.0.0.0", null: false t.integer "severity", default: 0, null: false t.text "comment", default: "", null: false @@ -565,8 +564,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "lists", force: :cascade do |t| t.bigint "account_id", null: false t.string "title", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.integer "replies_policy", default: 0, null: false t.boolean "exclusive", default: false, null: false t.index ["account_id"], name: "index_lists_on_account_id" @@ -580,7 +579,7 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "failure_reason" t.inet "ip" t.string "user_agent" - t.datetime "created_at" + t.datetime "created_at", precision: nil t.index ["user_id"], name: "index_login_activities_on_user_id" end @@ -589,8 +588,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "timeline", default: "", null: false t.bigint "last_read_id", default: 0, null: false t.integer "lock_version", default: 0, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["user_id", "timeline"], name: "index_markers_on_user_id_and_timeline", unique: true end @@ -599,10 +598,10 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "file_file_name" t.string "file_content_type" t.integer "file_file_size" - t.datetime "file_updated_at" + t.datetime "file_updated_at", precision: nil t.string "remote_url", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.string "shortcode" t.integer "type", default: 0, null: false t.json "file_meta" @@ -615,7 +614,7 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "thumbnail_file_name" t.string "thumbnail_content_type" t.integer "thumbnail_file_size" - t.datetime "thumbnail_updated_at" + t.datetime "thumbnail_updated_at", precision: nil t.string "thumbnail_remote_url" t.index ["account_id", "status_id"], name: "index_media_attachments_on_account_id_and_status_id", order: { status_id: :desc } t.index ["scheduled_status_id"], name: "index_media_attachments_on_scheduled_status_id", where: "(scheduled_status_id IS NOT NULL)" @@ -625,8 +624,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "mentions", force: :cascade do |t| t.bigint "status_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "account_id" t.boolean "silent", default: false, null: false t.index ["account_id", "status_id"], name: "index_mentions_on_account_id_and_status_id", unique: true @@ -634,12 +633,12 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do end create_table "mutes", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.boolean "hide_notifications", default: true, null: false t.bigint "account_id", null: false t.bigint "target_account_id", null: false - t.datetime "expires_at" + t.datetime "expires_at", precision: nil t.index ["account_id", "target_account_id"], name: "index_mutes_on_account_id_and_target_account_id", unique: true t.index ["target_account_id"], name: "index_mutes_on_target_account_id" end @@ -647,8 +646,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "notifications", force: :cascade do |t| t.bigint "activity_id", null: false t.string "activity_type", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "account_id", null: false t.bigint "from_account_id", null: false t.string "type" @@ -661,8 +660,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "token", null: false t.integer "expires_in", null: false t.text "redirect_uri", null: false - t.datetime "created_at", null: false - t.datetime "revoked_at" + t.datetime "created_at", precision: nil, null: false + t.datetime "revoked_at", precision: nil t.string "scopes" t.bigint "application_id", null: false t.bigint "resource_owner_id", null: false @@ -674,12 +673,12 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "token", null: false t.string "refresh_token" t.integer "expires_in" - t.datetime "revoked_at" - t.datetime "created_at", null: false + t.datetime "revoked_at", precision: nil + t.datetime "created_at", precision: nil, null: false t.string "scopes" t.bigint "application_id" t.bigint "resource_owner_id" - t.datetime "last_used_at" + t.datetime "last_used_at", precision: nil t.inet "last_used_ip" t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true, opclass: :text_pattern_ops, where: "(refresh_token IS NOT NULL)" t.index ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", where: "(resource_owner_id IS NOT NULL)" @@ -692,8 +691,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "secret", null: false t.text "redirect_uri", null: false t.string "scopes", default: "", null: false - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", precision: nil + t.datetime "updated_at", precision: nil t.boolean "superapp", default: false, null: false t.string "website" t.string "owner_type" @@ -709,8 +708,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "key_id", default: "", null: false t.text "key", default: "", null: false t.text "signature", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["device_id"], name: "index_one_time_keys_on_device_id" t.index ["key_id"], name: "index_one_time_keys_on_key_id" end @@ -720,7 +719,7 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.text "schema" t.text "relation" t.bigint "size" - t.datetime "captured_at" + t.datetime "captured_at", precision: nil t.index ["database", "captured_at"], name: "index_pghero_space_stats_on_database_and_captured_at" end @@ -728,8 +727,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "account_id" t.bigint "poll_id" t.integer "choice", default: 0, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.string "uri" t.index ["account_id"], name: "index_poll_votes_on_account_id" t.index ["poll_id"], name: "index_poll_votes_on_poll_id" @@ -738,15 +737,15 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "polls", force: :cascade do |t| t.bigint "account_id" t.bigint "status_id" - t.datetime "expires_at" + t.datetime "expires_at", precision: nil t.string "options", default: [], null: false, array: true t.bigint "cached_tallies", default: [], null: false, array: true t.boolean "multiple", default: false, null: false t.boolean "hide_totals", default: false, null: false t.bigint "votes_count", default: 0, null: false - t.datetime "last_fetched_at" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "last_fetched_at", precision: nil + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.integer "lock_version", default: 0, null: false t.bigint "voters_count" t.index ["account_id"], name: "index_polls_on_account_id" @@ -758,12 +757,12 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "icon_file_name" t.string "icon_content_type" t.bigint "icon_file_size" - t.datetime "icon_updated_at" + t.datetime "icon_updated_at", precision: nil t.boolean "trendable" - t.datetime "reviewed_at" - t.datetime "requested_review_at" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "reviewed_at", precision: nil + t.datetime "requested_review_at", precision: nil + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["domain"], name: "index_preview_card_providers_on_domain", unique: true end @@ -783,7 +782,7 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "image_file_name" t.string "image_content_type" t.integer "image_file_size" - t.datetime "image_updated_at" + t.datetime "image_updated_at", precision: nil t.integer "type", default: 0, null: false t.text "html", default: "", null: false t.string "author_name", default: "", null: false @@ -792,16 +791,17 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "provider_url", default: "", null: false t.integer "width", default: 0, null: false t.integer "height", default: 0, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.string "embed_url", default: "", null: false t.integer "image_storage_schema_version" t.string "blurhash" t.string "language" t.float "max_score" - t.datetime "max_score_at" + t.datetime "max_score_at", precision: nil t.boolean "trendable" t.integer "link_type" + t.datetime "published_at" t.index ["url"], name: "index_preview_cards_on_url", unique: true end @@ -814,8 +814,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "relays", force: :cascade do |t| t.string "inbox_url", default: "", null: false t.string "follow_activity_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.integer "state", default: 0, null: false end @@ -823,8 +823,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.text "content", null: false t.bigint "report_id", null: false t.bigint "account_id", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["account_id"], name: "index_report_notes_on_account_id" t.index ["report_id"], name: "index_report_notes_on_report_id" end @@ -832,8 +832,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "reports", force: :cascade do |t| t.bigint "status_ids", default: [], null: false, array: true t.text "comment", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "account_id", null: false t.bigint "action_taken_by_account_id" t.bigint "target_account_id", null: false @@ -841,7 +841,7 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "uri" t.boolean "forwarded" t.integer "category", default: 0, null: false - t.datetime "action_taken_at" + t.datetime "action_taken_at", precision: nil t.bigint "rule_ids", array: true t.index ["account_id"], name: "index_reports_on_account_id" t.index ["action_taken_by_account_id"], name: "index_reports_on_action_taken_by_account_id", where: "(action_taken_by_account_id IS NOT NULL)" @@ -851,15 +851,15 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "rules", force: :cascade do |t| t.integer "priority", default: 0, null: false - t.datetime "deleted_at" + t.datetime "deleted_at", precision: nil t.text "text", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false end create_table "scheduled_statuses", force: :cascade do |t| t.bigint "account_id" - t.datetime "scheduled_at" + t.datetime "scheduled_at", precision: nil t.jsonb "params" t.index ["account_id"], name: "index_scheduled_statuses_on_account_id" t.index ["scheduled_at"], name: "index_scheduled_statuses_on_scheduled_at" @@ -867,8 +867,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "session_activations", force: :cascade do |t| t.string "session_id", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.string "user_agent", default: "", null: false t.inet "ip" t.bigint "access_token_id" @@ -883,8 +883,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "var", null: false t.text "value" t.string "thing_type" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", precision: nil + t.datetime "updated_at", precision: nil t.bigint "thing_id" t.index ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true end @@ -894,10 +894,10 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "file_file_name" t.string "file_content_type" t.integer "file_file_size" - t.datetime "file_updated_at" + t.datetime "file_updated_at", precision: nil t.json "meta" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.string "blurhash" t.index ["var"], name: "index_site_uploads_on_var", unique: true end @@ -907,8 +907,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "account_id" t.text "text", default: "", null: false t.text "spoiler_text", default: "", null: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.bigint "ordered_media_attachment_ids", array: true t.text "media_descriptions", array: true t.string "poll_options", array: true @@ -920,8 +920,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "status_pins", force: :cascade do |t| t.bigint "account_id", null: false t.bigint "status_id", null: false - t.datetime "created_at", default: -> { "now()" }, null: false - t.datetime "updated_at", default: -> { "now()" }, null: false + t.datetime "created_at", precision: nil, default: -> { "now()" }, null: false + t.datetime "updated_at", precision: nil, default: -> { "now()" }, null: false t.index ["account_id", "status_id"], name: "index_status_pins_on_account_id_and_status_id", unique: true t.index ["status_id"], name: "index_status_pins_on_status_id" end @@ -931,8 +931,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "replies_count", default: 0, null: false t.bigint "reblogs_count", default: 0, null: false t.bigint "favourites_count", default: 0, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["status_id"], name: "index_status_stats_on_status_id", unique: true end @@ -950,8 +950,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "statuses", id: :bigint, default: -> { "timestamp_id('statuses'::text)" }, force: :cascade do |t| t.string "uri" t.text "text", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "in_reply_to_id" t.bigint "reblog_of_id" t.string "url" @@ -966,8 +966,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "application_id" t.bigint "in_reply_to_account_id" t.bigint "poll_id" - t.datetime "deleted_at" - t.datetime "edited_at" + t.datetime "deleted_at", precision: nil + t.datetime "edited_at", precision: nil t.boolean "trendable" t.bigint "ordered_media_attachment_ids", array: true t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20190820", order: { id: :desc }, where: "(deleted_at IS NULL)" @@ -989,31 +989,31 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "system_keys", force: :cascade do |t| t.binary "key" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false end create_table "tag_follows", force: :cascade do |t| t.bigint "tag_id", null: false t.bigint "account_id", null: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["account_id", "tag_id"], name: "index_tag_follows_on_account_id_and_tag_id", unique: true t.index ["tag_id"], name: "index_tag_follows_on_tag_id" end create_table "tags", force: :cascade do |t| t.string "name", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.boolean "usable" t.boolean "trendable" t.boolean "listable" - t.datetime "reviewed_at" - t.datetime "requested_review_at" - t.datetime "last_status_at" + t.datetime "reviewed_at", precision: nil + t.datetime "requested_review_at", precision: nil + t.datetime "last_status_at", precision: nil t.float "max_score" - t.datetime "max_score_at" + t.datetime "max_score_at", precision: nil t.string "display_name" t.index "lower((name)::text) text_pattern_ops", name: "index_tags_on_name_lower_btree", unique: true end @@ -1021,8 +1021,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "tombstones", force: :cascade do |t| t.bigint "account_id" t.string "uri", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.boolean "by_moderator" t.index ["account_id"], name: "index_tombstones_on_account_id" t.index ["uri"], name: "index_tombstones_on_uri" @@ -1030,16 +1030,16 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "unavailable_domains", force: :cascade do |t| t.string "domain", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["domain"], name: "index_unavailable_domains_on_domain", unique: true end create_table "user_invite_requests", force: :cascade do |t| t.bigint "user_id" t.text "text" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["user_id"], name: "index_user_invite_requests_on_user_id" end @@ -1049,24 +1049,24 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.integer "position", default: 0, null: false t.bigint "permissions", default: 0, null: false t.boolean "highlighted", default: false, null: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "users", force: :cascade do |t| t.string "email", default: "", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.string "encrypted_password", default: "", null: false t.string "reset_password_token" - t.datetime "reset_password_sent_at" + t.datetime "reset_password_sent_at", precision: nil t.integer "sign_in_count", default: 0, null: false - t.datetime "current_sign_in_at" - t.datetime "last_sign_in_at" + t.datetime "current_sign_in_at", precision: nil + t.datetime "last_sign_in_at", precision: nil t.boolean "admin", default: false, null: false t.string "confirmation_token" - t.datetime "confirmed_at" - t.datetime "confirmation_sent_at" + t.datetime "confirmed_at", precision: nil + t.datetime "confirmation_sent_at", precision: nil t.string "unconfirmed_email" t.string "locale" t.string "encrypted_otp_secret" @@ -1074,7 +1074,7 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "encrypted_otp_secret_salt" t.integer "consumed_timestep" t.boolean "otp_required_for_login", default: false, null: false - t.datetime "last_emailed_at" + t.datetime "last_emailed_at", precision: nil t.string "otp_backup_codes", array: true t.bigint "account_id", null: false t.boolean "disabled", default: false, null: false @@ -1084,7 +1084,7 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.bigint "created_by_application_id" t.boolean "approved", default: true, null: false t.string "sign_in_token" - t.datetime "sign_in_token_sent_at" + t.datetime "sign_in_token_sent_at", precision: nil t.string "webauthn_id" t.inet "sign_up_ip" t.boolean "skip_sign_in_token" @@ -1105,8 +1105,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "key_p256dh", null: false t.string "key_auth", null: false t.json "data" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "access_token_id" t.bigint "user_id" t.index ["access_token_id"], name: "index_web_push_subscriptions_on_access_token_id", where: "(access_token_id IS NOT NULL)" @@ -1115,8 +1115,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do create_table "web_settings", force: :cascade do |t| t.json "data" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.bigint "user_id", null: false t.index ["user_id"], name: "index_web_settings_on_user_id", unique: true end @@ -1127,8 +1127,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "nickname", null: false t.bigint "sign_count", default: 0, null: false t.bigint "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false t.index ["external_id"], name: "index_webauthn_credentials_on_external_id", unique: true t.index ["user_id"], name: "index_webauthn_credentials_on_user_id" end @@ -1138,8 +1138,8 @@ ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do t.string "events", default: [], null: false, array: true t.string "secret", default: "", null: false t.boolean "enabled", default: true, null: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.text "template" t.index ["url"], name: "index_webhooks_on_url", unique: true end From edc104c9ef7db2aa6edae83c9e5cc3d9c708e423 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 14:45:35 +0200 Subject: [PATCH 110/557] Update dependency sass to v1.64.1 (#26146) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0789a5f6de..1d9df1e5e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10238,9 +10238,9 @@ sass-loader@^10.2.0: semver "^7.3.2" sass@^1.62.1: - version "1.63.6" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.6.tgz#481610e612902e0c31c46b46cf2dad66943283ea" - integrity sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw== + version "1.64.1" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.64.1.tgz#6a46f6d68e0fa5ad90aa59ce025673ddaa8441cf" + integrity sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From ce1f35d7e213327549b960bb64f63c67a141ea40 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 25 Jul 2023 15:32:59 +0200 Subject: [PATCH 111/557] Revert poll colors to green outside of compose form (#26164) --- app/javascript/styles/mastodon/polls.scss | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss index 5bc017524d..8a26e611ca 100644 --- a/app/javascript/styles/mastodon/polls.scss +++ b/app/javascript/styles/mastodon/polls.scss @@ -105,7 +105,7 @@ &__input { display: inline-block; position: relative; - border: 1px solid $ui-button-background-color; + border: 1px solid $ui-primary-color; box-sizing: border-box; width: 18px; height: 18px; @@ -124,13 +124,13 @@ &:active, &:focus, &:hover { - border-color: $ui-button-focus-background-color; + border-color: lighten($valid-value-color, 15%); border-width: 4px; } &.active { - background-color: $ui-button-focus-background-color; - border-color: $ui-button-focus-background-color; + background-color: $valid-value-color; + border-color: $valid-value-color; } &::-moz-focus-inner { @@ -216,6 +216,14 @@ padding: 10px; } + .poll__input { + &:active, + &:focus, + &:hover { + border-color: $ui-button-focus-background-color; + } + } + .poll__footer { border-top: 1px solid darken($simple-background-color, 8%); padding: 10px; From 6781dc6462b0511a2d3e6e08c965b7006ffd3331 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Tue, 25 Jul 2023 20:29:31 +0200 Subject: [PATCH 112/557] Preserve translation on status re-import (#26168) --- .../mastodon/actions/importer/index.js | 6 ++-- .../mastodon/actions/importer/normalizer.js | 33 +++++++++++++++---- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/app/javascript/mastodon/actions/importer/index.js b/app/javascript/mastodon/actions/importer/index.js index 9c69be601e..369be6b8fb 100644 --- a/app/javascript/mastodon/actions/importer/index.js +++ b/app/javascript/mastodon/actions/importer/index.js @@ -81,7 +81,7 @@ export function importFetchedStatuses(statuses) { } if (status.poll && status.poll.id) { - pushUnique(polls, normalizePoll(status.poll)); + pushUnique(polls, normalizePoll(status.poll, getState().getIn(['polls', status.poll.id]))); } } @@ -95,7 +95,7 @@ export function importFetchedStatuses(statuses) { } export function importFetchedPoll(poll) { - return dispatch => { - dispatch(importPolls([normalizePoll(poll)])); + return (dispatch, getState) => { + dispatch(importPolls([normalizePoll(poll, getState().getIn(['polls', poll.id]))])); }; } diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js index 9ed6b583b5..67368abb24 100644 --- a/app/javascript/mastodon/actions/importer/normalizer.js +++ b/app/javascript/mastodon/actions/importer/normalizer.js @@ -76,6 +76,7 @@ export function normalizeStatus(status, normalOldStatus) { normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml'); normalStatus.spoiler_text = normalOldStatus.get('spoiler_text'); normalStatus.hidden = normalOldStatus.get('hidden'); + normalStatus.translation = normalOldStatus.get('translation'); } else { // If the status has a CW but no contents, treat the CW as if it were the // status' contents, to avoid having a CW toggle with seemingly no effect. @@ -94,6 +95,18 @@ export function normalizeStatus(status, normalOldStatus) { normalStatus.hidden = expandSpoilers ? false : spoilerText.length > 0 || normalStatus.sensitive; } + if (normalOldStatus) { + const list = normalOldStatus.get('media_attachments'); + if (normalStatus.media_attachments && list) { + normalStatus.media_attachments.forEach(item => { + const oldItem = list.find(i => i.get('id') === item.id); + if (oldItem && oldItem.get('description') === item.description) { + item.translation = oldItem.get('translation') + } + }); + } + } + return normalStatus; } @@ -112,15 +125,23 @@ export function normalizeStatusTranslation(translation, status) { return normalTranslation; } -export function normalizePoll(poll) { +export function normalizePoll(poll, normalOldPoll) { const normalPoll = { ...poll }; const emojiMap = makeEmojiMap(poll.emojis); - normalPoll.options = poll.options.map((option, index) => ({ - ...option, - voted: poll.own_votes && poll.own_votes.includes(index), - titleHtml: emojify(escapeTextContentForBrowser(option.title), emojiMap), - })); + normalPoll.options = poll.options.map((option, index) => { + const normalOption = { + ...option, + voted: poll.own_votes && poll.own_votes.includes(index), + titleHtml: emojify(escapeTextContentForBrowser(option.title), emojiMap), + } + + if (normalOldPoll && normalOldPoll.getIn(['options', index, 'title']) === option.title) { + normalOption.translation = normalOldPoll.getIn(['options', index, 'translation']); + } + + return normalOption + }); return normalPoll; } From a4b69bec2eab61f2c3dcebddfe1474be386f828e Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Wed, 26 Jul 2023 03:33:31 +0200 Subject: [PATCH 113/557] Fix missing GIF badge in account gallery (#26166) --- .../features/account_gallery/components/media_item.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.jsx b/app/javascript/mastodon/features/account_gallery/components/media_item.jsx index f60be5d54d..63fbac6799 100644 --- a/app/javascript/mastodon/features/account_gallery/components/media_item.jsx +++ b/app/javascript/mastodon/features/account_gallery/components/media_item.jsx @@ -128,7 +128,11 @@ export default class MediaItem extends ImmutablePureComponent {
{content} - {label && {label}} + {label && ( +
+ {label} +
+ )}
); } From 7d62e3b198f3a668acc66cc7659859b3b188d108 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 26 Jul 2023 03:44:51 -0400 Subject: [PATCH 114/557] Reformat large text arg in `FetchLinkCardService` spec (#26183) --- spec/services/fetch_link_card_service_spec.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb index 133d664410..eba38b6998 100644 --- a/spec/services/fetch_link_card_service_spec.rb +++ b/spec/services/fetch_link_card_service_spec.rb @@ -100,7 +100,14 @@ RSpec.describe FetchLinkCardService, type: :service do end context 'with a remote status' do - let(:status) { Fabricate(:status, account: Fabricate(:account, domain: 'example.com'), text: 'Habt ihr ein paar gute Links zu foo #Wannacry herumfliegen? Ich will mal unter
https://github.com/qbi/WannaCry was sammeln. !security ') } + let(:status) do + Fabricate(:status, account: Fabricate(:account, domain: 'example.com'), text: <<-TEXT) + Habt ihr ein paar gute Links zu foo + #Wannacry herumfliegen? + Ich will mal unter
https://github.com/qbi/WannaCry was sammeln. ! + security  + TEXT + end it 'parses out URLs' do expect(a_request(:get, 'https://github.com/qbi/WannaCry')).to have_been_made.at_least_once From bada7a65aa2aef470f6734b856d9d79f06a5b84d Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 26 Jul 2023 03:45:27 -0400 Subject: [PATCH 115/557] Ignore long line in regex initializer (#26182) --- config/initializers/twitter_regex.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb index 4673fbdd41..94db57b66d 100644 --- a/config/initializers/twitter_regex.rb +++ b/config/initializers/twitter_regex.rb @@ -26,7 +26,9 @@ module Twitter::TwitterText ) \) /iox + # rubocop:disable UCHARS = '\u{A0}-\u{D7FF}\u{F900}-\u{FDCF}\u{FDF0}-\u{FFEF}\u{10000}-\u{1FFFD}\u{20000}-\u{2FFFD}\u{30000}-\u{3FFFD}\u{40000}-\u{4FFFD}\u{50000}-\u{5FFFD}\u{60000}-\u{6FFFD}\u{70000}-\u{7FFFD}\u{80000}-\u{8FFFD}\u{90000}-\u{9FFFD}\u{A0000}-\u{AFFFD}\u{B0000}-\u{BFFFD}\u{C0000}-\u{CFFFD}\u{D0000}-\u{DFFFD}\u{E1000}-\u{EFFFD}\u{E000}-\u{F8FF}\u{F0000}-\u{FFFFD}\u{100000}-\u{10FFFD}' + # rubocop:enable REGEXEN[:valid_url_query_chars] = %r{[a-z0-9!?*'();:&=+$/%#\[\]\-_.,~|@\^#{UCHARS}]}iou REGEXEN[:valid_url_query_ending_chars] = %r{[a-z0-9_&=#/\-#{UCHARS}]}iou REGEXEN[:valid_url_path] = %r{(?: From 2d9808f6481ef797d43a57a42b2343ffbbfaaaca Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 26 Jul 2023 03:45:50 -0400 Subject: [PATCH 116/557] Reformat large key values in service specs (#26181) --- .../fetch_remote_key_service_spec.rb | 12 +++++++++- .../process_collection_service_spec.rb | 23 ++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/spec/services/activitypub/fetch_remote_key_service_spec.rb b/spec/services/activitypub/fetch_remote_key_service_spec.rb index cd8f29dddd..e210d20ec7 100644 --- a/spec/services/activitypub/fetch_remote_key_service_spec.rb +++ b/spec/services/activitypub/fetch_remote_key_service_spec.rb @@ -8,7 +8,17 @@ RSpec.describe ActivityPub::FetchRemoteKeyService, type: :service do let(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } } let(:public_key_pem) do - "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu3L4vnpNLzVH31MeWI39\n4F0wKeJFsLDAsNXGeOu0QF2x+h1zLWZw/agqD2R3JPU9/kaDJGPIV2Sn5zLyUA9S\n6swCCMOtn7BBR9g9sucgXJmUFB0tACH2QSgHywMAybGfmSb3LsEMNKsGJ9VsvYoh\n8lDET6X4Pyw+ZJU0/OLo/41q9w+OrGtlsTm/PuPIeXnxa6BLqnDaxC+4IcjG/FiP\nahNCTINl/1F/TgSSDZ4Taf4U9XFEIFw8wmgploELozzIzKq+t8nhQYkgAkt64euW\npva3qL5KD1mTIZQEP+LZvh3s2WHrLi3fhbdRuwQ2c0KkJA2oSTFPDpqqbPGZ3Qvu\nHQIDAQAB\n-----END PUBLIC KEY-----\n" + <<~TEXT + -----BEGIN PUBLIC KEY----- + MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu3L4vnpNLzVH31MeWI39 + 4F0wKeJFsLDAsNXGeOu0QF2x+h1zLWZw/agqD2R3JPU9/kaDJGPIV2Sn5zLyUA9S + 6swCCMOtn7BBR9g9sucgXJmUFB0tACH2QSgHywMAybGfmSb3LsEMNKsGJ9VsvYoh + 8lDET6X4Pyw+ZJU0/OLo/41q9w+OrGtlsTm/PuPIeXnxa6BLqnDaxC+4IcjG/FiP + ahNCTINl/1F/TgSSDZ4Taf4U9XFEIFw8wmgploELozzIzKq+t8nhQYkgAkt64euW + pva3qL5KD1mTIZQEP+LZvh3s2WHrLi3fhbdRuwQ2c0KkJA2oSTFPDpqqbPGZ3Qvu + HQIDAQAB + -----END PUBLIC KEY----- + TEXT end let(:public_key_id) { 'https://example.com/alice#main-key' } diff --git a/spec/services/activitypub/process_collection_service_spec.rb b/spec/services/activitypub/process_collection_service_spec.rb index 3cd60a6195..02011afea0 100644 --- a/spec/services/activitypub/process_collection_service_spec.rb +++ b/spec/services/activitypub/process_collection_service_spec.rb @@ -100,8 +100,18 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do username: 'bob', domain: 'example.com', uri: 'https://example.com/users/bob', - public_key: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuuYyoyfsRkYnXRotMsId\nW3euBDDfiv9oVqOxUVC7bhel8KednIMrMCRWFAkgJhbrlzbIkjVr68o1MP9qLcn7\nCmH/BXHp7yhuFTr4byjdJKpwB+/i2jNEsvDH5jR8WTAeTCe0x/QHg21V3F7dSI5m\nCCZ/1dSIyOXLRTWVlfDlm3rE4ntlCo+US3/7oSWbg/4/4qEnt1HC32kvklgScxua\n4LR5ATdoXa5bFoopPWhul7MJ6NyWCyQyScUuGdlj8EN4kmKQJvphKHrI9fvhgOuG\nTvhTR1S5InA4azSSchY0tXEEw/VNxraeX0KPjbgr6DPcwhPd/m0nhVDq0zVyVBBD\nMwIDAQAB\n-----END PUBLIC KEY-----\n", - private_key: nil) + private_key: nil, + public_key: <<~TEXT) + -----BEGIN PUBLIC KEY----- + MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuuYyoyfsRkYnXRotMsId + W3euBDDfiv9oVqOxUVC7bhel8KednIMrMCRWFAkgJhbrlzbIkjVr68o1MP9qLcn7 + CmH/BXHp7yhuFTr4byjdJKpwB+/i2jNEsvDH5jR8WTAeTCe0x/QHg21V3F7dSI5m + CCZ/1dSIyOXLRTWVlfDlm3rE4ntlCo+US3/7oSWbg/4/4qEnt1HC32kvklgScxua + 4LR5ATdoXa5bFoopPWhul7MJ6NyWCyQyScUuGdlj8EN4kmKQJvphKHrI9fvhgOuG + TvhTR1S5InA4azSSchY0tXEEw/VNxraeX0KPjbgr6DPcwhPd/m0nhVDq0zVyVBBD + MwIDAQAB + -----END PUBLIC KEY----- + TEXT end let(:payload) do @@ -125,7 +135,14 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do type: 'RsaSignature2017', creator: 'https://example.com/users/bob#main-key', created: '2022-03-09T21:57:25Z', - signatureValue: 'WculK0LelTQ0MvGwU9TPoq5pFzFfGYRDCJqjZ232/Udj4CHqDTGOSw5UTDLShqBOyycCkbZGrQwXG+dpyDpQLSe1UVPZ5TPQtc/9XtI57WlS2nMNpdvRuxGnnb2btPdesXZ7n3pCxo0zjaXrJMe0mqQh5QJO22mahb4bDwwmfTHgbD3nmkD+fBfGi+UV2qWwqr+jlV4L4JqNkh0gWljF5KTePLRRZCuWiQ/FAt7c67636cdIPf7fR+usjuZltTQyLZKEGuK8VUn2Gkfsx5qns7Vcjvlz1JqlAjyO8HPBbzTTHzUG2nUOIgC3PojCSWv6mNTmRGoLZzOscCAYQA6cKw==', + signatureValue: 'WculK0LelTQ0MvGwU9TPoq5pFzFfGYRDCJqjZ232/Udj4' \ + 'CHqDTGOSw5UTDLShqBOyycCkbZGrQwXG+dpyDpQLSe1UV' \ + 'PZ5TPQtc/9XtI57WlS2nMNpdvRuxGnnb2btPdesXZ7n3p' \ + 'Cxo0zjaXrJMe0mqQh5QJO22mahb4bDwwmfTHgbD3nmkD+' \ + 'fBfGi+UV2qWwqr+jlV4L4JqNkh0gWljF5KTePLRRZCuWi' \ + 'Q/FAt7c67636cdIPf7fR+usjuZltTQyLZKEGuK8VUn2Gk' \ + 'fsx5qns7Vcjvlz1JqlAjyO8HPBbzTTHzUG2nUOIgC3Poj' \ + 'CSWv6mNTmRGoLZzOscCAYQA6cKw==', }, '@id': 'https://example.com/users/bob/statuses/107928807471117876/activity', '@type': 'https://www.w3.org/ns/activitystreams#Create', From 8ac5a93a7df4139439428da53fe1435e399763d0 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 26 Jul 2023 03:46:11 -0400 Subject: [PATCH 117/557] Reformat large hash in `ContextHelper` module (#26180) --- app/helpers/context_helper.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/helpers/context_helper.rb b/app/helpers/context_helper.rb index 08cfa9c6d5..c23e8d028b 100644 --- a/app/helpers/context_helper.rb +++ b/app/helpers/context_helper.rb @@ -21,7 +21,14 @@ module ContextHelper blurhash: { 'toot' => 'http://joinmastodon.org/ns#', 'blurhash' => 'toot:blurhash' }, discoverable: { 'toot' => 'http://joinmastodon.org/ns#', 'discoverable' => 'toot:discoverable' }, voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' }, - olm: { 'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId', 'claim' => { '@type' => '@id', '@id' => 'toot:claim' }, 'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' }, 'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' }, 'devices' => { '@type' => '@id', '@id' => 'toot:devices' }, 'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText' }, + olm: { + 'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId', + 'claim' => { '@type' => '@id', '@id' => 'toot:claim' }, + 'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' }, + 'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' }, + 'devices' => { '@type' => '@id', '@id' => 'toot:devices' }, + 'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText' + }, suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' }, }.freeze From a2dca50ef3464734aa89eb56a163ce06a1b63b66 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 26 Jul 2023 03:49:15 -0400 Subject: [PATCH 118/557] Use heredoc SQL blocks in `AddFromAccountIdToNotifications` migration (#26178) --- ...20_add_from_account_id_to_notifications.rb | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/db/migrate/20161203164520_add_from_account_id_to_notifications.rb b/db/migrate/20161203164520_add_from_account_id_to_notifications.rb index 484cb9f4dc..e65642b386 100644 --- a/db/migrate/20161203164520_add_from_account_id_to_notifications.rb +++ b/db/migrate/20161203164520_add_from_account_id_to_notifications.rb @@ -4,10 +4,39 @@ class AddFromAccountIdToNotifications < ActiveRecord::Migration[5.0] def up add_column :notifications, :from_account_id, :integer - Notification.where(from_account_id: nil).where(activity_type: 'Status').update_all('from_account_id = (SELECT statuses.account_id FROM notifications AS notifications1 INNER JOIN statuses ON notifications1.activity_id = statuses.id WHERE notifications1.activity_type = \'Status\' AND notifications1.id = notifications.id)') - Notification.where(from_account_id: nil).where(activity_type: 'Mention').update_all('from_account_id = (SELECT statuses.account_id FROM notifications AS notifications1 INNER JOIN mentions ON notifications1.activity_id = mentions.id INNER JOIN statuses ON mentions.status_id = statuses.id WHERE notifications1.activity_type = \'Mention\' AND notifications1.id = notifications.id)') - Notification.where(from_account_id: nil).where(activity_type: 'Favourite').update_all('from_account_id = (SELECT favourites.account_id FROM notifications AS notifications1 INNER JOIN favourites ON notifications1.activity_id = favourites.id WHERE notifications1.activity_type = \'Favourite\' AND notifications1.id = notifications.id)') - Notification.where(from_account_id: nil).where(activity_type: 'Follow').update_all('from_account_id = (SELECT follows.account_id FROM notifications AS notifications1 INNER JOIN follows ON notifications1.activity_id = follows.id WHERE notifications1.activity_type = \'Follow\' AND notifications1.id = notifications.id)') + Notification.where(from_account_id: nil).where(activity_type: 'Status').update_all(<<~SQL.squish) + from_account_id = ( + SELECT statuses.account_id + FROM notifications AS notifications1 + INNER JOIN statuses ON notifications1.activity_id = statuses.id + WHERE notifications1.activity_type = 'Status' AND notifications1.id = notifications.id + ) + SQL + Notification.where(from_account_id: nil).where(activity_type: 'Mention').update_all(<<~SQL.squish) + from_account_id = ( + SELECT statuses.account_id + FROM notifications AS notifications1 + INNER JOIN mentions ON notifications1.activity_id = mentions.id + INNER JOIN statuses ON mentions.status_id = statuses.id + WHERE notifications1.activity_type = 'Mention' AND notifications1.id = notifications.id + ) + SQL + Notification.where(from_account_id: nil).where(activity_type: 'Favourite').update_all(<<~SQL.squish) + from_account_id = ( + SELECT favourites.account_id + FROM notifications AS notifications1 + INNER JOIN favourites ON notifications1.activity_id = favourites.id + WHERE notifications1.activity_type = 'Favourite' AND notifications1.id = notifications.id + ) + SQL + Notification.where(from_account_id: nil).where(activity_type: 'Follow').update_all(<<~SQL.squish) + from_account_id = ( + SELECT follows.account_id + FROM notifications AS notifications1 + INNER JOIN follows ON notifications1.activity_id = follows.id + WHERE notifications1.activity_type = 'Follow' AND notifications1.id = notifications.id + ) + SQL end def down From 84d520ee80110f09ded76aad927fe80777d5e43b Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 26 Jul 2023 03:50:48 -0400 Subject: [PATCH 119/557] Extract private methods in `StatusCacheHydrator` (#26177) --- app/lib/status_cache_hydrator.rb | 43 +++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/app/lib/status_cache_hydrator.rb b/app/lib/status_cache_hydrator.rb index a84d256947..c1231311b1 100644 --- a/app/lib/status_cache_hydrator.rb +++ b/app/lib/status_cache_hydrator.rb @@ -11,7 +11,7 @@ class StatusCacheHydrator # If we're delivering to the author who disabled the display of the application used to create the # status, we need to hydrate the application, since it was not rendered for the basic payload - payload[:application] = @status.application.present? ? ActiveModelSerializers::SerializableResource.new(@status.application, serializer: REST::StatusSerializer::ApplicationSerializer).as_json : nil if payload[:application].nil? && @status.account_id == account_id + payload[:application] = payload_application if payload[:application].nil? && @status.account_id == account_id # We take advantage of the fact that some relationships can only occur with an original status, not # the reblog that wraps it, so we can assume that some values are always false @@ -19,11 +19,13 @@ class StatusCacheHydrator payload[:muted] = false payload[:bookmarked] = false payload[:pinned] = false if @status.account_id == account_id - payload[:filtered] = CustomFilter.apply_cached_filters(CustomFilter.cached_filters_for(account_id), @status.reblog).map { |filter| ActiveModelSerializers::SerializableResource.new(filter, serializer: REST::FilterResultSerializer).as_json } + payload[:filtered] = CustomFilter + .apply_cached_filters(CustomFilter.cached_filters_for(account_id), @status.reblog) + .map { |filter| serialized_filter(filter) } # If the reblogged status is being delivered to the author who disabled the display of the application # used to create the status, we need to hydrate it here too - payload[:reblog][:application] = @status.reblog.application.present? ? ActiveModelSerializers::SerializableResource.new(@status.reblog.application, serializer: REST::StatusSerializer::ApplicationSerializer).as_json : nil if payload[:reblog][:application].nil? && @status.reblog.account_id == account_id + payload[:reblog][:application] = payload_reblog_application if payload[:reblog][:application].nil? && @status.reblog.account_id == account_id payload[:reblog][:favourited] = Favourite.where(account_id: account_id, status_id: @status.reblog_of_id).exists? payload[:reblog][:reblogged] = Status.where(account_id: account_id, reblog_of_id: @status.reblog_of_id).exists? @@ -51,7 +53,9 @@ class StatusCacheHydrator payload[:muted] = ConversationMute.where(account_id: account_id, conversation_id: @status.conversation_id).exists? payload[:bookmarked] = Bookmark.where(account_id: account_id, status_id: @status.id).exists? payload[:pinned] = StatusPin.where(account_id: account_id, status_id: @status.id).exists? if @status.account_id == account_id - payload[:filtered] = CustomFilter.apply_cached_filters(CustomFilter.cached_filters_for(account_id), @status).map { |filter| ActiveModelSerializers::SerializableResource.new(filter, serializer: REST::FilterResultSerializer).as_json } + payload[:filtered] = CustomFilter + .apply_cached_filters(CustomFilter.cached_filters_for(account_id), @status) + .map { |filter| serialized_filter(filter) } if payload[:poll] payload[:poll][:voted] = @status.account_id == account_id @@ -61,4 +65,35 @@ class StatusCacheHydrator payload end + + private + + def serialized_filter(filter) + ActiveModelSerializers::SerializableResource.new( + filter, + serializer: REST::FilterResultSerializer + ).as_json + end + + def payload_application + @status.application.present? ? serialized_status_application_json : nil + end + + def serialized_status_application_json + ActiveModelSerializers::SerializableResource.new( + @status.application, + serializer: REST::StatusSerializer::ApplicationSerializer + ).as_json + end + + def payload_reblog_application + @status.reblog.application.present? ? serialized_status_reblog_application_json : nil + end + + def serialized_status_reblog_application_json + ActiveModelSerializers::SerializableResource.new( + @status.reblog.application, + serializer: REST::StatusSerializer::ApplicationSerializer + ).as_json + end end From b9adea96953cb70e9222215a676b73b31f85c9c6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 13:46:16 +0200 Subject: [PATCH 120/557] New Crowdin Translations (automated) (#26072) Co-authored-by: GitHub Actions Co-authored-by: Claire --- app/javascript/mastodon/locales/af.json | 12 - app/javascript/mastodon/locales/an.json | 17 -- app/javascript/mastodon/locales/ar.json | 17 +- app/javascript/mastodon/locales/ast.json | 11 - app/javascript/mastodon/locales/be.json | 17 -- app/javascript/mastodon/locales/bg.json | 16 -- app/javascript/mastodon/locales/bn.json | 13 -- app/javascript/mastodon/locales/br.json | 15 -- app/javascript/mastodon/locales/bs.json | 6 - app/javascript/mastodon/locales/ca.json | 21 +- app/javascript/mastodon/locales/ckb.json | 16 -- app/javascript/mastodon/locales/co.json | 13 -- app/javascript/mastodon/locales/cs.json | 29 ++- app/javascript/mastodon/locales/cy.json | 18 +- app/javascript/mastodon/locales/da.json | 25 ++- app/javascript/mastodon/locales/de.json | 97 ++++---- app/javascript/mastodon/locales/el.json | 16 -- app/javascript/mastodon/locales/en-GB.json | 21 +- app/javascript/mastodon/locales/eo.json | 16 -- app/javascript/mastodon/locales/es-AR.json | 1 + app/javascript/mastodon/locales/es-MX.json | 16 +- app/javascript/mastodon/locales/es.json | 27 +-- app/javascript/mastodon/locales/et.json | 15 +- app/javascript/mastodon/locales/eu.json | 17 +- app/javascript/mastodon/locales/fa.json | 17 +- app/javascript/mastodon/locales/fi.json | 47 ++-- app/javascript/mastodon/locales/fo.json | 25 ++- app/javascript/mastodon/locales/fr-QC.json | 61 ++--- app/javascript/mastodon/locales/fr.json | 7 +- app/javascript/mastodon/locales/fy.json | 16 -- app/javascript/mastodon/locales/ga.json | 14 -- app/javascript/mastodon/locales/gd.json | 22 -- app/javascript/mastodon/locales/gl.json | 15 +- app/javascript/mastodon/locales/he.json | 17 +- app/javascript/mastodon/locales/hi.json | 14 -- app/javascript/mastodon/locales/hr.json | 13 -- app/javascript/mastodon/locales/hu.json | 153 ++++++------- app/javascript/mastodon/locales/hy.json | 48 ++-- app/javascript/mastodon/locales/id.json | 16 -- app/javascript/mastodon/locales/ig.json | 6 - app/javascript/mastodon/locales/io.json | 15 -- app/javascript/mastodon/locales/is.json | 3 +- app/javascript/mastodon/locales/it.json | 21 +- app/javascript/mastodon/locales/ja.json | 49 +++-- app/javascript/mastodon/locales/ka.json | 12 - app/javascript/mastodon/locales/kab.json | 13 -- app/javascript/mastodon/locales/kk.json | 13 -- app/javascript/mastodon/locales/kn.json | 8 - app/javascript/mastodon/locales/ko.json | 5 +- app/javascript/mastodon/locales/ku.json | 16 -- app/javascript/mastodon/locales/kw.json | 13 -- app/javascript/mastodon/locales/la.json | 7 - app/javascript/mastodon/locales/lt.json | 9 - app/javascript/mastodon/locales/lv.json | 16 -- app/javascript/mastodon/locales/mk.json | 11 - app/javascript/mastodon/locales/ml.json | 13 -- app/javascript/mastodon/locales/mr.json | 13 -- app/javascript/mastodon/locales/ms.json | 16 -- app/javascript/mastodon/locales/my.json | 27 +-- app/javascript/mastodon/locales/nl.json | 5 +- app/javascript/mastodon/locales/nn.json | 16 -- app/javascript/mastodon/locales/no.json | 16 -- app/javascript/mastodon/locales/oc.json | 14 -- app/javascript/mastodon/locales/pa.json | 8 - app/javascript/mastodon/locales/pl.json | 15 +- app/javascript/mastodon/locales/pt-BR.json | 16 -- app/javascript/mastodon/locales/pt-PT.json | 26 +-- app/javascript/mastodon/locales/ro.json | 16 -- app/javascript/mastodon/locales/ru.json | 20 +- app/javascript/mastodon/locales/sa.json | 16 -- app/javascript/mastodon/locales/sc.json | 13 -- app/javascript/mastodon/locales/sco.json | 16 -- app/javascript/mastodon/locales/si.json | 13 -- app/javascript/mastodon/locales/sk.json | 17 +- app/javascript/mastodon/locales/sl.json | 11 +- app/javascript/mastodon/locales/sq.json | 17 -- app/javascript/mastodon/locales/sr-Latn.json | 5 +- app/javascript/mastodon/locales/sr.json | 5 +- app/javascript/mastodon/locales/sv.json | 14 +- app/javascript/mastodon/locales/szl.json | 8 - app/javascript/mastodon/locales/ta.json | 13 -- app/javascript/mastodon/locales/tai.json | 8 - app/javascript/mastodon/locales/te.json | 13 -- app/javascript/mastodon/locales/th.json | 1 + app/javascript/mastodon/locales/tr.json | 33 +-- app/javascript/mastodon/locales/tt.json | 16 -- app/javascript/mastodon/locales/ug.json | 8 - app/javascript/mastodon/locales/uk.json | 25 ++- app/javascript/mastodon/locales/ur.json | 11 - app/javascript/mastodon/locales/uz.json | 13 -- app/javascript/mastodon/locales/vi.json | 19 +- app/javascript/mastodon/locales/zgh.json | 9 - app/javascript/mastodon/locales/zh-CN.json | 27 +-- app/javascript/mastodon/locales/zh-HK.json | 19 +- app/javascript/mastodon/locales/zh-TW.json | 5 +- config/locales/activerecord.de.yml | 2 +- config/locales/activerecord.es.yml | 2 +- config/locales/an.yml | 1 - config/locales/ar.yml | 1 - config/locales/ast.yml | 2 +- config/locales/be.yml | 1 - config/locales/bg.yml | 1 - config/locales/ca.yml | 8 +- config/locales/cs.yml | 1 - config/locales/cy.yml | 4 +- config/locales/da.yml | 40 ++-- config/locales/de.yml | 220 ++++++++++--------- config/locales/devise.da.yml | 4 +- config/locales/devise.de.yml | 4 +- config/locales/devise.hu.yml | 66 +++--- config/locales/doorkeeper.af.yml | 3 - config/locales/doorkeeper.an.yml | 3 - config/locales/doorkeeper.ar.yml | 3 - config/locales/doorkeeper.ast.yml | 2 - config/locales/doorkeeper.be.yml | 3 - config/locales/doorkeeper.bg.yml | 3 - config/locales/doorkeeper.br.yml | 2 - config/locales/doorkeeper.ca.yml | 6 +- config/locales/doorkeeper.ckb.yml | 3 - config/locales/doorkeeper.co.yml | 2 - config/locales/doorkeeper.cs.yml | 3 - config/locales/doorkeeper.de.yml | 22 +- config/locales/doorkeeper.el.yml | 3 - config/locales/doorkeeper.eo.yml | 3 - config/locales/doorkeeper.es-MX.yml | 3 - config/locales/doorkeeper.es.yml | 9 +- config/locales/doorkeeper.et.yml | 2 +- config/locales/doorkeeper.eu.yml | 3 - config/locales/doorkeeper.fa.yml | 3 - config/locales/doorkeeper.fi.yml | 4 +- config/locales/doorkeeper.fo.yml | 6 +- config/locales/doorkeeper.fr-QC.yml | 2 +- config/locales/doorkeeper.fr.yml | 2 +- config/locales/doorkeeper.fy.yml | 3 - config/locales/doorkeeper.ga.yml | 1 - config/locales/doorkeeper.gd.yml | 3 - config/locales/doorkeeper.hu.yml | 36 +-- config/locales/doorkeeper.hy.yml | 3 +- config/locales/doorkeeper.id.yml | 3 - config/locales/doorkeeper.io.yml | 3 - config/locales/doorkeeper.it.yml | 4 +- config/locales/doorkeeper.ja.yml | 2 +- config/locales/doorkeeper.ka.yml | 2 - config/locales/doorkeeper.kab.yml | 2 - config/locales/doorkeeper.kk.yml | 2 - config/locales/doorkeeper.ku.yml | 3 - config/locales/doorkeeper.lv.yml | 3 - config/locales/doorkeeper.ms.yml | 1 - config/locales/doorkeeper.my.yml | 6 +- config/locales/doorkeeper.nl.yml | 4 +- config/locales/doorkeeper.nn.yml | 3 - config/locales/doorkeeper.no.yml | 3 - config/locales/doorkeeper.oc.yml | 3 - config/locales/doorkeeper.pl.yml | 2 +- config/locales/doorkeeper.pt-BR.yml | 3 - config/locales/doorkeeper.pt-PT.yml | 2 +- config/locales/doorkeeper.ro.yml | 3 - config/locales/doorkeeper.ru.yml | 4 +- config/locales/doorkeeper.sc.yml | 2 - config/locales/doorkeeper.sco.yml | 3 - config/locales/doorkeeper.si.yml | 3 - config/locales/doorkeeper.sk.yml | 1 - config/locales/doorkeeper.sq.yml | 3 - config/locales/doorkeeper.sr-Latn.yml | 2 +- config/locales/doorkeeper.sr.yml | 2 +- config/locales/doorkeeper.sv.yml | 3 - config/locales/doorkeeper.tr.yml | 6 +- config/locales/doorkeeper.tt.yml | 1 - config/locales/doorkeeper.uk.yml | 4 +- config/locales/doorkeeper.vi.yml | 2 +- config/locales/doorkeeper.zh-CN.yml | 2 +- config/locales/doorkeeper.zh-HK.yml | 2 - config/locales/doorkeeper.zh-TW.yml | 2 +- config/locales/el.yml | 1 - config/locales/en-GB.yml | 6 +- config/locales/eo.yml | 1 - config/locales/es-AR.yml | 6 +- config/locales/es-MX.yml | 2 +- config/locales/es.yml | 26 +-- config/locales/et.yml | 6 +- config/locales/eu.yml | 2 +- config/locales/fa.yml | 1 - config/locales/fi.yml | 11 +- config/locales/fo.yml | 4 + config/locales/fr-QC.yml | 86 ++++---- config/locales/fr.yml | 4 + config/locales/gd.yml | 1 - config/locales/gl.yml | 4 + config/locales/he.yml | 4 + config/locales/hu.yml | 6 +- config/locales/hy.yml | 4 + config/locales/id.yml | 1 - config/locales/io.yml | 1 - config/locales/is.yml | 4 + config/locales/it.yml | 4 + config/locales/ja.yml | 4 + config/locales/kab.yml | 1 - config/locales/ko.yml | 56 ++--- config/locales/ku.yml | 1 - config/locales/lv.yml | 1 - config/locales/ms.yml | 1 - config/locales/my.yml | 4 + config/locales/nl.yml | 4 + config/locales/nn.yml | 1 - config/locales/no.yml | 1 - config/locales/oc.yml | 1 - config/locales/pl.yml | 4 + config/locales/pt-BR.yml | 1 - config/locales/pt-PT.yml | 2 +- config/locales/ru.yml | 7 +- config/locales/sco.yml | 1 - config/locales/simple_form.da.yml | 6 +- config/locales/simple_form.de.yml | 60 ++--- config/locales/simple_form.es.yml | 4 +- config/locales/simple_form.et.yml | 2 - config/locales/simple_form.fi.yml | 4 +- config/locales/simple_form.fr-QC.yml | 6 +- config/locales/simple_form.hy.yml | 2 + config/locales/simple_form.ko.yml | 2 +- config/locales/simple_form.pl.yml | 12 +- config/locales/simple_form.ru.yml | 9 +- config/locales/simple_form.sl.yml | 1 + config/locales/sk.yml | 3 +- config/locales/sl.yml | 8 +- config/locales/sq.yml | 17 +- config/locales/sr-Latn.yml | 4 + config/locales/sr.yml | 4 + config/locales/sv.yml | 2 + config/locales/th.yml | 4 + config/locales/tr.yml | 6 +- config/locales/tt.yml | 1 - config/locales/uk.yml | 4 + config/locales/vi.yml | 4 + config/locales/zh-CN.yml | 18 +- config/locales/zh-HK.yml | 1 - config/locales/zh-TW.yml | 4 + 236 files changed, 1020 insertions(+), 1787 deletions(-) diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json index 7f3e759c4c..388f7cd0cc 100644 --- a/app/javascript/mastodon/locales/af.json +++ b/app/javascript/mastodon/locales/af.json @@ -82,7 +82,6 @@ "column.community": "Plaaslike tydlyn", "column.directory": "Blaai deur profiele", "column.domain_blocks": "Geblokkeerde domeine", - "column.favourites": "Gunstelinge", "column.follow_requests": "Volgversoeke", "column.home": "Tuis", "column.lists": "Lyste", @@ -136,7 +135,6 @@ "confirmations.domain_block.confirm": "Blokkeer die hele domein", "confirmations.logout.confirm": "Teken Uit", "confirmations.logout.message": "Is jy seker jy wil uitteken?", - "confirmations.redraft.message": "Is jy seker jy wil hierdie plasing uitvee en oorbegin? Goedkeurings en aangestuurde plasings gaan verdwyn en antwoorde op jou oorspronklike plasing gaan wees gelaat word.", "confirmations.reply.confirm": "Antwoord", "conversation.mark_as_read": "Merk as gelees", "conversation.open": "Sien gesprek", @@ -146,7 +144,6 @@ "disabled_account_banner.account_settings": "Rekeninginstellings", "disabled_account_banner.text": "Jou rekening {disabledAccount} is tans gedeaktiveer.", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Bed hierdie plasing op jou webblad in met die kode wat jy hier onder kan kopieer.", "embed.preview": "Dit sal so lyk:", @@ -162,8 +159,6 @@ "empty_column.account_timeline": "Geen plasings hier nie!", "empty_column.bookmarked_statuses": "Jy het nog geen boekmerke gelaat nie. Boekmerke wat jy by plasings laat, sal jy hier sien.", "empty_column.community": "Die plaaslike tydlyn is leeg. Kry die bal aan die rol deur iets te skryf wat mense kan lees!", - "empty_column.favourited_statuses": "Jy het nog geen gunstelingplasings nie. As jy een as gunsteling merk, sal jy dit hier sien.", - "empty_column.favourites": "Hierdie plasing het nog nie goedkeurings ontvang nie. As iemand dit as gunsteling merk, sien jy dit hier.", "empty_column.follow_requests": "Jy het nog geen volgversoeke nie. Wanneer jy een ontvang, sal dit hier vertoon.", "empty_column.hashtag": "Daar is nog niks vir hierdie hutsetiket nie.", "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}", @@ -198,8 +193,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "Gaan afwaarts in die lys", "keyboard_shortcuts.enter": "Sien plasing", - "keyboard_shortcuts.favourite": "Gunsteling", - "keyboard_shortcuts.favourites": "Sien gunstelinge", "keyboard_shortcuts.federated": "Sien gefedereerde stroom", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "Sien tuisvoer", @@ -240,7 +233,6 @@ "navigation_bar.compose": "Skep nuwe plasing", "navigation_bar.domain_blocks": "Geblokkeerde domeine", "navigation_bar.edit_profile": "Redigeer profiel", - "navigation_bar.favourites": "Gunstelinge", "navigation_bar.lists": "Lyste", "navigation_bar.logout": "Teken uit", "navigation_bar.personal": "Persoonlik", @@ -249,15 +241,12 @@ "navigation_bar.public_timeline": "Gefedereerde tydlyn", "navigation_bar.search": "Soek", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} hou van jou plasing", "notification.reblog": "{name} het jou plasing aangestuur", - "notifications.column_settings.favourite": "Gunstelinge:", "notifications.column_settings.push": "Stootkennisgewings", "notifications.column_settings.reblog": "Aangestuurde plasings:", "notifications.column_settings.status": "Nuwe plasings:", "notifications.column_settings.unread_notifications.highlight": "Lig ongelese kennisgewings uit", "notifications.filter.boosts": "Aangestuurde plasings", - "notifications.filter.favourites": "Gunstelinge", "notifications.group": "{count} kennisgewings", "onboarding.actions.go_to_explore": "See what's trending", "onboarding.actions.go_to_home": "Go to your home feed", @@ -299,7 +288,6 @@ "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultate}}", "server_banner.administered_by": "Administrasie deur:", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open hierdie plasing as moderator", "status.cancel_reblog_private": "Maak aanstuur ongedaan", "status.cannot_reblog": "Hierdie plasing kan nie aangestuur word nie", diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json index 47719548a8..d9e436a35e 100644 --- a/app/javascript/mastodon/locales/an.json +++ b/app/javascript/mastodon/locales/an.json @@ -17,7 +17,6 @@ "account.badges.group": "Grupo", "account.block": "Blocar a @{name}", "account.block_domain": "Blocar dominio {domain}", - "account.block_short": "Blocar", "account.blocked": "Blocau", "account.browse_more_on_origin_server": "Veyer mas en o perfil orichinal", "account.cancel_follow_request": "Retirar solicitut de seguimiento", @@ -102,7 +101,6 @@ "column.community": "Linia de tiempo local", "column.directory": "Buscar perfils", "column.domain_blocks": "Dominios amagaus", - "column.favourites": "Favoritos", "column.follow_requests": "Solicitutz de seguimiento", "column.home": "Inicio", "column.lists": "Listas", @@ -165,7 +163,6 @@ "confirmations.mute.explanation": "Esto amagará las publicacions d'ells y en as qualas los has mencionau, pero les permitirá veyer los tuyos mensaches y seguir-te.", "confirmations.mute.message": "Yes seguro que quiers silenciar a {name}?", "confirmations.redraft.confirm": "Borrar y tornar ta borrador", - "confirmations.redraft.message": "Yes seguro que quiers eliminar esta publicación y convertir-la en borrador? Perderás totas las respuestas, retutz y favoritos asociaus a ell, y las respuestas a la publicación orichinal quedarán uerfanas.", "confirmations.reply.confirm": "Responder", "confirmations.reply.message": "Responder sobrescribirá lo mensache que yes escribindo. Yes seguro que deseyas continar?", "confirmations.unfollow.confirm": "Deixar de seguir", @@ -185,7 +182,6 @@ "dismissable_banner.community_timeline": "Estas son las publicacions publicas mas recients de personas que las suyas cuentas son alochadas en {domain}.", "dismissable_banner.dismiss": "Descartar", "dismissable_banner.explore_links": "Estas noticias son estando discutidas per personas en este y atros servidors d'o ret descentralizau en este momento.", - "dismissable_banner.explore_statuses": "Estas publicacions d'este y atros servidors en o ret descentralizau son ganando popularidat en este servidor en este momento.", "dismissable_banner.explore_tags": "Estas tendencias son ganando popularidat entre la chent en este y atros servidors d'o ret descentralizau en este momento.", "embed.instructions": "Anyade esta publicación a lo tuyo puesto web con o siguient codigo.", "embed.preview": "Asinas ye como se veyerá:", @@ -212,8 +208,6 @@ "empty_column.community": "La linia de tiempo local ye vueda. Escribe bella cosa pa empecipiar la fiesta!", "empty_column.domain_blocks": "Encara no i hai dominios amagaus.", "empty_column.explore_statuses": "Cosa ye en tendencia en este momento. Revisa mas tarde!", - "empty_column.favourited_statuses": "Encara no tiens publicacions favoritas. Quan marques una como favorita, amaneixerá aquí.", - "empty_column.favourites": "Dengún ha marcau esta publicación como favorita. Quan belún lo faiga, amaneixerá aquí.", "empty_column.follow_requests": "No tiens garra petición de seguidor. Quan recibas una, s'amostrará aquí.", "empty_column.hashtag": "No i hai cosa en este hashtag encara.", "empty_column.home": "La tuya linia temporal ye vueda! Sigue a mas personas pa replenar-la. {suggestions}", @@ -277,15 +271,12 @@ "home.column_settings.show_replies": "Amostrar respuestas", "home.hide_announcements": "Amagar anuncios", "home.show_announcements": "Amostrar anuncios", - "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puetz marcar como favorita esta publicación pa que l'autor saba que te fa goyo y alzar-la asinas pa mas abance.", "interaction_modal.description.follow": "Con una cuenta en Mastodon, puetz seguir {name} pa recibir las suyas publicacions en a tuya linia temporal d'inicio.", "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puetz empentar esta publicación pa compartir-la con os tuyos propios seguidores.", "interaction_modal.description.reply": "Con una cuenta en Mastodon, puetz responder a esta publicación.", "interaction_modal.on_another_server": "En un servidor diferent", "interaction_modal.on_this_server": "En este servidor", - "interaction_modal.other_server_instructions": "Copia y apega esta URL en a barra de busqueda d'a tuya aplicación Mastodon favorita u la interficie web d'o tuyo servidor Mastodon.", "interaction_modal.preamble": "Ya que Mastodon ye descentralizau, puetz usar la tuya cuenta existent alochada en unatro servidor Mastodon u plataforma compatible si no tiens una cuenta en este servidor.", - "interaction_modal.title.favourite": "Marcar como favorita la publicación de {name}", "interaction_modal.title.follow": "Seguir a {name}", "interaction_modal.title.reblog": "Empentar la publicación de {name}", "interaction_modal.title.reply": "Responder a la publicación de {name}", @@ -301,8 +292,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "Mover enta baixo en a lista", "keyboard_shortcuts.enter": "Ubrir estau", - "keyboard_shortcuts.favourite": "Anyadir en favoritos", - "keyboard_shortcuts.favourites": "Ubrir la lista de favoritos", "keyboard_shortcuts.federated": "Ubrir la linia de tiempo federada", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "Ubrir linia de tiempo", @@ -362,7 +351,6 @@ "navigation_bar.domain_blocks": "Dominios amagaus", "navigation_bar.edit_profile": "Editar perfil", "navigation_bar.explore": "Explorar", - "navigation_bar.favourites": "Favoritos", "navigation_bar.filters": "Parolas silenciadas", "navigation_bar.follow_requests": "Solicitutz pa seguir-te", "navigation_bar.follows_and_followers": "Seguindo y seguidores", @@ -378,7 +366,6 @@ "not_signed_in_indicator.not_signed_in": "Amenestes iniciar sesión pa acceder ta este recurso.", "notification.admin.report": "{name} informó {target}", "notification.admin.sign_up": "{name} se rechistró", - "notification.favourite": "{name} marcó lo tuyo estau como favorito", "notification.follow": "{name} t'empecipió a seguir", "notification.follow_request": "{name} ha solicitau seguir-te", "notification.mention": "{name} t'ha mencionau", @@ -392,7 +379,6 @@ "notifications.column_settings.admin.report": "Nuevos informes:", "notifications.column_settings.admin.sign_up": "Nuevos rechistros:", "notifications.column_settings.alert": "Notificacions d'escritorio", - "notifications.column_settings.favourite": "Favoritos:", "notifications.column_settings.filter_bar.advanced": "Amostrar totas las categorías", "notifications.column_settings.filter_bar.category": "Barra de filtrau rapido", "notifications.column_settings.filter_bar.show_bar": "Amostrar barra de filtros", @@ -410,7 +396,6 @@ "notifications.column_settings.update": "Edicions:", "notifications.filter.all": "Totz", "notifications.filter.boosts": "Retutz", - "notifications.filter.favourites": "Favoritos", "notifications.filter.follows": "Seguidores", "notifications.filter.mentions": "Mencions", "notifications.filter.polls": "Resultaus d'a votación", @@ -532,7 +517,6 @@ "server_banner.server_stats": "Estatisticas d'o servidor:", "sign_in_banner.create_account": "Creyar cuenta", "sign_in_banner.sign_in": "Iniciar sesión", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "Ubrir interficie de moderación pa @{name}", "status.admin_domain": "Ubrir interficie de moderación pa {domain}", "status.admin_status": "Ubrir este estau en a interficie de moderación", @@ -547,7 +531,6 @@ "status.edited": "Editau {date}", "status.edited_x_times": "Editau {count, plural, one {{count} vez} other {{count} veces}}", "status.embed": "Incrustado", - "status.favourite": "Favorito", "status.filter": "Filtrar esta publicación", "status.filtered": "Filtrau", "status.hide": "Amagar la publicación", diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index 3d4219c84d..1ed6dc1bb3 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -113,7 +113,7 @@ "column.direct": "الإشارات الخاصة", "column.directory": "تَصَفُّحُ المَلفات الشخصية", "column.domain_blocks": "النطاقات المحظورة", - "column.favourites": "المُفَضَّلَة", + "column.favourites": "Favorites", "column.firehose": "التغذيات المباشرة", "column.follow_requests": "طلبات المتابعة", "column.home": "الرئيسية", @@ -181,7 +181,6 @@ "confirmations.mute.explanation": "هذا سيخفي المنشورات عنهم وتلك المشار فيها إليهم، لكنه سيسمح لهم برؤية منشوراتك ومتابعتك.", "confirmations.mute.message": "هل أنت متأكد أنك تريد كتم {name} ؟", "confirmations.redraft.confirm": "إزالة وإعادة الصياغة", - "confirmations.redraft.message": "هل أنت متأكد من أنك تريد حذف هذا المنشور و إعادة صياغته؟ سوف تفقد جميع الإعجابات و الترقيات أما الردود المتصلة به فستُصبِح يتيمة.", "confirmations.reply.confirm": "رد", "confirmations.reply.message": "الرد في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد كتابتها. متأكد من أنك تريد المواصلة؟", "confirmations.unfollow.confirm": "إلغاء المتابعة", @@ -202,7 +201,6 @@ "dismissable_banner.community_timeline": "هذه هي أحدث المشاركات العامة من الأشخاص الذين تُستضاف حساباتهم على {domain}.", "dismissable_banner.dismiss": "رفض", "dismissable_banner.explore_links": "هذه القصص الإخبارية يتحدث عنها حاليًا أشخاص على هذا الخادم وكذا على الخوادم الأخرى للشبكة اللامركزية.", - "dismissable_banner.explore_statuses": "هذه المنشورات مِن هذا الخادم ومِن الخوادم الأخرى في الشبكة اللامركزية تجذب انتباه المستخدمين على هذا الخادم الآن.", "dismissable_banner.explore_tags": "هذه الوسوم تكتسب جذب اهتمام الناس حاليًا على هذا الخادم وكذا على الخوادم الأخرى للشبكة اللامركزية.", "dismissable_banner.public_timeline": "هذه هي أحدث المنشورات العامة من الناس على الشبكة الاجتماعية التي يتبعها الناس على {domain}.", "embed.instructions": "يمكنكم إدماج هذا المنشور على موقعكم الإلكتروني عن طريق نسخ الشفرة أدناه.", @@ -231,8 +229,6 @@ "empty_column.direct": "لم يتم الإشارة إليك بشكل خاص بعد. عندما تتلقى أو ترسل إشارة، سيتم عرضها هنا.", "empty_column.domain_blocks": "ليس هناك نطاقات تم حجبها بعد.", "empty_column.explore_statuses": "ليس هناك ما هو متداوَل الآن. عد في وقت لاحق!", - "empty_column.favourited_statuses": "ليس لديك أية منشورات مفضلة بعد. عندما ستقوم بالإعجاب بواحدة، ستظهر هنا.", - "empty_column.favourites": "لم يقم أي أحد بالإعجاب بهذا المنشور بعد. عندما يقوم أحدهم بذلك سوف يظهر هنا.", "empty_column.follow_requests": "ليس عندك أي طلب للمتابعة بعد. سوف تظهر طلباتك هنا إن قمت بتلقي البعض منها.", "empty_column.followed_tags": "لم تُتابع أي وسم بعدُ. ستظهر الوسوم هنا حينما تفعل ذلك.", "empty_column.hashtag": "ليس هناك بعدُ أي محتوى ذو علاقة بهذا الوسم.", @@ -307,15 +303,12 @@ "home.explore_prompt.title": "هذا مقرك الرئيسي داخل ماستدون.", "home.hide_announcements": "إخفاء الإعلانات", "home.show_announcements": "إظهار الإعلانات", - "interaction_modal.description.favourite": "مع حساب في ماستدون، يمكنك إضافة هذا المنشور إلى مفضلتك لإبلاغ الناشر عن تقديرك وكذا للاحتفاظ به لوقت لاحق.", "interaction_modal.description.follow": "مع حساب في ماستدون، يمكنك متابعة {name} وتلقي منشوراته على خيطك الرئيس.", "interaction_modal.description.reblog": "مع حساب في ماستدون، يمكنك تعزيز هذا المنشور ومشاركته مع مُتابِعيك.", "interaction_modal.description.reply": "مع حساب في ماستدون، يمكنك الرد على هذا المنشور.", "interaction_modal.on_another_server": "على خادم مختلف", "interaction_modal.on_this_server": "على هذا الخادم", - "interaction_modal.other_server_instructions": "انسخ و الصق هذا الرابط في حقل البحث الخاص بك لتطبيق ماستدون المفضل لديك أو واجهة الويب لخادم ماستدون الخاص بك.", "interaction_modal.preamble": "بما إن ماستدون لامركزي، يمكنك استخدام حسابك الحالي المستضاف بواسطة خادم ماستدون آخر أو منصة متوافقة إذا لم يكن لديك حساب هنا.", - "interaction_modal.title.favourite": "الإعجاب بمنشور {name}", "interaction_modal.title.follow": "اتبع {name}", "interaction_modal.title.reblog": "مشاركة منشور {name}", "interaction_modal.title.reply": "الرد على منشور {name}", @@ -331,8 +324,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "للانتقال إلى أسفل القائمة", "keyboard_shortcuts.enter": "لفتح المنشور", - "keyboard_shortcuts.favourite": "للإضافة إلى المفضلة", - "keyboard_shortcuts.favourites": "لفتح قائمة المفضلات", "keyboard_shortcuts.federated": "لفتح الخيط الزمني الفديرالي", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "لفتح الخيط الرئيسي", @@ -394,7 +385,6 @@ "navigation_bar.domain_blocks": "النطاقات المحظورة", "navigation_bar.edit_profile": "عدّل الملف التعريفي", "navigation_bar.explore": "استكشف", - "navigation_bar.favourites": "المفضلة", "navigation_bar.filters": "الكلمات المكتومة", "navigation_bar.follow_requests": "طلبات المتابعة", "navigation_bar.followed_tags": "الوسوم المتابَعة", @@ -411,7 +401,6 @@ "not_signed_in_indicator.not_signed_in": "تحتاج إلى تسجيل الدخول للوصول إلى هذا المصدر.", "notification.admin.report": "{name} أبلغ عن {target}", "notification.admin.sign_up": "أنشأ {name} حسابًا", - "notification.favourite": "أُعجِب {name} بمنشورك", "notification.follow": "{name} يتابعك", "notification.follow_request": "لقد طلب {name} متابعتك", "notification.mention": "{name} ذكرك", @@ -425,7 +414,6 @@ "notifications.column_settings.admin.report": "التقارير الجديدة:", "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:", "notifications.column_settings.alert": "إشعارات سطح المكتب", - "notifications.column_settings.favourite": "المُفَضَّلة:", "notifications.column_settings.filter_bar.advanced": "اعرض كافة الفئات", "notifications.column_settings.filter_bar.category": "شريط الفلترة السريعة", "notifications.column_settings.filter_bar.show_bar": "إظهار شريط التصفية", @@ -443,7 +431,6 @@ "notifications.column_settings.update": "التعديلات:", "notifications.filter.all": "الكل", "notifications.filter.boosts": "الترقيات", - "notifications.filter.favourites": "المفضلة", "notifications.filter.follows": "يتابِع", "notifications.filter.mentions": "الإشارات", "notifications.filter.polls": "نتائج استطلاع الرأي", @@ -594,7 +581,6 @@ "server_banner.server_stats": "إحصائيات الخادم:", "sign_in_banner.create_account": "أنشئ حسابًا", "sign_in_banner.sign_in": "تسجيل الدخول", - "sign_in_banner.text": "قم بالولوج بحسابك لمتابعة الصفحات الشخصية أو الوسوم، أو لإضافة الرسائل إلى المفضلة ومشاركتها والرد عليها أو التفاعل بواسطة حسابك المتواجد على خادم مختلف.", "status.admin_account": "افتح الواجهة الإدارية لـ @{name}", "status.admin_domain": "فتح واجهة الإشراف لـ {domain}", "status.admin_status": "افتح هذا المنشور على واجهة الإشراف", @@ -611,7 +597,6 @@ "status.edited": "عُدّل في {date}", "status.edited_x_times": "عُدّل {count, plural, zero {} one {مرةً واحدة} two {مرّتان} few {{count} مرات} many {{count} مرة} other {{count} مرة}}", "status.embed": "إدماج", - "status.favourite": "أضف إلى المفضلة", "status.filter": "تصفية هذه الرسالة", "status.filtered": "مُصفّى", "status.hide": "إخفاء المنشور", diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json index 1b96c62d99..3b458b9ac8 100644 --- a/app/javascript/mastodon/locales/ast.json +++ b/app/javascript/mastodon/locales/ast.json @@ -80,7 +80,6 @@ "column.community": "Llinia de tiempu llocal", "column.direct": "Menciones privaes", "column.domain_blocks": "Dominios bloquiaos", - "column.favourites": "Favoritos", "column.follow_requests": "Solicitúes de siguimientu", "column.home": "Aniciu", "column.lists": "Llistes", @@ -141,7 +140,6 @@ "directory.recently_active": "Con actividá recién", "dismissable_banner.community_timeline": "Esta seición contién los artículos públicos más actuales de los perfiles agospiaos nel dominiu {domain}.", "dismissable_banner.dismiss": "Escartar", - "dismissable_banner.explore_statuses": "Esta seición contién los artículos del fediversu que tán ganando popularidá güei. Los artículos nuevos que más se compartan ya s'amiesten a Favoritos apaecen no cimero.", "dismissable_banner.explore_tags": "Esta seición contién les etiquetes del fediversu que tán ganando popularidá güei. Les etiquetes más usaes polos perfiles apaecen no cimero.", "embed.instructions": "Empotra esti artículu nel to sitiu web pente la copia del códigu d'abaxo.", "embed.preview": "Va apaecer asina:", @@ -163,8 +161,6 @@ "empty_column.direct": "Nun tienes nenguna mención privada. Cuando unvies o recibas dalguna, apaez equí.", "empty_column.domain_blocks": "Nun hai nengún dominiu bloquiáu.", "empty_column.explore_statuses": "Agora nun hai nada en tendencia. ¡Volvi equí dempués!", - "empty_column.favourited_statuses": "Nun marquesti nengún artículu como favoritu. Cuando marques dalgún, apaez equí.", - "empty_column.favourites": "Naide marcó esti artículu como favoritu. Cuando dalgún perfil lo faiga, apaez equí.", "empty_column.follow_requests": "Nun tienes nenguna solicitú de siguimientu. Cuando recibas dalguna, apaez equí.", "empty_column.hashtag": "Entá nun hai nada con esta etiqueta.", "empty_column.home": "¡La to llinia de tiempu ta balera! Sigui a cuentes pa enllenala.", @@ -222,13 +218,11 @@ "home.column_settings.basic": "Configuración básica", "home.column_settings.show_reblogs": "Amosar los artículos compartíos", "home.column_settings.show_replies": "Amosar les rempuestes", - "interaction_modal.description.favourite": "Con una cuenta de Mastodon pues marcar esti artículu como favoritu ya avisar al autor/a de que te presta ya que lu guardes pa dempués.", "interaction_modal.description.follow": "Con una cuenta de Mastodon, pues siguir a {name} pa recibir los artículos de so nel to feed d'aniciu.", "interaction_modal.description.reblog": "Con una cuenta de Mastodon, pues compartir esti artículu colos perfiles que te sigan.", "interaction_modal.description.reply": "Con una cuenta de Mastodon, pues responder a esti artículu.", "interaction_modal.on_another_server": "N'otru sirvidor", "interaction_modal.on_this_server": "Nesti sirvidor", - "interaction_modal.other_server_instructions": "Copia ya apiega esta URL nel campu de busca de la to aplicación favorita de Mastodon o na interfaz web de dalgún sirvidor de Mastodon.", "interaction_modal.preamble": "Darréu que Mastodon ye una rede social descentralizada, pues usar una cuenta agospiada n'otru sirvidor de Mastodon o n'otra plataforma compatible si nun tienes cuenta nesti sirvidor.", "interaction_modal.title.reply": "Rempuesta al artículu de: {name}", "intervals.full.days": "{number, plural, one {# día} other {# díes}}", @@ -243,8 +237,6 @@ "keyboard_shortcuts.direct": "p'abrir la columna de les menciones privaes", "keyboard_shortcuts.down": "Baxar na llista", "keyboard_shortcuts.enter": "Abrir un artículu", - "keyboard_shortcuts.favourite": "Marcar un artículu como favoritu", - "keyboard_shortcuts.favourites": "Abrir la llista de Favoritos", "keyboard_shortcuts.federated": "Abrir la llinia de tiempu federada", "keyboard_shortcuts.heading": "Atayos del tecláu", "keyboard_shortcuts.home": "Abrir la llinia de tiempu del aniciu", @@ -292,7 +284,6 @@ "navigation_bar.domain_blocks": "Dominios bloquiaos", "navigation_bar.edit_profile": "Editar el perfil", "navigation_bar.explore": "Esploración", - "navigation_bar.favourites": "Favoritos", "navigation_bar.filters": "Pallabres desactivaes", "navigation_bar.follow_requests": "Solicitúes de siguimientu", "navigation_bar.follows_and_followers": "Perfiles que sigues ya te siguen", @@ -306,7 +297,6 @@ "not_signed_in_indicator.not_signed_in": "Tienes d'aniciar la sesión p'acceder a esti recursu.", "notification.admin.report": "{name} informó de: {target}", "notification.admin.sign_up": "{name} rexistróse", - "notification.favourite": "{name} marcó'l to artículu como favoritu", "notification.follow": "{name} siguióte", "notification.follow_request": "{name} solicitó siguite", "notification.mention": "{name} mentóte", @@ -317,7 +307,6 @@ "notifications.clear": "Borrar los avisos", "notifications.column_settings.admin.report": "Informes nuevos:", "notifications.column_settings.admin.sign_up": "Rexistros nuevos:", - "notifications.column_settings.favourite": "Artículos favoritos:", "notifications.column_settings.filter_bar.advanced": "Amosar toles categoríes", "notifications.column_settings.filter_bar.category": "Barra de peñera rápida", "notifications.column_settings.filter_bar.show_bar": "Amosar la barra de peñera", diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json index 2ef46fad3b..564d210a24 100644 --- a/app/javascript/mastodon/locales/be.json +++ b/app/javascript/mastodon/locales/be.json @@ -113,7 +113,6 @@ "column.direct": "Асабістыя згадванні", "column.directory": "Праглядзець профілі", "column.domain_blocks": "Заблакіраваныя дамены", - "column.favourites": "Упадабаныя", "column.firehose": "Стужкі", "column.follow_requests": "Запыты на падпіску", "column.home": "Галоўная", @@ -181,7 +180,6 @@ "confirmations.mute.explanation": "Гэта схавае допісы ад гэтага карыстальніка і пра яго, але ўсё яшчэ дазволіць яму чытаць вашыя допісы і быць падпісаным на вас.", "confirmations.mute.message": "Вы ўпэўненыя, што хочаце ігнараваць {name}?", "confirmations.redraft.confirm": "Выдаліць і перапісаць", - "confirmations.redraft.message": "Вы ўпэўнены, што хочаце выдаліць допіс і перапісаць яго? Упадабанні і пашырэнні згубяцца, а адказы да арыгінальнага допісу асірацеюць.", "confirmations.reply.confirm": "Адказаць", "confirmations.reply.message": "Калі вы адкажаце зараз, гэта ператрэ паведамленне, якое вы пішаце. Вы ўпэўнены, што хочаце працягнуць?", "confirmations.unfollow.confirm": "Адпісацца", @@ -202,7 +200,6 @@ "dismissable_banner.community_timeline": "Гэта самыя апошнія допісы ад людзей, уліковыя запісы якіх размяшчаюцца на {domain}.", "dismissable_banner.dismiss": "Адхіліць", "dismissable_banner.explore_links": "Гэтыя навіны абмяркоўваюцца прама зараз на гэтым і іншых серверах дэцэнтралізаванай сеткі.", - "dismissable_banner.explore_statuses": "Допісы з гэтага і іншых сервераў дэцэнтралізаванай сеткі, якія набіраюць папулярнасць прама зараз.", "dismissable_banner.explore_tags": "Гэтыя хэштэгі зараз набіраюць папулярнасць сярод людзей на гэтым і іншых серверах дэцэнтралізаванай сеткі", "dismissable_banner.public_timeline": "Гэта апошнія публічныя допісы людзей з усей сеткі, за якімі сочаць карыстальнікі {domain}.", "embed.instructions": "Убудуйце гэты пост на свой сайт, скапіраваўшы прыведзены ніжэй код", @@ -231,8 +228,6 @@ "empty_column.direct": "Пакуль у вас няма асабістых згадак. Калі вы дашляце або атрымаеце штось, яно з'явіцца тут.", "empty_column.domain_blocks": "Заблакіраваных даменаў пакуль няма.", "empty_column.explore_statuses": "Зараз не ў трэндзе. Праверце пазней", - "empty_column.favourited_statuses": "Вы яшчэ не ўпадабалі ніводны допіс. Калі гэта адбудзецца, вы ўбачыце яго тут.", - "empty_column.favourites": "Ніхто яшчэ не ўпадабаў гэты допіс. Калі гэта адбудзецца, вы ўбачыце гэтых людзей тут.", "empty_column.follow_requests": "У вас яшчэ няма запытаў на падпіскуі. Калі вы атрымаеце запыт, ён з'явяцца тут.", "empty_column.followed_tags": "Вы пакуль не падпісаны ні на адзін хэштэг. Калі падпішацеся, яны з'явяцца тут.", "empty_column.hashtag": "Па гэтаму хэштэгу пакуль што нічога няма.", @@ -307,15 +302,12 @@ "home.explore_prompt.title": "Гэта ваша апорная кропка ў Mastodon.", "home.hide_announcements": "Схаваць аб'явы", "home.show_announcements": "Паказаць аб'явы", - "interaction_modal.description.favourite": "Маючы ўліковы запіс Mastodon, вы можаце ўпадабаць гэты допіс, каб паведаміць аўтару, што ён вам падабаецца, і захаваць яго на будучыню.", "interaction_modal.description.follow": "Маючы акаўнт у Mastodon, вы можаце падпісацца на {name}, каб бачыць яго/яе допісы ў сваёй хатняй стужцы.", "interaction_modal.description.reblog": "З уліковым запісам Mastodon, вы можаце пашырыць гэты пост, каб падзяліцца ім са сваімі падпісчыкамі.", "interaction_modal.description.reply": "Маючы акаўнт у Mastodon, вы можаце адказаць на гэты пост.", "interaction_modal.on_another_server": "На іншым серверы", "interaction_modal.on_this_server": "На гэтым серверы", - "interaction_modal.other_server_instructions": "Скапіюйце і ўстаўце гэты URL у поле пошуку вашай любімай праграмы для Mastodon ці інтэрфейса вашага Mastodon сервера.", "interaction_modal.preamble": "Паколькі Mastodon дэцэнтралізаваны, вы можаце выкарыстоўваць існуючы акаўнт, які быў створаны на іншым серверы Mastodon або на сумяшчальнай платформе, калі ў вас пакуль няма акаўнта тут.", - "interaction_modal.title.favourite": "Упадабаць допіс {name}", "interaction_modal.title.follow": "Падпісацца на {name}", "interaction_modal.title.reblog": "Пашырыць допіс ад {name}", "interaction_modal.title.reply": "Адказаць на допіс {name}", @@ -331,8 +323,6 @@ "keyboard_shortcuts.direct": "адкрыць стоўп асабістых згадак", "keyboard_shortcuts.down": "Перамясціцца ўніз па спісе", "keyboard_shortcuts.enter": "Адкрыць допіс", - "keyboard_shortcuts.favourite": "Упадабаць допіс", - "keyboard_shortcuts.favourites": "Адкрыць спіс упадабаных", "keyboard_shortcuts.federated": "Адкрыць інтэграваную стужку", "keyboard_shortcuts.heading": "Спалучэнні клавіш", "keyboard_shortcuts.home": "Адкрыць хатнюю храналагічную стужку", @@ -385,7 +375,6 @@ "mute_modal.hide_notifications": "Схаваць апавяшчэнні ад гэтага карыстальніка?", "mute_modal.indefinite": "Бестэрмінова", "navigation_bar.about": "Пра нас", - "navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan", "navigation_bar.blocks": "Заблакаваныя карыстальнікі", "navigation_bar.bookmarks": "Закладкі", "navigation_bar.community_timeline": "Лакальная стужка", @@ -395,7 +384,6 @@ "navigation_bar.domain_blocks": "Заблакіраваныя дамены", "navigation_bar.edit_profile": "Рэдагаваць профіль", "navigation_bar.explore": "Агляд", - "navigation_bar.favourites": "Упадабаныя", "navigation_bar.filters": "Ігнараваныя словы", "navigation_bar.follow_requests": "Запыты на падпіску", "navigation_bar.followed_tags": "Падпіскі", @@ -412,7 +400,6 @@ "not_signed_in_indicator.not_signed_in": "Вам трэба ўвайсці каб атрымаць доступ да гэтага рэсурсу.", "notification.admin.report": "{name} паскардзіўся на {target}", "notification.admin.sign_up": "{name} зарэгістраваўся", - "notification.favourite": "Ваш допіс упадабаны {name}", "notification.follow": "{name} падпісаўся на вас", "notification.follow_request": "{name} адправіў запыт на падпіску", "notification.mention": "{name} згадаў вас", @@ -426,7 +413,6 @@ "notifications.column_settings.admin.report": "Новыя скаргі:", "notifications.column_settings.admin.sign_up": "Новыя ўваходы:", "notifications.column_settings.alert": "Апавяшчэнні на працоўным стале", - "notifications.column_settings.favourite": "Упадабаныя:", "notifications.column_settings.filter_bar.advanced": "Паказваць усе катэгорыі", "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі", "notifications.column_settings.filter_bar.show_bar": "Паказваць панэль фільтрацыі", @@ -444,7 +430,6 @@ "notifications.column_settings.update": "Праўкі:", "notifications.filter.all": "Усе", "notifications.filter.boosts": "Пашырэнні", - "notifications.filter.favourites": "Упадабаныя", "notifications.filter.follows": "Падпісаны на", "notifications.filter.mentions": "Згадванні", "notifications.filter.polls": "Вынікі апытання", @@ -595,7 +580,6 @@ "server_banner.server_stats": "Статыстыка сервера:", "sign_in_banner.create_account": "Стварыць уліковы запіс", "sign_in_banner.sign_in": "Увайсці", - "sign_in_banner.text": "Увайдзіце, каб падпісацца на людзей і тэгі, каб адказваць на допісы, дзяліцца імі і падабаць іх, альбо кантактаваць з вашага ўліковага запісу на іншым серверы.", "status.admin_account": "Адкрыць інтэрфейс мадэратара для @{name}", "status.admin_domain": "Адкрыць інтэрфейс мадэратара для {domain}", "status.admin_status": "Адкрыць гэты допіс у інтэрфейсе мадэрацыі", @@ -612,7 +596,6 @@ "status.edited": "Адрэдагавана {date}", "status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}", "status.embed": "Убудаваць", - "status.favourite": "Упадабаць", "status.filter": "Фільтраваць гэты допіс", "status.filtered": "Адфільтравана", "status.hide": "Схаваць допіс", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 32d0ebfca1..b7f40cb6c2 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -113,7 +113,6 @@ "column.direct": "Частни споменавания", "column.directory": "Разглеждане на профили", "column.domain_blocks": "Блокирани домейни", - "column.favourites": "Любими", "column.firehose": "Инфоканали на живо", "column.follow_requests": "Заявки за последване", "column.home": "Начало", @@ -181,7 +180,6 @@ "confirmations.mute.explanation": "Това ще скрие публикациите от тях и публикации, които ги споменават, но все още ще им позволява да виждат публикациите ви и да ви следват.", "confirmations.mute.message": "Наистина ли искате да заглушите {name}?", "confirmations.redraft.confirm": "Изтриване и преработване", - "confirmations.redraft.message": "Сигурни ли сте, че искате да изтриете тази публикация и да я върнете в чернова? Ще загубите подсилванията и означаванията като любима, и отговорите към оригинала ще останат висящи.", "confirmations.reply.confirm": "Отговор", "confirmations.reply.message": "Отговарянето сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?", "confirmations.unfollow.confirm": "Без следване", @@ -202,7 +200,6 @@ "dismissable_banner.community_timeline": "Ето най-скорошните публични публикации от хора, чиито акаунти са разположени в {domain}.", "dismissable_banner.dismiss": "Отхвърляне", "dismissable_banner.explore_links": "Тези новини се разказват от хората в този и други сървъри на децентрализираната мрежа точно сега.", - "dismissable_banner.explore_statuses": "Тези публикации от този и други сървъри в децентрализираната мрежа набират популярност сега на този сървър.", "dismissable_banner.explore_tags": "Тези хаштагове сега набират популярност сред хората в този и други сървъри на децентрализирата мрежа.", "dismissable_banner.public_timeline": "Ето най-новите обществени публикации от хора в социална мрежа, която хората в {domain} следват.", "embed.instructions": "Вградете публикацията в уебсайта си, копирайки кода долу.", @@ -231,8 +228,6 @@ "empty_column.direct": "Още нямате никакви частни споменавания. Тук ще се показват, изпращайки или получавайки едно.", "empty_column.domain_blocks": "Още няма блокирани домейни.", "empty_column.explore_statuses": "Няма нищо налагащо се в момента. Проверете пак по-късно!", - "empty_column.favourited_statuses": "Още нямате любими публикации. Поставяйки някоя в любими, то тя ще се покаже тук.", - "empty_column.favourites": "Още никой не е поставил публикацията в любими. Когато някой го направи, този човек ще се покаже тук.", "empty_column.follow_requests": "Още нямате заявки за последване. Получавайки такава, то тя ще се покаже тук.", "empty_column.followed_tags": "Още не сте последвали никакви хаштагове. Последваните хаштагове ще се покажат тук.", "empty_column.hashtag": "Още няма нищо в този хаштаг.", @@ -307,15 +302,12 @@ "home.explore_prompt.title": "Това е началната ви база с Mastodon.", "home.hide_announcements": "Скриване на оповестяванията", "home.show_announcements": "Показване на оповестяванията", - "interaction_modal.description.favourite": "С акаунт в Mastodon може да направите тази публикация като любима, за да позволите на автора да узнае, че я цените, и да я запазите за по-късно.", "interaction_modal.description.follow": "С акаунт в Mastodon може да последвате {name}, за да получавате публикациите от този акаунт в началния си инфоканал.", "interaction_modal.description.reblog": "С акаунт в Mastodon може да подсилите тази публикация, за да я споделите с последователите си.", "interaction_modal.description.reply": "С акаунт в Mastodon може да добавите отговор към тази публикация.", "interaction_modal.on_another_server": "На различен сървър", "interaction_modal.on_this_server": "На този сървър", - "interaction_modal.other_server_instructions": "Копипейстнете този URL адрес в полето за търсене на любимото си приложение Mastodon или мрежови интерфейс на своя Mastodon сървър.", "interaction_modal.preamble": "Откак Mastodon е децентрализиран, може да употребявате съществуващ акаунт, разположен на друг сървър на Mastodon или съвместима платформа, ако нямате акаунт на този сървър.", - "interaction_modal.title.favourite": "Любими публикации на {name}", "interaction_modal.title.follow": "Последване на {name}", "interaction_modal.title.reblog": "Подсилване на публикацията на {name}", "interaction_modal.title.reply": "Отговаряне на публикацията на {name}", @@ -331,8 +323,6 @@ "keyboard_shortcuts.direct": "за отваряне на колоната с частни споменавания", "keyboard_shortcuts.down": "Преместване надолу в списъка", "keyboard_shortcuts.enter": "Отваряне на публикация", - "keyboard_shortcuts.favourite": "Любима публикация", - "keyboard_shortcuts.favourites": "Отваряне на списъка с любими", "keyboard_shortcuts.federated": "Отваряне на федерирания инфопоток", "keyboard_shortcuts.heading": "Клавишни съчетания", "keyboard_shortcuts.home": "Отваряне на началната часова ос", @@ -395,7 +385,6 @@ "navigation_bar.domain_blocks": "Блокирани домейни", "navigation_bar.edit_profile": "Редактиране на профила", "navigation_bar.explore": "Изследване", - "navigation_bar.favourites": "Любими", "navigation_bar.filters": "Заглушени думи", "navigation_bar.follow_requests": "Заявки за последване", "navigation_bar.followed_tags": "Последвани хаштагове", @@ -412,7 +401,6 @@ "not_signed_in_indicator.not_signed_in": "Трябва ви вход за достъп до ресурса.", "notification.admin.report": "{name} докладва {target}", "notification.admin.sign_up": "{name} се регистрира", - "notification.favourite": "{name} сложи в любими ваша публикация", "notification.follow": "{name} ви последва", "notification.follow_request": "{name} поиска да ви последва", "notification.mention": "{name} ви спомена", @@ -426,7 +414,6 @@ "notifications.column_settings.admin.report": "Нови доклади:", "notifications.column_settings.admin.sign_up": "Нови регистрации:", "notifications.column_settings.alert": "Известия на работния плот", - "notifications.column_settings.favourite": "Любими:", "notifications.column_settings.filter_bar.advanced": "Показване на всички категории", "notifications.column_settings.filter_bar.category": "Лента за бърз филтър", "notifications.column_settings.filter_bar.show_bar": "Показване на лентата с филтри", @@ -444,7 +431,6 @@ "notifications.column_settings.update": "Промени:", "notifications.filter.all": "Всичко", "notifications.filter.boosts": "Подсилвания", - "notifications.filter.favourites": "Любими", "notifications.filter.follows": "Последвания", "notifications.filter.mentions": "Споменавания", "notifications.filter.polls": "Резултати от анкетата", @@ -595,7 +581,6 @@ "server_banner.server_stats": "Статистика на сървъра:", "sign_in_banner.create_account": "Създаване на акаунт", "sign_in_banner.sign_in": "Вход", - "sign_in_banner.text": "Влезте, за да последвате профили или хаштагове, отбелязвате като любими, споделяте и отговаряте на публикации. Можете също така да взаимодействате от акаунта ви на друг сървър.", "status.admin_account": "Отваряне на интерфейс за модериране за @{name}", "status.admin_domain": "Отваряне на модериращия интерфейс за {domain}", "status.admin_status": "Отваряне на публикацията в модериращия интерфейс", @@ -612,7 +597,6 @@ "status.edited": "Редактирано на {date}", "status.edited_x_times": "Редактирано {count, plural,one {{count} път} other {{count} пъти}}", "status.embed": "Вграждане", - "status.favourite": "Любимо", "status.filter": "Филтриране на публ.", "status.filtered": "Филтрирано", "status.hide": "Скриване на публ.", diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json index 62a522346d..3d1753d330 100644 --- a/app/javascript/mastodon/locales/bn.json +++ b/app/javascript/mastodon/locales/bn.json @@ -109,7 +109,6 @@ "column.direct": "গোপনে মেনশন করুন", "column.directory": "প্রোফাইল ব্রাউজ করুন", "column.domain_blocks": "লুকোনো ডোমেনগুলি", - "column.favourites": "পছন্দের গুলো", "column.follow_requests": "অনুসরণের অনুমতি অনুরোধকারী", "column.home": "বাড়ি", "column.lists": "তালিকাগুলো", @@ -170,7 +169,6 @@ "confirmations.mute.explanation": "এটি তাদের কাছ থেকে পোস্ট এবং তাদেরকে মেনশন করা পোস্টগুলি হাইড করবে, তবুও তাদেরকে এটি আপনার পোস্ট গুলো দেখতে দিবে ও তারা আপনাকে অনুসরন করতে পারবে।.", "confirmations.mute.message": "আপনি কি নিশ্চিত {name} সরিয়ে ফেলতে চান ?", "confirmations.redraft.confirm": "মুছে ফেলুন এবং আবার সম্পাদন করুন", - "confirmations.redraft.message": "আপনি কি নিশ্চিত এটি মুছে ফেলে এবং আবার সম্পাদন করতে চান ? এটাতে যা পছন্দিত, সমর্থন বা মতামত আছে সেগুলো নতুন লেখার সাথে যুক্ত থাকবে না।", "confirmations.reply.confirm": "মতামত", "confirmations.reply.message": "এখন মতামত লিখতে গেলে আপনার এখন যেটা লিখছেন সেটা মুছে যাবে। আপনি নি নিশ্চিত এটা করতে চান ?", "confirmations.unfollow.confirm": "অনুসরণ বন্ধ করো", @@ -184,7 +182,6 @@ "directory.new_arrivals": "নতুন আগত", "directory.recently_active": "সম্প্রতি সক্রিয়", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "এই লেখাটি আপনার ওয়েবসাইটে যুক্ত করতে নিচের কোডটি বেবহার করুন।", "embed.preview": "সেটা দেখতে এরকম হবে:", @@ -208,8 +205,6 @@ "empty_column.bookmarked_statuses": "আপনার কাছে এখনও কোনও বুকমার্কড টুট নেই। আপনি যখন একটি বুকমার্ক করেন, এটি এখানে প্রদর্শিত হবে।", "empty_column.community": "স্থানীয় সময়রেখাতে কিছু নেই। প্রকাশ্যভাবে কিছু লিখে লেখালেখির উদ্বোধন করে ফেলুন!", "empty_column.domain_blocks": "এখনও কোনও লুকানো ডোমেন নেই।", - "empty_column.favourited_statuses": "আপনার পছন্দের কোনো টুট এখনো নেই। আপনি কোনো লেখা পছন্দের হিসেবে চিহ্নিত করলে এখানে পাওয়া যাবে।", - "empty_column.favourites": "কেও এখনো এটাকে পছন্দের টুট হিসেবে চিহ্নিত করেনি। যদি করে, তখন তাদের এখানে পাওয়া যাবে।", "empty_column.follow_requests": "তোমার এখনো কোনো অনুসরণের আবেদন পাওনি। যদি কেউ পাঠায়, এখানে পাওয়া যাবে।", "empty_column.hashtag": "এই হেসটাগে এখনো কিছু নেই।", "empty_column.home": "আপনার বাড়ির সময়রেখা এখনো খালি! {public} এ ঘুরে আসুন অথবা অনুসন্ধান বেবহার করে শুরু করতে পারেন এবং অন্য ব্যবহারকারীদের সাথে সাক্ষাৎ করতে পারেন।", @@ -253,8 +248,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "তালিকার ভেতরে নিচে যেতে", "keyboard_shortcuts.enter": "অবস্থা দেখতে", - "keyboard_shortcuts.favourite": "পছন্দের দেখতে", - "keyboard_shortcuts.favourites": "পছন্দের তালিকা বের করতে", "keyboard_shortcuts.federated": "যুক্তবিশ্বের সময়রেখাতে যেতে", "keyboard_shortcuts.heading": "কিবোর্ডের দ্রুতকারক (শর্টকাট)", "keyboard_shortcuts.home": "বাড়ির সময়রেখা খুলতে", @@ -303,7 +296,6 @@ "navigation_bar.discover": "ঘুরে দেখুন", "navigation_bar.domain_blocks": "লুকানো ডোমেনগুলি", "navigation_bar.edit_profile": "নিজের পাতা সম্পাদনা করতে", - "navigation_bar.favourites": "পছন্দের", "navigation_bar.filters": "বন্ধ করা শব্দ", "navigation_bar.follow_requests": "অনুসরণের অনুরোধগুলি", "navigation_bar.follows_and_followers": "অনুসরণ এবং অনুসরণকারী", @@ -316,7 +308,6 @@ "navigation_bar.public_timeline": "যুক্তবিশ্বের সময়রেখা", "navigation_bar.security": "নিরাপত্তা", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} আপনার কার্যক্রম পছন্দ করেছেন", "notification.follow": "{name} আপনাকে অনুসরণ করেছেন", "notification.follow_request": "{name} আপনাকে অনুসরণ করার জন্য অনুরধ করেছে", "notification.mention": "{name} আপনাকে উল্লেখ করেছেন", @@ -326,7 +317,6 @@ "notifications.clear": "প্রজ্ঞাপনগুলো মুছে ফেলতে", "notifications.clear_confirmation": "আপনি কি নির্চিত প্রজ্ঞাপনগুলো মুছে ফেলতে চান ?", "notifications.column_settings.alert": "কম্পিউটারে প্রজ্ঞাপনগুলি", - "notifications.column_settings.favourite": "পছন্দের:", "notifications.column_settings.filter_bar.advanced": "সব শ্রেণীগুলো দেখানো", "notifications.column_settings.filter_bar.category": "সংক্ষিপ্ত ছাঁকনি অংশ", "notifications.column_settings.follow": "নতুন অনুসরণকারীরা:", @@ -340,7 +330,6 @@ "notifications.column_settings.status": "New toots:", "notifications.filter.all": "সব", "notifications.filter.boosts": "সমর্থনগুলো", - "notifications.filter.favourites": "পছন্দের গুলো", "notifications.filter.follows": "অনুসরণের", "notifications.filter.mentions": "উল্লেখিত", "notifications.filter.polls": "নির্বাচনের ফলাফল", @@ -396,7 +385,6 @@ "search_results.statuses_fts_disabled": "তাদের সামগ্রী দ্বারা টুটগুলি অনুসন্ধান এই মস্তোডন সার্ভারে সক্ষম নয়।", "search_results.total": "{count, number} {count, plural, one {ফলাফল} other {ফলাফল}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "@{name} র জন্য পরিচালনার ইন্টারফেসে ঢুকুন", "status.admin_status": "যায় লেখাটি পরিচালনার ইন্টারফেসে খুলুন", "status.block": "@{name} কে ব্লক করুন", @@ -408,7 +396,6 @@ "status.detailed_status": "বিস্তারিত কথোপকথনের হিসেবে দেখতে", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", "status.embed": "এমবেড করতে", - "status.favourite": "পছন্দের করতে", "status.filtered": "ছাঁকনিদিত", "status.load_more": "আরো দেখুন", "status.media_hidden": "মিডিয়া লুকানো আছে", diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json index 6484767010..34f9ad21b5 100644 --- a/app/javascript/mastodon/locales/br.json +++ b/app/javascript/mastodon/locales/br.json @@ -100,7 +100,6 @@ "column.community": "Red-amzer lec'hel", "column.directory": "Mont a-dreuz ar profiloù", "column.domain_blocks": "Domani berzet", - "column.favourites": "Muiañ-karet", "column.follow_requests": "Rekedoù heuliañ", "column.home": "Degemer", "column.lists": "Listennoù", @@ -163,7 +162,6 @@ "confirmations.mute.explanation": "Kement-se a guzho an toudoù skrivet gantañ·i hag ar re a veneg anezhañ·i, met ne viro ket outañ·i a welet ho toudoù nag a heuliañ ac'hanoc'h.", "confirmations.mute.message": "Ha sur oc'h e fell deoc'h kuzhaat {name} ?", "confirmations.redraft.confirm": "Diverkañ ha skrivañ en-dro", - "confirmations.redraft.message": "Ha sur oc'h e fell deoc'h dilemel an toudoù-mañ hag e adskrivañ ? Kollet e vo ar merkoù « muiañ-karet » hag ar skignadennoù, hag emzivat e vo ar respontoù d'an toud orin.", "confirmations.reply.confirm": "Respont", "confirmations.reply.message": "Respont bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?", "confirmations.unfollow.confirm": "Diheuliañ", @@ -183,7 +181,6 @@ "dismissable_banner.community_timeline": "Setu toudoù foran nevesañ an dud a zo herberc’hiet o c'hontoù gant {domain}.", "dismissable_banner.dismiss": "Diverkañ", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Enframmit an toud-mañ en ho lec'hienn en ur eilañ ar c'hod amañ-dindan.", "embed.preview": "Setu penaos e teuio war wel :", @@ -210,8 +207,6 @@ "empty_column.community": "Goulo eo ar red-amzer lec'hel. Skrivit'ta un dra evit lakaat tan dezhi !", "empty_column.domain_blocks": "N'eus domani kuzh ebet c'hoazh.", "empty_column.explore_statuses": "N'eus tuadur ebet evit c'hoazh. Distroit diwezhatoc'h !", - "empty_column.favourited_statuses": "N'ho peus toud muiañ-karet ebet c'hoazh. Pa vo ouzhpennet unan e teuio war wel amañ.", - "empty_column.favourites": "Den ebet n'eus ouzhpennet an toud-mañ en e reoù muiañ-karet c'hoazh. Pa vo graet gant unan bennak e teuio war wel amañ.", "empty_column.follow_requests": "N'ho peus reked heuliañ ebet c'hoazh. Pa vo resevet unan e teuio war wel amañ.", "empty_column.hashtag": "N'eus netra er ger-klik-mañ c'hoazh.", "empty_column.home": "Goullo eo ho red-amzer degemer! Kit da weladenniñ {public} pe implijit ar c'hlask evit kregiñ ganti ha kejañ gant implijer·ien·ezed all.", @@ -269,13 +264,11 @@ "home.column_settings.show_replies": "Diskouez ar respontoù", "home.hide_announcements": "Kuzhat ar c'hemennoù", "home.show_announcements": "Diskouez ar c'hemennoù", - "interaction_modal.description.favourite": "Gant ur gont Mastodon e c'hellit ouzhpennañ an toud-mañ d'ho re vuiañ-karet evit lakaat an den en deus eñ skrivet da c'houzout e plij deoc'h hag en enrollañ evit diwezhatoc'h.", "interaction_modal.description.follow": "Gant ur gont Mastodon e c'hellit heuliañ {name} evit resev an toudoù a embann war ho red degemer.", "interaction_modal.description.reblog": "Gant ur gont Mastodon e c'hellit skignañ an toud-mañ evit rannañ anezhañ gant ho heulierien·ezed.", "interaction_modal.description.reply": "Gant ur gont Mastodon e c'hellit respont d'an toud-mañ.", "interaction_modal.on_another_server": "War ur servijer all", "interaction_modal.on_this_server": "War ar servijer-mañ", - "interaction_modal.title.favourite": "Ouzhpennañ toud {name} d'ar re vuiañ-karet", "interaction_modal.title.follow": "Heuliañ {name}", "interaction_modal.title.reblog": "Skignañ toud {name}", "interaction_modal.title.reply": "Respont da doud {name}", @@ -291,8 +284,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "Diskennañ er roll", "keyboard_shortcuts.enter": "Digeriñ an toud", - "keyboard_shortcuts.favourite": "Ouzhpennañ an toud d'ar re vuiañ-karet", - "keyboard_shortcuts.favourites": "Digeriñ roll an toudoù muiañ-karet", "keyboard_shortcuts.federated": "Digeriñ ar red-amzer kevredet", "keyboard_shortcuts.heading": "Berradennoù klavier", "keyboard_shortcuts.home": "Digeriñ ho red-amzer degemer", @@ -350,7 +341,6 @@ "navigation_bar.domain_blocks": "Domanioù kuzhet", "navigation_bar.edit_profile": "Kemmañ ar profil", "navigation_bar.explore": "Furchal", - "navigation_bar.favourites": "Ar re vuiañ-karet", "navigation_bar.filters": "Gerioù kuzhet", "navigation_bar.follow_requests": "Pedadoù heuliañ", "navigation_bar.follows_and_followers": "Heuliadennoù ha heulier·ezed·ien", @@ -366,7 +356,6 @@ "not_signed_in_indicator.not_signed_in": "Ret eo deoc'h kevreañ evit tizhout an danvez-se.", "notification.admin.report": "Disklêriet eo bet {target} gant {name}", "notification.admin.sign_up": "{name} en·he deus lakaet e·hec'h anv", - "notification.favourite": "Gant {name} eo bet ouzhpennet ho toud d'h·e re vuiañ-karet", "notification.follow": "heuliañ a ra {name} ac'hanoc'h", "notification.follow_request": "Gant {name} eo bet goulennet ho heuliañ", "notification.mention": "Gant {name} oc'h bet meneget", @@ -380,7 +369,6 @@ "notifications.column_settings.admin.report": "Disklêriadurioù nevez :", "notifications.column_settings.admin.sign_up": "Enskrivadurioù nevez :", "notifications.column_settings.alert": "Kemennoù war ar burev", - "notifications.column_settings.favourite": "Ar re vuiañ-karet:", "notifications.column_settings.filter_bar.advanced": "Skrammañ an-holl rummadoù", "notifications.column_settings.filter_bar.category": "Barrenn siloù prim", "notifications.column_settings.filter_bar.show_bar": "Diskouezh barrenn siloù", @@ -398,7 +386,6 @@ "notifications.column_settings.update": "Kemmoù :", "notifications.filter.all": "Pep tra", "notifications.filter.boosts": "Skignadennoù", - "notifications.filter.favourites": "Muiañ-karet", "notifications.filter.follows": "Heuliañ", "notifications.filter.mentions": "Menegoù", "notifications.filter.polls": "Disoc'hoù ar sontadegoù", @@ -515,7 +502,6 @@ "server_banner.server_stats": "Stadegoù ar servijer :", "sign_in_banner.create_account": "Krouiñ ur gont", "sign_in_banner.sign_in": "Kevreañ", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "Digeriñ etrefas evezherezh evit @{name}", "status.admin_status": "Digeriñ an toud e-barzh an etrefas evezherezh", "status.block": "Berzañ @{name}", @@ -529,7 +515,6 @@ "status.edited": "Aozet {date}", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", "status.embed": "Enframmañ", - "status.favourite": "Muiañ-karet", "status.filter": "Silañ ar c'hannad-mañ", "status.filtered": "Silet", "status.history.created": "Krouet gant {name} {date}", diff --git a/app/javascript/mastodon/locales/bs.json b/app/javascript/mastodon/locales/bs.json index 142e115594..703039723b 100644 --- a/app/javascript/mastodon/locales/bs.json +++ b/app/javascript/mastodon/locales/bs.json @@ -12,9 +12,7 @@ "compose_form.spoiler.unmarked": "Text is not hidden", "confirmations.delete.message": "Are you sure you want to delete this status?", "confirmations.domain_block.confirm": "Hide entire domain", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "empty_column.account_timeline": "No posts found", @@ -29,8 +27,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -55,7 +51,6 @@ "keyboard_shortcuts.up": "to move up in the list", "navigation_bar.domain_blocks": "Hidden domains", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.reblog": "{name} boosted your status", "onboarding.actions.go_to_explore": "See what's trending", "onboarding.actions.go_to_home": "Go to your home feed", @@ -79,7 +74,6 @@ "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.copy": "Copy link to status", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index abe5417e96..29b2e3c2da 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -114,7 +114,7 @@ "column.directory": "Navega pels perfils", "column.domain_blocks": "Dominis blocats", "column.favourites": "Favorits", - "column.firehose": "Canal en directe", + "column.firehose": "Fluxos en directe", "column.follow_requests": "Peticions de seguir-te", "column.home": "Inici", "column.lists": "Llistes", @@ -150,7 +150,7 @@ "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre diverses opcions", "compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció", "compose_form.publish": "Tut", - "compose_form.publish_form": "Nova publicació", + "compose_form.publish_form": "Nou tut", "compose_form.publish_loud": "Tut!", "compose_form.save_changes": "Desa els canvis", "compose_form.sensitive.hide": "{count, plural, one {Marca mèdia com a sensible} other {Marca mèdia com a sensible}}", @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "Això amagarà els tuts d'ells i els d'els que els mencionin, però encara els permetrà veure els teus tuts i seguir-te.", "confirmations.mute.message": "Segur que vols silenciar {name}?", "confirmations.redraft.confirm": "Elimina i reescriu-la", - "confirmations.redraft.message": "Segur que vols eliminar aquest tut i tornar-lo a escriure? Es perdran tots els impulsos i els favorits, i les respostes al tut original quedaran aïllades.", + "confirmations.redraft.message": "Segur que vols eliminar aquest tut i tornar a escriure'l? Es perdran tots els impulsos i els favorits, i les respostes al tut original quedaran aïllades.", "confirmations.reply.confirm": "Respon", "confirmations.reply.message": "Si respons ara, sobreescriuràs el missatge que estàs editant. Segur que vols continuar?", "confirmations.unfollow.confirm": "Deixa de seguir", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Aquests són els tuts públics més recents d'usuaris amb els seus comptes a {domain}.", "dismissable_banner.dismiss": "Ometre", "dismissable_banner.explore_links": "Gent d'aquest i d'altres servidors de la xarxa descentralitzada estan comentant ara mateix aquestes notícies.", - "dismissable_banner.explore_statuses": "Aquests tuts d'aquest i altres servidors de la xarxa descentralitzada estan guanyant l'atenció ara mateix en aquest servidor.", + "dismissable_banner.explore_statuses": "Aquests son els tuts de la xarxa descentralitzada que guanyen atenció ara mateix. Els tuts més nous amb més impulsos i favorits tenen millor rànquing.", "dismissable_banner.explore_tags": "Aquestes etiquetes estan guanyant ara mateix l'atenció dels usuaris d'aquest i altres servidors de la xarxa descentralitzada.", "dismissable_banner.public_timeline": "Aquests son els tuts públics més recents de les persones a la web social que les persones de {domain} segueixen.", "embed.instructions": "Incrusta aquest tut a la teva pàgina web copiant el codi següent.", @@ -313,9 +313,9 @@ "interaction_modal.description.reply": "Amb un compte a Mastodon, pots respondre aquest tut.", "interaction_modal.on_another_server": "En un servidor diferent", "interaction_modal.on_this_server": "En aquest servidor", - "interaction_modal.other_server_instructions": "Copia i enganxa aquest enllaç en el camp de cerca de la teva aplicació Mastodon preferida o a la interfície web del teu servidor Mastodon.", + "interaction_modal.other_server_instructions": "Copia i enganxa aquest URL en el camp de cerca de la teva aplicació Mastodon preferida o a la interfície web del teu servidor Mastodon.", "interaction_modal.preamble": "Com que Mastodon és descentralitzat, pots fer servir el teu compte existent en un altre servidor Mastodon o plataforma compatible si no tens compte en aquest.", - "interaction_modal.title.favourite": "Marca el tut de {name}", + "interaction_modal.title.favourite": "Afavoreix el tut de {name}", "interaction_modal.title.follow": "Segueix {name}", "interaction_modal.title.reblog": "Impulsa el tut de {name}", "interaction_modal.title.reply": "Respon al tut de {name}", @@ -331,7 +331,7 @@ "keyboard_shortcuts.direct": "per a obrir la columna de mencions privades", "keyboard_shortcuts.down": "Abaixa a la llista", "keyboard_shortcuts.enter": "Obre el tut", - "keyboard_shortcuts.favourite": "Afavoreix el tut", + "keyboard_shortcuts.favourite": "Tut afavorit", "keyboard_shortcuts.favourites": "Obre la llista de preferits", "keyboard_shortcuts.federated": "Obre la línia de temps federada", "keyboard_shortcuts.heading": "Dreceres de teclat", @@ -363,6 +363,7 @@ "lightbox.previous": "Anterior", "limited_account_hint.action": "Mostra el perfil de totes maneres", "limited_account_hint.title": "Aquest perfil l'han amagat els moderadors de {domain}.", + "link_preview.author": "Per {name}", "lists.account.add": "Afegeix a la llista", "lists.account.remove": "Elimina de la llista", "lists.delete": "Elimina la llista", @@ -395,7 +396,7 @@ "navigation_bar.domain_blocks": "Dominis blocats", "navigation_bar.edit_profile": "Edita el perfil", "navigation_bar.explore": "Explora", - "navigation_bar.favourites": "Preferits", + "navigation_bar.favourites": "Favorits", "navigation_bar.filters": "Paraules silenciades", "navigation_bar.follow_requests": "Sol·licituds de seguiment", "navigation_bar.followed_tags": "Etiquetes seguides", @@ -412,7 +413,7 @@ "not_signed_in_indicator.not_signed_in": "Cal que iniciïs la sessió per a accedir a aquest recurs.", "notification.admin.report": "{name} ha reportat {target}", "notification.admin.sign_up": "{name} s'ha registrat", - "notification.favourite": "a {name} li ha agradat el teu tut", + "notification.favourite": "{name} ha afavorit el teu tut", "notification.follow": "{name} et segueix", "notification.follow_request": "{name} ha sol·licitat seguir-te", "notification.mention": "{name} t'ha mencionat", @@ -444,7 +445,7 @@ "notifications.column_settings.update": "Edicions:", "notifications.filter.all": "Totes", "notifications.filter.boosts": "Impulsos", - "notifications.filter.favourites": "Preferides", + "notifications.filter.favourites": "Favorits", "notifications.filter.follows": "Seguiments", "notifications.filter.mentions": "Mencions", "notifications.filter.polls": "Resultats de l'enquesta", diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json index 7253841519..01b41abcf5 100644 --- a/app/javascript/mastodon/locales/ckb.json +++ b/app/javascript/mastodon/locales/ckb.json @@ -103,7 +103,6 @@ "column.direct": "ئاماژەی تایبەت", "column.directory": "گەڕان لە پرۆفایلەکان", "column.domain_blocks": "دۆمەینە داخراوەکان", - "column.favourites": "دڵخوازترینەکان", "column.follow_requests": "بەدواداچوی داواکاریەکان بکە", "column.home": "سەرەتا", "column.lists": "پێرست", @@ -168,7 +167,6 @@ "confirmations.mute.explanation": "ئەمەش دەبێتە هۆی شاردنەوەی پۆستەکان یان ئەو بابەتانەی کە ئاماژەیان پێ دەکات ، بەڵام هێشتا ڕێگەیان پێ دەدات کە پۆستەکانتان ببینن و شوێنتان بکەون.", "confirmations.mute.message": "ئایا دڵنیایت لەوەی دەتەوێت بیلێیت {name}?", "confirmations.redraft.confirm": "سڕینەوە & دووبارە ڕەشکردنەوە", - "confirmations.redraft.message": "ئایا دڵنیایت لەوەی دەتەوێت ئەم توتە بسڕیتەوە و دووبارە دایبنووسیتەوە؟ دڵخوازەکان و بەرزکردنەوەکان وون دەبن، و وەڵامەکان بۆ پۆستە ڕەسەنەکە هەتیو دەبن.", "confirmations.reply.confirm": "وەڵام", "confirmations.reply.message": "وەڵامدانەوە ئێستا ئەو نامەیە ی کە تۆ ئێستا دایڕشتووە، دەنووسێتەوە. ئایا دڵنیایت کە دەتەوێت بەردەوام بیت?", "confirmations.unfollow.confirm": "بەدوادانەچو", @@ -188,7 +186,6 @@ "dismissable_banner.community_timeline": "ئەمانە دوایین پۆستی گشتی ئەو کەسانەن کە ئەکاونتەکانیان لەلایەن {domain}ەوە هۆست کراوە.", "dismissable_banner.dismiss": "بەلاوە نان", "dismissable_banner.explore_links": "ئەم هەواڵانە لە ئێستادا لەلایەن کەسانێکەوە لەسەر ئەم سێرڤەرە و سێرڤەرەکانی تری تۆڕی لامەرکەزی باس دەکرێن.", - "dismissable_banner.explore_statuses": "ئەم پۆستانەی ئەم سێرڤەرە و سێرڤەرەکانی تری ناو تۆڕی لامەرکەزی لە ئێستادا خەریکە کێشکردن لەسەر ئەم سێرڤەرە بەدەست دەهێنن.", "dismissable_banner.explore_tags": "ئەم هاشتاگانە لە ئێستادا لە نێو خەڵکی سەر ئەم سێرڤەرە و سێرڤەرەکانی تری تۆڕی لامەرکەزیدا جێگەی خۆیان دەگرن.", "embed.instructions": "ئەم توتە بنچین بکە لەسەر وێب سایتەکەت بە کۆپیکردنی کۆدەکەی خوارەوە.", "embed.preview": "ئەمە ئەو شتەیە کە لە شێوەی خۆی دەچێت:", @@ -216,8 +213,6 @@ "empty_column.direct": "تا ئێستا هیچ نامەیەکی ڕاستەوخۆت نییە. کاتێک یەکێکیان دەنێری یان وەریدەگریت، لێرە دەردەکەوێت.", "empty_column.domain_blocks": "هێشتا هیچ دۆمەینێکی بلۆک کراو نییە.", "empty_column.explore_statuses": "لە ئێستادا هیچ شتێک ترێند نییە. دواتر سەیری بکە!", - "empty_column.favourited_statuses": "تۆ هێشتا هیچ توتێکی دڵخوازت نییە، کاتێک حەزت لە دانەیەکی باشە، لێرە دەرئەکەویت.", - "empty_column.favourites": "کەس ئەم توتەی دڵخواز نەکردووە،کاتێک کەسێک وا بکات، لێرە دەرئەکەون.", "empty_column.follow_requests": "تۆ هێشتا هیچ داواکارییەکی بەدواداچووت نیە. کاتێک یەکێکت بۆ هات، لێرە دەرئەکەویت.", "empty_column.followed_tags": "تۆ هێشتا شوێن هیچ هاشتاگێک نەکەوتوویت. کاتێک کردت، ئەوان لێرە دەردەکەون.", "empty_column.hashtag": "هێشتا هیچ شتێک لەم هاشتاگەدا نییە.", @@ -284,15 +279,12 @@ "home.column_settings.show_replies": "وەڵامدانەوەکان پیشان بدە", "home.hide_announcements": "شاردنەوەی راگەیەنراوەکان", "home.show_announcements": "پیشاندانی راگەیەنراوەکان", - "interaction_modal.description.favourite": "بە هەژمارێک لەسەر ماستدۆن، دەتوانیت ئەم بڵاوکراوەیە زیادبکەیت بۆ دڵخوازەکانت. بۆ ئاگادارکردنەوەی بڵاوکەرەوەکە لە پێزانینەکەت و هێشتنەوەی بۆ دواتر.", "interaction_modal.description.follow": "بە هەژمارێک لەسەر ماستدۆن، ئەتوانیت شوێن {name} بکەویت بۆ ئەوەی بڵاوکراوەکانی بگاتە پەڕەی سەرەکیت.", "interaction_modal.description.reblog": "بە هەژمارێک لەسەر ماستدۆن، ئەتوانیت ئەم بڵاوکراوەیە بەرزبکەیتەوە تاوەکو بەژداری پێبکەیت لەگەل شوێنکەوتوانت.", "interaction_modal.description.reply": "بە هەژمارێک لەسەر ماستدۆن، ئەتوانیت وەڵامی ئەم بڵاوکراوەیە بدەیتەوە.", "interaction_modal.on_another_server": "لەسەر ڕاژەیەکی جیا", "interaction_modal.on_this_server": "لەسەر ئەم ڕاژەیە", - "interaction_modal.other_server_instructions": "ئەم URLە کۆپی بکە و بیخە ناو بواری گەڕانی ئەپی دڵخوازت لە ماستۆدۆن یان ڕووکاری وێبی سێرڤەری ماستۆدۆنەکەت.", "interaction_modal.preamble": "بەو پێیەی ماستۆدۆن لامەرکەزییە، دەتوانیت ئەکاونتی ئێستات بەکاربهێنیت کە لەلایەن سێرڤەرێکی تری ماستۆدۆن یان پلاتفۆرمی گونجاوەوە هۆست کراوە ئەگەر ئەکاونتێکت لەسەر ئەم ئەکاونتە نەبێت.", - "interaction_modal.title.favourite": "پۆستی {name}ی دڵخواز", "interaction_modal.title.follow": "دوای {name} بکەوە", "interaction_modal.title.reblog": "پۆستی {name} زیاد بکە", "interaction_modal.title.reply": "وەڵامی پۆستەکەی {name} بدەرەوە", @@ -308,8 +300,6 @@ "keyboard_shortcuts.direct": "بۆ کردنەوەی ستوونی ئاماژەی تایبەت", "keyboard_shortcuts.down": "بۆ چوونە خوارەوە لە لیستەکەدا", "keyboard_shortcuts.enter": "بۆ کردنەوەی توت", - "keyboard_shortcuts.favourite": "بۆ دڵخواز", - "keyboard_shortcuts.favourites": "بۆ کردنەوەی لیستی دڵخوازەکان", "keyboard_shortcuts.federated": "بۆ کردنەوەی نووسراوەکانی هەمووشوێن", "keyboard_shortcuts.heading": "قه‌دبڕەکانی تەختەکلیل", "keyboard_shortcuts.home": "بۆ کردنەوەی هێڵی کاتی ماڵەوە", @@ -370,7 +360,6 @@ "navigation_bar.domain_blocks": "دۆمەینە بلۆک کراوەکان", "navigation_bar.edit_profile": "دەستکاری پرۆفایل بکە", "navigation_bar.explore": "گەڕان", - "navigation_bar.favourites": "دڵخوازەکان", "navigation_bar.filters": "وشە کپەکان", "navigation_bar.follow_requests": "بەدواداچوی داواکاریەکان بکە", "navigation_bar.followed_tags": "هاشتاگی بەدوادا هات", @@ -387,7 +376,6 @@ "not_signed_in_indicator.not_signed_in": "پێویستە بچیتە ژوورەوە بۆ دەستگەیشتن بەم سەرچاوەیە.", "notification.admin.report": "{name} ڕاپۆرت کراوە {target}", "notification.admin.sign_up": "{name} تۆمارکرا", - "notification.favourite": "{name} نووسراوەکەتی پەسەند کرد", "notification.follow": "{name} دوای تۆ کەوت", "notification.follow_request": "{name} داوای کردووە کە شوێنت بکەوێت", "notification.mention": "{name} باسی ئێوەی کرد", @@ -401,7 +389,6 @@ "notifications.column_settings.admin.report": "ڕاپۆرتە نوێیەکان:", "notifications.column_settings.admin.sign_up": "چوونەژوورەوەی نوێ:", "notifications.column_settings.alert": "ئاگانامەکانی پیشانگەرر ڕومێزی", - "notifications.column_settings.favourite": "دڵخوازترین:", "notifications.column_settings.filter_bar.advanced": "هەموو پۆلەکان پیشان بدە", "notifications.column_settings.filter_bar.category": "شریتی پاڵێوەری خێرا", "notifications.column_settings.filter_bar.show_bar": "نیشاندانی شریتی پاڵافتن", @@ -419,7 +406,6 @@ "notifications.column_settings.update": "دەستکاری:", "notifications.filter.all": "هەموو", "notifications.filter.boosts": "دووبارەتوتەکان", - "notifications.filter.favourites": "دڵخوازەکان", "notifications.filter.follows": "بەدواداچوون", "notifications.filter.mentions": "ئاماژەکان", "notifications.filter.polls": "ئەنجامەکانی ڕاپرسی", @@ -550,7 +536,6 @@ "server_banner.server_stats": "دۆخی ڕاژەکار:", "sign_in_banner.create_account": "هەژمار دروستبکە", "sign_in_banner.sign_in": "بچۆ ژوورەوە", - "sign_in_banner.text": "چوونەژوورەوە بۆ فۆڵۆوکردنی پڕۆفایلی یان هاشتاگەکان، دڵخوازەکان، شەیرکردن و وەڵامدانەوەی پۆستەکان. هەروەها دەتوانیت لە ئەکاونتەکەتەوە لەسەر سێرڤەرێکی جیاواز کارلێک بکەیت.", "status.admin_account": "کردنەوەی میانڕەوی بەڕێوەبەر بۆ @{name}", "status.admin_domain": "ڕووکاری مامناوەندی بکەرەوە بۆ {domain}", "status.admin_status": "ئەم توتە بکەوە لە ناو ڕووکاری بەڕیوەبەر", @@ -567,7 +552,6 @@ "status.edited": "بەشداری {date}", "status.edited_x_times": "دەستکاریکراوە {count, plural, one {{count} کات} other {{count} کات}}", "status.embed": "نیشتەجێ بکە", - "status.favourite": "دڵخواز", "status.filter": "ئەم پۆستە فلتەر بکە", "status.filtered": "پاڵاوتن", "status.hide": "شاردنەوەی پۆست", diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json index d5f8daa015..c674c8e876 100644 --- a/app/javascript/mastodon/locales/co.json +++ b/app/javascript/mastodon/locales/co.json @@ -57,7 +57,6 @@ "column.community": "Linea pubblica lucale", "column.directory": "Percorre i prufili", "column.domain_blocks": "Duminii piattati", - "column.favourites": "Favuriti", "column.follow_requests": "Dumande d'abbunamentu", "column.home": "Accolta", "column.lists": "Liste", @@ -113,7 +112,6 @@ "confirmations.mute.explanation": "Quessu hà da piattà i statuti da sta persona è i posti chì a mintuvanu, ma ellu·a puderà sempre vede i vostri statuti è siguità vi.", "confirmations.mute.message": "Site sicuru·a che vulete piattà @{name}?", "confirmations.redraft.confirm": "Sguassà è riscrive", - "confirmations.redraft.message": "Site sicuru·a chè vulete sguassà stu statutu è riscrivelu? I favuriti è spartere saranu persi, è e risposte diventeranu orfane.", "confirmations.reply.confirm": "Risponde", "confirmations.reply.message": "Risponde avà sguasserà u missaghju chì scrivite. Site sicuru·a chì vulete cuntinuà?", "confirmations.unfollow.confirm": "Disabbunassi", @@ -127,7 +125,6 @@ "directory.new_arrivals": "Ultimi arrivi", "directory.recently_active": "Attività ricente", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Integrà stu statutu à u vostru situ cù u codice quì sottu.", "embed.preview": "Hà da parè à quessa:", @@ -152,8 +149,6 @@ "empty_column.bookmarked_statuses": "Ùn avete manc'un segnalibru. Quandu aghjunghjerate unu, sarà mustratu quì.", "empty_column.community": "Ùn c'hè nunda indè a linea lucale. Scrivete puru qualcosa!", "empty_column.domain_blocks": "Ùn c'hè manc'un duminiu bluccatu avà.", - "empty_column.favourited_statuses": "Ùn avete manc'unu statutu favuritu. Quandu aghjunghjerate unu à i vostri favuriti, sarà mustratu quì.", - "empty_column.favourites": "Nisunu hà aghjuntu stu statutu à i so favuriti. Quandu qualch'unu farà quessa, u so contu sarà mustratu quì.", "empty_column.follow_requests": "Ùn avete manc'una dumanda d'abbunamentu. Quandu averete una, sarà mustrata quì.", "empty_column.hashtag": "Ùn c'hè ancu nunda quì.", "empty_column.home": "A vostr'accolta hè viota! Pudete andà nant'à {public} o pruvà a ricerca per truvà parsone da siguità.", @@ -199,8 +194,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "falà indè a lista", "keyboard_shortcuts.enter": "apre u statutu", - "keyboard_shortcuts.favourite": "aghjunghje à i favuriti", - "keyboard_shortcuts.favourites": "per apre a lista di i favuriti", "keyboard_shortcuts.federated": "per apre a linea pubblica glubale", "keyboard_shortcuts.heading": "Accorte cù a tastera", "keyboard_shortcuts.home": "per apre a linea d'accolta", @@ -255,7 +248,6 @@ "navigation_bar.discover": "Scopre", "navigation_bar.domain_blocks": "Duminii piattati", "navigation_bar.edit_profile": "Mudificà u prufile", - "navigation_bar.favourites": "Favuriti", "navigation_bar.filters": "Parolle silenzate", "navigation_bar.follow_requests": "Dumande d'abbunamentu", "navigation_bar.follows_and_followers": "Abbunati è abbunamenti", @@ -268,7 +260,6 @@ "navigation_bar.public_timeline": "Linea pubblica glubale", "navigation_bar.security": "Sicurità", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} hà aghjuntu u vostru statutu à i so favuriti", "notification.follow": "{name} v'hà seguitatu", "notification.follow_request": "{name} vole abbunassi à u vostru contu", "notification.mention": "{name} v'hà mintuvatu", @@ -279,7 +270,6 @@ "notifications.clear": "Purgà e nutificazione", "notifications.clear_confirmation": "Site sicuru·a che vulete toglie tutte ste nutificazione?", "notifications.column_settings.alert": "Nutificazione nant'à l'urdinatore", - "notifications.column_settings.favourite": "Favuriti:", "notifications.column_settings.filter_bar.advanced": "Affissà tutte e categurie", "notifications.column_settings.filter_bar.category": "Barra di ricerca pronta", "notifications.column_settings.follow": "Abbunati novi:", @@ -293,7 +283,6 @@ "notifications.column_settings.status": "Statuti novi:", "notifications.filter.all": "Tuttu", "notifications.filter.boosts": "Spartere", - "notifications.filter.favourites": "Favuriti", "notifications.filter.follows": "Abbunamenti", "notifications.filter.mentions": "Minzione", "notifications.filter.polls": "Risultati di u scandagliu", @@ -359,7 +348,6 @@ "search_results.statuses_fts_disabled": "A ricerca di i cuntinuti di i statuti ùn hè micca attivata nant'à stu servore Mastodon.", "search_results.total": "{count, number} {count, plural, one {risultatu} other {risultati}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "Apre l'interfaccia di muderazione per @{name}", "status.admin_status": "Apre stu statutu in l'interfaccia di muderazione", "status.block": "Bluccà @{name}", @@ -371,7 +359,6 @@ "status.detailed_status": "Vista in ditagliu di a cunversazione", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", "status.embed": "Integrà", - "status.favourite": "Aghjunghje à i favuriti", "status.filtered": "Filtratu", "status.load_more": "Vede di più", "status.media_hidden": "Media piattata", diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json index 2f351a28b2..0eb7320bbd 100644 --- a/app/javascript/mastodon/locales/cs.json +++ b/app/javascript/mastodon/locales/cs.json @@ -17,6 +17,7 @@ "account.badges.group": "Skupina", "account.block": "Blokovat @{name}", "account.block_domain": "Blokovat doménu {domain}", + "account.block_short": "Zablokovat", "account.blocked": "Blokovaný", "account.browse_more_on_origin_server": "Více na původním profilu", "account.cancel_follow_request": "Zrušit žádost o sledování", @@ -48,7 +49,10 @@ "account.mention": "Zmínit @{name}", "account.moved_to": "Uživatel {name} uvedl, že jeho nový účet je nyní:", "account.mute": "Skrýt @{name}", + "account.mute_notifications_short": "Ztlumit upozornění", + "account.mute_short": "Ztlumit", "account.muted": "Skrytý", + "account.no_bio": "Nebyl poskytnut žádný popis.", "account.open_original_page": "Otevřít původní stránku", "account.posts": "Příspěvky", "account.posts_with_replies": "Příspěvky a odpovědi", @@ -64,6 +68,7 @@ "account.unendorse": "Nezvýrazňovat na profilu", "account.unfollow": "Přestat sledovat", "account.unmute": "Zrušit skrytí @{name}", + "account.unmute_notifications_short": "Zrušit ztlumení oznámení", "account.unmute_short": "Zrušit skrytí", "account_note.placeholder": "Klikněte pro přidání poznámky", "admin.dashboard.daily_retention": "Míra udržení uživatelů podle dne po registraci", @@ -71,6 +76,10 @@ "admin.dashboard.retention.average": "Průměr", "admin.dashboard.retention.cohort": "Měsíc registrace", "admin.dashboard.retention.cohort_size": "Noví uživatelé", + "admin.impact_report.instance_accounts": "Profily účtů, které by odstranily", + "admin.impact_report.instance_followers": "Sledovatelé, o které by naši uživatelé přišli", + "admin.impact_report.instance_follows": "Následovníci jejich uživatelé by ztratili", + "admin.impact_report.title": "Shrnutí dopadu", "alert.rate_limited.message": "Zkuste to prosím znovu po {retry_time, time, medium}.", "alert.rate_limited.title": "Spojení omezena", "alert.unexpected.message": "Objevila se neočekávaná chyba.", @@ -105,6 +114,7 @@ "column.directory": "Prozkoumat profily", "column.domain_blocks": "Blokované domény", "column.favourites": "Oblíbené", + "column.firehose": "Živé kanály l", "column.follow_requests": "Žádosti o sledování", "column.home": "Domů", "column.lists": "Seznamy", @@ -171,7 +181,7 @@ "confirmations.mute.explanation": "Tohle skryje uživatelovy příspěvky a příspěvky, které ho zmiňují, ale uživatel stále uvidí vaše příspěvky a může vás sledovat.", "confirmations.mute.message": "Opravdu chcete skrýt uživatele {name}?", "confirmations.redraft.confirm": "Smazat a přepsat", - "confirmations.redraft.message": "Opravdu chcete smazat a přepsat tento příspěvek? Oblíbení a boosty budou ztraceny a odpovědi na původní příspěvek ztratí kontext.", + "confirmations.redraft.message": "Jste si jistí, že chcete odstranit tento příspěvek a vytvořit z něj koncept? Oblíbené a boosty budou ztraceny a odpovědi na původní příspěvek ztratí kontext.", "confirmations.reply.confirm": "Odpovědět", "confirmations.reply.message": "Odpověď přepíše vaši rozepsanou zprávu. Opravdu chcete pokračovat?", "confirmations.unfollow.confirm": "Přestat sledovat", @@ -192,7 +202,6 @@ "dismissable_banner.community_timeline": "Toto jsou nejnovější veřejné příspěvky od lidí, jejichž účty hostuje {domain}.", "dismissable_banner.dismiss": "Zavřít", "dismissable_banner.explore_links": "O těchto zprávách hovoří lidé na tomto a dalších serverech decentralizované sítě právě teď.", - "dismissable_banner.explore_statuses": "Tyto příspěvky z tohoto a dalších serverů v decentralizované síti nyní na tomto serveru získávají na popularitě.", "dismissable_banner.explore_tags": "Tyto hashtagy právě teď získávají na popularitě mezi lidmi na tomto a dalších serverech decentralizované sítě.", "embed.instructions": "Pro přidání příspěvku na vaši webovou stránku zkopírujte níže uvedený kód.", "embed.preview": "Takhle to bude vypadat:", @@ -220,8 +229,6 @@ "empty_column.direct": "Zatím nemáte žádné soukromé zmínky. Až nějakou pošlete nebo dostanete, zobrazí se zde.", "empty_column.domain_blocks": "Ještě nemáte žádné zablokované domény.", "empty_column.explore_statuses": "Momentálně není nic populární. Vraťte se později!", - "empty_column.favourited_statuses": "Zatím nemáte žádné oblíbené příspěvky. Až si nějaký oblíbíte, zobrazí se zde.", - "empty_column.favourites": "Tento příspěvek si zatím nikdo neoblíbil. Až to někdo udělá, zobrazí se zde.", "empty_column.follow_requests": "Zatím nemáte žádné žádosti o sledování. Až nějakou obdržíte, zobrazí se zde.", "empty_column.followed_tags": "Zatím jste nesledovali žádné hashtagy. Až to uděláte, objeví se zde.", "empty_column.hashtag": "Pod tímto hashtagem zde zatím nic není.", @@ -259,6 +266,9 @@ "filter_modal.select_filter.subtitle": "Použít existující kategorii nebo vytvořit novou kategorii", "filter_modal.select_filter.title": "Filtrovat tento příspěvek", "filter_modal.title.status": "Filtrovat příspěvek", + "firehose.all": "Vše", + "firehose.local": "Tento server", + "firehose.remote": "Ostatní servery", "follow_request.authorize": "Autorizovat", "follow_request.reject": "Zamítnout", "follow_requests.unlocked_explanation": "Přestože váš účet není zamčený, administrátor {domain} usoudil, že byste mohli chtít tyto žádosti o sledování zkontrolovat ručně.", @@ -289,15 +299,12 @@ "home.column_settings.show_replies": "Zobrazit odpovědi", "home.hide_announcements": "Skrýt oznámení", "home.show_announcements": "Zobrazit oznámení", - "interaction_modal.description.favourite": "Pokud máte účet na Mastodonu, můžete tento příspěvek označit jako oblíbený a dát tak autorovi najevo, že si ho vážíte, a uložit si ho na později.", "interaction_modal.description.follow": "S účtem na Mastodonu můžete sledovat uživatele {name} a přijímat příspěvky ve vašem domovském kanálu.", "interaction_modal.description.reblog": "S účtem na Mastodonu můžete boostnout tento příspěvek a sdílet jej s vlastními sledujícími.", "interaction_modal.description.reply": "S účtem na Mastodonu můžete odpovědět na tento příspěvek.", "interaction_modal.on_another_server": "Na jiném serveru", "interaction_modal.on_this_server": "Na tomto serveru", - "interaction_modal.other_server_instructions": "Zkopírujte a vložte tuto URL adresu do vyhledávacího pole vaší oblíbené Mastodon aplikace nebo webového rozhraní vašeho Mastodon serveru.", "interaction_modal.preamble": "Protože Mastodon je decentralizovaný, pokud nemáte účet na tomto serveru, můžete použít svůj existující účet hostovaný jiným Mastodon serverem nebo kompatibilní platformou.", - "interaction_modal.title.favourite": "Oblíbit si příspěvek od uživatele {name}", "interaction_modal.title.follow": "Sledovat {name}", "interaction_modal.title.reblog": "Boostnout příspěvek uživatele {name}", "interaction_modal.title.reply": "Odpovědět na příspěvek uživatele {name}", @@ -313,8 +320,6 @@ "keyboard_shortcuts.direct": "otevřít sloupec soukromých zmínek", "keyboard_shortcuts.down": "Posunout v seznamu dolů", "keyboard_shortcuts.enter": "Otevřít příspěvek", - "keyboard_shortcuts.favourite": "Oblíbit si příspěvek", - "keyboard_shortcuts.favourites": "Otevřít seznam oblíbených", "keyboard_shortcuts.federated": "Otevřít federovanou časovou osu", "keyboard_shortcuts.heading": "Klávesové zkratky", "keyboard_shortcuts.home": "Otevřít domovskou časovou osu", @@ -375,7 +380,6 @@ "navigation_bar.domain_blocks": "Blokované domény", "navigation_bar.edit_profile": "Upravit profil", "navigation_bar.explore": "Prozkoumat", - "navigation_bar.favourites": "Oblíbené", "navigation_bar.filters": "Skrytá slova", "navigation_bar.follow_requests": "Žádosti o sledování", "navigation_bar.followed_tags": "Sledované hashtagy", @@ -392,7 +396,6 @@ "not_signed_in_indicator.not_signed_in": "Pro přístup k tomuto zdroji se musíte přihlásit.", "notification.admin.report": "Uživatel {name} nahlásil {target}", "notification.admin.sign_up": "Uživatel {name} se zaregistroval", - "notification.favourite": "Uživatel {name} si oblíbil váš příspěvek", "notification.follow": "Uživatel {name} vás začal sledovat", "notification.follow_request": "Uživatel {name} požádal o povolení vás sledovat", "notification.mention": "Uživatel {name} vás zmínil", @@ -406,7 +409,6 @@ "notifications.column_settings.admin.report": "Nová hlášení:", "notifications.column_settings.admin.sign_up": "Nové registrace:", "notifications.column_settings.alert": "Oznámení na počítači", - "notifications.column_settings.favourite": "Oblíbení:", "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie", "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování", "notifications.column_settings.filter_bar.show_bar": "Zobrazit panel filtrů", @@ -424,7 +426,6 @@ "notifications.column_settings.update": "Úpravy:", "notifications.filter.all": "Vše", "notifications.filter.boosts": "Boosty", - "notifications.filter.favourites": "Oblíbení", "notifications.filter.follows": "Sledování", "notifications.filter.mentions": "Zmínky", "notifications.filter.polls": "Výsledky anket", @@ -565,7 +566,6 @@ "server_banner.server_stats": "Statistiky serveru:", "sign_in_banner.create_account": "Vytvořit účet", "sign_in_banner.sign_in": "Přihlásit se", - "sign_in_banner.text": "Přihlaste se pro sledování profilů nebo hashtagů, označování oblíbených položek, sdílení a odpovídání na příspěvky. Svůj účet můžete používat k interagování i na jiném serveru.", "status.admin_account": "Otevřít moderátorské rozhraní pro @{name}", "status.admin_domain": "Otevřít moderátorské rozhraní pro {domain}", "status.admin_status": "Otevřít tento příspěvek v moderátorském rozhraní", @@ -582,7 +582,6 @@ "status.edited": "Upraveno {date}", "status.edited_x_times": "Upraveno {count, plural, one {{count}krát} few {{count}krát} many {{count}krát} other {{count}krát}}", "status.embed": "Vložit na web", - "status.favourite": "Oblíbit", "status.filter": "Filtrovat tento příspěvek", "status.filtered": "Filtrováno", "status.hide": "Skrýt příspěvek", diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json index a01dad553a..aa98e070e3 100644 --- a/app/javascript/mastodon/locales/cy.json +++ b/app/javascript/mastodon/locales/cy.json @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "Bydd hyn yn cuddio postiadau oddi wrthyn nhw a phostiadau sydd yn sôn amdanyn nhw, ond bydd hyn dal yn gadael iddyn nhw gweld eich postiadau a'ch dilyn.", "confirmations.mute.message": "Ydych chi wir eisiau tewi {name}?", "confirmations.redraft.confirm": "Dileu ac ailddrafftio", - "confirmations.redraft.message": "Ydych chi wir eisiau dileu y postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd ymatebion i'r postiad gwreiddiol yn cael eu hamddifadu.", + "confirmations.redraft.message": "Ydych chi'n siŵr eich bod am ddileu'r postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd atebion i'r post gwreiddiol yn mynd yn amddifad.", "confirmations.reply.confirm": "Ateb", "confirmations.reply.message": "Bydd ateb nawr yn cymryd lle y neges yr ydych yn cyfansoddi ar hyn o bryd. Ydych chi'n siŵr eich bod am barhau?", "confirmations.unfollow.confirm": "Dad-ddilyn", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl gyda chyfrifon ar {domain}.", "dismissable_banner.dismiss": "Diddymu", "dismissable_banner.explore_links": "Dyma'r straeon newyddion sy'n cael eu trafod ar hyn o bryd gan bobl ar y gweinydd hwn a rhai eraill ar y rhwydwaith datganoledig yma.", - "dismissable_banner.explore_statuses": "Dyma'r postiadau o'r gweinydd hwn a gweinyddion eraill ar y rhwydwaith datganoledig sy'n denu sylw ar y gweinydd hwn ar hyn o bryd.", + "dismissable_banner.explore_statuses": "Mae'r rhain yn bostiadau o bob rhan o'r we gymdeithasol sy'n cael eu poblogeiddio heddiw. Mae postiadau mwy diweddar gyda mwy o hybiau a ffefrynnau yn cael eu graddio'n uwch.", "dismissable_banner.explore_tags": "Mae'r hashnodau hyn yn denu sylw ymhlith pobl ar y gweinydd hwn a gweinyddwyr eraill y rhwydwaith datganoledig ar hyn o bryd.", "dismissable_banner.public_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl ar y we gymdeithasol y mae pobl ar {domain} yn eu dilyn.", "embed.instructions": "Gosodwch y post hwn ar eich gwefan drwy gopïo'r côd isod.", @@ -232,7 +232,7 @@ "empty_column.domain_blocks": "Nid oes yna unrhyw barthau cuddiedig eto.", "empty_column.explore_statuses": "Does dim yn trendio ar hyn o bryd. Dewch nôl nes ymlaen!", "empty_column.favourited_statuses": "Nid oes gennych unrhyw hoff bostiadau eto. Pan byddwch yn hoffi un, bydd yn ymddangos yma.", - "empty_column.favourites": "Does neb wedi hoffi'r post hwn eto. Pan bydd rhywun yn ei hoffi, byddent yn ymddangos yma.", + "empty_column.favourites": "Nid oes unrhyw un wedi hoffi'r postiad hwn eto. Pan fydd rhywun yn gwneud hynny, byddan nhw'n ymddangos yma.", "empty_column.follow_requests": "Nid oes gennych unrhyw geisiadau dilyn eto. Pan fyddwch yn derbyn un, byddan nhw'n ymddangos yma.", "empty_column.followed_tags": "Nid ydych wedi dilyn unrhyw hashnodau eto. Pan fyddwch chi'n gwneud hynny, byddan nhw'n ymddangos yma.", "empty_column.hashtag": "Nid oes dim ar yr hashnod hwn eto.", @@ -307,13 +307,13 @@ "home.explore_prompt.title": "Dyma'ch cartref o feewnn Mastodon.", "home.hide_announcements": "Cuddio cyhoeddiadau", "home.show_announcements": "Dangos cyhoeddiadau", - "interaction_modal.description.favourite": "Gyda chyfrif ar Mastodon, gallwch chi hoffi'r postiad hwn i roi gwybod i'r awdur eich bod chi'n ei werthfawrogi a'i gadw ar gyfer nes ymlaen.", + "interaction_modal.description.favourite": "Gyda chyfrif ar Mastodon, gallwch chi hoffi'r postiad hwn er mwyn roi gwybod i'r awdur eich bod chi'n ei werthfawrogi ac yn ei gadw ar gyfer nes ymlaen.", "interaction_modal.description.follow": "Gyda chyfrif ar Mastodon, gallwch ddilyn {name} i dderbyn eu postiadau yn eich llif cartref.", "interaction_modal.description.reblog": "Gyda chyfrif ar Mastodon, gallwch hybu'r postiad hwn i'w rannu â'ch dilynwyr.", "interaction_modal.description.reply": "Gyda chyfrif ar Mastodon, gallwch ymateb i'r postiad hwn.", "interaction_modal.on_another_server": "Ar weinydd gwahanol", "interaction_modal.on_this_server": "Ar y gweinydd hwn", - "interaction_modal.other_server_instructions": "Copïwch a gludo'r URL hwn i faes chwilio eich hoff ap Mastodon neu ryngwyneb gwe eich gweinydd Mastodon.", + "interaction_modal.other_server_instructions": "Copïwch a gludwch yr URL hwn i faes chwilio eich hoff ap Mastodon neu ryngwyneb gwe eich gweinydd Mastodon.", "interaction_modal.preamble": "Gan fod Mastodon wedi'i ddatganoli, gallwch ddefnyddio'ch cyfrif presennol a gynhelir gan weinydd Mastodon arall neu blatfform cydnaws os nad oes gennych gyfrif ar yr un hwn.", "interaction_modal.title.favourite": "Hoffi postiad {name}", "interaction_modal.title.follow": "Dilyn {name}", @@ -385,7 +385,7 @@ "mute_modal.hide_notifications": "Cuddio hysbysiadau gan y defnyddiwr hwn?", "mute_modal.indefinite": "Parhaus", "navigation_bar.about": "Ynghylch", - "navigation_bar.advanced_interface": "Abrir coa interface web avanzada", + "navigation_bar.advanced_interface": "Agor mewn rhyngwyneb gwe uwch", "navigation_bar.blocks": "Defnyddwyr wedi eu blocio", "navigation_bar.bookmarks": "Llyfrnodau", "navigation_bar.community_timeline": "Ffrwd leol", @@ -412,7 +412,7 @@ "not_signed_in_indicator.not_signed_in": "Rhaid i chi fewngofnodi i weld yr adnodd hwn.", "notification.admin.report": "Adroddwyd ar {name} {target}", "notification.admin.sign_up": "Cofrestrodd {name}", - "notification.favourite": "Hoffodd {name} eich post", + "notification.favourite": "Hoffodd {name} eich postiad", "notification.follow": "Dilynodd {name} chi", "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn", "notification.mention": "Crybwyllodd {name} amdanoch chi", @@ -595,7 +595,7 @@ "server_banner.server_stats": "Ystadegau'r gweinydd:", "sign_in_banner.create_account": "Creu cyfrif", "sign_in_banner.sign_in": "Mewngofnodi", - "sign_in_banner.text": "Mewngofnodwch i ddilyn proffiliau neu hashnodau, ffefrynnau, rhannu ac ateb postiadau. Gallwch hefyd ryngweithio o'ch cyfrif ar weinydd gwahanol.", + "sign_in_banner.text": "Mewngofnodwch i ddilyn proffiliau neu hashnodau, ffefrynnau, rhannu ac ymateb i bostiadau. Gallwch hefyd ryngweithio o'ch cyfrif ar weinyddion gwahanol.", "status.admin_account": "Agor rhyngwyneb cymedroli ar gyfer @{name}", "status.admin_domain": "Agor rhyngwyneb cymedroli {domain}", "status.admin_status": "Agor y postiad hwn yn y rhyngwyneb cymedroli", @@ -612,7 +612,7 @@ "status.edited": "Golygwyd {date}", "status.edited_x_times": "Golygwyd {count, plural, one {count} two {count} other {{count} gwaith}}", "status.embed": "Mewnblannu", - "status.favourite": "Ffefryn", + "status.favourite": "Hoffi", "status.filter": "Hidlo'r postiad hwn", "status.filtered": "Wedi'i hidlo", "status.hide": "Cuddio'r postiad", diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json index e60f9f6fe2..db1b0be78f 100644 --- a/app/javascript/mastodon/locales/da.json +++ b/app/javascript/mastodon/locales/da.json @@ -138,7 +138,7 @@ "compose.published.body": "Indlæg udgivet.", "compose.published.open": "Åbn", "compose_form.direct_message_warning_learn_more": "Få mere at vide", - "compose_form.encryption_warning": "Indlæg på Mastodon er ikke ende-til-ende krypteret. Del derfor ikke sensitiv information via Mastodon.", + "compose_form.encryption_warning": "Indlæg på Mastodon er ikke ende-til-ende-krypteret. Del derfor ikke sensitiv information via Mastodon.", "compose_form.hashtag_warning": "Da indlægget ikke er offentligt, vises det ikke under noget hashtag, da kun offentlige indlæg er søgbare via hashtags.", "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Enhver kan følge dig og se indlæg kun beregnet for følgere.", "compose_form.lock_disclaimer.lock": "låst", @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "Dette skjuler indlæg fra (og om) dem, men lader dem fortsat se dine indlæg og følge dig.", "confirmations.mute.message": "Er du sikker på, at du vil skjule {name}?", "confirmations.redraft.confirm": "Slet og omformulér", - "confirmations.redraft.message": "Er du sikker på, at du vil slette dette indlæg for at omskrive det? Favoritter og boosts går tabt, og svar til det oprindelige indlæg afassocieres.", + "confirmations.redraft.message": "Sikker på, at dette indlæg skal slettes og omskrives? Favoritter og boosts går tabt, og svar til det oprindelige indlæg mister tilknytningen.", "confirmations.reply.confirm": "Svar", "confirmations.reply.message": "Hvis du svarer nu, vil det overskrive den besked, du er ved at skrive. Fortsæt alligevel?", "confirmations.unfollow.confirm": "Følg ikke længere", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Disse er de seneste offentlige indlæg fra personer med konti hostes af {domain}.", "dismissable_banner.dismiss": "Afvis", "dismissable_banner.explore_links": "Der tales lige nu om disse nyhedshistorier af folk på denne og andre servere i det decentraliserede netværk.", - "dismissable_banner.explore_statuses": "Disse indlæg vinder lige nu fodfæste på denne og andre servere i det decentraliserede netværk.", + "dismissable_banner.explore_statuses": "Disse indlæg fra diverse sociale netværk vinder fodfæste i dag. Nyere indlæg med flere boosts og favoritter rangeres højere.", "dismissable_banner.explore_tags": "Disse hashtages vinder lige nu fodfæste blandt folk på denne og andre servere i det decentraliserede netværk.", "dismissable_banner.public_timeline": "Dette er de seneste offentlige indlæg fra folk på det sociale netværk, som folk på {domain} følger.", "embed.instructions": "Indlejr dette indlæg på dit websted ved at kopiere nedenstående kode.", @@ -303,17 +303,17 @@ "home.column_settings.basic": "Grundlæggende", "home.column_settings.show_reblogs": "Vis boosts", "home.column_settings.show_replies": "Vis svar", - "home.explore_prompt.body": "Dit hjem feed vil have en blanding af indlæg fra de hashtags du har valgt at følge, de personer, du har valgt at følge, og de indlæg, de booste. Det ser temmelig stille lige nu, så hvordan vi:", + "home.explore_prompt.body": "Dit hjemmefeed vil have en blanding af indlæg fra de hashtags, du har valgt at følge, de personer, du har valgt at følge, og de indlæg, de booster. Her virker temmelig stille lige nu, så hvad med at prøve:", "home.explore_prompt.title": "Dette er din hjemmebase i Mastodon.", "home.hide_announcements": "Skjul bekendtgørelser", "home.show_announcements": "Vis bekendtgørelser", - "interaction_modal.description.favourite": "Med en konto på Mastodon kan dette indlæg gøres til favorit for at lade forfatteren vide, at det værdsættes, samt gemme det til senere.", + "interaction_modal.description.favourite": "Med en konto på Mastodon kan dette indlæg gøres til favorit for at lade forfatteren vide, at det værdsættes og gemmes til senere.", "interaction_modal.description.follow": "Med en konto på Mastodon kan du følge {name} for at modtage vedkommendes indlæg i dit hjemmefeed.", "interaction_modal.description.reblog": "Med en konto på Mastodon kan dette indlæg fremhæves så det deles med egne følgere.", "interaction_modal.description.reply": "Med en konto på Mastodon kan dette indlæg besvares.", "interaction_modal.on_another_server": "På en anden server", "interaction_modal.on_this_server": "På denne server", - "interaction_modal.other_server_instructions": "Kopiér og indsæt denne URL i søgefeltet på en Mastodon-app eller webgrænseflade til en Mastodon-server.", + "interaction_modal.other_server_instructions": "Kopiér og indsæt denne URL i søgefeltet på den foretrukne Mastodon-app eller Mastodon-serverens webgrænseflade.", "interaction_modal.preamble": "Da Mastodon er decentraliseret, kan man bruge sin eksisterende konto hostet af en anden Mastodon-server eller kompatibel platform, såfremt man ikke har en konto på denne.", "interaction_modal.title.favourite": "Gør {name}s indlæg til favorit", "interaction_modal.title.follow": "Følg {name}", @@ -339,7 +339,7 @@ "keyboard_shortcuts.hotkey": "Hurtigtast", "keyboard_shortcuts.legend": "Vis dette symbol", "keyboard_shortcuts.local": "Åbn lokal tidslinje", - "keyboard_shortcuts.mention": "Nævn forfatter", + "keyboard_shortcuts.mention": "Omtal forfatter", "keyboard_shortcuts.muted": "Åbn listen over skjulte (mutede) brugere", "keyboard_shortcuts.my_profile": "Åbn din profil", "keyboard_shortcuts.notifications": "for at åbne notifikationskolonnen", @@ -363,6 +363,7 @@ "lightbox.previous": "Forrige", "limited_account_hint.action": "Vis profil alligevel", "limited_account_hint.title": "Denne profil er blevet skjult af {domain}-moderatorerne.", + "link_preview.author": "Af {name}", "lists.account.add": "Føj til liste", "lists.account.remove": "Fjern fra liste", "lists.delete": "Slet liste", @@ -409,7 +410,7 @@ "navigation_bar.public_timeline": "Fælles tidslinje", "navigation_bar.search": "Søg", "navigation_bar.security": "Sikkerhed", - "not_signed_in_indicator.not_signed_in": "Indlogning kræves for at tilgå denne ressource.", + "not_signed_in_indicator.not_signed_in": "Log ind for at tilgå denne ressource.", "notification.admin.report": "{name} anmeldte {target}", "notification.admin.sign_up": "{name} tilmeldte sig", "notification.favourite": "{name} favoritmarkerede dit indlæg", @@ -467,7 +468,7 @@ "onboarding.follows.lead": "Man kurerer sin eget hjemme-feed. Jo flere personer man følger, des mere aktiv og interessant vil det være. Disse profiler kan være et godt udgangspunkt – de kan altid fjernes senere!", "onboarding.follows.title": "Populært på Mastodon", "onboarding.share.lead": "Lad folk vide, hvordan de kan finde dig på Mastodon!", - "onboarding.share.message": "Jeg er {username} på Mastodon! Følg mig på {url}", + "onboarding.share.message": "Jeg er {username} på #Mastodon! Følg mig på {url}", "onboarding.share.next_steps": "Mulige næste trin:", "onboarding.share.title": "Del profilen", "onboarding.start.lead": "Den nye Mastodon konto er klar til brug. Sådan kan man få mest muligt ud af den:", @@ -475,8 +476,8 @@ "onboarding.start.title": "Du klarede det!", "onboarding.steps.follow_people.body": "Man kurerer sit eget feed. Lad os fylde det med interessante personer.", "onboarding.steps.follow_people.title": "Følg {count, plural, one {en person} other {# personer}}", - "onboarding.steps.publish_status.body": "Sig hej til verden.", - "onboarding.steps.publish_status.title": "Opret første indlæg", + "onboarding.steps.publish_status.body": "Sig hej til verden med tekst, billeder, videoer eller afstemninger {emoji}", + "onboarding.steps.publish_status.title": "Skriv dit første indlæg", "onboarding.steps.setup_profile.body": "Andre er mere tilbøjelige til at interagere, hvis man har udfyldt sin profil.", "onboarding.steps.setup_profile.title": "Tilpas profilen", "onboarding.steps.share_profile.body": "Lad vennerne vide, hvordan de finder dig på Mastodon!", @@ -500,7 +501,7 @@ "poll_button.remove_poll": "Fjern afstemning", "privacy.change": "Justér indlægsfortrolighed", "privacy.direct.long": "Kun synlig for nævnte brugere", - "privacy.direct.short": "Kun nævnte personer", + "privacy.direct.short": "Kun omtalte personer", "privacy.private.long": "Kun synlig for følgere", "privacy.private.short": "Kun følgere", "privacy.public.long": "Synlig for alle", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 8982760912..8130c3f640 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -3,7 +3,7 @@ "about.contact": "Kontakt:", "about.disclaimer": "Mastodon ist eine freie, quelloffene Software und eine Marke der Mastodon gGmbH.", "about.domain_blocks.no_reason_available": "Grund unbekannt", - "about.domain_blocks.preamble": "Mastodon erlaubt es dir grundsätzlich, alle Inhalte von allen Nutzer*innen auf allen Servern im Fediversum zu sehen und mit ihnen zu interagieren. Für diesen Server gibt es aber ein paar Ausnahmen.", + "about.domain_blocks.preamble": "Mastodon erlaubt es dir grundsätzlich, alle Inhalte von allen Nutzer*innen auf allen Servern im Fediverse zu sehen und mit ihnen zu interagieren. Für diesen Server gibt es aber ein paar Ausnahmen.", "about.domain_blocks.silenced.explanation": "Alle Inhalte und Profile dieses Servers werden zunächst nicht angezeigt. Du kannst die Profile und Inhalte aber dennoch sehen, wenn du explizit nach diesen suchst oder diesen folgst.", "about.domain_blocks.silenced.title": "Stummgeschaltet", "about.domain_blocks.suspended.explanation": "Es werden keine Daten von diesem Server verarbeitet, gespeichert oder ausgetauscht, sodass eine Interaktion oder Kommunikation mit Nutzer*innen dieses Servers nicht möglich ist.", @@ -39,7 +39,7 @@ "account.follows.empty": "Dieses Profil folgt noch niemandem.", "account.follows_you": "Folgt dir", "account.go_to_profile": "Profil aufrufen", - "account.hide_reblogs": "Geteilte Beiträge von @{name} verbergen", + "account.hide_reblogs": "Geteilte Beiträge von @{name} ausblenden", "account.in_memoriam": "Zum Andenken.", "account.joined_short": "Registriert", "account.languages": "Genutzte Sprachen überarbeiten", @@ -47,7 +47,7 @@ "account.locked_info": "Die Privatsphäre dieses Kontos wurde auf „geschützt“ gesetzt. Die Person bestimmt manuell, wer ihrem Profil folgen darf.", "account.media": "Medien", "account.mention": "@{name} erwähnen", - "account.moved_to": "{name} hat bekannt gegeben, dass das neue Konto nun dieses ist:", + "account.moved_to": "{name} hat angegeben, dass dieses das neue Konto ist:", "account.mute": "@{name} stummschalten", "account.mute_notifications_short": "Benachrichtigungen stummschalten", "account.mute_short": "Stummschalten", @@ -71,11 +71,11 @@ "account.unmute_notifications_short": "Stummschaltung der Benachrichtigungen aufheben", "account.unmute_short": "Stummschaltung aufheben", "account_note.placeholder": "Notiz durch Klicken hinzufügen", - "admin.dashboard.daily_retention": "Benutzerverbleibrate nach Tag nach Anmeldung", - "admin.dashboard.monthly_retention": "Benutzerverbleibrate nach Monat nach Anmeldung", + "admin.dashboard.daily_retention": "Verweildauer der Nutzer*innen pro Tag nach der Registrierung", + "admin.dashboard.monthly_retention": "Verweildauer der Nutzer*innen pro Monat nach der Registrierung", "admin.dashboard.retention.average": "Durchschnitt", "admin.dashboard.retention.cohort": "Monat der Registrierung", - "admin.dashboard.retention.cohort_size": "Neue Benutzer*innen", + "admin.dashboard.retention.cohort_size": "Neue Konten", "admin.impact_report.instance_accounts": "Kontenprofile, die dadurch gelöscht würden", "admin.impact_report.instance_followers": "Follower, die unsere Nutzer*innen verlieren würden", "admin.impact_report.instance_follows": "Follower, die deren Nutzer*innen verlieren würden", @@ -131,8 +131,8 @@ "column_header.unpin": "Lösen", "column_subheading.settings": "Einstellungen", "community.column_settings.local_only": "Nur lokal", - "community.column_settings.media_only": "Nur Beiträge mit angehängten Medien", - "community.column_settings.remote_only": "Nur andere Mastodon-Server anzeigen", + "community.column_settings.media_only": "Nur Beiträge mit Medien", + "community.column_settings.remote_only": "Nur andere Mastodon-Server", "compose.language.change": "Sprache festlegen", "compose.language.search": "Sprachen suchen …", "compose.published.body": "Beitrag veröffentlicht.", @@ -143,14 +143,14 @@ "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Andere können dir folgen und deine Beiträge sehen, die nur für Follower bestimmt sind.", "compose_form.lock_disclaimer.lock": "geschützt", "compose_form.placeholder": "Was gibt's Neues?", - "compose_form.poll.add_option": "Auswahlfeld hinzufügen", + "compose_form.poll.add_option": "Auswahl", "compose_form.poll.duration": "Umfragedauer", "compose_form.poll.option_placeholder": "{number}. Auswahl", "compose_form.poll.remove_option": "Auswahlfeld entfernen", "compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben", "compose_form.poll.switch_to_single": "Nur Einzelauswahl erlauben", "compose_form.publish": "Veröffentlichen", - "compose_form.publish_form": "Neuer Beitrag", + "compose_form.publish_form": "Veröffentlichen", "compose_form.publish_loud": "{publish}!", "compose_form.save_changes": "Änderungen speichern", "compose_form.sensitive.hide": "{count, plural, one {Mit einer Inhaltswarnung versehen} other {Mit einer Inhaltswarnung versehen}}", @@ -162,26 +162,26 @@ "confirmation_modal.cancel": "Abbrechen", "confirmations.block.block_and_report": "Blockieren und melden", "confirmations.block.confirm": "Blockieren", - "confirmations.block.message": "Bist du dir sicher, dass du {name} blockieren möchtest?", + "confirmations.block.message": "Möchtest du {name} wirklich blockieren?", "confirmations.cancel_follow_request.confirm": "Anfrage zurückziehen", "confirmations.cancel_follow_request.message": "Möchtest du deine Anfrage, {name} zu folgen, wirklich zurückziehen?", "confirmations.delete.confirm": "Löschen", "confirmations.delete.message": "Bist du dir sicher, dass du diesen Beitrag löschen möchtest?", "confirmations.delete_list.confirm": "Löschen", - "confirmations.delete_list.message": "Bist du dir sicher, dass du diese Liste endgültig löschen möchtest?", + "confirmations.delete_list.message": "Möchtest du diese Liste endgültig löschen?", "confirmations.discard_edit_media.confirm": "Verwerfen", "confirmations.discard_edit_media.message": "Du hast Änderungen an der Medienbeschreibung oder -vorschau vorgenommen, die noch nicht gespeichert sind. Trotzdem verwerfen?", "confirmations.domain_block.confirm": "Domain blockieren", - "confirmations.domain_block.message": "Bist du dir wirklich sicher, dass du die gesamte Domain {domain} blockieren möchtest? In den meisten Fällen reichen ein paar gezielte Blockierungen oder Stummschaltungen aus. Du wirst den Inhalt von dieser Domain nicht in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Auch deine Follower von dieser Domain werden entfernt.", + "confirmations.domain_block.message": "Möchtest du die gesamte Domain {domain} wirklich blockieren? In den meisten Fällen reichen ein paar gezielte Blockierungen oder Stummschaltungen aus. Du wirst den Inhalt von dieser Domain nicht in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Auch deine Follower von dieser Domain werden entfernt.", "confirmations.edit.confirm": "Bearbeiten", - "confirmations.edit.message": "Das Bearbeiten überschreibt die Nachricht, die du gerade verfasst. Bist du dir sicher, dass du fortfahren möchtest?", + "confirmations.edit.message": "Das Bearbeiten überschreibt die Nachricht, die du gerade verfasst. Möchtest du wirklich fortfahren?", "confirmations.logout.confirm": "Abmelden", - "confirmations.logout.message": "Bist du dir sicher, dass du dich abmelden möchtest?", + "confirmations.logout.message": "Möchtest du dich wirklich abmelden?", "confirmations.mute.confirm": "Stummschalten", "confirmations.mute.explanation": "Dies wird Beiträge von dieser Person und Beiträge, die diese Person erwähnen, ausblenden, aber es wird der Person trotzdem erlauben, deine Beiträge zu sehen und dir zu folgen.", "confirmations.mute.message": "Bist du dir sicher, dass du {name} stummschalten möchtest?", "confirmations.redraft.confirm": "Löschen und neu erstellen", - "confirmations.redraft.message": "Bist du dir sicher, dass du diesen Beitrag löschen und auf Basis deines vorherigen neu erstellen möchtest? Favoriten und geteilte Beiträge gehen verloren. Vorhandene Antworten von dir und anderen Nutzer*innen auf diesen Beitrag werden zwar nicht gelöscht, aber die Verknüpfungen gehen verloren.", + "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Favoriten und geteilte Beiträge gehen verloren, und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.", "confirmations.reply.confirm": "Antworten", "confirmations.reply.message": "Wenn du jetzt darauf antwortest, wird der andere Beitrag, an dem du gerade geschrieben hast, verworfen. Möchtest du wirklich fortfahren?", "confirmations.unfollow.confirm": "Entfolgen", @@ -202,8 +202,8 @@ "dismissable_banner.community_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen, deren Konten von {domain} verwaltet werden.", "dismissable_banner.dismiss": "Ablehnen", "dismissable_banner.explore_links": "Diese Nachrichten werden heute am häufigsten im sozialen Netzwerk geteilt. Neuere Nachrichten, die von vielen verschiedenen Profilen veröffentlicht wurden, werden höher eingestuft.", - "dismissable_banner.explore_statuses": "Diese Beiträge stammen aus dem gesamten sozialen Netzwerk, die gerade an Reichweite gewinnen. Neuere Beiträge, die häufiger geteilt und favorisiert wurden, werden höher eingestuft.", - "dismissable_banner.explore_tags": "Das sind Hashtags, die gerade an Reichweite gewinnen. Hashtags, die von vielen verschiedenen Profilen verwendet werden, werden höher eingestuft.", + "dismissable_banner.explore_statuses": "Diese Beiträge stammen aus dem gesamten sozialen Netz und gewinnen derzeit an Reichweite. Neuere Beiträge, die häufiger geteilt und favorisiert wurden, werden höher eingestuft.", + "dismissable_banner.explore_tags": "Das sind Hashtags, die derzeit an Reichweite gewinnen. Hashtags, die von vielen verschiedenen Profilen verwendet werden, werden höher eingestuft.", "dismissable_banner.public_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen im sozialen Netzwerk, denen Leute auf {domain} folgen.", "embed.instructions": "Du kannst diesen Beitrag außerhalb des Fediverse (z. B. auf deiner Website) einbetten, indem du diesen iFrame-Code einfügst.", "embed.preview": "Vorschau:", @@ -218,7 +218,7 @@ "emoji_button.objects": "Gegenstände", "emoji_button.people": "Personen", "emoji_button.recent": "Häufig verwendet", - "emoji_button.search": "Suchen …", + "emoji_button.search": "Suchen …", "emoji_button.search_results": "Suchergebnisse", "emoji_button.symbols": "Symbole", "emoji_button.travel": "Reisen & Orte", @@ -228,11 +228,11 @@ "empty_column.blocks": "Du hast bisher keine Profile blockiert.", "empty_column.bookmarked_statuses": "Du hast bisher keine Beiträge als Lesezeichen abgelegt. Sobald du einen Beitrag als Lesezeichen speicherst, wird er hier erscheinen.", "empty_column.community": "Die lokale Timeline ist leer. Schreibe einen öffentlichen Beitrag, um den Stein ins Rollen zu bringen!", - "empty_column.direct": "Du hast noch keine privaten Erwähnungen. Wenn du eine sendest oder erhältst, wird sie hier angezeigt.", + "empty_column.direct": "Du hast noch keine privaten Erwähnungen. Sobald du eine sendest oder erhältst, wird sie hier angezeigt.", "empty_column.domain_blocks": "Du hast noch keine Domains blockiert.", "empty_column.explore_statuses": "Momentan ist nichts im Trend. Schau später wieder vorbei!", "empty_column.favourited_statuses": "Du hast noch keine Beiträge favorisiert. Sobald du einen favorisierst, wird er hier erscheinen.", - "empty_column.favourites": "Bisher hat noch niemand diesen Beitrag favorisiert. Sobald es jemand tut, wird das Profil hier angezeigt.", + "empty_column.favourites": "Diesen Beitrag hat bisher noch niemand favorisiert. Sobald es jemand tut, wird das Profil hier angezeigt.", "empty_column.follow_requests": "Es liegen derzeit keine Follower-Anfragen vor. Sobald du eine erhältst, wird sie hier angezeigt.", "empty_column.followed_tags": "Du folgst noch keinen Hashtags. Wenn du dies tust, werden sie hier erscheinen.", "empty_column.hashtag": "Unter diesem Hashtag gibt es noch nichts.", @@ -259,7 +259,7 @@ "filter_modal.added.expired_explanation": "Diese Filterkategorie ist abgelaufen. Du musst das Ablaufdatum für diese Kategorie ändern.", "filter_modal.added.expired_title": "Abgelaufener Filter!", "filter_modal.added.review_and_configure": "Um diesen Filter zu überprüfen oder noch weiter zu konfigurieren, rufe die {settings_link} auf.", - "filter_modal.added.review_and_configure_title": "Filter-Einstellungen", + "filter_modal.added.review_and_configure_title": "Filtereinstellungen", "filter_modal.added.settings_link": "Einstellungen", "filter_modal.added.short_explanation": "Dieser Beitrag wurde der folgenden Filterkategorie hinzugefügt: {title}.", "filter_modal.added.title": "Filter hinzugefügt!", @@ -298,8 +298,8 @@ "hashtag.column_settings.tag_toggle": "Zusätzliche Hashtags dieser Spalte hinzufügen", "hashtag.follow": "Hashtag folgen", "hashtag.unfollow": "Hashtag entfolgen", - "home.actions.go_to_explore": "Sieh dir die Trends an", - "home.actions.go_to_suggestions": "Finde Profile zum Folgen", + "home.actions.go_to_explore": "Trends ansehen", + "home.actions.go_to_suggestions": "Profile zum Folgen finden", "home.column_settings.basic": "Einfach", "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen", "home.column_settings.show_replies": "Antworten anzeigen", @@ -313,7 +313,7 @@ "interaction_modal.description.reply": "Mit einem Mastodon-Konto kannst du auf diesen Beitrag antworten.", "interaction_modal.on_another_server": "Auf einem anderen Server", "interaction_modal.on_this_server": "Auf diesem Server", - "interaction_modal.other_server_instructions": "Kopiere diese URL und füge sie in das Suchfeld deiner bevorzugten Mastodon-App oder im Webinterface deiner Mastodon-Instanz ein.", + "interaction_modal.other_server_instructions": "Kopiere diese URL und füge sie in das Suchfeld deiner bevorzugten Mastodon-App oder in das Webinterface deines Mastodon-Servers ein.", "interaction_modal.preamble": "Da Mastodon dezentralisiert ist, kannst du dein bestehendes Konto auf einem anderen Mastodon-Server oder einer kompatiblen Plattform nutzen, wenn du kein Konto auf dieser Plattform hast.", "interaction_modal.title.favourite": "Beitrag von {name} favorisieren", "interaction_modal.title.follow": "Folge {name}", @@ -343,17 +343,17 @@ "keyboard_shortcuts.muted": "Liste stummgeschalteter Profile öffnen", "keyboard_shortcuts.my_profile": "Eigenes Profil aufrufen", "keyboard_shortcuts.notifications": "Mitteilungen aufrufen", - "keyboard_shortcuts.open_media": "Mediendatei öffnen", + "keyboard_shortcuts.open_media": "Medieninhalt öffnen", "keyboard_shortcuts.pinned": "Liste angehefteter Beiträge öffnen", "keyboard_shortcuts.profile": "Profil aufrufen", "keyboard_shortcuts.reply": "Auf Beitrag antworten", - "keyboard_shortcuts.requests": "Liste der Follower-Anfragen öffnen", + "keyboard_shortcuts.requests": "Liste der Follower-Anfragen aufrufen", "keyboard_shortcuts.search": "Suchleiste fokussieren", "keyboard_shortcuts.spoilers": "Feld für Inhaltswarnung anzeigen/ausblenden", "keyboard_shortcuts.start": "„Auf geht's!“ öffnen", "keyboard_shortcuts.toggle_hidden": "Beitragstext hinter der Inhaltswarnung anzeigen/ausblenden", "keyboard_shortcuts.toggle_sensitivity": "Medien anzeigen/ausblenden", - "keyboard_shortcuts.toot": "Einen neuen Beitrag erstellen", + "keyboard_shortcuts.toot": "Neuen Beitrag erstellen", "keyboard_shortcuts.unfocus": "Eingabefeld/Suche nicht mehr fokussieren", "keyboard_shortcuts.up": "Ansicht nach oben bewegen", "lightbox.close": "Schließen", @@ -363,6 +363,7 @@ "lightbox.previous": "Zurück", "limited_account_hint.action": "Profil trotzdem anzeigen", "limited_account_hint.title": "Dieses Profil wurde von den Moderator*innen von {domain} ausgeblendet.", + "link_preview.author": "Von {name}", "lists.account.add": "Zur Liste hinzufügen", "lists.account.remove": "Von der Liste entfernen", "lists.delete": "Liste löschen", @@ -412,7 +413,7 @@ "not_signed_in_indicator.not_signed_in": "Du musst dich anmelden, um auf diesen Inhalt zugreifen zu können.", "notification.admin.report": "{name} meldete {target}", "notification.admin.sign_up": "{name} registrierte sich", - "notification.favourite": "{name} hat deinen Beitrag favorisiert", + "notification.favourite": "{name} favorisierte deinen Beitrag", "notification.follow": "{name} folgt dir jetzt", "notification.follow_request": "{name} möchte dir folgen", "notification.mention": "{name} erwähnte dich", @@ -422,12 +423,12 @@ "notification.status": "{name} veröffentlichte gerade", "notification.update": "{name} bearbeitete einen Beitrag", "notifications.clear": "Mitteilungen löschen", - "notifications.clear_confirmation": "Bist du dir sicher, dass du diese Mitteilungen für immer löschen möchtest?", + "notifications.clear_confirmation": "Möchtest du diese Mitteilungen für immer löschen?", "notifications.column_settings.admin.report": "Neue Meldungen:", "notifications.column_settings.admin.sign_up": "Neue Registrierungen:", "notifications.column_settings.alert": "Desktop-Benachrichtigungen", - "notifications.column_settings.favourite": "Favorisierungen:", - "notifications.column_settings.filter_bar.advanced": "Erweiterte Filterleiste aktivieren", + "notifications.column_settings.favourite": "Favoriten:", + "notifications.column_settings.filter_bar.advanced": "Alle Filterkategorien anzeigen", "notifications.column_settings.filter_bar.category": "Filterleiste:", "notifications.column_settings.filter_bar.show_bar": "Filterleiste anzeigen", "notifications.column_settings.follow": "Neue Follower:", @@ -439,12 +440,12 @@ "notifications.column_settings.show": "In diesem Feed anzeigen", "notifications.column_settings.sound": "Ton abspielen", "notifications.column_settings.status": "Neue Beiträge:", - "notifications.column_settings.unread_notifications.category": "Ungelesene Mitteilungen:", + "notifications.column_settings.unread_notifications.category": "Ungelesene Benachrichtigungen", "notifications.column_settings.unread_notifications.highlight": "Ungelesene Mitteilungen markieren", - "notifications.column_settings.update": "Bearbeitete Beiträge:", + "notifications.column_settings.update": "Überarbeitete Beiträge:", "notifications.filter.all": "Alles", "notifications.filter.boosts": "Geteilte Beiträge", - "notifications.filter.favourites": "Favorisierungen", + "notifications.filter.favourites": "Favoriten", "notifications.filter.follows": "Neue Follower", "notifications.filter.mentions": "Erwähnungen", "notifications.filter.polls": "Umfrageergebnisse", @@ -460,8 +461,8 @@ "notifications_permission_banner.title": "Nichts verpassen", "onboarding.action.back": "Bring mich zurück", "onboarding.actions.back": "Bring mich zurück", - "onboarding.actions.go_to_explore": "Ansehen, was gerade angesagt ist", - "onboarding.actions.go_to_home": "Zu meiner Startseite", + "onboarding.actions.go_to_explore": "Zeig mir die Trends", + "onboarding.actions.go_to_home": "Bring mich zu meiner Startseite", "onboarding.compose.template": "Hallo #Mastodon!", "onboarding.follows.empty": "Bedauerlicherweise können aktuell keine Ergebnisse angezeigt werden. Du kannst die Suche verwenden oder den Reiter „Entdecken“ auswählen, um neue Leute zum Folgen zu finden – oder du versuchst es später erneut.", "onboarding.follows.lead": "Deine Startseite ist der primäre Anlaufpunkt, um Mastodon zu erleben. Je mehr Profilen du folgst, umso aktiver und interessanter wird sie. Damit du direkt loslegen kannst, gibt es hier ein paar Empfehlungen:", @@ -503,7 +504,7 @@ "privacy.direct.short": "Nur erwähnte Profile", "privacy.private.long": "Nur für deine Follower sichtbar", "privacy.private.short": "Nur Follower", - "privacy.public.long": "Für alle sichtbar, auch für nicht-registrierte bzw. nicht-angemeldete Nutzer*innen", + "privacy.public.long": "Für alle sichtbar", "privacy.public.short": "Öffentlich", "privacy.unlisted.long": "Sichtbar für alle, aber nicht über Suchfunktion", "privacy.unlisted.short": "Nicht gelistet", @@ -536,20 +537,20 @@ "report.close": "Fertig", "report.comment.title": "Gibt es etwas anderes, was wir wissen sollten?", "report.forward": "Meldung zusätzlich an {target} weiterleiten", - "report.forward_hint": "Dieses Konto gehört zu einem anderen Server. Soll eine anonymisierte Kopie der Meldung auch dorthin geschickt werden?", + "report.forward_hint": "Dieses Konto gehört zu einem anderen Server. Soll eine anonymisierte Kopie der Meldung auch dorthin gesendet werden?", "report.mute": "Stummschalten", "report.mute_explanation": "Du wirst die Beiträge vom Konto nicht mehr sehen. Das Konto kann dir immer noch folgen, und die Person hinter dem Konto wird deine Beiträge sehen können und nicht wissen, dass du sie stummgeschaltet hast.", "report.next": "Weiter", "report.placeholder": "Ergänzende Hinweise", "report.reasons.dislike": "Das gefällt mir nicht", - "report.reasons.dislike_description": "Es ist etwas, das du nicht sehen willst", + "report.reasons.dislike_description": "Das ist etwas, das du nicht sehen möchtest", "report.reasons.legal": "Das ist illegal", "report.reasons.legal_description": "Du bist davon überzeugt, dass es gegen die Gesetze deines Landes oder des Landes des Servers verstößt", "report.reasons.other": "Es ist etwas anderes", "report.reasons.other_description": "Der Vorfall passt zu keiner dieser Kategorien", "report.reasons.spam": "Das ist Spam", "report.reasons.spam_description": "Bösartige Links, gefälschtes Engagement oder wiederholte Antworten", - "report.reasons.violation": "Das verstößt gegen Serverregeln", + "report.reasons.violation": "Es verstößt gegen Serverregeln", "report.reasons.violation_description": "Du bist dir sicher, dass eine bestimmte Regel gebrochen wurde", "report.rules.subtitle": "Wähle alle zutreffenden Inhalte aus", "report.rules.title": "Welche Regeln werden verletzt?", @@ -587,7 +588,7 @@ "search_results.statuses_fts_disabled": "Die Suche nach Beitragsinhalten ist auf diesem Mastodon-Server deaktiviert.", "search_results.title": "Suchergebnisse für {q}", "search_results.total": "{count, number} {count, plural, one {Ergebnis} other {Ergebnisse}}", - "server_banner.about_active_users": "Personen, die diesen Server in den vergangenen 30 Tagen verwendet haben (monatlich aktive Benutzer*innen)", + "server_banner.about_active_users": "Personen, die diesen Server in den vergangenen 30 Tagen verwendet haben (monatlich aktive Nutzer*innen)", "server_banner.active_users": "aktive Profile", "server_banner.administered_by": "Verwaltet von:", "server_banner.introduction": "{domain} ist ein Teil des dezentralisierten sozialen Netzwerks, angetrieben von {mastodon}.", @@ -601,7 +602,7 @@ "status.admin_status": "Beitrag moderieren", "status.block": "@{name} blockieren", "status.bookmark": "Beitrag als Lesezeichen setzen", - "status.cancel_reblog_private": "Teilen des Beitrags rückgängig machen", + "status.cancel_reblog_private": "Beitrag nicht mehr teilen", "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden", "status.copy": "Link zum Beitrag kopieren", "status.delete": "Beitrag löschen", @@ -619,9 +620,9 @@ "status.history.created": "{name} erstellte {date}", "status.history.edited": "{name} bearbeitete {date}", "status.load_more": "Weitere laden", - "status.media.open": "Zum Öffnen klicken", - "status.media.show": "Zum Anzeigen klicken", - "status.media_hidden": "Inhalt verborgen", + "status.media.open": "Zum Öffnen anklicken", + "status.media.show": "Zum Anzeigen anklicken", + "status.media_hidden": "Inhalt ausgeblendet", "status.mention": "@{name} erwähnen", "status.more": "Mehr", "status.mute": "@{name} stummschalten", @@ -633,7 +634,7 @@ "status.reblog": "Teilen", "status.reblog_private": "Mit der ursprünglichen Zielgruppe teilen", "status.reblogged_by": "{name} teilte", - "status.reblogs.empty": "Bisher hat noch niemand diesen Beitrag geteilt. Sobald es jemand tut, wird das Profil hier angezeigt.", + "status.reblogs.empty": "Diesen Beitrag hat bisher noch niemand geteilt. Sobald es jemand tut, wird das Profil hier angezeigt.", "status.redraft": "Löschen und neu erstellen", "status.remove_bookmark": "Lesezeichen entfernen", "status.replied_to": "Antwortete {name}", @@ -648,7 +649,7 @@ "status.show_more": "Mehr anzeigen", "status.show_more_all": "Alle Inhaltswarnungen aufklappen", "status.show_original": "Ursprünglichen Beitrag anzeigen", - "status.title.with_attachments": "{user} veröffentlichte {attachmentCount, plural, one {eine Mediendatei} other {{attachmentCount} Mediendateien}}", + "status.title.with_attachments": "{user} veröffentlichte {attachmentCount, plural, one {ein Medium} other {{attachmentCount} Medien}}", "status.translate": "Übersetzen", "status.translated_from_with": "Aus {lang} mittels {provider} übersetzt", "status.uncached_media_warning": "Vorschau nicht verfügbar", diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json index d2f4e633fa..e34df674fd 100644 --- a/app/javascript/mastodon/locales/el.json +++ b/app/javascript/mastodon/locales/el.json @@ -104,7 +104,6 @@ "column.direct": "Ιδιωτικές αναφορές", "column.directory": "Περιήγηση στα προφίλ", "column.domain_blocks": "Αποκλεισμένοι τομείς", - "column.favourites": "Αγαπημένα", "column.follow_requests": "Αιτήματα ακολούθησης", "column.home": "Αρχική", "column.lists": "Λίστες", @@ -169,7 +168,6 @@ "confirmations.mute.explanation": "Αυτό θα κρύψει τις δημοσιεύσεις τους και τις δημοσιεύσεις που τους αναφέρουν, αλλά θα συνεχίσουν να μπορούν να βλέπουν τις δημοσιεύσεις σου και να σε ακολουθούν.", "confirmations.mute.message": "Σίγουρα θες να αποσιωπήσεις {name};", "confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο", - "confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την κατάσταση και να την ξαναγράψεις; Οι αναφορές και τα αγαπημένα της θα χαθούν ενώ οι απαντήσεις προς αυτή θα μείνουν ορφανές.", "confirmations.reply.confirm": "Απάντησε", "confirmations.reply.message": "Απαντώντας τώρα θα αντικαταστήσεις το κείμενο που ήδη γράφεις. Σίγουρα θέλεις να συνεχίσεις;", "confirmations.unfollow.confirm": "Άρση ακολούθησης", @@ -190,7 +188,6 @@ "dismissable_banner.community_timeline": "Αυτές είναι οι πιο πρόσφατες δημόσιες αναρτήσεις ατόμων των οποίων οι λογαριασμοί φιλοξενούνται στο {domain}.", "dismissable_banner.dismiss": "Παράβλεψη", "dismissable_banner.explore_links": "Αυτές οι ειδήσεις συζητούνται σε αυτόν και άλλους διακομιστές του αποκεντρωμένου δικτύου αυτή τη στιγμή.", - "dismissable_banner.explore_statuses": "Αυτές οι αναρτήσεις από αυτόν τον διακομιστή και άλλους στο αποκεντρωμένο δίκτυο αποκτούν απήχηση σε αυτόν τον διακομιστή αυτή τη στιγμή.", "dismissable_banner.explore_tags": "Αυτές οι ετικέτες αποκτούν απήχηση σε αυτόν και άλλους διακομιστές του αποκεντρωμένου δικτύου αυτή τη στιγμή.", "embed.instructions": "Ενσωμάτωσε αυτή την ανάρτηση στην ιστοσελίδα σου αντιγράφοντας τον παρακάτω κώδικα.", "embed.preview": "Ορίστε πως θα φαίνεται:", @@ -218,8 +215,6 @@ "empty_column.direct": "Δεν έχεις καμία προσωπική επισήμανση ακόμα. Όταν στείλεις ή λάβεις μία, θα εμφανιστεί εδώ.", "empty_column.domain_blocks": "Δεν υπάρχουν αποκλεισμένοι τομείς ακόμα.", "empty_column.explore_statuses": "Τίποτα δεν βρίσκεται στις τάσεις αυτή τη στιγμή. Έλεγξε αργότερα!", - "empty_column.favourited_statuses": "Δεν έχεις καμία αγαπημένη ανάρτηση ακόμα. Μόλις αγαπήσεις κάποια, θα εμφανιστεί εδώ.", - "empty_column.favourites": "Κανείς δεν έχει αυτή την ανάρτηση στα αγαπημένα ακόμα. Μόλις το κάνει κάποιος, θα εμφανιστεί εδώ.", "empty_column.follow_requests": "Δεν έχεις κανένα αίτημα παρακολούθησης ακόμα. Μόλις λάβεις κάποιο, θα εμφανιστεί εδώ.", "empty_column.followed_tags": "Δεν έχετε παρακολουθήσει ακόμα καμία ετικέτα. Όταν το κάνετε, θα εμφανιστούν εδώ.", "empty_column.hashtag": "Δεν υπάρχει ακόμα κάτι για αυτή την ετικέτα.", @@ -287,15 +282,12 @@ "home.column_settings.show_replies": "Εμφάνιση απαντήσεων", "home.hide_announcements": "Απόκρυψη ανακοινώσεων", "home.show_announcements": "Εμφάνιση ανακοινώσεων", - "interaction_modal.description.favourite": "Με ένα λογαριασμό Mastodon μπορείτε να προτιμήσετε αυτή την ανάρτηση, για να ενημερώσετε τον συγγραφέα ότι την εκτιμάτε και να την αποθηκεύσετε για αργότερα.", "interaction_modal.description.follow": "Με έναν λογαριασμό Mastodon, μπορείς να ακολουθήσεις τον/την {name} ώστε να λαμβάνεις τις αναρτήσεις του/της στη δική σου ροή.", "interaction_modal.description.reblog": "Με ένα λογαριασμό Mastodon, μπορείς να ενισχύσεις αυτή την ανάρτηση για να τη μοιραστείς με τους δικούς σου ακολούθους.", "interaction_modal.description.reply": "Με ένα λογαριασμό Mastodon, μπορείς να απαντήσεις σε αυτή την ανάρτηση.", "interaction_modal.on_another_server": "Σε διαφορετικό διακομιστή", "interaction_modal.on_this_server": "Σε αυτόν τον διακομιστή", - "interaction_modal.other_server_instructions": "Αντέγραψε και επικόλλησε αυτήν τη διεύθυνση URL στο πεδίο αναζήτησης της αγαπημένης σου εφαρμογής Mastodon ή στη διεπαφή ιστού του διακομιστή σας στο Mastodon.", "interaction_modal.preamble": "Δεδομένου ότι το Mastodon είναι αποκεντρωμένο, μπορείς να χρησιμοποιείς τον υπάρχοντα λογαριασμό σου που φιλοξενείται σε άλλον διακομιστή του Mastodon ή σε συμβατή πλατφόρμα, αν δεν έχετε λογαριασμό σε αυτόν.", - "interaction_modal.title.favourite": "Αγαπημένη ανάρτησητου {name}", "interaction_modal.title.follow": "Ακολούθησε {name}", "interaction_modal.title.reblog": "Ενίσχυσε την ανάρτηση του {name}", "interaction_modal.title.reply": "Απάντηση στην ανάρτηση του {name}", @@ -311,8 +303,6 @@ "keyboard_shortcuts.direct": "για το άνοιγμα της στήλης ιδιωτικών επισημάνσεων", "keyboard_shortcuts.down": "κίνηση προς τα κάτω στη λίστα", "keyboard_shortcuts.enter": "Εμφάνιση ανάρτησης", - "keyboard_shortcuts.favourite": "Σημείωση ως αγαπημένο", - "keyboard_shortcuts.favourites": "Άνοιγμα λίστας αγαπημένων", "keyboard_shortcuts.federated": "Άνοιγμα ροής συναλλαγών", "keyboard_shortcuts.heading": "Συντομεύσεις πληκτρολογίου", "keyboard_shortcuts.home": "Άνοιγμα ροής αρχικής σελίδας", @@ -373,7 +363,6 @@ "navigation_bar.domain_blocks": "Αποκλεισμένοι τομείς", "navigation_bar.edit_profile": "Επεξεργασία προφίλ", "navigation_bar.explore": "Εξερεύνηση", - "navigation_bar.favourites": "Αγαπημένα", "navigation_bar.filters": "Αποσιωπημένες λέξεις", "navigation_bar.follow_requests": "Αιτήματα ακολούθησης", "navigation_bar.followed_tags": "Ετικέτες που ακολουθούνται", @@ -390,7 +379,6 @@ "not_signed_in_indicator.not_signed_in": "Πρέπει να συνδεθείς για να αποκτήσεις πρόσβαση σε αυτόν τον πόρο.", "notification.admin.report": "Ο/Η {name} ανέφερε τον {target}", "notification.admin.sign_up": "{name} έχει εγγραφεί", - "notification.favourite": "Ο/Η {name} σημείωσε ως αγαπημένη την ανάρτησή σου", "notification.follow": "Ο/Η {name} σε ακολούθησε", "notification.follow_request": "Ο/H {name} ζήτησε να σε ακολουθήσει", "notification.mention": "Ο/Η {name} σε επισήμανε", @@ -404,7 +392,6 @@ "notifications.column_settings.admin.report": "Νέες αναφορές:", "notifications.column_settings.admin.sign_up": "Νέες εγγραφές:", "notifications.column_settings.alert": "Ειδοποιήσεις επιφάνειας εργασίας", - "notifications.column_settings.favourite": "Αγαπημένα:", "notifications.column_settings.filter_bar.advanced": "Εμφάνιση όλων των κατηγοριών", "notifications.column_settings.filter_bar.category": "Μπάρα γρήγορου φίλτρου", "notifications.column_settings.filter_bar.show_bar": "Εμφάνιση μπάρας φίλτρου", @@ -422,7 +409,6 @@ "notifications.column_settings.update": "Επεξεργασίες:", "notifications.filter.all": "Όλες", "notifications.filter.boosts": "Ενισχύσεις", - "notifications.filter.favourites": "Αγαπημένα", "notifications.filter.follows": "Ακολουθείς", "notifications.filter.mentions": "Επισημάνσεις", "notifications.filter.polls": "Αποτελέσματα δημοσκόπησης", @@ -558,7 +544,6 @@ "server_banner.server_stats": "Στατιστικά διακομιστή:", "sign_in_banner.create_account": "Δημιουργία λογαριασμού", "sign_in_banner.sign_in": "Σύνδεση", - "sign_in_banner.text": "Συνδέσου για να ακολουθήσεις προφίλ ή ετικέτες, να αγαπήσεις, να μοιραστείς και να απαντήσεις σε αναρτήσεις. Μπορείς επίσης να αλληλεπιδράσεις από τον λογαριασμό σου σε διαφορετικό διακομιστή.", "status.admin_account": "Άνοιγμα διεπαφής συντονισμού για τον/την @{name}", "status.admin_domain": "Άνοιγμα λειτουργίας διαμεσολάβησης για {domain}", "status.admin_status": "Άνοιγμα αυτής της ανάρτησης σε διεπαφή συντονισμού", @@ -575,7 +560,6 @@ "status.edited": "Επεξεργάστηκε στις {date}", "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}", "status.embed": "Ενσωμάτωσε", - "status.favourite": "Σημείωσε ως αγαπημένο", "status.filter": "Φιλτράρισμα αυτής της ανάρτησης", "status.filtered": "Φιλτραρισμένα", "status.hide": "Απόκρυψη ανάρτησης", diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json index 793bf35427..a0892fd1e3 100644 --- a/app/javascript/mastodon/locales/en-GB.json +++ b/app/javascript/mastodon/locales/en-GB.json @@ -135,7 +135,7 @@ "community.column_settings.remote_only": "Remote only", "compose.language.change": "Change language", "compose.language.search": "Search languages...", - "compose.published.body": "Příspěvek zveřejněn.", + "compose.published.body": "Post published.", "compose.published.open": "Open", "compose_form.direct_message_warning_learn_more": "Learn more", "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any sensitive information over Mastodon.", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.", "dismissable_banner.dismiss": "Dismiss", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralised network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralised network are gaining traction on this server right now.", + "dismissable_banner.explore_statuses": "These are posts from across the social web that are gaining traction today. Newer posts with more boosts and favourites are ranked higher.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralised network right now.", "dismissable_banner.public_timeline": "These are the most recent public posts from people on the social web that people on {domain} follow.", "embed.instructions": "Embed this post on your website by copying the code below.", @@ -331,8 +331,8 @@ "keyboard_shortcuts.direct": "to open private mentions column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", + "keyboard_shortcuts.favourite": "Favourite post", + "keyboard_shortcuts.favourites": "Open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -363,6 +363,7 @@ "lightbox.previous": "Previous", "limited_account_hint.action": "Show profile anyway", "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.", + "link_preview.author": "By {name}", "lists.account.add": "Add to list", "lists.account.remove": "Remove from list", "lists.delete": "Delete list", @@ -385,7 +386,7 @@ "mute_modal.hide_notifications": "Hide notifications from this user?", "mute_modal.indefinite": "Indefinite", "navigation_bar.about": "About", - "navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan", + "navigation_bar.advanced_interface": "Open in advanced web interface", "navigation_bar.blocks": "Blocked users", "navigation_bar.bookmarks": "Bookmarks", "navigation_bar.community_timeline": "Local timeline", @@ -412,7 +413,7 @@ "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", "notification.admin.report": "{name} reported {target}", "notification.admin.sign_up": "{name} signed up", - "notification.favourite": "{name} favourited your status", + "notification.favourite": "{name} favourited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", "notification.mention": "{name} mentioned you", @@ -595,7 +596,7 @@ "server_banner.server_stats": "Server stats:", "sign_in_banner.create_account": "Create account", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", + "sign_in_banner.text": "Login to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "Open moderation interface for @{name}", "status.admin_domain": "Open moderation interface for {domain}", "status.admin_status": "Open this status in the moderation interface", @@ -619,8 +620,8 @@ "status.history.created": "{name} created {date}", "status.history.edited": "{name} edited {date}", "status.load_more": "Load more", - "status.media.open": "Klikka fyri at lata upp", - "status.media.show": "Klik om te toanen", + "status.media.open": "Click to open", + "status.media.show": "Click to show", "status.media_hidden": "Media hidden", "status.mention": "Mention @{name}", "status.more": "More", @@ -651,7 +652,7 @@ "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}", "status.translate": "Translate", "status.translated_from_with": "Translated from {lang} using {provider}", - "status.uncached_media_warning": "A vista previa non está dispoñíble", + "status.uncached_media_warning": "Preview not available", "status.unmute_conversation": "Unmute conversation", "status.unpin": "Unpin from profile", "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 5ae639093d..68fb0a8012 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -113,7 +113,6 @@ "column.direct": "Privataj mencioj", "column.directory": "Foliumi la profilojn", "column.domain_blocks": "Blokitaj domajnoj", - "column.favourites": "Stelumoj", "column.firehose": "Vivantaj fluoj", "column.follow_requests": "Petoj de sekvado", "column.home": "Hejmo", @@ -181,7 +180,6 @@ "confirmations.mute.explanation": "Tio kaŝos la mesaĝojn de la uzanto kaj la mesaĝojn kiuj mencias rin, sed ri ankoraŭ rajtos vidi viajn mesaĝojn kaj sekvi vin.", "confirmations.mute.message": "Ĉu vi certas, ke vi volas silentigi {name}?", "confirmations.redraft.confirm": "Forigi kaj reskribi", - "confirmations.redraft.message": "Ĉu vi certas ke vi volas forigi tiun afiŝon kaj reskribi ĝin? Ĉiuj diskonigoj kaj stelumoj estos perditaj, kaj respondoj al la originala mesaĝo estos senparentaj.", "confirmations.reply.confirm": "Respondi", "confirmations.reply.message": "Respondi nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?", "confirmations.unfollow.confirm": "Ne plu sekvi", @@ -202,7 +200,6 @@ "dismissable_banner.community_timeline": "Jen la plej novaj publikaj afiŝoj de uzantoj, kies kontojn gastigas {domain}.", "dismissable_banner.dismiss": "Eksigi", "dismissable_banner.explore_links": "Tiuj novaĵoj estas aktuale priparolataj de uzantoj en tiu ĉi kaj aliaj serviloj, sur la malcentrigita reto.", - "dismissable_banner.explore_statuses": "Ĉi tiuj afiŝoj de ĉi tiu kaj aliaj serviloj en la malcentra reto pli populariĝas en ĉi tiu servilo nun.", "dismissable_banner.explore_tags": "Ĉi tiuj kradvostoj populariĝas en ĉi tiu kaj aliaj serviloj en la malcentraliza reto nun.", "embed.instructions": "Enkorpigu ĉi tiun afiŝon en vian retejon per kopio de la suba kodo.", "embed.preview": "Ĝi aperos tiel:", @@ -230,8 +227,6 @@ "empty_column.direct": "Vi ankoraŭ ne havas privatan mencion. Kiam vi sendos aŭ ricevos iun, tiu aperos ĉi tie.", "empty_column.domain_blocks": "Ankoraŭ neniu domajno estas blokita.", "empty_column.explore_statuses": "Nenio tendencas nun. Rekontrolu poste!", - "empty_column.favourited_statuses": "Vi ankoraŭ ne stelumis afiŝon. Kiam vi stelumos iun, ĝi aperos ĉi tie.", - "empty_column.favourites": "Ankoraŭ neniu stelumis ĉi tiun afiŝon. Kiam iu faros tion, tiu aperos ĉi tie.", "empty_column.follow_requests": "Vi ne ankoraŭ havas iun peton de sekvado. Kiam vi ricevos unu, ĝi aperos ĉi tie.", "empty_column.followed_tags": "Vi ankoraŭ ne sekvas iujn kradvortojn. Kiam vi faras, ili aperos ĉi tie.", "empty_column.hashtag": "Ankoraŭ estas nenio per ĉi tiu kradvorto.", @@ -303,15 +298,12 @@ "home.column_settings.show_replies": "Montri respondojn", "home.hide_announcements": "Kaŝi la anoncojn", "home.show_announcements": "Montri anoncojn", - "interaction_modal.description.favourite": "Kun konto ĉe Mastodon, vi povos stelumi ĉi tiun afiŝon por konservi ĝin kaj por sciigi al la afiŝinto, ke vi estimas ĝin.", "interaction_modal.description.follow": "Kun konto ĉe Mastodon, vi povos sekvi {name} por vidi ties mesaĝojn en via hejmo.", "interaction_modal.description.reblog": "Kun konto ĉe Mastodon, vi povas diskonigi ĉi tiun afiŝon, por ke viaj propraj sekvantoj vidu ĝin.", "interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu mesaĝo.", "interaction_modal.on_another_server": "En alia servilo", "interaction_modal.on_this_server": "En ĉi tiu servilo", - "interaction_modal.other_server_instructions": "Preni ĉi tiun retadreson (URL) kaj meti ĝin en la serĉbreton de via preferata apo aŭ retfoliumilo por Mastodon.", "interaction_modal.preamble": "Ĉar Mastodon estas malcentrigita, vi povas uzi jam ekzistantan konton gastigatan de alia Mastodona servilo aŭ kongrua substrato, se vi ne havas konton ĉe tiu ĉi.", - "interaction_modal.title.favourite": "Stelumi la afiŝon de {name}", "interaction_modal.title.follow": "Sekvi {name}", "interaction_modal.title.reblog": "Akceli la afiŝon de {name}", "interaction_modal.title.reply": "Respondi al la afiŝo de {name}", @@ -327,8 +319,6 @@ "keyboard_shortcuts.direct": "por malfermi la kolumnon pri privataj mencioj", "keyboard_shortcuts.down": "iri suben en la listo", "keyboard_shortcuts.enter": "malfermi mesaĝon", - "keyboard_shortcuts.favourite": "Stelumi", - "keyboard_shortcuts.favourites": "Malfermi la liston de la stelumoj", "keyboard_shortcuts.federated": "Malfermi la frataran templinion", "keyboard_shortcuts.heading": "Klavaraj mallongigoj", "keyboard_shortcuts.home": "Malfermi la hejman templinion", @@ -391,7 +381,6 @@ "navigation_bar.domain_blocks": "Blokitaj domajnoj", "navigation_bar.edit_profile": "Redakti profilon", "navigation_bar.explore": "Esplori", - "navigation_bar.favourites": "Stelumoj", "navigation_bar.filters": "Silentigitaj vortoj", "navigation_bar.follow_requests": "Petoj de sekvado", "navigation_bar.followed_tags": "Sekvataj kradvortoj", @@ -408,7 +397,6 @@ "not_signed_in_indicator.not_signed_in": "Necesas saluti por aliri tiun rimedon.", "notification.admin.report": "{name} raportis {target}", "notification.admin.sign_up": "{name} kreis konton", - "notification.favourite": "{name} stelumis vian afiŝon", "notification.follow": "{name} eksekvis vin", "notification.follow_request": "{name} petis sekvi vin", "notification.mention": "{name} menciis vin", @@ -422,7 +410,6 @@ "notifications.column_settings.admin.report": "Novaj raportoj:", "notifications.column_settings.admin.sign_up": "Novaj registriĝoj:", "notifications.column_settings.alert": "Sciigoj de la retumilo", - "notifications.column_settings.favourite": "Stelumoj:", "notifications.column_settings.filter_bar.advanced": "Montri ĉiujn kategoriojn", "notifications.column_settings.filter_bar.category": "Rapida filtra breto", "notifications.column_settings.filter_bar.show_bar": "Montri la breton de filtrilo", @@ -440,7 +427,6 @@ "notifications.column_settings.update": "Redaktoj:", "notifications.filter.all": "Ĉiuj", "notifications.filter.boosts": "Diskonigoj", - "notifications.filter.favourites": "Stelumoj", "notifications.filter.follows": "Sekvoj", "notifications.filter.mentions": "Mencioj", "notifications.filter.polls": "Balotenketaj rezultoj", @@ -580,7 +566,6 @@ "server_banner.server_stats": "Statistikoj de la servilo:", "sign_in_banner.create_account": "Krei konton", "sign_in_banner.sign_in": "Saluti", - "sign_in_banner.text": "Salutu por sekvi profilojn aŭ kradvortojn, stelumi, kundividi kaj respondi afiŝojn. Vi ankaŭ povas interagi per via konto ĉe alia servilo.", "status.admin_account": "Malfermi fasadon de moderigado por @{name}", "status.admin_domain": "Malfermu moderigan interfacon por {domain}", "status.admin_status": "Malfermi ĉi tiun mesaĝon en la kontrola interfaco", @@ -597,7 +582,6 @@ "status.edited": "Redaktita {date}", "status.edited_x_times": "Redactita {count, plural, one {{count} fojon} other {{count} fojojn}}", "status.embed": "Enkorpigi", - "status.favourite": "Stelumi", "status.filter": "Filtri ĉi tiun afiŝon", "status.filtered": "Filtrita", "status.hide": "Kaŝi mesaĝon", diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json index ade26fb33a..511dcc453e 100644 --- a/app/javascript/mastodon/locales/es-AR.json +++ b/app/javascript/mastodon/locales/es-AR.json @@ -363,6 +363,7 @@ "lightbox.previous": "Anterior", "limited_account_hint.action": "Mostrar perfil de todos modos", "limited_account_hint.title": "Este perfil fue ocultado por los moderadores de {domain}.", + "link_preview.author": "Por {name}", "lists.account.add": "Agregar a lista", "lists.account.remove": "Quitar de lista", "lists.delete": "Eliminar lista", diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json index 557672c7a3..6e4ad100eb 100644 --- a/app/javascript/mastodon/locales/es-MX.json +++ b/app/javascript/mastodon/locales/es-MX.json @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "Esto esconderá las publicaciones de ellos y en las que los has mencionado, pero les permitirá ver tus mensajes y seguirte.", "confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?", "confirmations.redraft.confirm": "Borrar y volver a borrador", - "confirmations.redraft.message": "¿Estás seguro de que quieres eliminar este toot y convertirlo en borrador? Perderás todas las respuestas, retoots y favoritos asociados a él, y las respuestas a la publicación original quedarán huérfanas.", + "confirmations.redraft.message": "¿Estás seguro de querer borrar esta publicación y reescribirla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán sin contexto.", "confirmations.reply.confirm": "Responder", "confirmations.reply.message": "Responder sobrescribirá el mensaje que estás escribiendo. ¿Estás seguro de que deseas continuar?", "confirmations.unfollow.confirm": "Dejar de seguir", @@ -202,7 +202,6 @@ "dismissable_banner.community_timeline": "Estas son las publicaciones públicas más recientes de las personas cuyas cuentas están alojadas en {domain}.", "dismissable_banner.dismiss": "Descartar", "dismissable_banner.explore_links": "Estas noticias están siendo discutidas por personas en este y otros servidores de la red descentralizada en este momento.", - "dismissable_banner.explore_statuses": "Estas publicaciones de este y otros servidores en la red descentralizada están ganando popularidad en este servidor en este momento.", "dismissable_banner.explore_tags": "Se trata de hashtags que están ganando adeptos en las redes sociales hoy en día. Los hashtags que son utilizados por más personas diferentes se clasifican mejor.", "dismissable_banner.public_timeline": "Estos son los toots públicos más recientes de personas en la web social a las que sigue la gente en {domain}.", "embed.instructions": "Añade este toot a tu sitio web con el siguiente código.", @@ -231,8 +230,6 @@ "empty_column.direct": "Aún no tienes menciones privadas. Cuando envíes o recibas una, aparecerán aquí.", "empty_column.domain_blocks": "Todavía no hay dominios ocultos.", "empty_column.explore_statuses": "Nada es tendencia en este momento. ¡Revisa más tarde!", - "empty_column.favourited_statuses": "Aún no tienes toots preferidos. Cuando marques uno como favorito, aparecerá aquí.", - "empty_column.favourites": "Nadie ha marcado este toot como preferido. Cuando alguien lo haga, aparecerá aquí.", "empty_column.follow_requests": "No tienes ninguna petición de seguidor. Cuando recibas una, se mostrará aquí.", "empty_column.followed_tags": "No estás siguiendo ningún hashtag todavía. Cuando lo hagas, aparecerá aquí.", "empty_column.hashtag": "No hay nada en este hashtag aún.", @@ -307,15 +304,12 @@ "home.explore_prompt.title": "Este es tu punto de partida en Mastodon.", "home.hide_announcements": "Ocultar anuncios", "home.show_announcements": "Mostrar anuncios", - "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta y guardarla para más adelante.", "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu fuente de inicio.", "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.", "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.", "interaction_modal.on_another_server": "En un servidor diferente", "interaction_modal.on_this_server": "En este servidor", - "interaction_modal.other_server_instructions": "Copia y pega esta URL en la barra de búsqueda de tu aplicación Mastodon favorita o en la interfaz web de tu servidor Mastodon.", "interaction_modal.preamble": "Ya que Mastodon es descentralizado, puedes usar tu cuenta existente alojada en otro servidor Mastodon o plataforma compatible si no tienes una cuenta en este servidor.", - "interaction_modal.title.favourite": "Marcar como favorita la publicación de {name}", "interaction_modal.title.follow": "Seguir a {name}", "interaction_modal.title.reblog": "Impulsar la publicación de {name}", "interaction_modal.title.reply": "Responder la publicación de {name}", @@ -331,8 +325,6 @@ "keyboard_shortcuts.direct": "para abrir la columna de menciones privadas", "keyboard_shortcuts.down": "mover hacia abajo en la lista", "keyboard_shortcuts.enter": "abrir estado", - "keyboard_shortcuts.favourite": "añadir a favoritos", - "keyboard_shortcuts.favourites": "abrir la lista de favoritos", "keyboard_shortcuts.federated": "abrir el timeline federado", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "abrir el timeline propio", @@ -395,7 +387,6 @@ "navigation_bar.domain_blocks": "Dominios ocultos", "navigation_bar.edit_profile": "Editar perfil", "navigation_bar.explore": "Explorar", - "navigation_bar.favourites": "Favoritos", "navigation_bar.filters": "Palabras silenciadas", "navigation_bar.follow_requests": "Solicitudes para seguirte", "navigation_bar.followed_tags": "Hashtags seguidos", @@ -412,7 +403,6 @@ "not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.", "notification.admin.report": "{name} denunció a {target}", "notification.admin.sign_up": "{name} se unio", - "notification.favourite": "{name} marcó tu estado como favorito", "notification.follow": "{name} te empezó a seguir", "notification.follow_request": "{name} ha solicitado seguirte", "notification.mention": "{name} te ha mencionado", @@ -426,7 +416,6 @@ "notifications.column_settings.admin.report": "Nuevas denuncias:", "notifications.column_settings.admin.sign_up": "Registros nuevos:", "notifications.column_settings.alert": "Notificaciones de escritorio", - "notifications.column_settings.favourite": "Favoritos:", "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías", "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido", "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros", @@ -444,7 +433,6 @@ "notifications.column_settings.update": "Ediciones:", "notifications.filter.all": "Todos", "notifications.filter.boosts": "Retoots", - "notifications.filter.favourites": "Favoritos", "notifications.filter.follows": "Seguidores", "notifications.filter.mentions": "Menciones", "notifications.filter.polls": "Resultados de la votación", @@ -595,7 +583,6 @@ "server_banner.server_stats": "Estadísticas del servidor:", "sign_in_banner.create_account": "Crear cuenta", "sign_in_banner.sign_in": "Iniciar sesión", - "sign_in_banner.text": "Inicia sesión para seguir perfiles o hashtags, marcar favorito, compartir y responder a publicaciones. También puedes interactuar desde tu cuenta en un servidor diferente.", "status.admin_account": "Abrir interfaz de moderación para @{name}", "status.admin_domain": "Abrir interfaz de moderación para {domain}", "status.admin_status": "Abrir este estado en la interfaz de moderación", @@ -612,7 +599,6 @@ "status.edited": "Editado {date}", "status.edited_x_times": "Editado {count, plural, one {{count} time} other {{count} veces}}", "status.embed": "Incrustado", - "status.favourite": "Favorito", "status.filter": "Filtrar esta publicación", "status.filtered": "Filtrado", "status.hide": "Ocultar toot", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index 13712e861e..db78eb7dac 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "Esto esconderá las publicaciones de ellos y en las que los has mencionado, pero les permitirá ver tus mensajes y seguirte.", "confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?", "confirmations.redraft.confirm": "Borrar y volver a borrador", - "confirmations.redraft.message": "¿Estás seguro de que quieres eliminar esta publicación y convertirla en borrador? Perderás todas las respuestas, impulsos y favoritos asociados a él, y las respuestas a la publicación original quedarán huérfanas.", + "confirmations.redraft.message": "¿Estás seguro de querer borrar esta publicación y reescribirla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán sin contexto.", "confirmations.reply.confirm": "Responder", "confirmations.reply.message": "Responder sobrescribirá el mensaje que estás escribiendo. ¿Seguro que deseas continuar?", "confirmations.unfollow.confirm": "Dejar de seguir", @@ -202,7 +202,6 @@ "dismissable_banner.community_timeline": "Estas son las publicaciones públicas más recientes de personas cuyas cuentas están alojadas en {domain}.", "dismissable_banner.dismiss": "Descartar", "dismissable_banner.explore_links": "Estas son las noticias que están siendo más compartidas hoy en la red. Nuevas noticias publicadas por diferentes personas se puntúan más alto.", - "dismissable_banner.explore_statuses": "Estas son las publicaciones que están ganando popularidad hoy en la red. Nuevas publicaciones con mayor número de impulsos y favoritos se puntúan más alto.", "dismissable_banner.explore_tags": "Estas son las etiquetas que están ganando popularidad hoy en la red. Etiquetas que se usan por personas diferentes se puntúan más alto.", "dismissable_banner.public_timeline": "Estas son las publicaciones más recientes de personas en el Fediverso que siguen las personas de {domain}.", "embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.", @@ -231,8 +230,6 @@ "empty_column.direct": "Aún no tienes menciones privadas. Cuando envíes o recibas una, aparecerán aquí.", "empty_column.domain_blocks": "Todavía no hay dominios ocultos.", "empty_column.explore_statuses": "Nada está en tendencia en este momento. ¡Revisa más tarde!", - "empty_column.favourited_statuses": "Aún no tienes publicaciones favoritas. Cuando marques una como favorita, aparecerá aquí.", - "empty_column.favourites": "Nadie ha marcado esta publicación como favorita. Cuando alguien lo haga, aparecerá aquí.", "empty_column.follow_requests": "No tienes ninguna petición de seguidor. Cuando recibas una, se mostrará aquí.", "empty_column.followed_tags": "No has seguido ninguna etiqueta todavía. Cuando lo hagas, se mostrarán aquí.", "empty_column.hashtag": "No hay nada en este hashtag aún.", @@ -307,15 +304,12 @@ "home.explore_prompt.title": "Este es tu punto de partida en Mastodon.", "home.hide_announcements": "Ocultar anuncios", "home.show_announcements": "Mostrar anuncios", - "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta y guardarla así para más adelante.", "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu línea temporal de inicio.", "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.", "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.", "interaction_modal.on_another_server": "En un servidor diferente", "interaction_modal.on_this_server": "En este servidor", - "interaction_modal.other_server_instructions": "Copia y pega esta URL en la barra de búsqueda de tu aplicación Mastodon favorita o la interfaz web de tu servidor Mastodon.", "interaction_modal.preamble": "Ya que Mastodon es descentralizado, puedes usar tu cuenta existente alojada en otro servidor Mastodon o plataforma compatible si no tienes una cuenta en este servidor.", - "interaction_modal.title.favourite": "Marcar como favorita la publicación de {name}", "interaction_modal.title.follow": "Seguir a {name}", "interaction_modal.title.reblog": "Impulsar la publicación de {name}", "interaction_modal.title.reply": "Responder a la publicación de {name}", @@ -325,14 +319,12 @@ "keyboard_shortcuts.back": "volver atrás", "keyboard_shortcuts.blocked": "abrir una lista de usuarios bloqueados", "keyboard_shortcuts.boost": "Impulsar", - "keyboard_shortcuts.column": "enfocar un estado en una de las columnas", + "keyboard_shortcuts.column": "Enfocar columna", "keyboard_shortcuts.compose": "enfocar el área de texto de redacción", "keyboard_shortcuts.description": "Descripción", "keyboard_shortcuts.direct": "para abrir la columna de menciones privadas", "keyboard_shortcuts.down": "mover hacia abajo en la lista", - "keyboard_shortcuts.enter": "abrir estado", - "keyboard_shortcuts.favourite": "añadir a favoritos", - "keyboard_shortcuts.favourites": "abrir la lista de favoritos", + "keyboard_shortcuts.enter": "Abrir publicación", "keyboard_shortcuts.federated": "Abrir la cronología federada", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "Abrir cronología principal", @@ -385,7 +377,6 @@ "mute_modal.hide_notifications": "¿Ocultar notificaciones de este usuario?", "mute_modal.indefinite": "Indefinida", "navigation_bar.about": "Acerca de", - "navigation_bar.advanced_interface": "Abrir en la interfaz web avanzada", "navigation_bar.blocks": "Usuarios bloqueados", "navigation_bar.bookmarks": "Marcadores", "navigation_bar.community_timeline": "Cronología local", @@ -395,7 +386,6 @@ "navigation_bar.domain_blocks": "Dominios ocultos", "navigation_bar.edit_profile": "Editar perfil", "navigation_bar.explore": "Explorar", - "navigation_bar.favourites": "Favoritos", "navigation_bar.filters": "Palabras silenciadas", "navigation_bar.follow_requests": "Solicitudes para seguirte", "navigation_bar.followed_tags": "Etiquetas seguidas", @@ -412,7 +402,6 @@ "not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.", "notification.admin.report": "{name} informó {target}", "notification.admin.sign_up": "{name} se registró", - "notification.favourite": "{name} marcó tu estado como favorito", "notification.follow": "{name} te empezó a seguir", "notification.follow_request": "{name} ha solicitado seguirte", "notification.mention": "{name} te ha mencionado", @@ -426,7 +415,6 @@ "notifications.column_settings.admin.report": "Nuevos informes:", "notifications.column_settings.admin.sign_up": "Nuevos registros:", "notifications.column_settings.alert": "Notificaciones de escritorio", - "notifications.column_settings.favourite": "Favoritos:", "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías", "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido", "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros", @@ -444,7 +432,6 @@ "notifications.column_settings.update": "Ediciones:", "notifications.filter.all": "Todos", "notifications.filter.boosts": "Impulsos", - "notifications.filter.favourites": "Favoritos", "notifications.filter.follows": "Seguidores", "notifications.filter.mentions": "Menciones", "notifications.filter.polls": "Resultados de la votación", @@ -595,15 +582,14 @@ "server_banner.server_stats": "Estadísticas del servidor:", "sign_in_banner.create_account": "Crear cuenta", "sign_in_banner.sign_in": "Iniciar sesión", - "sign_in_banner.text": "Inicia sesión para seguir perfiles o etiquetas, marcar como favorito, compartir y responder a mensajes. También puedes interactuar desde tu cuenta en un servidor diferente.", "status.admin_account": "Abrir interfaz de moderación para @{name}", "status.admin_domain": "Abrir interfaz de moderación para {domain}", - "status.admin_status": "Abrir este estado en la interfaz de moderación", + "status.admin_status": "Abrir esta publicación en la interfaz de moderación", "status.block": "Bloquear a @{name}", "status.bookmark": "Añadir marcador", "status.cancel_reblog_private": "Deshacer impulso", "status.cannot_reblog": "Esta publicación no se puede impulsar", - "status.copy": "Copiar enlace al estado", + "status.copy": "Copiar enlace a la publicación", "status.delete": "Borrar", "status.detailed_status": "Vista de conversación detallada", "status.direct": "Mención privada @{name}", @@ -612,7 +598,6 @@ "status.edited": "Editado {date}", "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}", "status.embed": "Incrustado", - "status.favourite": "Favorito", "status.filter": "Filtrar esta publicación", "status.filtered": "Filtrado", "status.hide": "Ocultar publicación", @@ -626,7 +611,7 @@ "status.more": "Más", "status.mute": "Silenciar @{name}", "status.mute_conversation": "Silenciar conversación", - "status.open": "Expandir estado", + "status.open": "Expandir publicación", "status.pin": "Fijar", "status.pinned": "Publicación fijada", "status.read_more": "Leer más", diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json index d08db67f58..44d3c91220 100644 --- a/app/javascript/mastodon/locales/et.json +++ b/app/javascript/mastodon/locales/et.json @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "See peidab tema postitused ning postitused, milles teda mainitakse, kuid lubab tal ikkagi sinu postitusi näha ning sind jälgida.", "confirmations.mute.message": "Oled kindel, et soovid {name} vaigistada?", "confirmations.redraft.confirm": "Kustuta & taasalusta", - "confirmations.redraft.message": "Kas kustutada postitus ja võtta uue aluseks? Meeldimised ja jagamised lähevad kaotsi ning vastused jäävad ilma algse postituseta.", + "confirmations.redraft.message": "Kindel, et soovid postituse kustutada ja võtta uue aluseks? Lemmikuks märkimised ja jagamised lähevad kaotsi ning vastused jäävad ilma algse postituseta.", "confirmations.reply.confirm": "Vasta", "confirmations.reply.message": "Praegu vastamine kirjutab hetkel koostatava sõnumi üle. Oled kindel, et soovid jätkata?", "confirmations.unfollow.confirm": "Ära jälgi", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Need on kõige viimased avalikud postitused inimestelt, kelle kontosid majutab {domain}.", "dismissable_banner.dismiss": "Sulge", "dismissable_banner.explore_links": "Need on uudised, millest inimesed siin ja teistes serverites üle detsentraliseeritud võrgu praegu räägivad.", - "dismissable_banner.explore_statuses": "Need postitused siit ja teistes serveritest detsentraliseeritud võrgus koguvad tähelepanu just praegu selles serveris.", + "dismissable_banner.explore_statuses": "Need postitused üle sotsiaalse võrgu koguvad praegu tähelepanu. Uued postitused, millel on rohkem jagamisi ja lemmikuks märkimisi, on kõrgemal kohal.", "dismissable_banner.explore_tags": "Need sildid siit ja teistes serveritest detsentraliseeritud võrgus koguvad tähelepanu just praegu selles serveris.", "dismissable_banner.public_timeline": "Need on kõige uuemad avalikud postitused inimestelt sotsiaalvõrgustikus, mida {domain} inimesed jälgivad.", "embed.instructions": "Lisa see postitus oma veebilehele, kopeerides alloleva koodi.", @@ -232,7 +232,7 @@ "empty_column.domain_blocks": "Siin ei ole veel peidetud domeene.", "empty_column.explore_statuses": "Praegu pole ühtegi trendi. Tule hiljem tagasi!", "empty_column.favourited_statuses": "Pole veel lemmikpostitusi. Kui märgid mõne, näed neid siin.", - "empty_column.favourites": "Keegi pole veel seda postitust lemmikuks märkinud. Kui seegi seda teeb, näed seda siin.", + "empty_column.favourites": "Keegi pole veel seda postitust lemmikuks märkinud. Kui keegi seda teeb, näed seda siin.", "empty_column.follow_requests": "Pole hetkel ühtegi jälgimistaotlust. Kui saad mõne, näed neid siin.", "empty_column.followed_tags": "Sa ei jälgi veel ühtegi märksõna. Kui jälgid, ilmuvad need siia.", "empty_column.hashtag": "Selle sildi all ei ole ühtegi postitust.", @@ -307,13 +307,13 @@ "home.explore_prompt.title": "See on sinu kodubaas Mastodonis.", "home.hide_announcements": "Peida teadaanded", "home.show_announcements": "Kuva teadaandeid", - "interaction_modal.description.favourite": "Mastodoni kontoga saad selle postituse lemmikuks märkida, et autor teaks, et sa hindad seda, ja hiljemaks alles jätta.", + "interaction_modal.description.favourite": "Mastodoni kontoga saad postituse lemmikuks märkida, et autor teaks, et sa hindad seda, ja jätta see hiljemaks alles.", "interaction_modal.description.follow": "Mastodoni kontoga saad jälgida kasutajat {name}, et tema postitusi oma koduvoos näha.", "interaction_modal.description.reblog": "Mastodoni kontoga saad seda postitust levitada, jagades seda oma jälgijatele.", "interaction_modal.description.reply": "Mastodoni kontoga saad sellele postitusele vastata.", "interaction_modal.on_another_server": "Teises serveris", "interaction_modal.on_this_server": "Selles serveris", - "interaction_modal.other_server_instructions": "Kopeeri ja kleebi see URL oma Mastodoni lemmikäppi või Mastodoni serveri veebiliidesesse.", + "interaction_modal.other_server_instructions": "Kopeeri ja kleebi see URL oma Mastodoni lemmikäpi või Mastodoni serveri veebiliidese otsinguväljale.", "interaction_modal.preamble": "Kuna Mastodon on detsentraliseeritud, saab kasutada teises Mastodoni serveris olevat kontot või ka ühilduval platvormil, kui siin serveril kontot ei ole.", "interaction_modal.title.favourite": "Lisa konto {name} postitus lemmikuks", "interaction_modal.title.follow": "Jälgi kontot {name}", @@ -331,7 +331,7 @@ "keyboard_shortcuts.direct": "privaatsete mainimiste veeru avamiseks", "keyboard_shortcuts.down": "Liigu loetelus alla", "keyboard_shortcuts.enter": "Ava postitus", - "keyboard_shortcuts.favourite": "Märgi lemmikuks", + "keyboard_shortcuts.favourite": "Lemmikpostitus", "keyboard_shortcuts.favourites": "Ava lemmikute loetelu", "keyboard_shortcuts.federated": "Ava föderatsiooni ajajoon", "keyboard_shortcuts.heading": "Kiirklahvid", @@ -363,6 +363,7 @@ "lightbox.previous": "Eelmine", "limited_account_hint.action": "Näita profilli sellegipoolest", "limited_account_hint.title": "See profiil on peidetud {domain} moderaatorite poolt.", + "link_preview.author": "{name} poolt", "lists.account.add": "Lisa nimekirja", "lists.account.remove": "Eemalda nimekirjast", "lists.delete": "Kustuta nimekiri", @@ -385,7 +386,6 @@ "mute_modal.hide_notifications": "Kas peita teated sellelt kasutajalt?", "mute_modal.indefinite": "Lõpmatu", "navigation_bar.about": "Teave", - "navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan", "navigation_bar.blocks": "Blokeeritud kasutajad", "navigation_bar.bookmarks": "Järjehoidjad", "navigation_bar.community_timeline": "Kohalik ajajoon", @@ -444,7 +444,6 @@ "notifications.column_settings.update": "Muudatused:", "notifications.filter.all": "Kõik", "notifications.filter.boosts": "Jagamised", - "notifications.filter.favourites": "Lemmikud", "notifications.filter.follows": "Jälgib", "notifications.filter.mentions": "Mainimised", "notifications.filter.polls": "Küsitluse tulemused", diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json index 1f8b7c8805..5a7a97f9a9 100644 --- a/app/javascript/mastodon/locales/eu.json +++ b/app/javascript/mastodon/locales/eu.json @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "Honek horko bidalketak eta aipamena egiten dietenak ezkutatuko ditu, baina beraiek zure bidalketak ikusi ahal izango dituzte eta zuri jarraitu.", "confirmations.mute.message": "Ziur {name} mututu nahi duzula?", "confirmations.redraft.confirm": "Ezabatu eta berridatzi", - "confirmations.redraft.message": "Ziur bidalketa hau ezabatu eta berridatzi nahi duzula? Gogokoak eta bultzadak galduko dira eta jaso dituen erantzunak umezurtz geratuko dira.", + "confirmations.redraft.message": "Ziur zaude argitalpen hau ezabatu eta zirriborroa berriro egitea nahi duzula? Gogokoak eta bultzadak galduko dira, eta jatorrizko argitalpenaren erantzunak zurtz geratuko dira.", "confirmations.reply.confirm": "Erantzun", "confirmations.reply.message": "Orain erantzuteak idazten ari zaren mezua gainidatziko du. Ziur jarraitu nahi duzula?", "confirmations.unfollow.confirm": "Utzi jarraitzeari", @@ -202,7 +202,6 @@ "dismissable_banner.community_timeline": "Hauek dira {domain} zerbitzarian ostatatutako kontuen bidalketa publiko berrienak.", "dismissable_banner.dismiss": "Baztertu", "dismissable_banner.explore_links": "Albiste hauei buruz hitz egiten ari da jendea orain zerbitzari honetan eta sare deszentralizatuko besteetan.", - "dismissable_banner.explore_statuses": "Zerbitzari honetako eta sare deszentralizatuko besteetako bidalketa hauek daude bogan zerbitzari honetan orain.", "dismissable_banner.explore_tags": "Traola hauek daude bogan orain zerbitzari honetan eta sare deszentralizatuko besteetan.", "dismissable_banner.public_timeline": "Hauek dira {domain}-(e)ko jendeak web sozialean jarraitzen dituen jendearen azkeneko argitalpen publikoak.", "embed.instructions": "Txertatu bidalketa hau zure webgunean beheko kodea kopiatuz.", @@ -231,8 +230,6 @@ "empty_column.direct": "Ez duzu aipamen pribaturik oraindik. Baten bat bidali edo jasotzen duzunean, hemen agertuko da.", "empty_column.domain_blocks": "Ez dago ezkutatutako domeinurik oraindik.", "empty_column.explore_statuses": "Ez dago joerarik une honetan. Begiratu beranduago!", - "empty_column.favourited_statuses": "Ez duzu gogokorik oraindik. Gogokoren bat duzunean hemen agertuko da.", - "empty_column.favourites": "Ez du inork gogokoetara gehitu bidalketa hau oraindik. Inork egiten duenean, hemen agertuko dira.", "empty_column.follow_requests": "Ez duzu jarraitzeko eskaririk oraindik. Baten bat jasotzen duzunean, hemen agertuko da.", "empty_column.followed_tags": "Oraindik ez duzu traolik jarraitzen. Egiterakoan, hemen agertuko dira.", "empty_column.hashtag": "Ez dago ezer traola honetan oraindik.", @@ -307,15 +304,12 @@ "home.explore_prompt.title": "Hau zure hasiera da Mastodonen.", "home.hide_announcements": "Ezkutatu iragarpenak", "home.show_announcements": "Erakutsi iragarpenak", - "interaction_modal.description.favourite": "Mastodon kontu batekin bidalketa hau gogoko egin dezakezu, egileari eskertzeko eta gerorako gordetzeko.", "interaction_modal.description.follow": "Mastodon kontu batekin {name} jarraitu dezakezu bere bidalketak zure hasierako denbora lerroan jasotzeko.", "interaction_modal.description.reblog": "Mastodon kontu batekin bidalketa hau bultzatu dezakezu, zure jarraitzaileekin partekatzeko.", "interaction_modal.description.reply": "Mastodon kontu batekin bidalketa honi erantzun diezaiokezu.", "interaction_modal.on_another_server": "Beste zerbitzari batean", "interaction_modal.on_this_server": "Zerbitzari honetan", - "interaction_modal.other_server_instructions": "Kopiatu eta itsatsi URL hau zure Mastodon aplikazio gogokoenaren edo zure Mastodon zerbitzariaren web interfazeko bilaketa eremuan.", "interaction_modal.preamble": "Mastodon deszentralizatua denez, zerbitzari honetan konturik ez badaukazu, beste Mastodon zerbitzari batean edo bateragarria den plataforma batean ostatatutako kontua erabil dezakezu.", - "interaction_modal.title.favourite": "Egin gogoko {name}(r)en bidalketa", "interaction_modal.title.follow": "Jarraitu {name}", "interaction_modal.title.reblog": "Bultzatu {name}(r)en bidalketa", "interaction_modal.title.reply": "Erantzun {name}(r)en bidalketari", @@ -331,8 +325,6 @@ "keyboard_shortcuts.direct": "aipamen pribatuen zutabea irekitzeko", "keyboard_shortcuts.down": "zerrendan behera mugitzea", "keyboard_shortcuts.enter": "Ireki bidalketa", - "keyboard_shortcuts.favourite": "Egin gogoko bidalketa", - "keyboard_shortcuts.favourites": "gogokoen zerrenda irekitzeko", "keyboard_shortcuts.federated": "federatutako denbora-lerroa irekitzeko", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "hasierako denbora-lerroa irekitzeko", @@ -363,6 +355,7 @@ "lightbox.previous": "Aurrekoa", "limited_account_hint.action": "Erakutsi profila hala ere", "limited_account_hint.title": "Profil hau ezkutatu egin dute {domain} zerbitzariko moderatzaileek.", + "link_preview.author": "{name}(r)en eskutik", "lists.account.add": "Gehitu zerrendara", "lists.account.remove": "Kendu zerrendatik", "lists.delete": "Ezabatu zerrenda", @@ -395,7 +388,6 @@ "navigation_bar.domain_blocks": "Ezkutatutako domeinuak", "navigation_bar.edit_profile": "Aldatu profila", "navigation_bar.explore": "Arakatu", - "navigation_bar.favourites": "Gogokoak", "navigation_bar.filters": "Mutututako hitzak", "navigation_bar.follow_requests": "Jarraitzeko eskariak", "navigation_bar.followed_tags": "Jarraitutako traolak", @@ -412,7 +404,6 @@ "not_signed_in_indicator.not_signed_in": "Baliabide honetara sarbidea izateko saioa hasi behar duzu.", "notification.admin.report": "{name} erabiltzaileak {target} salatu du", "notification.admin.sign_up": "{name} erabiltzailea erregistratu da", - "notification.favourite": "{name}(e)k zure bidalketa gogoko du", "notification.follow": "{name}(e)k jarraitzen zaitu", "notification.follow_request": "{name}(e)k zu jarraitzeko eskaera egin du", "notification.mention": "{name}(e)k aipatu zaitu", @@ -426,7 +417,6 @@ "notifications.column_settings.admin.report": "Txosten berriak:", "notifications.column_settings.admin.sign_up": "Izen-emate berriak:", "notifications.column_settings.alert": "Mahaigaineko jakinarazpenak", - "notifications.column_settings.favourite": "Gogokoak:", "notifications.column_settings.filter_bar.advanced": "Erakutsi kategoria guztiak", "notifications.column_settings.filter_bar.category": "Iragazki azkarraren barra", "notifications.column_settings.filter_bar.show_bar": "Erakutsi iragazki-barra", @@ -444,7 +434,6 @@ "notifications.column_settings.update": "Edizioak:", "notifications.filter.all": "Denak", "notifications.filter.boosts": "Bultzadak", - "notifications.filter.favourites": "Gogokoak", "notifications.filter.follows": "Jarraipenak", "notifications.filter.mentions": "Aipamenak", "notifications.filter.polls": "Inkestaren emaitza", @@ -595,7 +584,6 @@ "server_banner.server_stats": "Zerbitzariaren estatistikak:", "sign_in_banner.create_account": "Sortu kontua", "sign_in_banner.sign_in": "Hasi saioa", - "sign_in_banner.text": "Hasi saioa profilak edo traolak jarraitzeko, tutak gogokoetara gehitzeko, partekatzeko edo erantzuteko. Zure kontutik ere komunika zaitezke beste zerbitzari ezberdin batean.", "status.admin_account": "Ireki @{name} erabiltzailearen moderazio interfazea", "status.admin_domain": "{domain}-(r)en moderazio-interfazea ireki", "status.admin_status": "Ireki bidalketa hau moderazio interfazean", @@ -612,7 +600,6 @@ "status.edited": "Editatua {date}", "status.edited_x_times": "{count, plural, one {behin} other {{count} aldiz}} editatua", "status.embed": "Txertatu", - "status.favourite": "Gogokoa", "status.filter": "Iragazi bidalketa hau", "status.filtered": "Iragazita", "status.hide": "Tuta ezkutatu", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 82919c6554..01ddb7565b 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -113,7 +113,7 @@ "column.direct": "خصوصی نام ببرید", "column.directory": "مرور نمایه‌ها", "column.domain_blocks": "دامنه‌های مسدود شده", - "column.favourites": "پسندیده‌ها", + "column.favourites": "برگزیده‌ها", "column.firehose": "خوراک‌های زنده", "column.follow_requests": "درخواست‌های پی‌گیری", "column.home": "خانه", @@ -181,7 +181,6 @@ "confirmations.mute.explanation": "این کار فرسته‌های آن‌ها و فرسته‌هایی را که از آن‌ها نام برده پنهان می‌کند، ولی آن‌ها همچنان اجازه دارند فرسته‌های شما را ببینند و شما را پی‌گیری کنند.", "confirmations.mute.message": "مطمئنید می‌خواهید {name} را بخموشانید؟", "confirmations.redraft.confirm": "حذف و بازنویسی", - "confirmations.redraft.message": "مطمئنید که می‌خواهید این فرسته را حذف کنید و از نو بنویسید؟ با این کار تقویت‌ها و پسندهای آن از دست می‌رود و پاسخ‌ها به آن بی‌مرجع می‌شود.", "confirmations.reply.confirm": "پاسخ", "confirmations.reply.message": "اگر الان پاسخ دهید، چیزی که در حال نوشتنش بودید پاک خواهد شد. می‌خواهید ادامه دهید؟", "confirmations.unfollow.confirm": "پی‌نگرفتن", @@ -331,8 +330,7 @@ "keyboard_shortcuts.direct": "باز کردن ستون اشاره‌های خصوصی", "keyboard_shortcuts.down": "پایین بردن در سیاهه", "keyboard_shortcuts.enter": "گشودن فرسته", - "keyboard_shortcuts.favourite": "پسندیدن فرسته", - "keyboard_shortcuts.favourites": "گشودن سیاههٔ برگزیده‌ها", + "keyboard_shortcuts.favourites": "گشودن فهرست برگزیده‌ها", "keyboard_shortcuts.federated": "گشودن خط زمانی همگانی", "keyboard_shortcuts.heading": "میان‌برهای صفحه‌کلید", "keyboard_shortcuts.home": "گشودن خط زمانی خانگی", @@ -363,6 +361,7 @@ "lightbox.previous": "قبلی", "limited_account_hint.action": "به هر روی نمایه نشان داده شود", "limited_account_hint.title": "این نمایه از سوی ناظم‌های {domain} پنهان شده.", + "link_preview.author": "بر اساس {name}", "lists.account.add": "افزودن به سیاهه", "lists.account.remove": "برداشتن از سیاهه", "lists.delete": "حذف سیاهه", @@ -395,7 +394,7 @@ "navigation_bar.domain_blocks": "دامنه‌های مسدود شده", "navigation_bar.edit_profile": "ویرایش نمایه", "navigation_bar.explore": "کاوش", - "navigation_bar.favourites": "پسندیده‌ها", + "navigation_bar.favourites": "برگزیده‌ها", "navigation_bar.filters": "واژه‌های خموش", "navigation_bar.follow_requests": "درخواست‌های پی‌گیری", "navigation_bar.followed_tags": "برچسب‌های پی‌گرفته", @@ -412,7 +411,7 @@ "not_signed_in_indicator.not_signed_in": "برای دسترسی به این منبع باید وارد شوید.", "notification.admin.report": "{name}، {target} را گزارش داد", "notification.admin.sign_up": "{name} ثبت نام کرد", - "notification.favourite": "‫{name}‬ فرسته‌تان را پسندید", + "notification.favourite": "{name} نوشتهٔ شما را پسندید", "notification.follow": "‫{name}‬ پی‌گیرتان شد", "notification.follow_request": "{name} می‌خواهد پی‌گیر شما باشد", "notification.mention": "‫{name}‬ از شما نام برد", @@ -426,7 +425,7 @@ "notifications.column_settings.admin.report": "گزارش‌های جدید:", "notifications.column_settings.admin.sign_up": "ثبت نام‌های جدید:", "notifications.column_settings.alert": "آگاهی‌های میزکار", - "notifications.column_settings.favourite": "پسندیده‌ها:", + "notifications.column_settings.favourite": "برگزیده‌ها:", "notifications.column_settings.filter_bar.advanced": "نمایش همۀ دسته‌ها", "notifications.column_settings.filter_bar.category": "نوار پالایش سریع", "notifications.column_settings.filter_bar.show_bar": "نمایش نوار پالایه", @@ -444,7 +443,7 @@ "notifications.column_settings.update": "ویرایش‌ها:", "notifications.filter.all": "همه", "notifications.filter.boosts": "تقویت‌ها", - "notifications.filter.favourites": "پسندها", + "notifications.filter.favourites": "برگزیده‌ها", "notifications.filter.follows": "پی‌گرفتگان", "notifications.filter.mentions": "نام‌بردن‌ها", "notifications.filter.polls": "نتایج نظرسنجی", @@ -612,7 +611,7 @@ "status.edited": "ویرایش شده در {date}", "status.edited_x_times": "{count, plural, one {{count} مرتبه} other {{count} مرتبه}} ویرایش شد", "status.embed": "جاسازی", - "status.favourite": "پسندیدن", + "status.favourite": "برگزیده‌", "status.filter": "پالایش این فرسته", "status.filtered": "پالوده", "status.hide": "نهفتن فرسته", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index 93694d241d..814652e8be 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -147,8 +147,8 @@ "compose_form.poll.duration": "Äänestyksen kesto", "compose_form.poll.option_placeholder": "Valinta {number}", "compose_form.poll.remove_option": "Poista tämä valinta", - "compose_form.poll.switch_to_multiple": "Muuta kysely monivalinnaksi", - "compose_form.poll.switch_to_single": "Muuta kysely sallimaan vain yksi valinta", + "compose_form.poll.switch_to_multiple": "Muuta äänestys monivalinnaksi", + "compose_form.poll.switch_to_single": "Muuta äänestys sallimaan vain yksi valinta", "compose_form.publish": "Julkaise", "compose_form.publish_form": "Julkaise", "compose_form.publish_loud": "{publish}!", @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "Tämä toiminto piilottaa heidän julkaisunsa sinulta – mukaan lukien ne, joissa heidät mainitaan – sallien heidän yhä nähdä julkaisusi ja seurata sinua.", "confirmations.mute.message": "Haluatko varmasti mykistää profiilin {name}?", "confirmations.redraft.confirm": "Poista & palauta muokattavaksi", - "confirmations.redraft.message": "Oletko varma että haluat poistaa tämän julkaisun ja tehdä siitä uuden luonnoksen? Suosikit ja tehostukset menetään, alkuperäisen julkaisusi vastaukset jäävät orvoiksi.", + "confirmations.redraft.message": "Haluatko varmasti poistaa viestin ja tehdä siitä uuden luonnoksen? Suosikit ja tehostukset menetään, ja alkuperäisen viestisi vastaukset jäävät orvoiksi.", "confirmations.reply.confirm": "Vastaa", "confirmations.reply.message": "Jos vastaat nyt, vastaus korvaa tällä hetkellä työstämäsi viestin. Oletko varma, että haluat jatkaa?", "confirmations.unfollow.confirm": "Lopeta seuraaminen", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Nämä ovat uusimmat julkiset julkaisut käyttäjiltä, joiden tilejä isännöi {domain}.", "dismissable_banner.dismiss": "Hylkää", "dismissable_banner.explore_links": "Näistä uutisista puhuvat ihmiset juuri nyt tällä ja muilla hajautetun verkon palvelimilla.", - "dismissable_banner.explore_statuses": "Nämä viestit juuri nyt tältä ja muilta hajautetun verkon palvelimilta ovat saamassa vetoa tältä palvelimelta.", + "dismissable_banner.explore_statuses": "Nämä ovat sosiaalisen verkon viestejä, jotka keräävät huomiota tänään. Uudemmat ja enemmän tehostetut viestit, ja suosikit rankataan korkeammalle.", "dismissable_banner.explore_tags": "Nämä aihetunnisteet saavat juuri nyt vetovoimaa tällä ja muilla hajautetun verkon palvelimilla olevien ihmisten keskuudessa.", "dismissable_banner.public_timeline": "Nämä ovat viimeisimmät julkiset viestit sosiaalisen verkon ihmisiltä, joita {domain} käyttäjät seuraa.", "embed.instructions": "Upota julkaisu verkkosivullesi kopioimalla alla oleva koodi.", @@ -231,8 +231,8 @@ "empty_column.direct": "Yksityisiä mainintoja ei vielä ole. Jos lähetät tai sinulle lähetetään sellaisia, näet ne täällä.", "empty_column.domain_blocks": "Palveluita ei ole vielä estetty.", "empty_column.explore_statuses": "Mikään ei trendaa nyt. Tarkista myöhemmin uudelleen!", - "empty_column.favourited_statuses": "Et ole vielä lisännyt viestejä kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.", - "empty_column.favourites": "Kukaan ei ole vielä lisännyt tätä viestiä suosikkeihinsa. Kun joku tekee niin, näkyy kyseinen henkilö tässä.", + "empty_column.favourited_statuses": "Sinulla ei ole vielä yhtään suosikkiviestiä. Kun lisäät yhden, näkyy se tässä.", + "empty_column.favourites": "Kukaan ei ole vielä lisännyt tätä viestiä suosikkeihinsa. Kun joku on lisännyt, näkyy hän tässä.", "empty_column.follow_requests": "Et ole vielä vastaanottanut seurauspyyntöjä. Saamasi pyynnöt näytetään täällä.", "empty_column.followed_tags": "Et ole vielä ottanut yhtään aihetunnistetta seurattavaksesi. Jos tai kun sitten teet niin, ne listautuvat tänne.", "empty_column.hashtag": "Tällä aihetunnisteella ei ole vielä mitään.", @@ -307,15 +307,15 @@ "home.explore_prompt.title": "Tämä on kotitukikohtasi Mastodonissa.", "home.hide_announcements": "Piilota ilmoitukset", "home.show_announcements": "Näytä ilmoitukset", - "interaction_modal.description.favourite": "Kun sinulla on tili Mastodonissa, voit lisätä tämän viestin suosikkeihin ja tallentaa sen myöhempää käyttöä varten.", + "interaction_modal.description.favourite": "Mastodon-tilillä voit lisätä viestin suosikkeihisi näyttääksesi sen kirjoittajalle arvostavasi sitä ja tallentaaksesi sen tulevaisuutta varten.", "interaction_modal.description.follow": "Kun sinulla on Mastodon-tili, voit seurata käyttäjää {name} nähdäksesi hänen viestinsä kotisyötteessäsi.", "interaction_modal.description.reblog": "Kun sinulla on tili Mastodonissa, voit tehostaa viestiä ja jakaa sen omien seuraajiesi kanssa.", "interaction_modal.description.reply": "Kun sinulla on tili Mastodonissa, voit vastata tähän viestiin.", "interaction_modal.on_another_server": "Toisella palvelimella", "interaction_modal.on_this_server": "Tällä palvelimella", - "interaction_modal.other_server_instructions": "Kopioi ja liitä tämä URL-osoite käyttämäsi Mastodon-sovelluksen hakukenttään tai Mastodon-palvelimen web-käyttöliittymään.", + "interaction_modal.other_server_instructions": "Kopioi ja liitä tämä URL-osoite käyttämäsi Mastodon-sovelluksen tai Mastodon-palvelimen verkkosivuston hakukenttään.", "interaction_modal.preamble": "Koska Mastodon on hajautettu, voit käyttää toisen Mastodon-palvelimen tai yhteensopivan alustan ylläpitämää tiliäsi, jos sinulla ei ole tiliä tällä palvelimella.", - "interaction_modal.title.favourite": "Aseta käyttäjän {name} viesti suosikiksi", + "interaction_modal.title.favourite": "Lisää käyttäjän {name} viesti suosikkeihin", "interaction_modal.title.follow": "Seuraa {name}", "interaction_modal.title.reblog": "Tehosta käyttäjän {name} viestiä", "interaction_modal.title.reply": "Vastaa käyttäjän {name} viestiin", @@ -331,8 +331,8 @@ "keyboard_shortcuts.direct": "avataksesi yksityisten mainintojen sarakkeen", "keyboard_shortcuts.down": "Siirry listassa alaspäin", "keyboard_shortcuts.enter": "Avaa julkaisu", - "keyboard_shortcuts.favourite": "Lisää suosikkeihin", - "keyboard_shortcuts.favourites": "Avaa lista suosikeista", + "keyboard_shortcuts.favourite": "Lisää viesti suosikkeihin", + "keyboard_shortcuts.favourites": "Avaa suosikkilista", "keyboard_shortcuts.federated": "Avaa yleinen aikajana", "keyboard_shortcuts.heading": "Pikanäppäimet", "keyboard_shortcuts.home": "Avaa kotiaikajana", @@ -353,7 +353,7 @@ "keyboard_shortcuts.start": "avaa \"Aloitus\"", "keyboard_shortcuts.toggle_hidden": "näytä/piilota sisältövaroituksella merkitty teksti", "keyboard_shortcuts.toggle_sensitivity": "näytä/piilota media", - "keyboard_shortcuts.toot": "Luo uusi julkaisu", + "keyboard_shortcuts.toot": "Luo uusi viesti", "keyboard_shortcuts.unfocus": "Poistu teksti-/hakukentästä", "keyboard_shortcuts.up": "Siirry listassa ylöspäin", "lightbox.close": "Sulje", @@ -363,6 +363,7 @@ "lightbox.previous": "Edellinen", "limited_account_hint.action": "Näytä profiili joka tapauksessa", "limited_account_hint.title": "Palvelun {domain} ylläpito on piilottanut tämän profiilin.", + "link_preview.author": "Julkaissut {name}", "lists.account.add": "Lisää listaan", "lists.account.remove": "Poista listasta", "lists.delete": "Poista lista", @@ -412,11 +413,11 @@ "not_signed_in_indicator.not_signed_in": "Sinun on kirjauduttava sisään käyttääksesi resurssia.", "notification.admin.report": "{name} teki ilmoituksen käytäjästä {target}", "notification.admin.sign_up": "{name} rekisteröityi", - "notification.favourite": "{name} tykkäsi julkaisustasi", + "notification.favourite": "{name} lisäsi viestisi suosikkeihinsa", "notification.follow": "{name} seurasi sinua", "notification.follow_request": "{name} haluaa seurata sinua", "notification.mention": "{name} mainitsi sinut", - "notification.own_poll": "Kyselysi on päättynyt", + "notification.own_poll": "Äänestyksesi on päättynyt", "notification.poll": "Kysely, johon osallistuit, on päättynyt", "notification.reblog": "{name} tehosti viestiäsi", "notification.status": "{name} julkaisi juuri viestin", @@ -426,14 +427,14 @@ "notifications.column_settings.admin.report": "Uudet ilmoitukset:", "notifications.column_settings.admin.sign_up": "Uudet kirjautumiset:", "notifications.column_settings.alert": "Työpöytäilmoitukset", - "notifications.column_settings.favourite": "Tykkäykset:", + "notifications.column_settings.favourite": "Suosikit:", "notifications.column_settings.filter_bar.advanced": "Näytä kaikki kategoriat", "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki", "notifications.column_settings.filter_bar.show_bar": "Näytä suodatinpalkki", "notifications.column_settings.follow": "Uudet seuraajat:", "notifications.column_settings.follow_request": "Uudet seuraamispyynnöt:", "notifications.column_settings.mention": "Maininnat:", - "notifications.column_settings.poll": "Kyselyn tulokset:", + "notifications.column_settings.poll": "Äänestyksen tulokset:", "notifications.column_settings.push": "Push-ilmoitukset", "notifications.column_settings.reblog": "Tehostukset:", "notifications.column_settings.show": "Näytä sarakkeessa", @@ -447,7 +448,7 @@ "notifications.filter.favourites": "Suosikit", "notifications.filter.follows": "Seuraa", "notifications.filter.mentions": "Maininnat", - "notifications.filter.polls": "Kyselyn tulokset", + "notifications.filter.polls": "Äänestyksen tulokset", "notifications.filter.statuses": "Päivitykset henkilöiltä, joita seuraat", "notifications.grant_permission": "Myönnä lupa.", "notifications.group": "{count} ilmoitusta", @@ -496,8 +497,8 @@ "poll.vote": "Äänestä", "poll.voted": "Äänestit tätä vastausta", "poll.votes": "{votes, plural, one {# ääni} other {# ääntä}}", - "poll_button.add_poll": "Lisää kysely", - "poll_button.remove_poll": "Poista kysely", + "poll_button.add_poll": "Lisää äänestys", + "poll_button.remove_poll": "Poista äänestys", "privacy.change": "Muuta viestin näkyvyyttä", "privacy.direct.long": "Näkyvissä vain mainituille käyttäjille", "privacy.direct.short": "Vain mainitut henkilöt", @@ -595,7 +596,7 @@ "server_banner.server_stats": "Palvelimen tilastot:", "sign_in_banner.create_account": "Luo tili", "sign_in_banner.sign_in": "Kirjaudu", - "sign_in_banner.text": "Kirjaudu sisään seurataksesi profiileja tai aihetunnisteita, lisätäksesi suosikkeihin, jakaaksesi julkaisuja ja vastataksesi niihin. Voit myös olla vuorovaikutuksessa tililtäsi toisella palvelimella.", + "sign_in_banner.text": "Kirjaudu sisään seurataksesi profiileja tai aihetunnisteita, lisätäksesi suosikkeja, jakaaksesi viestejä ja vastataksesi niihin. Voit myös vuorovaikuttaa myös eri palvelimilla olevilta tileiltäsi.", "status.admin_account": "Avaa moderaattorinäkymä tilistä @{name}", "status.admin_domain": "Avaa palvelimen {domain} moderointitoiminnot", "status.admin_status": "Avaa viesti moderointinäkymässä", @@ -612,7 +613,7 @@ "status.edited": "Muokattu {date}", "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}", "status.embed": "Upota", - "status.favourite": "Lisää suosikkeihin", + "status.favourite": "Suosikki", "status.filter": "Suodata tämä viesti", "status.filtered": "Suodatettu", "status.hide": "Piilota julkaisu", @@ -626,7 +627,7 @@ "status.more": "Lisää", "status.mute": "Mykistä @{name}", "status.mute_conversation": "Mykistä keskustelu", - "status.open": "Laajenna julkaisu", + "status.open": "Laajenna viesti", "status.pin": "Kiinnitä profiiliin", "status.pinned": "Kiinnitetty julkaisu", "status.read_more": "Näytä enemmän", @@ -679,7 +680,7 @@ "upload_area.title": "Lataa raahaamalla ja pudottamalla tähän", "upload_button.label": "Lisää kuvia, video tai äänitiedosto", "upload_error.limit": "Tiedostolatauksien raja ylitetty.", - "upload_error.poll": "Tiedon lataaminen ei ole sallittua kyselyissä.", + "upload_error.poll": "Tiedoston lataaminen ei ole sallittua äänestyksissä.", "upload_form.audio_description": "Kuvaile sisältöä kuuroille ja kuulorajoitteisille", "upload_form.description": "Kuvaile sisältöä sokeille ja näkörajoitteisille", "upload_form.description_missing": "Kuvausta ei ole lisätty", diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json index c718b3f4ef..87a47b3756 100644 --- a/app/javascript/mastodon/locales/fo.json +++ b/app/javascript/mastodon/locales/fo.json @@ -113,7 +113,7 @@ "column.direct": "Privatar umrøður", "column.directory": "Blaða gjøgnum vangar", "column.domain_blocks": "Bannað økisnøvn", - "column.favourites": "Dámd", + "column.favourites": "Dámdir postar", "column.firehose": "Beinleiðis rásir", "column.follow_requests": "Umbønir at fylgja", "column.home": "Heim", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Hesir er nýggjastu almennu postarnir frá fólki, hvørs kontur eru hýstar av {domain}.", "dismissable_banner.dismiss": "Avvís", "dismissable_banner.explore_links": "Fólk tosa um hesi tíðindi, á hesum og øðrum ambætarum á miðspjadda netverkinum, júst nú.", - "dismissable_banner.explore_statuses": "Hesi uppsløg, frá hesum og øðrum ambætarum á miðspjadda netverkinum, hava framgongd á hesum ambætara júst nú.", + "dismissable_banner.explore_statuses": "Hesi uppsløg, frá hesum og øðrum ambætarum á miðspjadda netverkinum, hava framgongd á hesum ambætara júst nú. Nýggjari postar, sum fleiri hava framhevja og dáma, verða raðfestir hægri.", "dismissable_banner.explore_tags": "Hesi frámerki vinna í løtuni fótafesti millum fólk á hesum og øðrum ambætarum í desentrala netverkinum beint nú.", "dismissable_banner.public_timeline": "Hetta eru teir nýggjast postarnir frá fólki á sosialu vevinum, sum fólk á {domain} fylgja.", "embed.instructions": "Fell hendan postin inní á tínum vevstaði við at taka avrit av koduni niðanfyri.", @@ -307,7 +307,7 @@ "home.explore_prompt.title": "Hetta er tín heimastøð í Mastodon.", "home.hide_announcements": "Fjal kunngerðir", "home.show_announcements": "Vís kunngerðir", - "interaction_modal.description.favourite": "Við einari kontu á Mastodon kanst tú dáma hetta uppslagið fyri at vísa rithøvundanum at tú virðismetur tað og goymir tað til seinni.", + "interaction_modal.description.favourite": "Við einari kontu á Mastodon kanst tú dáma hendan postin fyri at vísa rithøvundanum at tú virðismetur hann og goymir hann til seinni.", "interaction_modal.description.follow": "Við eini kontu á Mastodon kanst tú fylgja {name} fyri at síggja teirra postar á tíni heimarás.", "interaction_modal.description.reblog": "Við eini kontu á Mastodon kanst tú stimbra hendan postin og soleiðis deila hann við tínar fylgjarar.", "interaction_modal.description.reply": "Við eini kontu á Mastodon, so kanst tú svara hesum posti.", @@ -315,7 +315,7 @@ "interaction_modal.on_this_server": "Á hesum ambætaranum", "interaction_modal.other_server_instructions": "Kopiera og set hendan URLin inn í leititeigin í tíni yndis-Mastodon-app ella í vev-markamótið á tínum Mastodon-ambætara.", "interaction_modal.preamble": "Av tí at Mastodon er desentraliserað, kanst tú brúka tína kontu frá einum øðrum Mastodon ambætara ella sambærligum palli, um tú ikki hevur eina kontu á hesum ambætaranum.", - "interaction_modal.title.favourite": "Dáma {name}sa uppslag", + "interaction_modal.title.favourite": "Dáma postin hjá {name}", "interaction_modal.title.follow": "Fylg {name}", "interaction_modal.title.reblog": "Stimbra postin hjá {name}", "interaction_modal.title.reply": "Svara postinum hjá {name}", @@ -331,8 +331,8 @@ "keyboard_shortcuts.direct": "at lata teigin við privatum umrøðum upp", "keyboard_shortcuts.down": "Flyt niðureftir listanum", "keyboard_shortcuts.enter": "Opna uppslag", - "keyboard_shortcuts.favourite": "Dáma uppslag", - "keyboard_shortcuts.favourites": "Opna listan av dámdum", + "keyboard_shortcuts.favourite": "Dáma post", + "keyboard_shortcuts.favourites": "Lat listan av dámdum postum upp", "keyboard_shortcuts.federated": "Lat felags tíðslinju upp", "keyboard_shortcuts.heading": "Snarknappar", "keyboard_shortcuts.home": "Lat heimatíðarlinju upp", @@ -363,6 +363,7 @@ "lightbox.previous": "Aftur", "limited_account_hint.action": "Vís vangamynd kortini", "limited_account_hint.title": "Hesin vangin er fjaldur av kjakleiðarunum á {domain}.", + "link_preview.author": "Av {name}", "lists.account.add": "Legg afturat lista", "lists.account.remove": "Tak av lista", "lists.delete": "Strika lista", @@ -395,7 +396,7 @@ "navigation_bar.domain_blocks": "Bannað økisnøvn", "navigation_bar.edit_profile": "Broyt vanga", "navigation_bar.explore": "Rannsaka", - "navigation_bar.favourites": "Dámd", + "navigation_bar.favourites": "Dámdir postar", "navigation_bar.filters": "Doyvd orð", "navigation_bar.follow_requests": "Umbønir um at fylgja", "navigation_bar.followed_tags": "Fylgd frámerki", @@ -412,7 +413,7 @@ "not_signed_in_indicator.not_signed_in": "Tú mást rita inn fyri at fáa atgongd til hetta tilfarið.", "notification.admin.report": "{name} hevur meldað {target}", "notification.admin.sign_up": "{name} meldaði seg til", - "notification.favourite": "{name} dámdi títt uppslag", + "notification.favourite": "{name} dámdi postin hjá tær", "notification.follow": "{name} fylgdi tær", "notification.follow_request": "{name} biður um at fylgja tær", "notification.mention": "{name} nevndi teg", @@ -426,7 +427,7 @@ "notifications.column_settings.admin.report": "Nýggjar fráboðanir:", "notifications.column_settings.admin.sign_up": "Nýggjar tilmeldingar:", "notifications.column_settings.alert": "Skriviborðsfráboðanir", - "notifications.column_settings.favourite": "Dámd:", + "notifications.column_settings.favourite": "Dámdir postar:", "notifications.column_settings.filter_bar.advanced": "Vís allar bólkar", "notifications.column_settings.filter_bar.category": "Skjótfilturbjálki", "notifications.column_settings.filter_bar.show_bar": "Vís filturbjálka", @@ -444,7 +445,7 @@ "notifications.column_settings.update": "Rættingar:", "notifications.filter.all": "Øll", "notifications.filter.boosts": "Stimbranir", - "notifications.filter.favourites": "Dámd", + "notifications.filter.favourites": "Dámdir postar", "notifications.filter.follows": "Fylgir", "notifications.filter.mentions": "Umrøður", "notifications.filter.polls": "Úrslit av atkvøðugreiðslu", @@ -595,7 +596,7 @@ "server_banner.server_stats": "Ambætarahagtøl:", "sign_in_banner.create_account": "Stovna kontu", "sign_in_banner.sign_in": "Rita inn", - "sign_in_banner.text": "Innrita fyri at fylgja vangum og frámerkjum, seta yndismerki á, deila og svara postum. Tú kanst eisini brúka kontuna til at samvirka á einum øðrum ambætara.", + "sign_in_banner.text": "Innrita fyri at fylgja vangum og frámerkjum, dáma, deila og svara postum. Tú kanst eisini brúka kontuna til at samvirka á einum øðrum ambætara.", "status.admin_account": "Lat kjakleiðaramarkamót upp fyri @{name}", "status.admin_domain": "Lat umsjónarmarkamót upp fyri {domain}", "status.admin_status": "Lat hendan postin upp í kjakleiðaramarkamótinum", @@ -612,7 +613,7 @@ "status.edited": "Rættað {date}", "status.edited_x_times": "Rættað {count, plural, one {{count} ferð} other {{count} ferð}}", "status.embed": "Legg inní", - "status.favourite": "Dámað", + "status.favourite": "Dámdur postur", "status.filter": "Filtrera hendan postin", "status.filtered": "Filtrerað", "status.hide": "Fjal post", diff --git a/app/javascript/mastodon/locales/fr-QC.json b/app/javascript/mastodon/locales/fr-QC.json index aed2643926..547d9a773f 100644 --- a/app/javascript/mastodon/locales/fr-QC.json +++ b/app/javascript/mastodon/locales/fr-QC.json @@ -40,8 +40,8 @@ "account.follows_you": "Vous suit", "account.go_to_profile": "Voir ce profil", "account.hide_reblogs": "Masquer les boosts de @{name}", - "account.in_memoriam": "En mémoire de.", - "account.joined_short": "Inscript en", + "account.in_memoriam": "En souvenir de", + "account.joined_short": "Inscrit·e", "account.languages": "Changer les langues abonnées", "account.link_verified_on": "La propriété de ce lien a été vérifiée le {date}", "account.locked_info": "Le statut de confidentialité de ce compte est privé. Son propriétaire vérifie manuellement qui peut le/la suivre.", @@ -68,7 +68,7 @@ "account.unendorse": "Ne pas inclure sur profil", "account.unfollow": "Ne plus suivre", "account.unmute": "Ne plus masquer @{name}", - "account.unmute_notifications_short": "Réactiver les notifications", + "account.unmute_notifications_short": "Ne plus masquer les notifications", "account.unmute_short": "Ne plus masquer", "account_note.placeholder": "Cliquez pour ajouter une note", "admin.dashboard.daily_retention": "Taux de rétention des comptes par jour après inscription", @@ -78,7 +78,7 @@ "admin.dashboard.retention.cohort_size": "Nouveaux comptes", "admin.impact_report.instance_accounts": "Profils de comptes que cela supprimerait", "admin.impact_report.instance_followers": "Abonnés que nos utilisateurs perdraient", - "admin.impact_report.instance_follows": "Abonnées que leurs utilisateurs perdraient", + "admin.impact_report.instance_follows": "Abonnées que ses utilisateurs perdraient", "admin.impact_report.title": "Résumé de l'impact", "alert.rate_limited.message": "Veuillez réessayer après {retry_time, time, medium}.", "alert.rate_limited.title": "Débit limité", @@ -135,7 +135,7 @@ "community.column_settings.remote_only": "À distance seulement", "compose.language.change": "Changer de langue", "compose.language.search": "Rechercher des langues…", - "compose.published.body": "Message Publié.", + "compose.published.body": "Publiée.", "compose.published.open": "Ouvrir", "compose_form.direct_message_warning_learn_more": "En savoir plus", "compose_form.encryption_warning": "Les publications sur Mastodon ne sont pas chiffrées de bout en bout. Veuillez ne partager aucune information sensible sur Mastodon.", @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "Cela masquera ses publications et celle le/la mentionnant, mais cela lui permettra toujours de voir vos messages et de vous suivre.", "confirmations.mute.message": "Voulez-vous vraiment masquer {name}?", "confirmations.redraft.confirm": "Supprimer et réécrire", - "confirmations.redraft.message": "Voulez-vous vraiment effacer cette publication pour la réécrire? Ses mentions favori et boosts seront perdus et ses réponses deviendront orphelines.", + "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire? Ses ses mises en favori et boosts seront perdus et ses réponses seront orphelines.", "confirmations.reply.confirm": "Répondre", "confirmations.reply.message": "Répondre maintenant écrasera le message que vous rédigez présentement. Voulez-vous vraiment continuer?", "confirmations.unfollow.confirm": "Ne plus suivre", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Voici les publications publiques les plus récentes de personnes dont les comptes sont hébergés par {domain}.", "dismissable_banner.dismiss": "Rejeter", "dismissable_banner.explore_links": "Ces nouvelles sont présentement en cours de discussion par des personnes sur d'autres serveurs du réseau décentralisé ainsi que sur celui-ci.", - "dismissable_banner.explore_statuses": "Ces publications de ce serveur et d'autres du réseau décentralisé sont présentement en train de gagner de l'ampleur sur ce serveur.", + "dismissable_banner.explore_statuses": "Voici des publications venant de tout le web social gagnant en popularité aujourd’hui. Les nouvelles publications avec plus de boosts et de favoris sont classés plus haut.", "dismissable_banner.explore_tags": "Ces hashtags sont présentement en train de gagner de l'ampleur parmi des personnes sur les serveurs du réseau décentralisé dont celui-ci.", "dismissable_banner.public_timeline": "Ce sont les messages publics les plus récents de personnes sur le web social que les gens de {domain} suivent.", "embed.instructions": "Intégrez cette publication à votre site en copiant le code ci-dessous.", @@ -303,19 +303,19 @@ "home.column_settings.basic": "Basique", "home.column_settings.show_reblogs": "Afficher boosts", "home.column_settings.show_replies": "Afficher réponses", - "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'ils boostent. Cela a l'air assez calme en ce moment, alors comment :", + "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de publications depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les publications qu'elles boostent. C'est plutôt calme en ce moment, alors que dites-vous de:", "home.explore_prompt.title": "C'est chez vous dans Mastadon.", "home.hide_announcements": "Masquer les annonces", "home.show_announcements": "Afficher annonces", - "interaction_modal.description.favourite": "Avec un compte Mastodon, vous pouvez ajouter cette publication aux favoris pour informer son auteur·rice que vous l'appréciez et la sauvegarder pour plus tard.", + "interaction_modal.description.favourite": "Avec un compte Mastodon, vous pouvez ajouter cette publication à vos favoris pour informer l'auteur⋅rice que vous l'appréciez et la sauvegarder pour plus tard.", "interaction_modal.description.follow": "Avec un compte Mastodon, vous pouvez suivre {name} et recevoir leurs publications dans votre fil d'accueil.", "interaction_modal.description.reblog": "Avec un compte Mastodon, vous pouvez booster cette publication pour la partager avec vos propres abonné·e·s.", "interaction_modal.description.reply": "Avec un compte sur Mastodon, vous pouvez répondre à cette publication.", "interaction_modal.on_another_server": "Sur un autre serveur", "interaction_modal.on_this_server": "Sur ce serveur", - "interaction_modal.other_server_instructions": "Copiez et collez cet URL dans le champ de recherche de votre application Mastodon préférée ou l'interface web de votre serveur Mastodon.", + "interaction_modal.other_server_instructions": "Copiez et collez cet URL dans le champ de recherche de votre application Mastodon préférée ou de l'interface web de votre serveur Mastodon.", "interaction_modal.preamble": "Puisque Mastodon est décentralisé, vous pouvez utiliser votre compte existant hébergé par un autre serveur Mastodon ou une plateforme compatible si vous n'avez pas de compte sur celui-ci.", - "interaction_modal.title.favourite": "Ajouter la publication de {name} à vos favoris", + "interaction_modal.title.favourite": "Ajouter la publication de {name} aux favoris", "interaction_modal.title.follow": "Suivre {name}", "interaction_modal.title.reblog": "Booster la publication de {name}", "interaction_modal.title.reply": "Répondre à la publication de {name}", @@ -331,7 +331,7 @@ "keyboard_shortcuts.direct": "pour ouvrir la colonne de mentions privées", "keyboard_shortcuts.down": "Descendre dans la liste", "keyboard_shortcuts.enter": "Ouvrir cette publication", - "keyboard_shortcuts.favourite": "Ajouter publication aux favoris", + "keyboard_shortcuts.favourite": "Ajouter la publication aux favoris", "keyboard_shortcuts.favourites": "Ouvrir la liste des favoris", "keyboard_shortcuts.federated": "Ouvrir le fil global", "keyboard_shortcuts.heading": "Raccourcis clavier", @@ -363,12 +363,13 @@ "lightbox.previous": "Précédent", "limited_account_hint.action": "Afficher le profil quand même", "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.", + "link_preview.author": "Par {name}", "lists.account.add": "Ajouter à une liste", "lists.account.remove": "Retirer d'une liste", "lists.delete": "Supprimer la liste", "lists.edit": "Modifier la liste", "lists.edit.submit": "Modifier le titre", - "lists.exclusive": "Cacher ces postes depuis la page d'accueil", + "lists.exclusive": "Cacher ces publications depuis la page d'accueil", "lists.new.create": "Ajouter une liste", "lists.new.title_placeholder": "Titre de la nouvelle liste", "lists.replies_policy.followed": "N'importe quel compte suivi", @@ -412,7 +413,7 @@ "not_signed_in_indicator.not_signed_in": "Vous devez vous connecter pour accéder à cette ressource.", "notification.admin.report": "{name} a signalé {target}", "notification.admin.sign_up": "{name} s'est inscrit·e", - "notification.favourite": "{name} a aimé votre publication", + "notification.favourite": "{name} a ajouté votre publication à ses favoris", "notification.follow": "{name} vous suit", "notification.follow_request": "{name} a demandé à vous suivre", "notification.mention": "{name} vous a mentionné·e", @@ -463,29 +464,29 @@ "onboarding.actions.go_to_explore": "See what's trending", "onboarding.actions.go_to_home": "Go to your home feed", "onboarding.compose.template": "Bonjour #Mastodon!", - "onboarding.follows.empty": "Malheureusement, aucun résultat ne peut être affiché pour le moment. Vous pouvez essayer d'utiliser la recherche ou parcourir la page pour trouver des personnes à suivre, ou réessayez plus tard.", + "onboarding.follows.empty": "Malheureusement, aucun résultat ne peut être affiché pour le moment. Vous pouvez essayer de rechercher ou de parcourir la page \"Explorer\" pour trouver des personnes à suivre, ou réessayer plus tard.", "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!", "onboarding.follows.title": "Popular on Mastodon", - "onboarding.share.lead": "Faites savoir aux gens comment ils peuvent vous trouver sur Mastodon!", - "onboarding.share.message": "Je suis {username} sur #Mastodon! Suivez-moi à {url}", - "onboarding.share.next_steps": "Étapes suivantes possibles :", + "onboarding.share.lead": "Faites savoir aux gens comment vous trouver sur Mastodon!", + "onboarding.share.message": "Je suis {username} sur #Mastodon! Suivez-moi sur {url}", + "onboarding.share.next_steps": "Étapes suivantes possibles:", "onboarding.share.title": "Partager votre profil", "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:", "onboarding.start.skip": "Want to skip right ahead?", - "onboarding.start.title": "Vous avez réussi !", + "onboarding.start.title": "Vous avez réussi!", "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.", "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}", "onboarding.steps.publish_status.body": "Say hello to the world.", - "onboarding.steps.publish_status.title": "Écrivez votre premier post", + "onboarding.steps.publish_status.title": "Écrivez votre première publication", "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.", "onboarding.steps.setup_profile.title": "Customize your profile", "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!", "onboarding.steps.share_profile.title": "Share your profile", - "onboarding.tips.2fa": "Le saviez-vous ? Vous pouvez sécuriser votre compte en configurant l'authentification à deux facteurs dans les paramètres de votre compte. Il fonctionne avec n'importe quelle application TOTP de votre choix, sans numéro de téléphone nécessaire !", - "onboarding.tips.accounts_from_other_servers": "Le saviez-vous ? Puisque Mastodon est décentralisé, certains profils que vous rencontrez seront hébergés sur des serveurs autres que les vôtres. Et pourtant, vous pouvez interagir avec eux ! Leur serveur est dans la seconde moitié de leur nom d'utilisateur !", - "onboarding.tips.migration": "Le saviez-vous ? Si vous avez l'impression que {domain} n'est pas un bon choix de serveur pour vous dans le futur, vous pouvez vous déplacer sur un autre serveur Mastodon sans perdre vos abonnés. Vous pouvez même héberger votre propre serveur!", - "onboarding.tips.verification": "Le saviez-vous ? Vous pouvez vérifier votre compte en mettant un lien vers votre profil Mastodon sur votre propre site web et en ajoutant le site à votre profil. Pas de frais ou de documents nécessaires !", - "password_confirmation.exceeds_maxlength": "La confirmation du mot de passe dépasse la longueur du mot de passe", + "onboarding.tips.2fa": "Le saviez-vous ? Vous pouvez sécuriser votre compte en configurant l'authentification à deux facteurs dans les paramètres de votre compte. Ça marche avec n'importe quelle application TOTP de votre choix, aucun numéro de téléphone nécessaire!", + "onboarding.tips.accounts_from_other_servers": "Le saviez-vous ? Puisque Mastodon est décentralisé, certains profils que vous rencontrez seront hébergés sur des serveurs autres que les vôtres. Et vous pouvez toujours interagir avec ceux-là de façon transparente! Leur serveur est dans la seconde moitié de leur nom d'utilisateur!", + "onboarding.tips.migration": "Le saviez-vous ? Si vous avez l'impression que {domain} n'est pas un bon choix de serveur pour vous dans le futur, vous pouvez déménager vers un autre serveur Mastodon sans perdre vos abonnés. Vous pouvez même héberger votre propre serveur!", + "onboarding.tips.verification": "Le saviez-vous ? Vous pouvez vérifier votre compte en mettant un lien vers votre profil Mastodon sur votre propre site web et en ajoutant le site à votre profil. Sans frais ou documents!", + "password_confirmation.exceeds_maxlength": "La confirmation du mot de passe dépasse la longueur maximale du mot de passe", "password_confirmation.mismatching": "Les deux mots de passe ne correspondent pas", "picture_in_picture.restore": "Remettre en place", "poll.closed": "Fermé", @@ -564,7 +565,7 @@ "report.unfollow": "Ne plus suivre @{name}", "report.unfollow_explanation": "Vous suivez ce compte. Pour ne plus en voir les messages sur votre fil d'accueil, arrêtez de le suivre.", "report_notification.attached_statuses": "{count, plural, one {{count} publication liée} other {{count} publications liées}}", - "report_notification.categories.legal": "Légal", + "report_notification.categories.legal": "Mentions légales", "report_notification.categories.other": "Autre", "report_notification.categories.spam": "Spam", "report_notification.categories.violation": "Infraction aux règles du serveur", @@ -595,7 +596,7 @@ "server_banner.server_stats": "Statistiques du serveur:", "sign_in_banner.create_account": "Créer un compte", "sign_in_banner.sign_in": "Se connecter", - "sign_in_banner.text": "Identifiez-vous pour suivre des profils ou des hashtags, ajouter des favoris, partager et répondre à des messages. Vous pouvez également interagir depuis votre compte sur un autre serveur.", + "sign_in_banner.text": "Identifiez-vous pour suivre des profils ou des hashtags, ajouter des favoris, partager et répondre à des publications. Vous pouvez également interagir depuis votre compte sur un autre serveur.", "status.admin_account": "Ouvrir l’interface de modération pour @{name}", "status.admin_domain": "Ouvrir l’interface de modération pour {domain}", "status.admin_status": "Ouvrir ce message dans l’interface de modération", @@ -620,7 +621,7 @@ "status.history.edited": "modifié par {name} {date}", "status.load_more": "Charger plus", "status.media.open": "Cliquez pour ouvrir", - "status.media.show": "Cliquez pour voir", + "status.media.show": "Cliquez pour afficher", "status.media_hidden": "Média masqué", "status.mention": "Mentionner @{name}", "status.more": "Plus", @@ -651,7 +652,7 @@ "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}", "status.translate": "Traduire", "status.translated_from_with": "Traduit de {lang} avec {provider}", - "status.uncached_media_warning": "Prévisualisation non disponible", + "status.uncached_media_warning": "Aperçu non disponible", "status.unmute_conversation": "Ne plus masquer cette conversation", "status.unpin": "Désépingler du profil", "subscribed_languages.lead": "Seules des publications dans les langues sélectionnées apparaîtront sur vos fil d'accueil et de liste(s) après le changement. N'en sélectionnez aucune pour recevoir des publications dans toutes les langues.", @@ -699,7 +700,7 @@ "upload_modal.preview_label": "Aperçu ({ratio})", "upload_progress.label": "Envoi en cours...", "upload_progress.processing": "Traitement en cours…", - "username.taken": "Ce nom d'utilisateur est déjà pris. Essayez d'en prendre un autre", + "username.taken": "Ce nom d'utilisateur est déjà pris. Essayez-en en autre", "video.close": "Fermer la vidéo", "video.download": "Télécharger ce fichier", "video.exit_fullscreen": "Quitter le plein écran", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 5cf8daad9a..00025b20a5 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "Cela masquera ses messages et les messages le ou la mentionnant, mais cela lui permettra quand même de voir vos messages et de vous suivre.", "confirmations.mute.message": "Voulez-vous vraiment masquer {name} ?", "confirmations.redraft.confirm": "Supprimer et ré-écrire", - "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer ce statut pour le réécrire ? Ses partages ainsi que ses mises en favori seront perdus et ses réponses seront orphelines.", + "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire ? Ses partages ainsi que ses mises en favori seront perdus et ses réponses seront orphelines.", "confirmations.reply.confirm": "Répondre", "confirmations.reply.message": "Répondre maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?", "confirmations.unfollow.confirm": "Ne plus suivre", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Voici les messages publics les plus récents des comptes hébergés par {domain}.", "dismissable_banner.dismiss": "Rejeter", "dismissable_banner.explore_links": "On parle actuellement de ces nouvelles sur ce serveur, ainsi que sur d'autres serveurs du réseau décentralisé.", - "dismissable_banner.explore_statuses": "Ces publications depuis les serveurs du réseau décentralisé, dont celui-ci, sont actuellement en train de gagner de l'ampleur sur ce serveur.", + "dismissable_banner.explore_statuses": "Ces messages venant de tout le web social gagnent en popularité aujourd’hui. Les nouveaux messages avec plus de boosts et de favoris sont classés plus haut.", "dismissable_banner.explore_tags": "Ces hashtags sont actuellement en train de gagner de l'ampleur parmi les personnes sur les serveurs du réseau décentralisé dont celui-ci.", "dismissable_banner.public_timeline": "Ce sont les posts publics les plus récents de personnes sur le web social que les gens sur {domain} suivent.", "embed.instructions": "Intégrez ce message à votre site en copiant le code ci-dessous.", @@ -363,6 +363,7 @@ "lightbox.previous": "Précédent", "limited_account_hint.action": "Afficher le profil quand même", "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.", + "link_preview.author": "Par {name}", "lists.account.add": "Ajouter à la liste", "lists.account.remove": "Supprimer de la liste", "lists.delete": "Supprimer la liste", @@ -426,7 +427,7 @@ "notifications.column_settings.admin.report": "Nouveaux signalements :", "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions :", "notifications.column_settings.alert": "Notifications du navigateur", - "notifications.column_settings.favourite": "Favoris :", + "notifications.column_settings.favourite": "Favoris :", "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories", "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide", "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre", diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json index 72b53de811..d6bfba9eec 100644 --- a/app/javascript/mastodon/locales/fy.json +++ b/app/javascript/mastodon/locales/fy.json @@ -113,7 +113,6 @@ "column.direct": "Priveefermeldingen", "column.directory": "Profilen trochsykje", "column.domain_blocks": "Blokkearre domeinen", - "column.favourites": "Favoriten", "column.firehose": "Live feeds", "column.follow_requests": "Folchfersiken", "column.home": "Startside", @@ -181,7 +180,6 @@ "confirmations.mute.explanation": "Dit sil berjochten fan harren en berjochten dêr’t se yn fermeld wurde ûnsichtber meitsje, mar se sille berjochten noch hieltyd sjen kinne en jo folgje kinne.", "confirmations.mute.message": "Binne jo wis dat jo {name} negearje wolle?", "confirmations.redraft.confirm": "Fuortsmite en opnij opstelle", - "confirmations.redraft.message": "Wolle jo dit berjocht wurklik fuortsmite en opnij opstelle? Favoriten en boosts geane dan ferlern en reaksjes op it oarspronklike berjocht reitsje jo kwyt.", "confirmations.reply.confirm": "Reagearje", "confirmations.reply.message": "Troch no te reagearjen sil it berjocht dat jo no oan it skriuwen binne oerskreaun wurde. Wolle jo trochgean?", "confirmations.unfollow.confirm": "Net mear folgje", @@ -202,7 +200,6 @@ "dismissable_banner.community_timeline": "Dit binne de meast resinte iepenbiere berjochten fan accounts op {domain}.", "dismissable_banner.dismiss": "Slute", "dismissable_banner.explore_links": "Dizze nijsberjochten winne oan populariteit op dizze en oare servers binnen it desintrale netwurk.", - "dismissable_banner.explore_statuses": "Dizze berjochten winne oan populariteit op dizze en oare servers binnen it desintrale netwurk.", "dismissable_banner.explore_tags": "Dizze hashtags winne oan populariteit op dizze en oare servers binnen it desintrale netwurk.", "dismissable_banner.public_timeline": "Dit binne de meast resinte iepenbiere berjochten fan accounts op it sosjale web dy’t troch minsken op {domain} folge wurde.", "embed.instructions": "Embed this status on your website by copying the code below.", @@ -231,8 +228,6 @@ "empty_column.direct": "Jo hawwe noch gjin priveefermeldingen. Wannear’t jo der ien ferstjoere of ûntfange, komt dizze hjir te stean.", "empty_column.domain_blocks": "Der binne noch gjin blokkearre domeinen.", "empty_column.explore_statuses": "Op dit stuit binne der gjin trends. Kom letter werom!", - "empty_column.favourited_statuses": "Jo hawwe noch gjin favorite berjochten. Wannear’t jo ien as favoryt markearje, falt dizze hjir te sjen.", - "empty_column.favourites": "Net ien hat dit berjocht noch as favoryt markearre. Wannear’t ien dit docht, falt dat hjir te sjen.", "empty_column.follow_requests": "Jo hawwe noch gjin folchfersiken ûntfongen. Wannear’t jo der ien ûntfange, falt dat hjir te sjen.", "empty_column.followed_tags": "Jo folgje noch gjin hashtags. As jo dat wol dogge, wurde se hjir toand.", "empty_column.hashtag": "Der is noch neat te finen ûnder dizze hashtag.", @@ -307,15 +302,12 @@ "home.explore_prompt.title": "Dit is jo thúsbasis op Mastodon.", "home.hide_announcements": "Meidielingen ferstopje", "home.show_announcements": "Meidielingen toane", - "interaction_modal.description.favourite": "Jo kinne mei in Mastodon-account dit berjocht as favoryt markearje, om dy brûker witte te litten dat jo it berjocht wurdearje en om it te bewarjen.", "interaction_modal.description.follow": "Jo kinne mei in Mastodon-account {name} folgje, om sa harren berjochten op jo starttiidline te ûntfangen.", "interaction_modal.description.reblog": "Jo kinne mei in Mastodon-account dit berjocht booste, om it sa mei jo folgers te dielen.", "interaction_modal.description.reply": "Jo kinne mei in Mastodon-account op dit berjocht reagearje.", "interaction_modal.on_another_server": "Op een oare server", "interaction_modal.on_this_server": "Op dizze server", - "interaction_modal.other_server_instructions": "Kopiearje en plak ienfâldich dizze URL yn it sykfjild fan de troch jo brûkte Mastodon-app of op de website fan de Mastodon-server wêrop jo oanmeld binne.", "interaction_modal.preamble": "Mastodon is desintralisearre. Dêrom hawwe jo gjin account op dizze Mastodon-server nedich, wannear’t jo al in account op in oare Mastodon-server of kompatibel platfoarm hawwe.", - "interaction_modal.title.favourite": "Berjocht fan {name} as favoryt markearje", "interaction_modal.title.follow": "{name} folgje", "interaction_modal.title.reblog": "Berjocht fan {name} booste", "interaction_modal.title.reply": "Op it berjocht fan {name} reagearje", @@ -331,8 +323,6 @@ "keyboard_shortcuts.direct": "om de kolom priveefermeldingen te iepenjen", "keyboard_shortcuts.down": "Nei ûnder yn list ferpleatse", "keyboard_shortcuts.enter": "Berjocht iepenje", - "keyboard_shortcuts.favourite": "As favoryt markearje", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Fluchtoetsen", "keyboard_shortcuts.home": "Starttiidline toane", @@ -395,7 +385,6 @@ "navigation_bar.domain_blocks": "Blokkearre domeinen", "navigation_bar.edit_profile": "Profyl bewurkje", "navigation_bar.explore": "Ferkenne", - "navigation_bar.favourites": "Favoriten", "navigation_bar.filters": "Negearre wurden", "navigation_bar.follow_requests": "Folchfersiken", "navigation_bar.followed_tags": "Folge hashtags", @@ -412,7 +401,6 @@ "not_signed_in_indicator.not_signed_in": "Do moatst oanmelde om tagong ta dizze ynformaasje te krijen.", "notification.admin.report": "{name} hat {target} rapportearre", "notification.admin.sign_up": "{name} hat harren registrearre", - "notification.favourite": "{name} hat jo berjocht as favoryt markearre", "notification.follow": "{name} folget dy", "notification.follow_request": "{name} hat dy in folchfersyk stjoerd", "notification.mention": "{name} hat dy fermeld", @@ -426,7 +414,6 @@ "notifications.column_settings.admin.report": "Nije rapportaazjes:", "notifications.column_settings.admin.sign_up": "Nije registraasjes:", "notifications.column_settings.alert": "Desktopmeldingen", - "notifications.column_settings.favourite": "Favoriten:", "notifications.column_settings.filter_bar.advanced": "Alle kategoryen toane", "notifications.column_settings.filter_bar.category": "Flugge filterbalke", "notifications.column_settings.filter_bar.show_bar": "Filterbalke toane", @@ -444,7 +431,6 @@ "notifications.column_settings.update": "Bewurkingen:", "notifications.filter.all": "Alle", "notifications.filter.boosts": "Boosts", - "notifications.filter.favourites": "Favoriten", "notifications.filter.follows": "Folget", "notifications.filter.mentions": "Fermeldingen", "notifications.filter.polls": "Pollresultaten", @@ -595,7 +581,6 @@ "server_banner.server_stats": "Serverstatistiken:", "sign_in_banner.create_account": "Account registrearje", "sign_in_banner.sign_in": "Oanmelde", - "sign_in_banner.text": "Meld jo oan, om profilen of hashtags te folgjen, berjochten favoryt te meitsjen, te dielen en te beäntwurdzjen of om fan jo account út op in oare server mei oaren ynteraksje te hawwen.", "status.admin_account": "Moderaasje-omjouwing fan @{name} iepenje", "status.admin_domain": "Moderaasje-omjouwing fan {domain} iepenje", "status.admin_status": "Open this status in the moderation interface", @@ -612,7 +597,6 @@ "status.edited": "Bewurke op {date}", "status.edited_x_times": "{count, plural, one {{count} kear} other {{count} kearen}} bewurke", "status.embed": "Ynslute", - "status.favourite": "Favoryt", "status.filter": "Dit berjocht filterje", "status.filtered": "Filtere", "status.hide": "Berjocht ferstopje", diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json index ec3cb6aa1a..d2a60ba0e0 100644 --- a/app/javascript/mastodon/locales/ga.json +++ b/app/javascript/mastodon/locales/ga.json @@ -102,7 +102,6 @@ "column.community": "Amlíne áitiúil", "column.directory": "Brabhsáil próifílí", "column.domain_blocks": "Fearainn bhactha", - "column.favourites": "Toghanna", "column.follow_requests": "Iarratais leanúnaí", "column.home": "Baile", "column.lists": "Liostaí", @@ -162,7 +161,6 @@ "confirmations.mute.explanation": "Cuiridh seo teachtaireachtaí uathu agus fúthu i bhfolach, ach beidh siad in ann fós do theachtaireachtaí a fheiceáil agus tú a leanúint.", "confirmations.mute.message": "An bhfuil tú cinnte gur mhaith leat {name} a bhalbhú?", "confirmations.redraft.confirm": "Scrios ⁊ athdhréachtaigh", - "confirmations.redraft.message": "An bhfuil tú cinnte gur mhaith leat an phostáil sin a scriosadh agus a athdhréachtú? Caillfear toghanna agus moltaí, agus fágfar freagracha don phostáil bhunúsach ina ndílleachtaí.", "confirmations.reply.confirm": "Freagair", "confirmations.reply.message": "Scriosfaidh freagra láithreach an teachtaireacht atá a chumadh anois agat. An bhfuil tú cinnte gur mhaith leat leanúint leat?", "confirmations.unfollow.confirm": "Ná lean", @@ -182,7 +180,6 @@ "dismissable_banner.community_timeline": "Seo iad na postála is déanaí ó dhaoine le cuntais ar {domain}.", "dismissable_banner.dismiss": "Diúltaigh", "dismissable_banner.explore_links": "Tá na scéalta nuachta seo á phlé anseo agus ar fhreastalaithe eile ar an líonra díláraithe faoi láthair.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "embed.preview": "Seo an chuma a bheidh air:", @@ -209,8 +206,6 @@ "empty_column.community": "Tá an amlíne áitiúil folamh. Foilsigh rud éigin go poiblí le tús a chur le cúrsaí!", "empty_column.domain_blocks": "Níl aon fearainn bhactha ann go fóill.", "empty_column.explore_statuses": "Níl rud ar bith ag treochtáil faoi láthair. Tar ar ais ar ball!", - "empty_column.favourited_statuses": "Níor roghnaigh tú postáil ar bith fós. Nuair a roghnaigh tú ceann, beidh sí le feiceáil anseo.", - "empty_column.favourites": "Níor thogh éinne an phostáil seo fós. Nuair a thoghfaidh duine éigin í, taispeánfar anseo é sin.", "empty_column.follow_requests": "Níl aon phostáil leabharmharcaithe agat fós. Nuair a dhéanann tú leabharmharc, feicfear anseo é.", "empty_column.hashtag": "Níl rud ar bith faoin haischlib seo go fóill.", "empty_column.home": "Tá d'amlíne baile folamh! B'fhiú duit cúpla duine eile a leanúint lena líonadh! {suggestions}", @@ -266,7 +261,6 @@ "home.show_announcements": "Taispeáin fógraí", "interaction_modal.on_another_server": "Ar freastalaí eile", "interaction_modal.on_this_server": "Ar an freastalaí seo", - "interaction_modal.title.favourite": "Togh postáil de chuid {name}", "interaction_modal.title.follow": "Lean {name}", "interaction_modal.title.reblog": "Mol postáil de chuid {name}", "interaction_modal.title.reply": "Freagair postáil {name}", @@ -282,8 +276,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "Bog síos ar an liosta", "keyboard_shortcuts.enter": "Oscail postáil", - "keyboard_shortcuts.favourite": "Roghnaigh postáil", - "keyboard_shortcuts.favourites": "Oscail liosta toghanna", "keyboard_shortcuts.federated": "Oscail amlíne cónaidhmithe", "keyboard_shortcuts.heading": "Aicearraí méarchláir", "keyboard_shortcuts.home": "Oscail amlíne bhaile", @@ -338,7 +330,6 @@ "navigation_bar.domain_blocks": "Fearainn bhactha", "navigation_bar.edit_profile": "Cuir an phróifíl in eagar", "navigation_bar.explore": "Féach thart", - "navigation_bar.favourites": "Toghanna", "navigation_bar.filters": "Focail bhalbhaithe", "navigation_bar.follow_requests": "Iarratais leanúnaí", "navigation_bar.follows_and_followers": "Ag leanúint agus do do leanúint", @@ -354,7 +345,6 @@ "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", "notification.admin.report": "Tuairiscigh {name} {target}", "notification.admin.sign_up": "Chláraigh {name}", - "notification.favourite": "Is maith le {name} do phostáil", "notification.follow": "Lean {name} thú", "notification.follow_request": "D'iarr {name} ort do chuntas a leanúint", "notification.mention": "Luaigh {name} tú", @@ -366,7 +356,6 @@ "notifications.clear": "Glan fógraí", "notifications.column_settings.admin.report": "Tuairiscí nua:", "notifications.column_settings.alert": "Fógraí deisce", - "notifications.column_settings.favourite": "Toghanna:", "notifications.column_settings.filter_bar.advanced": "Taispeáin na catagóirí go léir", "notifications.column_settings.filter_bar.category": "Barra scagaire tapa", "notifications.column_settings.filter_bar.show_bar": "Taispeáin barra scagaire", @@ -383,7 +372,6 @@ "notifications.column_settings.update": "Eagair:", "notifications.filter.all": "Uile", "notifications.filter.boosts": "Treisithe", - "notifications.filter.favourites": "Toghanna", "notifications.filter.follows": "Ag leanúint", "notifications.filter.mentions": "Tráchtanna", "notifications.filter.polls": "Torthaí suirbhéanna", @@ -479,7 +467,6 @@ "server_banner.server_stats": "Staitisticí freastalaí:", "sign_in_banner.create_account": "Cruthaigh cuntas", "sign_in_banner.sign_in": "Sinigh isteach", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.block": "Bac @{name}", "status.bookmark": "Leabharmharcanna", @@ -491,7 +478,6 @@ "status.edited": "Curtha in eagar in {date}", "status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}", "status.embed": "Leabaigh", - "status.favourite": "Rogha", "status.filter": "Déan scagadh ar an bpostáil seo", "status.filtered": "Scagtha", "status.hide": "Cuir postáil i bhfolach", diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json index bcc9a10e68..a1bc89d217 100644 --- a/app/javascript/mastodon/locales/gd.json +++ b/app/javascript/mastodon/locales/gd.json @@ -113,7 +113,6 @@ "column.direct": "Iomraidhean prìobhaideach", "column.directory": "Rùraich sna pròifilean", "column.domain_blocks": "Àrainnean bacte", - "column.favourites": "Na h-annsachdan", "column.firehose": "Inbhirean beòtha", "column.follow_requests": "Iarrtasan leantainn", "column.home": "Dachaigh", @@ -135,8 +134,6 @@ "community.column_settings.remote_only": "Feadhainn chèin a-mhàin", "compose.language.change": "Atharraich an cànan", "compose.language.search": "Lorg cànan…", - "compose.published.body": "Postimi u botua.", - "compose.published.open": "Fosgail", "compose_form.direct_message_warning_learn_more": "Barrachd fiosrachaidh", "compose_form.encryption_warning": "Chan eil crioptachadh ceann gu ceann air postaichean Mhastodon. Na co-roinn fiosrachadh dìomhair idir le Mastodon.", "compose_form.hashtag_warning": "Cha nochd am post seo fon taga hais o nach eil e poblach. Cha ghabh ach postaichean poblach a lorg a-rèir an tagaichean hais.", @@ -181,7 +178,6 @@ "confirmations.mute.explanation": "Cuiridh seo na postaichean uapa ’s na postaichean a bheir iomradh orra am falach ach chì iad-san na postaichean agad fhathast is faodaidh iad ’gad leantainn.", "confirmations.mute.message": "A bheil thu cinnteach gu bheil thu airson {name} a mhùchadh?", "confirmations.redraft.confirm": "Sguab às ⁊ dèan dreachd ùr", - "confirmations.redraft.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às agus dreachd ùr a thòiseachadh? Caillidh tu gach annsachd is brosnachadh air agus thèid freagairtean dhan phost thùsail ’nan dìlleachdanan.", "confirmations.reply.confirm": "Freagair", "confirmations.reply.message": "Ma bheir thu freagairt an-dràsta, thèid seo a sgrìobhadh thairis air an teachdaireachd a tha thu a’ sgrìobhadh an-dràsta. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?", "confirmations.unfollow.confirm": "Na lean tuilleadh", @@ -202,7 +198,6 @@ "dismissable_banner.community_timeline": "Seo na postaichean poblach as ùire o dhaoine aig a bheil cunntas air {domain}.", "dismissable_banner.dismiss": "Leig seachad", "dismissable_banner.explore_links": "Seo na naidheachdan air a bhithear a’ bruidhinn an-dràsta fhèin air an fhrithealaiche seo is frithealaichean eile dhen lìonra sgaoilte.", - "dismissable_banner.explore_statuses": "Tha fèill air na postaichean seo on fhrithealaiche seo is frithealaichean eile dhen lìonra sgaoilte a’ fàs air an fhrithealaich seo an-dràsta fhèin.", "dismissable_banner.explore_tags": "Tha fèill air na tagaichean hais seo a’ fàs an-dràsta fhèin air an fhrithealaich seo is frithealaichean eile dhen lìonra sgaoilte.", "dismissable_banner.public_timeline": "Seo na postaichean poblach as ùire o dhaoine air an lìonra sòisealta tha ’gan leantainn le daoine air {domain}.", "embed.instructions": "Leabaich am post seo san làrach-lìn agad is tu a’ dèanamh lethbhreac dhen chòd gu h-ìosal.", @@ -231,8 +226,6 @@ "empty_column.direct": "Chan eil iomradh prìobhaideach agad fhathast. Nuair a chuireas no a gheibh thu tè, nochdaidh i an-seo.", "empty_column.domain_blocks": "Cha deach àrainn sam bith a bhacadh fhathast.", "empty_column.explore_statuses": "Chan eil dad a’ treandadh an-dràsta fhèin. Thoir sùil a-rithist an ceann greis!", - "empty_column.favourited_statuses": "Chan eil annsachd air post agad fhathast. Nuair a nì thu annsachd de dh’fhear, nochdaidh e an-seo.", - "empty_column.favourites": "Chan eil am post seo ’na annsachd aig duine sam bith fhathast. Nuair a nì daoine annsachd dheth, nochdaidh iad an-seo.", "empty_column.follow_requests": "Chan eil iarrtas leantainn agad fhathast. Nuair a gheibh thu fear, nochdaidh e an-seo.", "empty_column.followed_tags": "Cha do lean thu taga hais sam bith fhathast. Nuair a leanas tu, nochdaidh iad an-seo.", "empty_column.hashtag": "Chan eil dad san taga hais seo fhathast.", @@ -307,15 +300,12 @@ "home.explore_prompt.title": "Seo do dhachaigh am broinn Mastodon.", "home.hide_announcements": "Falaich na brathan-fios", "home.show_announcements": "Seall na brathan-fios", - "interaction_modal.description.favourite": "Le cunntas air Mastodon, ’s urrainn dhut am post seo a chur ris na h-annsachdan airson innse dhan ùghdar gu bheil e a’ còrdadh dhut ’s a shàbhaladh do uaireigin eile.", "interaction_modal.description.follow": "Le cunntas air Mastodon, ’s urrainn dhut {name} a leantainn ach am faigh thu na postaichean aca nad dhachaigh.", "interaction_modal.description.reblog": "Le cunntas air Mastodon, ’s urrainn dhut am post seo a bhrosnachadh gus a cho-roinneadh leis an luchd-leantainn agad fhèin.", "interaction_modal.description.reply": "Le cunntas air Mastodon, ’s urrainn dhut freagairt a chur dhan phost seo.", "interaction_modal.on_another_server": "Air frithealaiche eile", "interaction_modal.on_this_server": "Air an frithealaiche seo", - "interaction_modal.other_server_instructions": "Dèan lethbhreac agus cuir an URL seo san raon luirg aig an aplacaid Mastodon as fheàrr leat no ann an eadar-aghaidh an fhrithealaiche Mastodon agad.", "interaction_modal.preamble": "Air sgàth ’s gu bheil Mastodon sgaoilte, ’s urrainn dhut cunntas a chleachdadh a tha ’ga òstadh le frithealaiche Mastodon no le ùrlar co-chòrdail eile mur eil cunntas agad air an fhear seo.", - "interaction_modal.title.favourite": "Cuir am post aig {name} ris na h-annsachdan", "interaction_modal.title.follow": "Lean {name}", "interaction_modal.title.reblog": "Brosnaich am post aig {name}", "interaction_modal.title.reply": "Freagair dhan phost aig {name}", @@ -331,8 +321,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "Gluais sìos air an liosta", "keyboard_shortcuts.enter": "Fosgail post", - "keyboard_shortcuts.favourite": "Cuir post ris na h-annsachdan", - "keyboard_shortcuts.favourites": "Fosgail liosta nan annsachdan", "keyboard_shortcuts.federated": "Fosgail an loidhne-ama cho-naisgte", "keyboard_shortcuts.heading": "Ath-ghoiridean a’ mheur-chlàir", "keyboard_shortcuts.home": "Fosgail loidhne-ama na dachaigh", @@ -385,7 +373,6 @@ "mute_modal.hide_notifications": "A bheil thu airson na brathan fhalach on chleachdaiche seo?", "mute_modal.indefinite": "Gun chrìoch", "navigation_bar.about": "Mu dhèidhinn", - "navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan", "navigation_bar.blocks": "Cleachdaichean bacte", "navigation_bar.bookmarks": "Comharran-lìn", "navigation_bar.community_timeline": "Loidhne-ama ionadail", @@ -395,7 +382,6 @@ "navigation_bar.domain_blocks": "Àrainnean bacte", "navigation_bar.edit_profile": "Deasaich a’ phròifil", "navigation_bar.explore": "Rùraich", - "navigation_bar.favourites": "Na h-annsachdan", "navigation_bar.filters": "Faclan mùchte", "navigation_bar.follow_requests": "Iarrtasan leantainn", "navigation_bar.followed_tags": "Tagaichean hais ’gan leantainn", @@ -412,7 +398,6 @@ "not_signed_in_indicator.not_signed_in": "Feumaidh tu clàradh a-steach mus fhaigh thu cothrom air a’ ghoireas seo.", "notification.admin.report": "Rinn {name} gearan mu {target}", "notification.admin.sign_up": "Chlàraich {name}", - "notification.favourite": "Is annsa le {name} am post agad", "notification.follow": "Tha {name} ’gad leantainn a-nis", "notification.follow_request": "Dh’iarr {name} ’gad leantainn", "notification.mention": "Thug {name} iomradh ort", @@ -426,7 +411,6 @@ "notifications.column_settings.admin.report": "Gearanan ùra:", "notifications.column_settings.admin.sign_up": "Clàraidhean ùra:", "notifications.column_settings.alert": "Brathan deasga", - "notifications.column_settings.favourite": "Na h-annsachdan:", "notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa", "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath", "notifications.column_settings.filter_bar.show_bar": "Seall am bàr-criathraidh", @@ -444,7 +428,6 @@ "notifications.column_settings.update": "Deasachaidhean:", "notifications.filter.all": "Na h-uile", "notifications.filter.boosts": "Brosnachaidhean", - "notifications.filter.favourites": "Na h-annsachdan", "notifications.filter.follows": "A’ leantainn", "notifications.filter.mentions": "Iomraidhean", "notifications.filter.polls": "Toraidhean cunntais-bheachd", @@ -595,7 +578,6 @@ "server_banner.server_stats": "Stadastaireachd an fhrithealaiche:", "sign_in_banner.create_account": "Cruthaich cunntas", "sign_in_banner.sign_in": "Clàraich a-steach", - "sign_in_banner.text": "Clàraich a-steach a leantainn phròifilean no thagaichean hais, a’ cur postaichean ris na h-annsachdan ’s ’gan co-roinneadh is freagairt dhaibh. ’S urrainn dhut gnìomh a ghabhail le cunntas o fhrithealaiche eile cuideachd.", "status.admin_account": "Fosgail eadar-aghaidh na maorsainneachd dha @{name}", "status.admin_domain": "Fosgail eadar-aghaidh na maorsainneachd dha {domain}", "status.admin_status": "Fosgail am post seo ann an eadar-aghaidh na maorsainneachd", @@ -612,15 +594,12 @@ "status.edited": "Air a dheasachadh {date}", "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{counter} turas} two {{counter} thuras} few {{counter} tursan} other {{counter} turas}}", "status.embed": "Leabaich", - "status.favourite": "Cuir ris na h-annsachdan", "status.filter": "Criathraich am post seo", "status.filtered": "Criathraichte", "status.hide": "Falaich am post", "status.history.created": "Chruthaich {name} {date} e", "status.history.edited": "Dheasaich {name} {date} e", "status.load_more": "Luchdaich barrachd dheth", - "status.media.open": "Klikoni për hapje", - "status.media.show": "Klikoni për shfaqje", "status.media_hidden": "Meadhan falaichte", "status.mention": "Thoir iomradh air @{name}", "status.more": "Barrachd", @@ -651,7 +630,6 @@ "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}", "status.translate": "Eadar-theangaich", "status.translated_from_with": "Air eadar-theangachadh o {lang} le {provider}", - "status.uncached_media_warning": "S’ka paraparje", "status.unmute_conversation": "Dì-mhùch an còmhradh", "status.unpin": "Dì-phrìnich on phròifil", "subscribed_languages.lead": "Cha nochd ach na postaichean sna cànanan a thagh thu air loidhnichean-ama na dachaigh ’s nan liostaichean às dèidh an atharrachaidh seo. Na tagh gin ma tha thu airson na postaichean uile fhaighinn ge b’ e dè an cànan.", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index e0f1f4b1b2..3ecb3b8cbe 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Estas son as publicacións máis recentes das persoas que teñen a súa conta en {domain}.", "dismissable_banner.dismiss": "Desbotar", "dismissable_banner.explore_links": "As persoas deste servidor e da rede descentralizada están a falar destas historias agora mesmo.", - "dismissable_banner.explore_statuses": "Está aumentando a popularidade destas publicacións no servidor e na rede descentralizada.", + "dismissable_banner.explore_statuses": "Estas son as publicacións da web social que hoxe están gañando popularidade. As publicacións con máis promocións e favorecemento teñen puntuación máis alta.", "dismissable_banner.explore_tags": "Estes cancelos están gañando popularidade entre as persoas deste servidor e noutros servidores da rede descentralizada.", "dismissable_banner.public_timeline": "Estas son as publicacións públicas máis recentes das persoas que as usuarias de {domain} están a seguir.", "embed.instructions": "Engade esta publicación ó teu sitio web copiando o seguinte código.", @@ -231,8 +231,8 @@ "empty_column.direct": "Aínda non tes mencións privadas. Cando envíes ou recibas unha, aparecerá aquí.", "empty_column.domain_blocks": "Aínda non hai dominios agochados.", "empty_column.explore_statuses": "Non hai temas en voga. Volve máis tarde!", - "empty_column.favourited_statuses": "Aínda non tes publicacións favoritas. Cando che guste algunha, aparecerá aquí.", - "empty_column.favourites": "A ninguén lle gustou esta publicación polo momento. Cando a alguén lle guste, aparecerá aquí.", + "empty_column.favourited_statuses": "Aínda non tes publicacións favoritas. Cando favorezas unha, aparecerá aquí.", + "empty_column.favourites": "Ninguén marcou como favorita esta publicación. Cando alguén o faga, aparecerá aquí.", "empty_column.follow_requests": "Non tes peticións de seguimento. Cando recibas unha, amosarase aquí.", "empty_column.followed_tags": "Aínda non seguiches ningún cancelo. Cando o fagas aparecerán aquí.", "empty_column.hashtag": "Aínda non hai nada con este cancelo.", @@ -307,13 +307,13 @@ "home.explore_prompt.title": "Iste é o teu fogar en Mastodon.", "home.hide_announcements": "Agochar anuncios", "home.show_announcements": "Amosar anuncios", - "interaction_modal.description.favourite": "Cunha conta en Mastodon, poderás marcar esta publicación como favorita, para gardalo e para que o autor saiba o moito que lle gustou.", + "interaction_modal.description.favourite": "Cunha conta Mastodon podes favorecer esta publicación e facerlle saber á autora que che gustou e que a gardas para máis tarde.", "interaction_modal.description.follow": "Cunha conta en Mastodon, poderás seguir a {name} e recibir as súas publicacións na túa cronoloxía de inicio.", "interaction_modal.description.reblog": "Cunha conta en Mastodon, poderás promover esta publicación para compartila con quen te siga.", "interaction_modal.description.reply": "Cunha conta en Mastodon, poderás responder a esta publicación.", "interaction_modal.on_another_server": "Nun servidor diferente", "interaction_modal.on_this_server": "Neste servidor", - "interaction_modal.other_server_instructions": "Copia e pega este URL no campo de busca da túa app Mastodon favorita ou na interface web do teu servidor Mastodon.", + "interaction_modal.other_server_instructions": "Copia e pega este URL na barra de busca da túa app Mastodon favorita ou na interface web do servidor Mastodon.", "interaction_modal.preamble": "Como Mastodon é descentralizado, é posible usar unha conta existente noutro servidor Mastodon, ou nunha plataforma compatible, se non dispós dunha conta neste servidor.", "interaction_modal.title.favourite": "Marcar coma favorita a publicación de {name}", "interaction_modal.title.follow": "Seguir a {name}", @@ -363,6 +363,7 @@ "lightbox.previous": "Anterior", "limited_account_hint.action": "Mostrar perfil igualmente", "limited_account_hint.title": "Este perfil foi agochado pola moderación de {domain}.", + "link_preview.author": "Por {name}", "lists.account.add": "Engadir á listaxe", "lists.account.remove": "Eliminar da listaxe", "lists.delete": "Eliminar listaxe", @@ -412,7 +413,7 @@ "not_signed_in_indicator.not_signed_in": "Debes acceder para ver este recurso.", "notification.admin.report": "{name} denunciou a {target}", "notification.admin.sign_up": "{name} rexistrouse", - "notification.favourite": "{name} marcou a túa publicación como favorita", + "notification.favourite": "{name} marcou como favorita a túa publicación", "notification.follow": "{name} comezou a seguirte", "notification.follow_request": "{name} solicitou seguirte", "notification.mention": "{name} mencionoute", @@ -612,7 +613,7 @@ "status.edited": "Editado {date}", "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}", "status.embed": "Incrustar", - "status.favourite": "Favorita", + "status.favourite": "Favorecer", "status.filter": "Filtrar esta publicación", "status.filtered": "Filtrado", "status.hide": "Agochar publicación", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index 7940f15fb9..a86f2a124e 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "זה יסתיר הודעות שלהם והודעות שמאזכרות אותם, אבל עדיין יתיר להם לראות הודעות שלך ולעקוב אחריך.", "confirmations.mute.message": "בטוח/ה שברצונך להשתיק את {name}?", "confirmations.redraft.confirm": "מחיקה ועריכה מחדש", - "confirmations.redraft.message": "בטוחה שאת רוצה למחוק ולהתחיל טיוטה חדשה? חיבובים והדהודים יאבדו, ותגובות להודעה המקורית ישארו יתומות.", + "confirmations.redraft.message": "למחוק ולהתחיל טיוטה חדשה? חיבובים והדהודים יאבדו, ותגובות להודעה המקורית ישארו יתומות.", "confirmations.reply.confirm": "תגובה", "confirmations.reply.message": "תגובה עכשיו תמחק את ההודעה שכבר התחלת לכתוב. להמשיך?", "confirmations.unfollow.confirm": "הפסקת מעקב", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "אלו הם החצרוצים הציבוריים האחרונים מהמשתמשים על שרת {domain}.", "dismissable_banner.dismiss": "בטל", "dismissable_banner.explore_links": "אלו הקישורים האחרונים ששותפו על ידי משתמשים ששרת זה רואה ברשת המבוזרת כרגע.", - "dismissable_banner.explore_statuses": "החצרוצים האלו, משרת זה ואחרים ברשת המבוזרת, צוברים חשיפה כעת.", + "dismissable_banner.explore_statuses": "ההודעות האלו, משרת זה ואחרים ברשת המבוזרת, צוברים חשיפה היום. הודעות חדשות יותר עם יותר הדהודים וחיבובים מדורגים יותר לגובה.", "dismissable_banner.explore_tags": "התגיות האלו, משרת זה ואחרים ברשת המבוזרת, צוברות חשיפה כעת.", "dismissable_banner.public_timeline": "אלו ההודעות האחרונות שהתקבלו מהמשתמשים שנעקבים על ידי משתמשים מ־{domain}.", "embed.instructions": "ניתן להטמיע את ההודעה הזו באתרך ע\"י העתקת הקוד שלהלן.", @@ -231,7 +231,7 @@ "empty_column.direct": "אין לך שום הודעות פרטיות עדיין. כשתשלחו או תקבלו אחת, היא תופיע כאן.", "empty_column.domain_blocks": "אין עדיין קהילות מוסתרות.", "empty_column.explore_statuses": "אין נושאים חמים כרגע. אולי אחר כך!", - "empty_column.favourited_statuses": "אין עדיין הודעות שחיבבת. כשתחבב את הראשונה, היא תופיע כאן.", + "empty_column.favourited_statuses": "אין עדיין הודעות שחיבבת. כשתחבב/י את הראשונה, היא תופיע כאן.", "empty_column.favourites": "עוד לא חיבבו את ההודעה הזו. כאשר זה יקרה, החיבובים יופיעו כאן.", "empty_column.follow_requests": "אין לך שום בקשות מעקב עדיין. לכשיתקבלו כאלה, הן תופענה כאן.", "empty_column.followed_tags": "עוד לא עקבת אחרי תגיות. כשיהיו לך תגיות נעקבות, ההודעות יופיעו פה.", @@ -307,7 +307,7 @@ "home.explore_prompt.title": "זהו בסיס הבית שלך בתוך מסטודון.", "home.hide_announcements": "הסתר הכרזות", "home.show_announcements": "הצג הכרזות", - "interaction_modal.description.favourite": "עם חשבון מסטודון, ניתן לחבב את החצרוץ כדי לומר למחבר/ת שהערכת את תוכנו או כדי לשמור אותו לקריאה בעתיד.", + "interaction_modal.description.favourite": "עם חשבון מסטודון, ניתן לחבב את ההודעה כדי לומר למחבר/ת שהערכת את תוכנו או כדי לשמור אותו לקריאה בעתיד.", "interaction_modal.description.follow": "עם חשבון מסטודון, ניתן לעקוב אחרי {name} כדי לקבל את הםוסטים שלו/ה בפיד הבית.", "interaction_modal.description.reblog": "עם חשבון מסטודון, ניתן להדהד את החצרוץ ולשתף עם עוקבים.", "interaction_modal.description.reply": "עם חשבון מסטודון, ניתן לענות לחצרוץ.", @@ -331,8 +331,8 @@ "keyboard_shortcuts.direct": "לפתוח עמודת שיחות פרטיות", "keyboard_shortcuts.down": "לנוע במורד הרשימה", "keyboard_shortcuts.enter": "פתח הודעה", - "keyboard_shortcuts.favourite": "לחבב", - "keyboard_shortcuts.favourites": "פתיחת רשימת מועדפים", + "keyboard_shortcuts.favourite": "חיבוב הודעה", + "keyboard_shortcuts.favourites": "פתיחת רשימת מחובבות", "keyboard_shortcuts.federated": "פתיחת ציר זמן בין-קהילתי", "keyboard_shortcuts.heading": "מקשי קיצור במקלדת", "keyboard_shortcuts.home": "פתיחת ציר זמן אישי", @@ -363,6 +363,7 @@ "lightbox.previous": "הקודם", "limited_account_hint.action": "הצג חשבון בכל זאת", "limited_account_hint.title": "פרופיל המשתמש הזה הוסתר על ידי המנחים של {domain}.", + "link_preview.author": "מאת {name}", "lists.account.add": "הוסף לרשימה", "lists.account.remove": "הסר מרשימה", "lists.delete": "מחיקת רשימה", @@ -426,7 +427,7 @@ "notifications.column_settings.admin.report": "דו\"חות חדשים", "notifications.column_settings.admin.sign_up": "הרשמות חדשות:", "notifications.column_settings.alert": "התראות לשולחן העבודה", - "notifications.column_settings.favourite": "מחובבים:", + "notifications.column_settings.favourite": "חיבובים:", "notifications.column_settings.filter_bar.advanced": "הצג את כל הקטגוריות", "notifications.column_settings.filter_bar.category": "שורת סינון מהיר", "notifications.column_settings.filter_bar.show_bar": "הצג שורת סינון", @@ -612,7 +613,7 @@ "status.edited": "נערך ב{date}", "status.edited_x_times": "נערך {count, plural, one {פעם {count}} other {{count} פעמים}}", "status.embed": "הטמעה", - "status.favourite": "חיבוב", + "status.favourite": "מחובבת", "status.filter": "סנן הודעה זו", "status.filtered": "סונן", "status.hide": "הסתרת חיצרוץ", diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json index 91e6999751..9be65015b2 100644 --- a/app/javascript/mastodon/locales/hi.json +++ b/app/javascript/mastodon/locales/hi.json @@ -103,7 +103,6 @@ "column.direct": "निजी संदेश", "column.directory": "प्रोफाइल्स खोजें", "column.domain_blocks": "छुपे डोमेन्स", - "column.favourites": "पसंदीदा", "column.follow_requests": "फॉलो रिक्वेस्ट्स", "column.home": "होम", "column.lists": "सूचियाँ", @@ -168,7 +167,6 @@ "confirmations.mute.explanation": "यह उनसे और पोस्टों का उल्लेख करते हुए उनसे छिपाएगा, लेकिन यह अभी भी उन्हें आपकी पोस्ट देखने और आपको फॉलो करने की अनुमति देगा।", "confirmations.mute.message": "क्या आप वाकई {name} को शांत करना चाहते हैं?", "confirmations.redraft.confirm": "मिटायें और पुनःप्रारूपण करें", - "confirmations.redraft.message": "क्या आप वाकई इस स्टेटस को हटाना चाहते हैं और इसे फिर से ड्राफ्ट करना चाहते हैं? पसंदीदा और बूस्ट खो जाएंगे, और मूल पोस्ट के उत्तर अनाथ हो जाएंगे।", "confirmations.reply.confirm": "उत्तर दें", "confirmations.reply.message": "अब उत्तर देना उस संदेश को अधिलेखित कर देगा जो आप वर्तमान में बना रहे हैं। क्या आप सुनिश्चित रूप से आगे बढ़ना चाहते हैं?", "confirmations.unfollow.confirm": "अनफॉलो करें", @@ -188,7 +186,6 @@ "dismissable_banner.community_timeline": "ये उन लोगों की सबसे रीसेंट पब्लिक पोस्ट हैं जिनके अकाउंट इनके {domain} द्वारा होस्ट किए गए हैं", "dismissable_banner.dismiss": "डिसमिस", "dismissable_banner.explore_links": "इन समाचारों के बारे में लोगों द्वारा इस पर और डेसेंट्रलीसेड नेटवर्क के अन्य सर्वरों पर अभी बात की जा रही है।", - "dismissable_banner.explore_statuses": "डेसेंट्रलीसेड नेटवर्क में इस और अन्य सर्वरों से ये पोस्ट अभी इस सर्वर पर कर्षण प्राप्त कर रहे हैं।", "dismissable_banner.explore_tags": "ये हैशटैग अभी इस पर और डेसेंट्रलीसेड नेटवर्क के अन्य सर्वरों पर लोगों के बीच कर्षण प्राप्त कर रहे हैं।", "embed.instructions": "अपने वेबसाइट पर, निचे दिए कोड को कॉपी करके, इस स्टेटस को एम्बेड करें", "embed.preview": "यह ऐसा दिखेगा :", @@ -216,8 +213,6 @@ "empty_column.direct": "अभी तक आपको कोई निजी संदेश नहीं मिला है। जब भी आप निजी संदेश भेजेंगे या पाएंगे, तो वो यहां पर दिखेगा।", "empty_column.domain_blocks": "अभी तक कोई छुपा हुआ डोमेन नहीं है।", "empty_column.explore_statuses": "कुछ भी अभी ट्रैंडिंग नहीं है, कुछ देर बाद जांचे!", - "empty_column.favourited_statuses": "आपके पास अभी कोई भी चहिता टूट नहीं है. जब आप किसी टूट को पसंद (स्टार) करेंगे, तब वो यहाँ दिखेगा।", - "empty_column.favourites": "अभी तक किसी ने भी इस टूट को पसंद (स्टार) नहीं किया है. जब भी कोई इसे पसंद करेगा, उनका नाम यहाँ दिखेगा।", "empty_column.follow_requests": "अभी तक किसी ने भी आपका अनुसरण करने की विनती नहीं की है. जब भी कोई आपको विनती भेजेगा, वो यहाँ दिखेगी.", "empty_column.followed_tags": "आपने किसी हैशटैग को फॉलो नहीं किया है। जैसे ही आप फॉलो करेंगे, आपके फॉलो किए गए हैशटैग यहां दिखेंगे।", "empty_column.hashtag": "यह हैशटैग अभी तक खाली है।", @@ -285,15 +280,12 @@ "home.column_settings.show_replies": "जवाबों को दिखाए", "home.hide_announcements": "घोषणाएँ छिपाएँ", "home.show_announcements": "घोषणाएं दिखाएं", - "interaction_modal.description.favourite": "मास्टोडन पर एक अकाउंट के साथ, आप इस पोस्ट को पसंदीदा बना सकते हैं ताकि लेखक को यह पता चल सके कि आप इसकी सराहना करते हैं और इसे बाद के लिए सहेज सकते हैं।", "interaction_modal.description.follow": "मास्टोडन पर एक अकाउंट के साथ, आप अपने होम फीड में उनकी पोस्ट प्राप्त करने के लिए {name} का अनुसरण कर सकते हैं", "interaction_modal.description.reblog": "मास्टोडन पर एक अकाउंट के साथ, आप इस पोस्ट को अपने फोल्लोवेर्स के साथ साझा करने के लिए बढ़ा सकते हैं।", "interaction_modal.description.reply": "मास्टोडन पर एक अकाउंट के साथ, आप इस पोस्ट का जवाब दे सकते हैं।", "interaction_modal.on_another_server": "एक अलग सर्वर पर", "interaction_modal.on_this_server": "इस सर्वर पे", - "interaction_modal.other_server_instructions": "इस URL को अपने पसंदीदा Mastodon ऐप या अपने Mastodon सर्वर के वेब इंटरफ़ेस के खोज फ़ील्ड में कॉपी और पेस्ट करें।", "interaction_modal.preamble": "चूंकि मास्टोडन डेसेंट्रलीसेड है, यदि आपके पास इस पर कोई अकाउंट नहीं है, तो आप किसी अन्य मास्टोडन सर्वर या संगत प्लेटफ़ॉर्म द्वारा होस्ट किए गए अपने मौजूदा अकाउंट का उपयोग कर सकते हैं।", - "interaction_modal.title.favourite": "पसंदीदा {name} की पोस्ट", "interaction_modal.title.follow": "फॉलो {name}", "interaction_modal.title.reblog": "बूस्ट {name} की पोस्ट", "interaction_modal.title.reply": "{name} की पोस्ट पे रिप्लाई करें", @@ -308,8 +300,6 @@ "keyboard_shortcuts.direct": "निजी संदेश खोलने के लिए", "keyboard_shortcuts.down": "सूची में शामिल करने के लिए", "keyboard_shortcuts.enter": "स्टेटस खोलने के लिए", - "keyboard_shortcuts.favourite": "पसंदीदा के लिए", - "keyboard_shortcuts.favourites": "पसंदीदा सूची खोलने के लिए", "keyboard_shortcuts.federated": "फ़ैडरेटेड टाइम्लाइन खोलने के लिए", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "होम टाइम्लाइन खोलने के लिए", @@ -364,7 +354,6 @@ "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.edit_profile": "प्रोफ़ाइल संपादित करें", "navigation_bar.explore": "अन्वेषण करें", - "navigation_bar.favourites": "पसंदीदा", "navigation_bar.filters": "वारित शब्द", "navigation_bar.follow_requests": "अनुसरण करने के अनुरोध", "navigation_bar.followed_tags": "हैशटैग को फॉलो करें", @@ -374,7 +363,6 @@ "navigation_bar.search": "ढूंढें", "navigation_bar.security": "सुरक्षा", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.reblog": "{name} boosted your status", "notifications.column_settings.admin.report": "नई रिपोर्ट:", "notifications.column_settings.filter_bar.advanced": "सभी श्रेणियाँ दिखाएं", @@ -390,7 +378,6 @@ "notifications.column_settings.update": "संपादन:", "notifications.filter.all": "सभी", "notifications.filter.boosts": "बूस्ट", - "notifications.filter.favourites": "पसंदीदा", "notifications.filter.follows": "फॉलो", "notifications.filter.mentions": "उल्लेख", "notifications.filter.polls": "चुनाव परिणाम", @@ -459,7 +446,6 @@ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.copy": "Copy link to status", "status.direct": "निजी संदेश @{name} से", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index 891e7fa082..46e058cc51 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -66,7 +66,6 @@ "column.community": "Lokalna vremenska crta", "column.directory": "Pregledavanje profila", "column.domain_blocks": "Blokirane domene", - "column.favourites": "Favoriti", "column.follow_requests": "Zahtjevi za praćenje", "column.home": "Početna", "column.lists": "Liste", @@ -128,7 +127,6 @@ "confirmations.mute.explanation": "Ovo će sakriti njihove objave i objave koje ih spominju, ali i dalje će im dopuštati da vide Vaše objave i da Vas prate.", "confirmations.mute.message": "Jeste li sigurni da želite utišati {name}?", "confirmations.redraft.confirm": "Izbriši i ponovno uredi", - "confirmations.redraft.message": "Jeste li sigurni da želite izbrisati ovaj toot i ponovno ga urediti? Favoriti i boostovi bit će izgubljeni, a odgovori na izvornu objavu bit će odvojeni.", "confirmations.reply.confirm": "Odgovori", "confirmations.reply.message": "Odgovaranje sada će prepisati poruku koju upravo pišete. Jeste li sigurni da želite nastaviti?", "confirmations.unfollow.confirm": "Prestani pratiti", @@ -142,7 +140,6 @@ "directory.new_arrivals": "Novi korisnici", "directory.recently_active": "Nedavno aktivni", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "embed.preview": "Evo kako će izgledati:", @@ -167,8 +164,6 @@ "empty_column.bookmarked_statuses": "Još nemaš niti jedan označeni toot. Kada označiš jedan, prikazad će se ovdje.", "empty_column.community": "Lokalna vremenska crta je prazna. Napišite nešto javno da biste pokrenuli stvari!", "empty_column.domain_blocks": "Još nema blokiranih domena.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", "empty_column.follow_requests": "Nemaš niti jedan zahtjev za praćenjem. Ako ga dobiješ, prikazat će se ovdje.", "empty_column.hashtag": "Još ne postoji ništa s ovim hashtagom.", "empty_column.home": "Vaša početna vremenska crta je prazna! Posjetite {public} ili koristite tražilicu kako biste započeli i upoznali druge korisnike.", @@ -230,8 +225,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "za pomak dolje na listi", "keyboard_shortcuts.enter": "za otvaranje toota", - "keyboard_shortcuts.favourite": "za označavanje favoritom", - "keyboard_shortcuts.favourites": "za otvaranje liste favorita", "keyboard_shortcuts.federated": "za otvaranje federalne vremenske crte", "keyboard_shortcuts.heading": "Tipkovnički prečaci", "keyboard_shortcuts.home": "za otvaranje početne vremenske crte", @@ -280,7 +273,6 @@ "navigation_bar.discover": "Istraživanje", "navigation_bar.domain_blocks": "Blokirane domene", "navigation_bar.edit_profile": "Uredi profil", - "navigation_bar.favourites": "Favoriti", "navigation_bar.filters": "Utišane riječi", "navigation_bar.follow_requests": "Zahtjevi za praćenje", "navigation_bar.follows_and_followers": "Praćeni i pratitelji", @@ -293,7 +285,6 @@ "navigation_bar.public_timeline": "Federalna vremenska crta", "navigation_bar.security": "Sigurnost", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} je favorizirao/la Vaš toot", "notification.follow": "{name} Vas je počeo/la pratiti", "notification.follow_request": "{name} zatražio/la je da Vas prati", "notification.mention": "{name} Vas je spomenuo", @@ -303,7 +294,6 @@ "notifications.clear": "Očisti obavijesti", "notifications.clear_confirmation": "Želite li zaista trajno očistiti sve Vaše obavijesti?", "notifications.column_settings.alert": "Obavijesti radne površine", - "notifications.column_settings.favourite": "Favoriti:", "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije", "notifications.column_settings.filter_bar.category": "Brza traka filtera", "notifications.column_settings.follow": "Novi pratitelji:", @@ -317,7 +307,6 @@ "notifications.column_settings.status": "New toots:", "notifications.filter.all": "Sve", "notifications.filter.boosts": "Boostovi", - "notifications.filter.favourites": "Favoriti", "notifications.filter.follows": "Praćenja", "notifications.filter.mentions": "Spominjanja", "notifications.filter.polls": "Rezultati anketa", @@ -395,7 +384,6 @@ "server_banner.learn_more": "Saznaj više", "sign_in_banner.create_account": "Stvori račun", "sign_in_banner.sign_in": "Prijavi se", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.bookmark": "Dodaj u favorite", "status.cannot_reblog": "Ova objava ne može biti boostana", @@ -405,7 +393,6 @@ "status.edited": "Uređeno {date}", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", "status.embed": "Umetni", - "status.favourite": "Označi favoritom", "status.filter": "Filtriraj ovu objavu", "status.filtered": "Filtrirano", "status.hide": "Sakrij objavu", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index ac440abb15..c4a2cadef2 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -1,7 +1,7 @@ { "about.blocks": "Moderált kiszolgálók", "about.contact": "Kapcsolat:", - "about.disclaimer": "A Mastodon ingyenes, nyílt forráskódú szoftver, a Mastodon gGmbH védejegye.", + "about.disclaimer": "A Mastodon ingyenes, nyílt forráskódú szoftver, a Mastodon gGmbH védjegye.", "about.domain_blocks.no_reason_available": "Nem áll rendelkezésre indoklás", "about.domain_blocks.preamble": "A Mastodon általában mindenféle tartalomcserét és interakciót lehetővé tesz bármelyik másik kiszolgálóval a födiverzumban. Ezek azok a kivételek, amelyek a mi kiszolgálónkon érvényben vannak.", "about.domain_blocks.silenced.explanation": "Általában nem fogsz profilokat és tartalmat látni erről a kiszolgálóról, hacsak közvetlenül fel nem keresed vagy követed.", @@ -19,7 +19,7 @@ "account.block_domain": "Domain blokkolása: {domain}", "account.block_short": "Letiltás", "account.blocked": "Letiltva", - "account.browse_more_on_origin_server": "Böngéssz tovább az eredeti profilon", + "account.browse_more_on_origin_server": "További böngészés az eredeti profilon", "account.cancel_follow_request": "Követési kérés visszavonása", "account.direct": "@{name} személyes említése", "account.disable_notifications": "Ne figyelmeztessen, ha @{name} bejegyzést tesz közzé", @@ -35,7 +35,7 @@ "account.followers.empty": "Ezt a felhasználót még senki sem követi.", "account.followers_counter": "{count, plural, one {{counter} Követő} other {{counter} Követő}}", "account.following": "Követve", - "account.following_counter": "{count, plural, one {{counter} követett} other {{counter} követett}}", + "account.following_counter": "{count, plural, one {{counter} Követett} other {{counter} Követett}}", "account.follows.empty": "Ez a felhasználó még senkit sem követ.", "account.follows_you": "Követ téged", "account.go_to_profile": "Ugrás a profilhoz", @@ -57,7 +57,7 @@ "account.posts": "Bejegyzések", "account.posts_with_replies": "Bejegyzések és válaszok", "account.report": "@{name} jelentése", - "account.requested": "Jóváhagysára vár. Kattintás a követési kérés törléséhez", + "account.requested": "Jóváhagyásra vár. Kattints a követési kérés visszavonásához", "account.requested_follow": "{name} kérte, hogy követhessen", "account.share": "@{name} profiljának megosztása", "account.show_reblogs": "@{name} megtolásainak mutatása", @@ -68,7 +68,7 @@ "account.unendorse": "Ne jelenjen meg a profilodon", "account.unfollow": "Követés megszüntetése", "account.unmute": "@{name} némításának feloldása", - "account.unmute_notifications_short": "Értesítés némítás feloldása", + "account.unmute_notifications_short": "Értesítések némításának feloldása", "account.unmute_short": "Némitás feloldása", "account_note.placeholder": "Kattintás jegyzet hozzáadásához", "admin.dashboard.daily_retention": "Napi regisztráció utáni felhasználómegtartási arány", @@ -76,10 +76,10 @@ "admin.dashboard.retention.average": "Átlag", "admin.dashboard.retention.cohort": "Regisztráció hónapja", "admin.dashboard.retention.cohort_size": "Új felhasználó", - "admin.impact_report.instance_accounts": "Fiókprofilok törlődnek", - "admin.impact_report.instance_followers": "Felhasználóinkat követők elveszítenék", - "admin.impact_report.instance_follows": "Felhasználóikat követők elvesztése", - "admin.impact_report.title": "Hatás összegzés", + "admin.impact_report.instance_accounts": "Fiókprofilok, melyek törlődnének", + "admin.impact_report.instance_followers": "Követők, akiket a mi felhasználóink elveszítenének", + "admin.impact_report.instance_follows": "Követők, akiket az ő felhasználóik elveszítenének", + "admin.impact_report.title": "Hatásvizsgálat", "alert.rate_limited.message": "Próbáld újra {retry_time, time, medium} után.", "alert.rate_limited.title": "Adatforgalom korlátozva", "alert.unexpected.message": "Váratlan hiba történt.", @@ -104,7 +104,7 @@ "closed_registrations.other_server_instructions": "Mivel a Mastdon decentralizált, létrehozhatsz egy fiókot egy másik kiszolgálón és mégis kapcsolódhatsz ehhez.", "closed_registrations_modal.description": "Fiók létrehozása a {domain} kiszolgálón jelenleg nem lehetséges, de jó, ha tudod, hogy nem szükséges fiókkal rendelkezni pont a {domain} kiszolgálón, hogy használhasd a Mastodont.", "closed_registrations_modal.find_another_server": "Másik kiszolgáló keresése", - "closed_registrations_modal.preamble": "A Mastodon nem központosított, így teljesen mindegy, hol történik a fiók létrehozása, követhető bárki és kapcsolatba lehet lépni bárkivel ezen a kiszolgálón is. Saját magunk is üzemeltethetünk kiszolgálót!", + "closed_registrations_modal.preamble": "A Mastodon decentralizált, így teljesen mindegy, hol hozod létre a fiókodat, követhetsz és kapcsolódhatsz bárkivel ezen a kiszolgálón is. Saját magad is üzemeltethetsz kiszolgálót!", "closed_registrations_modal.title": "Regisztráció a Mastodonra", "column.about": "Névjegy", "column.blocks": "Letiltott felhasználók", @@ -164,17 +164,17 @@ "confirmations.block.confirm": "Letiltás", "confirmations.block.message": "Biztos, hogy letiltod: {name}?", "confirmations.cancel_follow_request.confirm": "Kérés visszavonása", - "confirmations.cancel_follow_request.message": "Biztosan visszavonásra kerüljön {name} felhasználóra vonatkozó követési kérés?", + "confirmations.cancel_follow_request.message": "Biztos, hogy visszavonod a(z) {name} felhasználóra vonatkozó követési kérésedet?", "confirmations.delete.confirm": "Törlés", "confirmations.delete.message": "Biztos, hogy törölni szeretnéd ezt a bejegyzést?", "confirmations.delete_list.confirm": "Törlés", "confirmations.delete_list.message": "Biztos, hogy véglegesen törölni szeretnéd ezt a listát?", "confirmations.discard_edit_media.confirm": "Elvetés", - "confirmations.discard_edit_media.message": "Elmentetlen változtatások vannak a média leírásában vagy előnézetében. Elvetésre kerüljenek?", + "confirmations.discard_edit_media.message": "Elmentetlen változtatásaid vannak a média leírásában vagy előnézetében. Eldobjuk őket?", "confirmations.domain_block.confirm": "Teljes tartomány tiltása", "confirmations.domain_block.message": "Biztos, hogy le szeretnéd tiltani a teljes {domain} domaint? A legtöbb esetben néhány célzott tiltás vagy némítás elegendő, és kívánatosabb megoldás. Semmilyen tartalmat nem fogsz látni ebből a domainből se az idővonalakon, se az értesítésekben. Az ebben a domainben lévő követőidet is eltávolítjuk.", "confirmations.edit.confirm": "Szerkesztés", - "confirmations.edit.message": "A szerkesztés felülírja a most összeállítás alatt álló üzenetet. Folytatás?", + "confirmations.edit.message": "Ha most szerkeszted, ez felülírja a most szerkesztés alatt álló üzenetet. Mégis ezt szeretnéd?", "confirmations.logout.confirm": "Kijelentkezés", "confirmations.logout.message": "Biztos, hogy kijelentkezel?", "confirmations.mute.confirm": "Némítás", @@ -198,18 +198,18 @@ "directory.new_arrivals": "Új csatlakozók", "directory.recently_active": "Nemrég aktív", "disabled_account_banner.account_settings": "Fiókbeállítások", - "disabled_account_banner.text": "{disabledAccount} fiók jelenleg letilzásra került.", + "disabled_account_banner.text": "A(z) {disabledAccount} fiókod jelenleg le van tiltva.", "dismissable_banner.community_timeline": "Ezek a legfrissebb nyilvános bejegyzések, amelyeket {domain} tartományban levő kiszolgáló fiókjait használó emberek tettek közzé.", "dismissable_banner.dismiss": "Elvetés", "dismissable_banner.explore_links": "Jelenleg ezekről a hírekről beszélgetnek az ezen és a központosítás nélküli hálózat többi kiszolgálóján lévő emberek.", - "dismissable_banner.explore_statuses": "Jelenleg ezek a bejegyzések hódítanak teret ezen és a központosítás nélküli hálózat egyéb kiszolgálóin.", + "dismissable_banner.explore_statuses": "Ezek azok a bejegyzések a szociális hálón, melyek ma válnak népszerűvé. Újabb bejegyzéseket, illetve több megtolással vagy kedvencnek jelöléssel rendelkezőket rangsoroljuk előrébb.", "dismissable_banner.explore_tags": "Jelenleg ezek a hashtagek hódítanak teret a közösségi weben. Azokat a hashtageket, amelyeket több különböző ember használ, magasabbra rangsorolják.", "dismissable_banner.public_timeline": "Ezek a legfrissebb nyilvános bejegyzések a közösségi weben, amelyeket {domain} domain felhasználói követnek.", "embed.instructions": "Ágyazd be ezt a bejegyzést a weboldaladba az alábbi kód kimásolásával.", "embed.preview": "Így fog kinézni:", "emoji_button.activity": "Tevékenység", "emoji_button.clear": "Törlés", - "emoji_button.custom": "Egyéni", + "emoji_button.custom": "Egyedi", "emoji_button.flags": "Zászlók", "emoji_button.food": "Étel és Ital", "emoji_button.label": "Emodzsi beszúrása", @@ -222,10 +222,10 @@ "emoji_button.search_results": "Keresési találatok", "emoji_button.symbols": "Szimbólumok", "emoji_button.travel": "Utazás és Helyek", - "empty_column.account_suspended": "A fiók felfüggesztésre került", + "empty_column.account_suspended": "Fiók felfüggesztve", "empty_column.account_timeline": "Itt nincs bejegyzés!", "empty_column.account_unavailable": "A profil nem érhető el", - "empty_column.blocks": "Még senki sem került letiltásra.", + "empty_column.blocks": "Még senkit sem tiltottál le.", "empty_column.bookmarked_statuses": "Még nincs egyetlen könyvjelzőzött bejegyzésed sem. Ha könyvjelzőzöl egyet, itt fog megjelenni.", "empty_column.community": "A helyi idővonal üres. Tégy közzé valamit nyilvánosan, hogy elindítsd az eseményeket!", "empty_column.direct": "Még nincs egy személyes említésed sem. Küldéskor vagy fogadáskor itt fognak megjelenni.", @@ -233,19 +233,19 @@ "empty_column.explore_statuses": "Jelenleg semmi sem felkapott. Nézz vissza később!", "empty_column.favourited_statuses": "Még nincs egyetlen kedvenc bejegyzésed sem. Ha kedvencnek jelölsz egyet, itt fog megjelenni.", "empty_column.favourites": "Még senki sem jelölte ezt a bejegyzést kedvencnek. Ha valaki mégis megteszi, itt fogjuk mutatni.", - "empty_column.follow_requests": "Még nincs egy követési kérés sem. Fogadáskor itt jelenik meg.", + "empty_column.follow_requests": "Még nincs egy követési kérésed sem. Ha kapsz egyet, itt fogjuk feltüntetni.", "empty_column.followed_tags": "Még egy hashtaget sem követtél be. Itt fognak megjelenni, ahogy bekövetsz egyet.", - "empty_column.hashtag": "Jelenleg nem található semmi ezzel a #címkével.", - "empty_column.home": "A saját idővonal üres! További emberek követése a kitöltéshez. {suggestions}", + "empty_column.hashtag": "Jelenleg nem található semmi ezzel a hashtaggel.", + "empty_column.home": "A saját idővonalad üres! Kövess további embereket ennek megtöltéséhez.", "empty_column.list": "A lista jelenleg üres. Ha a listatagok bejegyzést tesznek közzé, itt fog megjelenni.", - "empty_column.lists": "Még nincs egyetlen lista sem. A létrehozáskor itt jelenik meg.", - "empty_column.mutes": "Még nincs egyetlen némított felhasználót sem.", - "empty_column.notifications": "Jelenleg nincsenek értesítések. Más emberekkel kapcsolatba lépés után ez itt lesz látható.", - "empty_column.public": "Jelenleg itt nincs semmi! Írjunk valamit nyilvánosan vagy kövessünk más kiszolgálón levő felhasználókat a megjelenéshez.", + "empty_column.lists": "Még nincs egyetlen listád sem. Ha létrehozol egyet, itt fog megjelenni.", + "empty_column.mutes": "Még egy felhasználót sem némítottál le.", + "empty_column.notifications": "Jelenleg még nincsenek értesítéseid. Ha mások kapcsolatba lépnek veled, ezek itt lesznek láthatóak.", + "empty_column.public": "Jelenleg itt nincs semmi! Írj valamit nyilvánosan vagy kövess más kiszolgálón levő felhasználókat, hogy megtöltsd.", "error.unexpected_crash.explanation": "Egy hiba vagy böngésző inkompatibilitás miatt ez az oldal nem jeleníthető meg rendesen.", "error.unexpected_crash.explanation_addons": "Ezt az oldalt nem lehet helyesen megjeleníteni. Ezt a hibát valószínűleg egy böngésző kiegészítő vagy egy automatikus fordító okozza.", - "error.unexpected_crash.next_steps": "Próbáljuk meg frissíteni az oldalt. Ha ez nem segít, egy másik böngészőn vagy appon keresztül még mindig használható a Mastodon.", - "error.unexpected_crash.next_steps_addons": "Próbáljuk meg letiltani őket és frissíteni az oldalt. Ha ez nem segít, egy másik böngészőn vagy alkalmazáson keresztül még mindig használható a Mastodon.", + "error.unexpected_crash.next_steps": "Próbáld frissíteni az oldalt. Ha ez nem segít, egy másik böngészőn vagy appon keresztül még mindig használhatod a Mastodont.", + "error.unexpected_crash.next_steps_addons": "Próbáld letiltani őket és frissíteni az oldalt. Ha ez nem segít, egy másik böngészőn vagy appon keresztül még mindig használhatod a Mastodont.", "errors.unexpected_crash.copy_stacktrace": "Veremkiíratás vágólapra másolása", "errors.unexpected_crash.report_issue": "Probléma jelentése", "explore.search_results": "Keresési találatok", @@ -254,20 +254,20 @@ "explore.trending_links": "Hírek", "explore.trending_statuses": "Bejegyzések", "explore.trending_tags": "Hashtagek", - "filter_modal.added.context_mismatch_explanation": "Ez a szűrőkategória nem érvényes abban a környezetben, amelyből ez a bejegyzés elérésre kerül. Ha ebben a környezetben is szűrni szeretnénk a bejegyzést, akkor szerkeszteni kell a szűrőt.", + "filter_modal.added.context_mismatch_explanation": "Ez a szűrőkategória nem érvényes abban a környezetben, amelyből elérted ezt a bejegyzést. Ha ebben a környezetben is szűrni szeretnéd a bejegyzést, akkor szerkesztened kell a szűrőt.", "filter_modal.added.context_mismatch_title": "Környezeti eltérés.", - "filter_modal.added.expired_explanation": "Ez a szűrőkategória elévült, a használatához módosítani kell a lejárati dátumot.", + "filter_modal.added.expired_explanation": "Ez a szűrőkategória elévült, a használatához módosítanod kell az elévülési dátumot.", "filter_modal.added.expired_title": "A szűrő lejárt!", - "filter_modal.added.review_and_configure": "A szűrőkategória felülvizsgálatához és további beállításához ugorás {settings_link} oldalra.", + "filter_modal.added.review_and_configure": "A szűrőkategória felülvizsgálatához és további beállításához ugorj a {settings_link} oldalra.", "filter_modal.added.review_and_configure_title": "Szűrőbeállítások", "filter_modal.added.settings_link": "beállítások oldal", "filter_modal.added.short_explanation": "A következő bejegyzés hozzá lett adva a következő szűrőkategóriához: {title}.", - "filter_modal.added.title": "A szűrő hozzáadásra került.", + "filter_modal.added.title": "Szűrő hozzáadva!", "filter_modal.select_filter.context_mismatch": "nem érvényes erre a környezetre", "filter_modal.select_filter.expired": "lejárt", "filter_modal.select_filter.prompt_new": "Új kategória: {name}", "filter_modal.select_filter.search": "Keresés vagy létrehozás", - "filter_modal.select_filter.subtitle": "Létező kategória használata vagy új létrehozása", + "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat", "filter_modal.select_filter.title": "E bejegyzés szűrése", "filter_modal.title.status": "Egy bejegyzés szűrése", "firehose.all": "Összes", @@ -278,7 +278,7 @@ "follow_requests.unlocked_explanation": "Bár a fiókod nincs zárolva, a(z) {domain} csapata úgy gondolta, hogy talán kézzel szeretnéd ellenőrizni a fiók követési kéréseit.", "followed_tags": "Követett hashtagek", "footer.about": "Névjegy", - "footer.directory": "Profiladatbázis", + "footer.directory": "Profiltár", "footer.get_app": "Alkalmazás beszerzése", "footer.invite": "Emberek meghívása", "footer.keyboard_shortcuts": "Billentyűparancsok", @@ -295,26 +295,26 @@ "hashtag.column_settings.tag_mode.all": "Mindegyik", "hashtag.column_settings.tag_mode.any": "Bármelyik", "hashtag.column_settings.tag_mode.none": "Egyik sem", - "hashtag.column_settings.tag_toggle": "Új címkék felvétele ehhez az oszlophoz", + "hashtag.column_settings.tag_toggle": "További címkék felvétele ehhez az oszlophoz", "hashtag.follow": "Hashtag követése", "hashtag.unfollow": "Hashtag követésének megszüntetése", "home.actions.go_to_explore": "Felkapottak megtekintése", "home.actions.go_to_suggestions": "Követhetők keresése", - "home.column_settings.basic": "Alapvető", - "home.column_settings.show_reblogs": "Megtolások mutatása", + "home.column_settings.basic": "Általános", + "home.column_settings.show_reblogs": "Megtolások megjelenítése", "home.column_settings.show_replies": "Válaszok megjelenítése", - "home.explore_prompt.body": "A kezdő hírfolyam a követésre kiválasztott hashtagek, a követésre kiválasztott személyek és az általuk népszerűsített bejegyzések keverékét tartalmazza. Ez most elég csendesnek tűnik, szóval mit szólnánk ehhez:", - "home.explore_prompt.title": "Ez a kezdő bázis a Mastodonon belül.", + "home.explore_prompt.body": "A saját hírfolyam a követésre kiválasztott hashtagek, a követésre kiválasztott személyek és az általuk népszerűsített bejegyzések keverékét tartalmazza. Ez most elég csendesnek tűnik, szóval mit szólnál ehhez:", + "home.explore_prompt.title": "Ez a kezdőpontod a Mastodonon belül.", "home.hide_announcements": "Közlemények elrejtése", "home.show_announcements": "Közlemények megjelenítése", - "interaction_modal.description.favourite": "Egy Mastodon fiókkal kedvencnek jelölhető ez a bejegyzés, tudatva a szerzővel, hogy értékeljük és eltesszük későbbre.", + "interaction_modal.description.favourite": "Egy Mastodon fiókkal kedvencnek jelölheted ezt a bejegyzést, tudatva a szerzővel, hogy értékeled és elteszed későbbre.", "interaction_modal.description.follow": "Egy Mastodon fiókkal bekövetheted {name} fiókot, hogy lásd a bejegyzéseit a saját hírfolyamodban.", - "interaction_modal.description.reblog": "Egy Mastodon fiókkal megtolható ez a bejegyzés a saját követőkkel megosztáshoz.", - "interaction_modal.description.reply": "Egy Mastodon fiókkal válaszolhatunk erre a bejegyzésre.", + "interaction_modal.description.reblog": "Egy Mastodon fiókkal megtolhatod ezt a bejegyzést, hogy megoszd a saját követőiddel.", + "interaction_modal.description.reply": "Egy Mastodon fiókkal válaszolhatsz erre a bejegyzésre.", "interaction_modal.on_another_server": "Másik kiszolgálón", "interaction_modal.on_this_server": "Ezen a kiszolgálón", - "interaction_modal.other_server_instructions": "Másoljuk és illesszük be ezt a webcímet a kedvenc Mastodon alkalmazásd vagy a Mastodon kiszolgáló webes felületének keresőmezőjébe.", - "interaction_modal.preamble": "Mivel a Mastodon nem központosított, használható egy másik Mastodon kiszolgálón vagy kompatibilis szolgáltatáson lévő fiók, ha ezen a kiszolgálón nincs saját fiók.", + "interaction_modal.other_server_instructions": "Másold és illeszd be ezt a webcímet a kedvenc Mastodon alkalmazásod vagy a Mastodon-kiszolgálód webes felületének keresőmezőjébe.", + "interaction_modal.preamble": "Mivel a Mastodon decentralizált, használhatod egy másik Mastodon kiszolgálón, vagy kompatibilis szolgáltatáson lévő fiókodat, ha ezen a kiszolgálón nincs fiókod.", "interaction_modal.title.favourite": "{name} bejegyzésének megjelölése kedvencként", "interaction_modal.title.follow": "{name} követése", "interaction_modal.title.reblog": "{name} bejegyzésének megtolása", @@ -345,10 +345,10 @@ "keyboard_shortcuts.notifications": "Értesítések oszlop megnyitása", "keyboard_shortcuts.open_media": "Média megnyitása", "keyboard_shortcuts.pinned": "Kitűzött bejegyzések listájának megnyitása", - "keyboard_shortcuts.profile": "Szerző profil megnyitása", + "keyboard_shortcuts.profile": "Szerző profiljának megnyitása", "keyboard_shortcuts.reply": "Válasz bejegyzésre", - "keyboard_shortcuts.requests": "Követési kérések lista megnyitása", - "keyboard_shortcuts.search": "Keresősáv fókuszálása", + "keyboard_shortcuts.requests": "Követési kérések listájának megnyitása", + "keyboard_shortcuts.search": "Fókuszálás a keresősávra", "keyboard_shortcuts.spoilers": "Tartalmi figyelmeztetés mező megjelenítése/elrejtése", "keyboard_shortcuts.start": "\"Első lépések\" oszlop megnyitása", "keyboard_shortcuts.toggle_hidden": "Tartalmi figyelmeztetéssel ellátott szöveg megjelenítése/elrejtése", @@ -363,26 +363,27 @@ "lightbox.previous": "Előző", "limited_account_hint.action": "Profil megjelenítése mindenképpen", "limited_account_hint.title": "Ezt a profilt {domain} moderátorai elrejtették.", + "link_preview.author": "{name} szerint", "lists.account.add": "Hozzáadás a listához", "lists.account.remove": "Eltávolítás a listából", "lists.delete": "Lista törlése", "lists.edit": "Lista szerkesztése", "lists.edit.submit": "Cím megváltoztatása", - "lists.exclusive": "Ezen bejegyzések elrejtése a kezdésből", + "lists.exclusive": "Ezen bejegyzések elrejtése a kezdőoldalról", "lists.new.create": "Lista hozzáadása", "lists.new.title_placeholder": "Új lista címe", "lists.replies_policy.followed": "Bármely követett felhasználó", "lists.replies_policy.list": "A lista tagjai", "lists.replies_policy.none": "Senki", - "lists.replies_policy.title": "Válaszok megjelenítése:", + "lists.replies_policy.title": "Nekik mutassuk a válaszokat:", "lists.search": "Keresés a követett személyek között", "lists.subheading": "Saját listák", "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}}", - "moved_to_account_banner.text": "{disabledAccount} fiók jelenleg le van tiltva, mert más {movedToAccount} fiókba került át.", + "moved_to_account_banner.text": "A(z) {disabledAccount} fiókod jelenleg le van tiltva, mert átköltöztél ide: {movedToAccount}.", "mute_modal.duration": "Időtartam", - "mute_modal.hide_notifications": "Értesítések elrejtése ettől a felhasználótól?", + "mute_modal.hide_notifications": "Rejtsük el a felhasználótól származó értesítéseket?", "mute_modal.indefinite": "Határozatlan", "navigation_bar.about": "Névjegy", "navigation_bar.advanced_interface": "Haladó webes felület engedélyezése", @@ -416,8 +417,8 @@ "notification.follow": "{name} követ téged", "notification.follow_request": "{name} követni szeretne téged", "notification.mention": "{name} megemlített", - "notification.own_poll": "A szavazás véget ért", - "notification.poll": "Egy általam részt vett szavazás véget ért", + "notification.own_poll": "A szavazásod véget ért", + "notification.poll": "Egy szavazás, melyben részt vettél, véget ért", "notification.reblog": "{name} megtolta a bejegyzésedet", "notification.status": "{name} bejegyzést tett közzé", "notification.update": "{name} szerkesztett egy bejegyzést", @@ -427,7 +428,7 @@ "notifications.column_settings.admin.sign_up": "Új regisztrálók:", "notifications.column_settings.alert": "Asztali értesítések", "notifications.column_settings.favourite": "Kedvencek:", - "notifications.column_settings.filter_bar.advanced": "Összes kategória megjelenítése", + "notifications.column_settings.filter_bar.advanced": "Minden kategória megjelenítése", "notifications.column_settings.filter_bar.category": "Gyorsszűrő sáv", "notifications.column_settings.filter_bar.show_bar": "Szűrősáv megjelenítése", "notifications.column_settings.follow": "Új követők:", @@ -436,7 +437,7 @@ "notifications.column_settings.poll": "Szavazási eredmények:", "notifications.column_settings.push": "Push értesítések", "notifications.column_settings.reblog": "Megtolások:", - "notifications.column_settings.show": "Megjelenítés oszlopban", + "notifications.column_settings.show": "Megjelenítés az oszlopban", "notifications.column_settings.sound": "Hang lejátszása", "notifications.column_settings.status": "Új bejegyzések:", "notifications.column_settings.unread_notifications.category": "Olvasatlan értesítések", @@ -452,19 +453,19 @@ "notifications.grant_permission": "Engedély megadása.", "notifications.group": "{count} értesítés", "notifications.mark_as_read": "Összes értesítés megjelölése olvasottként", - "notifications.permission_denied": "Az asztali értesítések nem érhetők el a korábban elutasított böngésző engedély kérelem miatt", + "notifications.permission_denied": "Az asztali értesítések nem érhetők el a korábban elutasított böngészőengedély-kérelem miatt", "notifications.permission_denied_alert": "Az asztali értesítések nem engedélyezhetők a korábban elutasított böngésző engedély miatt", - "notifications.permission_required": "Az asztali értesítések nem érhetők, mivel a szükséges engedély nem lett megadva.", + "notifications.permission_required": "Az asztali értesítések nem érhetőek el, mivel a szükséges engedély nem lett megadva.", "notifications_permission_banner.enable": "Asztali értesítések engedélyezése", - "notifications_permission_banner.how_to_control": "Bezárt Mastononnál értesések fogadásához engedélyezni kell az asztali értesítéseket. Pontosan lehet vezérelni, hogy milyen interakciókról érkezzen értesítés fenti {icon} gombon keresztül, ha már lorábban megtörtént az engedélyezés.", - "notifications_permission_banner.title": "Soha ne mulasszunk el semmit", + "notifications_permission_banner.how_to_control": "Ahhoz, hogy értesítéseket kapj akkor, amikor a Mastodon nincs megnyitva, engedélyezd az asztali értesítéseket. Pontosan be tudod állítani, hogy milyen interakciókról értesülj a fenti {icon} gombon keresztül, ha egyszer már engedélyezted őket.", + "notifications_permission_banner.title": "Soha ne mulassz el semmit", "onboarding.action.back": "Vissza", "onboarding.actions.back": "Vissza", "onboarding.actions.go_to_explore": "Felkapottak megtekintése", "onboarding.actions.go_to_home": "Ugrás a saját hírfolyamra", "onboarding.compose.template": "Üdvözlet, #Mastodon!", "onboarding.follows.empty": "Sajnos jelenleg nem jeleníthető meg eredmény. Kipróbálhatod a keresést vagy böngészheted a felfedező oldalon a követni kívánt személyeket, vagy próbáld meg később.", - "onboarding.follows.lead": "Mindenki maga válogatja össze a saját hírfolyamát. Minél több embert követsz, annál aktívabb és érdekesebb a dolog. Ezek a profilok jó kiindulási alapot jelenthetnek – később bármikor leállíthatod a követésüket!", + "onboarding.follows.lead": "A saját hírfolyamod az elsődleges tapasztalás a Mastodonon. Minél több embert követsz, annál aktívabb és érdekesebb a dolog. Az induláshoz itt van néhány javaslat:", "onboarding.follows.title": "Népszerű a Mastodonon", "onboarding.share.lead": "Tudassuk az emberekkel, hogyan találhatnak meg a Mastodonon!", "onboarding.share.message": "{username} vagyok a #Mastodon hálózaton! Kövess itt: {url}.", @@ -494,7 +495,7 @@ "poll.total_people": "{count, plural, one {# személy} other {# személy}}", "poll.total_votes": "{count, plural, one {# szavazat} other {# szavazat}}", "poll.vote": "Szavazás", - "poll.voted": "Megtörtént a szavazás erre a kérdésre", + "poll.voted": "Erre a válaszra szavaztál", "poll.votes": "{votes, plural, one {# szavazat} other {# szavazat}}", "poll_button.add_poll": "Új szavazás", "poll_button.remove_poll": "Szavazás eltávolítása", @@ -510,7 +511,7 @@ "privacy_policy.last_updated": "Utoljára frissítve: {date}", "privacy_policy.title": "Adatvédelmi szabályzat", "refresh": "Frissítés", - "regeneration_indicator.label": "A betöltés folyamatban van…", + "regeneration_indicator.label": "Betöltés…", "regeneration_indicator.sublabel": "A saját idővonalad épp készül!", "relative_time.days": "{number}n", "relative_time.full.days": "{number, plural, one {# napja} other {# napja}}", @@ -525,7 +526,7 @@ "relative_time.today": "ma", "reply_indicator.cancel": "Mégsem", "report.block": "Letiltás", - "report.block_explanation": "A bejegyzéseik nem áthatók. Nem nézheti meg a saját bejegyzéseimet és nem tudni követni sem. Azt is meg fogja tudni mondani, hogy letiltották.", + "report.block_explanation": "Nem fogod látni a bejegyzéseit. Nem fogja tudni megnézni a bejegyzéseidet és nem fog tudni követni sem. Azt is meg fogja tudni mondani, hogy letiltottad.", "report.categories.other": "Egyéb", "report.categories.spam": "Kéretlen üzenet", "report.categories.violation": "A tartalom a kiszolgáló egy vagy több szabályát sérti", @@ -540,7 +541,7 @@ "report.mute": "Némítás", "report.mute_explanation": "Nem fogod látni a bejegyzéseit. Továbbra is fog tudni követni, és látni fogja a bejegyzéseidet, és nem fogja tudni, hogy némítottad.", "report.next": "Következő", - "report.placeholder": "További hozzászólások", + "report.placeholder": "További megjegyzések", "report.reasons.dislike": "Nem tetszik", "report.reasons.dislike_description": "Ezt nem szeretném látni", "report.reasons.legal": "Ez illegális", @@ -558,7 +559,7 @@ "report.submit": "Küldés", "report.target": "{target} jelentése", "report.thanks.take_action": "Itt vannak a beállítások, melyek szabályozzák, hogy mit látsz a Mastodonon:", - "report.thanks.take_action_actionable": "Míg átnézzük, a következőket lehet tenni @{name} ellen:", + "report.thanks.take_action_actionable": "Míg átnézzük, a következőket teheted @{name} ellen:", "report.thanks.title": "Nem akarod ezt látni?", "report.thanks.title_actionable": "Köszönjük, hogy jelentetted, megnézzük.", "report.unfollow": "@{name} követésének leállítása", @@ -585,14 +586,14 @@ "search_results.nothing_found": "Nincs találat ezekre a keresési kifejezésekre", "search_results.statuses": "Bejegyzések", "search_results.statuses_fts_disabled": "Ezen a Mastodon szerveren nem engedélyezett a bejegyzések tartalom szerinti keresése.", - "search_results.title": "Keresés erre: {q}", + "search_results.title": "{q} keresése", "search_results.total": "{count, number} {count, plural, one {találat} other {találat}}", "server_banner.about_active_users": "Az elmúlt 30 napban ezt a kiszolgálót használók száma (Havi aktív felhasználók)", "server_banner.active_users": "aktív felhasználó", "server_banner.administered_by": "Adminisztrátor:", - "server_banner.introduction": "{domain} része egy központ nélküliközösségi hálónak, melyet a {mastodon} hajt meg.", - "server_banner.learn_more": "További információ", - "server_banner.server_stats": "Szerver statisztika:", + "server_banner.introduction": "{domain} része egy decentralizált közösségi hálónak, melyet a {mastodon} hajt meg.", + "server_banner.learn_more": "Tudj meg többet", + "server_banner.server_stats": "Kiszolgálóstatisztika:", "sign_in_banner.create_account": "Fiók létrehozása", "sign_in_banner.sign_in": "Bejelentkezés", "sign_in_banner.text": "Jelentkezz be profilok vagy hashtagek követéséhez, kedvencnek jelöléséhez, bejegyzések megosztásához, megválaszolásához. A fiókodból más kiszolgálókon is kommunikálhatsz.", @@ -654,11 +655,11 @@ "status.uncached_media_warning": "Előnézet nem érhető el", "status.unmute_conversation": "Beszélgetés némításának feloldása", "status.unpin": "Kitűzés eltávolítása a profilodról", - "subscribed_languages.lead": "A változtatás után csak a kiválasztott nyelvű bejegyzések fognak megjelenni a kezdőoldalon és az idővonalakon. Ha egy sincs kiválasztva, akkor az összes nyelvű bejegyzések megjelennek.", + "subscribed_languages.lead": "A változtatás után csak a kiválasztott nyelvű bejegyzések fognak megjelenni a kezdőlapon és az idővonalakon. Ha egy sincs kiválasztva, akkor minden nyelven megjelennek a bejegyzések.", "subscribed_languages.save": "Változások mentése", "subscribed_languages.target": "Feliratkozott nyelvek módosítása {target} esetében", "suggestions.dismiss": "Javaslat elvetése", - "suggestions.header": "Esetleg érdeklődésre tarthat számot…", + "suggestions.header": "Esetleg érdekelhet…", "tabs_bar.home": "Kezdőoldal", "tabs_bar.notifications": "Értesítések", "time_remaining.days": "{number, plural, one {# nap} other {# nap}} van hátra", @@ -672,21 +673,21 @@ "timeline_hint.resources.statuses": "Régi bejegyzések", "trends.counter_by_accounts": "{count, plural, one {{counter} ember} other {{counter} ember}} az elmúlt {days, plural,one {napban} other {{days} napban}}", "trends.trending_now": "Most felkapott", - "ui.beforeunload": "A vázlat elveszik a Mastodon elhagyásakor.", + "ui.beforeunload": "A piszkozatod el fog veszni, ha elhagyod a Mastodont.", "units.short.billion": "{count}Mrd", "units.short.million": "{count}M", "units.short.thousand": "{count}K", "upload_area.title": "Húzás a feltöltéshez", - "upload_button.label": "Képek, videó vagy audió fájl hozzáadása", + "upload_button.label": "Képek, videó vagy audiófájl hozzáadása", "upload_error.limit": "A fájlfeltöltési korlát elérésre került.", "upload_error.poll": "Szavazásnál nem lehet fájlt feltölteni.", - "upload_form.audio_description": "Leírás be a siket vagy hallássérült embereknek", - "upload_form.description": "Leírás be vak vagy gyengénlátó embereknek", + "upload_form.audio_description": "Leírás siket vagy hallássérült emberek számára", + "upload_form.description": "Leírás vak vagy gyengénlátó emberek számára", "upload_form.description_missing": "Nincs leírás megadva", "upload_form.edit": "Szerkesztés", "upload_form.thumbnail": "Bélyegkép megváltoztatása", "upload_form.undo": "Törlés", - "upload_form.video_description": "Leírás be a siket, hallássérült, vak vagy gyengénlátó embereknek", + "upload_form.video_description": "Leírás siket, hallássérült, vak vagy gyengénlátó emberek számára", "upload_modal.analyzing_picture": "Kép elemzése…", "upload_modal.apply": "Alkalmazás", "upload_modal.applying": "Alkalmazás…", @@ -694,7 +695,7 @@ "upload_modal.description_placeholder": "A gyors, barna róka átugrik a lusta kutya fölött", "upload_modal.detect_text": "Szöveg felismerése a képről", "upload_modal.edit_media": "Média szerkesztése", - "upload_modal.hint": "Kattintás vagy kör húzása az előnézetben arra a fókuszpontra, mely minden megjelenített bélyegképen láthatónak kell lenni.", + "upload_modal.hint": "Kattints vagy húzd a kört az előnézetben arra a fókuszpontra, mely minden bélyegképen látható kell, hogy legyen.", "upload_modal.preparing_ocr": "OCR előkészítése…", "upload_modal.preview_label": "Előnézet ({ratio})", "upload_progress.label": "Feltöltés...", diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json index 7bdb30bed7..5e4f16c150 100644 --- a/app/javascript/mastodon/locales/hy.json +++ b/app/javascript/mastodon/locales/hy.json @@ -5,7 +5,7 @@ "about.domain_blocks.silenced.title": "Սահմանափակ", "about.domain_blocks.suspended.title": "Սպասող", "about.not_available": "Այս տեղեկութիւնը տեսանելի չի այս սերուերում։", - "about.powered_by": "Ապակենտրոն սոց. ցանց սեղծուած {mastodon}-ի կողմից", + "about.powered_by": "Ապակենտրոն սոց. ցանց սեղծուած {mastodon}-ով։", "about.rules": "Սերուերի կանոնները", "account.account_note_header": "Նշում", "account.add_or_remove_from_list": "Աւելացնել կամ հեռացնել ցանկերից", @@ -13,12 +13,13 @@ "account.badges.group": "Խումբ", "account.block": "Արգելափակել @{name}֊ին", "account.block_domain": "Թաքցնել ամէնը հետեւեալ տիրոյթից՝ {domain}", + "account.block_short": "Արգելափակել", "account.blocked": "Արգելափակուած է", "account.browse_more_on_origin_server": "Դիտել աւելին իրական պրոֆիլում", "account.cancel_follow_request": "Withdraw follow request", "account.disable_notifications": "Ծանուցումները անջատել @{name} գրառումների համար", "account.domain_blocked": "Տիրոյթը արգելափակուած է", - "account.edit_profile": "Խմբագրել անձնական էջը", + "account.edit_profile": "Խմբագրել հաշիւը", "account.enable_notifications": "Ծանուցել ինձ @{name} գրառումների մասին", "account.endorse": "Ցուցադրել անձնական էջում", "account.featured_tags.last_status_at": "Վերջին գրառումը եղել է՝ {date}", @@ -39,7 +40,9 @@ "account.media": "Մեդիա", "account.mention": "Նշել @{name}֊ին", "account.mute": "Լռեցնել @{name}֊ին", + "account.mute_short": "Լռեցնել", "account.muted": "Լռեցուած", + "account.no_bio": "Նկարագրութիւն չկայ:", "account.open_original_page": "Բացել իրական էջը", "account.posts": "Գրառումներ", "account.posts_with_replies": "Գրառումներ եւ պատասխաններ", @@ -104,6 +107,7 @@ "community.column_settings.remote_only": "Միայն հեռակայ", "compose.language.change": "Փոխել լեզուն", "compose.language.search": "Որոնել լեզուներ", + "compose.published.open": "Բացել", "compose_form.direct_message_warning_learn_more": "Իմանալ աւելին", "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.", "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.", @@ -137,13 +141,13 @@ "confirmations.discard_edit_media.confirm": "Չեղարկել", "confirmations.domain_block.confirm": "Թաքցնել ամբողջ տիրույթը", "confirmations.domain_block.message": "Հաստատ֊հաստա՞տ վստահ ես, որ ուզում ես արգելափակել ամբողջ {domain} տիրոյթը։ Սովորաբար մի երկու թիրախաւորուած արգելափակում կամ լռեցում բաւական է ու նախընտրելի։", + "confirmations.edit.confirm": "Խմբագրել", "confirmations.logout.confirm": "Ելք", "confirmations.logout.message": "Համոզո՞ւած ես, որ ուզում ես դուրս գալ", "confirmations.mute.confirm": "Լռեցնել", - "confirmations.mute.explanation": "Սա թաքցնելու է իրենց գրառումները, ինչպէս նաեւ իրենց նշող գրառումները, բայց իրենք միեւնոյն է կը կարողանան հետեւել ձեզ եւ տեսնել ձեր գրառումները։", + "confirmations.mute.explanation": "Սա թաքցնելու ա իրենց գրառումներն, ինչպէս նաեւ իրենց նշող գրառումներն, բայց իրենք միեւնոյն է կը կարողանան հետեւել ձեզ եւ տեսնել ձեր գրառումները։", "confirmations.mute.message": "Վստա՞հ ես, որ ուզում ես {name}֊ին լռեցնել։", "confirmations.redraft.confirm": "Ջնջել եւ խմբագրել նորից", - "confirmations.redraft.message": "Վստահ ե՞ս, որ ցանկանում ես ջնջել եւ վերախմբագրել այս գրառումը։ Դու կը կորցնես այս գրառման բոլոր պատասխանները, տարածումները եւ հաւանումները։", "confirmations.reply.confirm": "Պատասխանել", "confirmations.reply.message": "Այս պահին պատասխանելը կը չեղարկի ձեր՝ այս պահին անաւարտ հաղորդագրութիւնը։ Համոզուա՞ծ էք։", "confirmations.unfollow.confirm": "Ապահետեւել", @@ -158,8 +162,8 @@ "directory.local": "{domain} տիրոյթից միայն", "directory.new_arrivals": "Նորեկներ", "directory.recently_active": "Վերջերս ակտիւ", + "disabled_account_banner.account_settings": "Հաշուի կարգաւորումներ", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Այս գրառումը քո կայքում ներդնելու համար կարող ես պատճէնել ներքեւի կոդը։", "embed.preview": "Ահա, թէ ինչ տեսք կունենայ այն՝", @@ -185,8 +189,6 @@ "empty_column.bookmarked_statuses": "Դու դեռ չունես որեւէ էջանշուած գրառում։ Երբ էջանշես, դրանք կը երեւան այստեղ։", "empty_column.community": "Տեղական հոսքը դատարկ է։ Հրապարակային մի բան գրի՛ր շարժիչը գործարկելու համար։", "empty_column.domain_blocks": "Թաքցուած տիրոյթներ դեռ չկան։", - "empty_column.favourited_statuses": "Դու դեռ չունես որեւէ հաւանած գրառում։ Երբ հաւանես, դրանք կերեւան այստեղ։", - "empty_column.favourites": "Այս գրառումը ոչ մէկ դեռ չի հաւանել։ Հաւանողները կերեւան այստեղ, երբ հաւանեն։", "empty_column.follow_requests": "Դու դեռ չունես որեւէ հետեւելու յայտ։ Բոլոր նման յայտերը կը յայտնուեն այստեղ։", "empty_column.hashtag": "Այս պիտակով դեռ ոչինչ չկայ։", "empty_column.home": "Քո հիմնական հոսքը դատարկ է։ Այցելի՛ր {public}ը կամ օգտուիր որոնումից՝ այլ մարդկանց հանդիպելու համար։", @@ -202,18 +204,28 @@ "errors.unexpected_crash.copy_stacktrace": "Պատճենել սթաքթրեյսը սեղմատախտակին", "errors.unexpected_crash.report_issue": "Զեկուցել խնդրի մասին", "explore.search_results": "Որոնման արդիւնքներ", + "explore.suggested_follows": "Մարդիկ", "explore.title": "Բացայայտել", "explore.trending_links": "Նորութիւններ", "explore.trending_statuses": "Գրառումներ", "explore.trending_tags": "Պիտակներ", "filter_modal.added.settings_link": "կարգաւորումների էջ", + "filter_modal.select_filter.expired": "ժամկէտանց", + "filter_modal.select_filter.prompt_new": "Նոր կատեգորիա՝ {name}", "filter_modal.select_filter.search": "Որոնել կամ ստեղծել", + "filter_modal.select_filter.title": "Զտել այս գրառումը", + "firehose.all": "Բոլորը", "follow_request.authorize": "Վաւերացնել", "follow_request.reject": "Մերժել", "follow_requests.unlocked_explanation": "Այս հարցումը ուղարկուած է հաշուից, որի համար {domain}-ի անձնակազմը միացրել է ձեռքով ստուգում։", + "followed_tags": "Հետեւած պիտակներ", "footer.about": "Մասին", + "footer.directory": "Հաշիւների մատեան", "footer.invite": "Հրաւիրել մարդկանց", "footer.keyboard_shortcuts": "Ստեղնաշարի կարճատներ", + "footer.privacy_policy": "Գաղտնիութեան քաղաքականութիւն", + "footer.source_code": "Նայել ելակոդը", + "footer.status": "Կարգավիճակ", "generic.saved": "Պահպանուած է", "getting_started.heading": "Ինչպէս սկսել", "hashtag.column_header.tag_mode.all": "եւ {additional}", @@ -232,6 +244,7 @@ "home.column_settings.show_replies": "Ցուցադրել պատասխանները", "home.hide_announcements": "Թաքցնել յայտարարութիւնները", "home.show_announcements": "Ցուցադրել յայտարարութիւնները", + "interaction_modal.title.favourite": "Հաւանել {name}-ի գրառումը", "interaction_modal.title.follow": "Հետեւել {name}-ին", "interaction_modal.title.reblog": "Տարածել {name}-ի գրառումը", "interaction_modal.title.reply": "Պատասխանել {name}-ի գրառմանը", @@ -247,8 +260,8 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "ցանկով ներքեւ շարժուելու համար", "keyboard_shortcuts.enter": "Գրառումը բացելու համար", - "keyboard_shortcuts.favourite": "հաւանելու համար", - "keyboard_shortcuts.favourites": "էջանիշերի ցուցակը բացելու համար", + "keyboard_shortcuts.favourite": "Հաւանած գրառում", + "keyboard_shortcuts.favourites": "Բացել հաւանածների ցուցակը", "keyboard_shortcuts.federated": "դաշնային հոսքին անցնելու համար", "keyboard_shortcuts.heading": "Ստեղնաշարի կարճատներ", "keyboard_shortcuts.home": "անձնական հոսքին անցնելու համար", @@ -303,11 +316,12 @@ "navigation_bar.compose": "Ստեղծել նոր գրառում", "navigation_bar.discover": "Բացայայտել", "navigation_bar.domain_blocks": "Թաքցուած տիրոյթներ", - "navigation_bar.edit_profile": "Խմբագրել անձնական էջը", + "navigation_bar.edit_profile": "Խմբագրել հաշիւը", "navigation_bar.explore": "Բացայայտել", "navigation_bar.favourites": "Հաւանածներ", "navigation_bar.filters": "Լռեցուած բառեր", "navigation_bar.follow_requests": "Հետեւելու հայցեր", + "navigation_bar.followed_tags": "Հետեւած պիտակներ", "navigation_bar.follows_and_followers": "Հետեւածներ եւ հետեւողներ", "navigation_bar.lists": "Ցանկեր", "navigation_bar.logout": "Դուրս գալ", @@ -320,7 +334,7 @@ "navigation_bar.security": "Անվտանգութիւն", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", "notification.admin.sign_up": "{name}-ը գրանցուած է", - "notification.favourite": "{name} հաւանեց գրառումդ", + "notification.favourite": "{name}-ը հաւանել է քո գրառումը", "notification.follow": "{name} սկսեց հետեւել քեզ", "notification.follow_request": "{name} քեզ հետեւելու հայց է ուղարկել", "notification.mention": "{name} նշեց քեզ", @@ -333,7 +347,7 @@ "notifications.clear_confirmation": "Վստա՞հ ես, որ ուզում ես մշտապէս մաքրել քո բոլոր ծանուցումները։", "notifications.column_settings.admin.sign_up": "Նոր գրանցումներ՝", "notifications.column_settings.alert": "Աշխատատիրոյթի ծանուցումներ", - "notifications.column_settings.favourite": "Հաւանածներից՝", + "notifications.column_settings.favourite": "Հաւանածներ՝", "notifications.column_settings.filter_bar.advanced": "Ցուցադրել բոլոր կատեգորիաները", "notifications.column_settings.filter_bar.category": "Արագ զտման վահանակ", "notifications.column_settings.filter_bar.show_bar": "Ցոյց տալ զտման պանելը", @@ -350,7 +364,7 @@ "notifications.column_settings.update": "Խմբագրածներ՝", "notifications.filter.all": "Բոլորը", "notifications.filter.boosts": "Տարածածները", - "notifications.filter.favourites": "Հաւանածները", + "notifications.filter.favourites": "Հաւանածներ", "notifications.filter.follows": "Հետեւածները", "notifications.filter.mentions": "Նշումները", "notifications.filter.polls": "Հարցման արդիւնքները", @@ -366,6 +380,7 @@ "notifications_permission_banner.title": "Ոչինչ բաց մի թող", "onboarding.actions.go_to_explore": "See what's trending", "onboarding.actions.go_to_home": "Go to your home feed", + "onboarding.compose.template": "Բարեւ #Mastodon!", "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!", "onboarding.follows.title": "Popular on Mastodon", "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:", @@ -395,6 +410,8 @@ "privacy.public.long": "Տեսանելի բոլորին", "privacy.public.short": "Հրապարակային", "privacy.unlisted.short": "Ծածուկ", + "privacy_policy.last_updated": "Վերջին անգամ թարմացուել է՝ {date}", + "privacy_policy.title": "Գաղտնիութեան քաղաքականութիւն", "refresh": "Թարմացնել", "regeneration_indicator.label": "Բեռնւում է…", "regeneration_indicator.sublabel": "պատրաստւում է հիմնական հոսքդ", @@ -432,6 +449,7 @@ "report_notification.categories.spam": "Սպամ", "search.placeholder": "Փնտրել", "search.search_or_paste": "Որոնել կամ դնել URL", + "search_results.accounts": "Հաշիւներ", "search_results.all": "Բոլորը", "search_results.hashtags": "Պիտակներ", "search_results.statuses": "Գրառումներ", @@ -440,11 +458,11 @@ "search_results.total": "{count, number} {count, plural, one {արդիւնք} other {արդիւնք}}", "server_banner.active_users": "ակտիւ մարդիկ", "server_banner.administered_by": "Կառաւարող", + "server_banner.introduction": "{domain}-ը հանդիասնում է ապակենտրոն սոց. ցանցի մաս, ստեղծուած {mastodon}-ով։\n", "server_banner.learn_more": "Իմանալ աւելին", "server_banner.server_stats": "Սերուերի վիճակը", "sign_in_banner.create_account": "Ստեղծել հաշիւ", "sign_in_banner.sign_in": "Մուտք", - "sign_in_banner.text": "Մտէք, որ կարողանաք հետեւել հաշիւներին կամ պիտակներին, հաւանել, տարածել կամ պատասխանել գրառումներին։ Նաեւ շփուել այլ հանգոյցների հետ։", "status.admin_account": "Բացել @{name} օգտատիրոջ մոդերացիայի դիմերէսը։", "status.admin_status": "Բացել այս գրառումը մոդերատորի դիմերէսի մէջ", "status.block": "Արգելափակել @{name}֊ին", @@ -458,7 +476,7 @@ "status.edited": "Խմբագրուել է՝ {date}", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", "status.embed": "Ներդնել", - "status.favourite": "Հաւանել", + "status.filter": "Զտել այս գրառումը", "status.filtered": "Զտուած", "status.hide": "Թաքցնել գրառումը", "status.history.created": "{name}-ը ստեղծել է՝ {date}", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index ae0b6838df..e898d8efd6 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -108,7 +108,6 @@ "column.community": "Linimasa Lokal", "column.directory": "Jelajahi profil", "column.domain_blocks": "Domain tersembunyi", - "column.favourites": "Favorit", "column.follow_requests": "Permintaan mengikuti", "column.home": "Beranda", "column.lists": "List", @@ -173,7 +172,6 @@ "confirmations.mute.explanation": "Ini akan menyembunyikan pos dari mereka dan pos yang menyebut mereka, tapi ini tetap mengizinkan mereka melihat posmu dan mengikutimu.", "confirmations.mute.message": "Apa Anda yakin ingin membisukan {name}?", "confirmations.redraft.confirm": "Hapus dan susun ulang", - "confirmations.redraft.message": "Apakah Anda yakin ingin menghapus dan draf ulang? Favorit dan boost akan hilang, dan balasan terhadap kiriman asli akan ditinggalkan.", "confirmations.reply.confirm": "Balas", "confirmations.reply.message": "Membalas sekarang akan menimpa pesan yang sedang Anda buat. Anda yakin ingin melanjutkan?", "confirmations.unfollow.confirm": "Berhenti mengikuti", @@ -194,7 +192,6 @@ "dismissable_banner.community_timeline": "Ini adalah kiriman publik terkini dari orang yang akunnya berada di {domain}.", "dismissable_banner.dismiss": "Abaikan", "dismissable_banner.explore_links": "Cerita berita ini sekarang sedang dibicarakan oleh orang di server ini dan lainnya dalam jaringan terdesentralisasi.", - "dismissable_banner.explore_statuses": "Kiriman ini dari server ini dan lainnya dalam jaringan terdesentralisasi sekarang sedang tren di server ini.", "dismissable_banner.explore_tags": "Tagar ini sekarang sedang tren di antara orang di server ini dan lainnya dalam jaringan terdesentralisasi.", "embed.instructions": "Sematkan kiriman ini di situs web Anda dengan menyalin kode di bawah ini.", "embed.preview": "Tampilan akan seperti ini nantinya:", @@ -221,8 +218,6 @@ "empty_column.community": "Linimasa lokal masih kosong. Tulis sesuatu secara publik dan buat roda berputar!", "empty_column.domain_blocks": "Tidak ada topik tersembunyi.", "empty_column.explore_statuses": "Tidak ada yang sedang tren pada saat ini. Periksa lagi nanti!", - "empty_column.favourited_statuses": "Anda belum memiliki kiriman favorit. Ketika Anda mengirim atau menerimanya, mereka akan muncul di sini.", - "empty_column.favourites": "Belum ada yang memfavoritkan toot ini. Ketika seseorang melakukannya, mereka akan muncul di sini.", "empty_column.follow_requests": "Anda belum memiliki permintaan mengikuti. Ketika Anda menerimanya, maka itu akan muncul di sini.", "empty_column.followed_tags": "Anda belum mengikuti tagar apapun. Saat Anda mulai melakukannya, mereka akan muncul di sini.", "empty_column.hashtag": "Tidak ada apa pun dalam hashtag ini.", @@ -295,15 +290,12 @@ "home.column_settings.show_replies": "Tampilkan balasan", "home.hide_announcements": "Sembunyikan pengumuman", "home.show_announcements": "Tampilkan pengumuman", - "interaction_modal.description.favourite": "Dengan sebuah akun di Mastodon, Anda bisa memfavorit kiriman ini untuk memberi tahu penulis bahwa Anda mengapresiasinya dan menyimpannya untuk nanti.", "interaction_modal.description.follow": "Dengan sebuah akun di Mastodon, Anda bisa mengikuti {name} untuk menerima kirimannya di beranda Anda.", "interaction_modal.description.reblog": "Dengan sebuah akun di Mastodon, Anda bisa mem-boost kiriman ini untuk membagikannya ke pengikut Anda sendiri.", "interaction_modal.description.reply": "Dengan sebuah akun di Mastodon, Anda bisa menanggapi kiriman ini.", "interaction_modal.on_another_server": "Di server lain", "interaction_modal.on_this_server": "Di server ini", - "interaction_modal.other_server_instructions": "Salin dan tempel URL ini ke bidang telusur aplikasi Mastodon favorit Anda atau antarmuka web server Mastodon Anda.", "interaction_modal.preamble": "Karena Mastodon itu terdesentralisasi, Anda dapat menggunakan akun Anda yang sudah ada yang berada di server Mastodon lain atau platform yang kompatibel jika Anda tidak memiliki sebuah akun di sini.", - "interaction_modal.title.favourite": "Favoritkan kiriman {name}", "interaction_modal.title.follow": "Ikuti {name}", "interaction_modal.title.reblog": "Boost kiriman {name}", "interaction_modal.title.reply": "Balas ke kiriman {name}", @@ -319,8 +311,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "untuk pindah ke bawah dalam sebuah daftar", "keyboard_shortcuts.enter": "Buka kiriman", - "keyboard_shortcuts.favourite": "untuk memfavoritkan", - "keyboard_shortcuts.favourites": "buka daftar favorit", "keyboard_shortcuts.federated": "buka linimasa gabungan", "keyboard_shortcuts.heading": "Pintasan keyboard", "keyboard_shortcuts.home": "Buka linimasa beranda", @@ -380,7 +370,6 @@ "navigation_bar.domain_blocks": "Domain tersembunyi", "navigation_bar.edit_profile": "Ubah profil", "navigation_bar.explore": "Jelajahi", - "navigation_bar.favourites": "Favorit", "navigation_bar.filters": "Kata yang dibisukan", "navigation_bar.follow_requests": "Permintaan mengikuti", "navigation_bar.followed_tags": "Tagar yang diikuti", @@ -397,7 +386,6 @@ "not_signed_in_indicator.not_signed_in": "Anda harus masuk untuk mengakses sumber daya ini.", "notification.admin.report": "{name} melaporkan {target}", "notification.admin.sign_up": "{name} mendaftar", - "notification.favourite": "{name} memfavorit kiriman Anda", "notification.follow": "{name} mengikuti Anda", "notification.follow_request": "{name} ingin mengikuti Anda", "notification.mention": "{name} menyebut Anda", @@ -411,7 +399,6 @@ "notifications.column_settings.admin.report": "Laporan baru:", "notifications.column_settings.admin.sign_up": "Pendaftaran baru:", "notifications.column_settings.alert": "Notifikasi desktop", - "notifications.column_settings.favourite": "Favorit:", "notifications.column_settings.filter_bar.advanced": "Tampilkan semua kategori", "notifications.column_settings.filter_bar.category": "Bilah penyaring cepat", "notifications.column_settings.filter_bar.show_bar": "Tampilkan bilah filter", @@ -429,7 +416,6 @@ "notifications.column_settings.update": "Edit:", "notifications.filter.all": "Semua", "notifications.filter.boosts": "Boost", - "notifications.filter.favourites": "Favorit", "notifications.filter.follows": "Diikuti", "notifications.filter.mentions": "Sebutan", "notifications.filter.polls": "Hasil japat", @@ -557,7 +543,6 @@ "server_banner.server_stats": "Statistik server:", "sign_in_banner.create_account": "Buat akun", "sign_in_banner.sign_in": "Masuk", - "sign_in_banner.text": "Masuk untuk mengikuti profil atau tagar, memfavoritkan, membagi, dan membalas kiriman. Anda juga dapat berinteraksi dari akun Anda di server yang berbeda.", "status.admin_account": "Buka antarmuka moderasi untuk @{name}", "status.admin_domain": "Buka antarmuka moderasi untuk {domain}", "status.admin_status": "Buka kiriman ini dalam antar muka moderasi", @@ -572,7 +557,6 @@ "status.edited": "Diedit {date}", "status.edited_x_times": "Diedit {count, plural, other {{count} kali}}", "status.embed": "Tanam", - "status.favourite": "Difavoritkan", "status.filter": "Saring kiriman ini", "status.filtered": "Disaring", "status.hide": "Sembunyikan pos", diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json index e03fa838b8..c2160528ca 100644 --- a/app/javascript/mastodon/locales/ig.json +++ b/app/javascript/mastodon/locales/ig.json @@ -32,11 +32,9 @@ "confirmations.delete.message": "Are you sure you want to delete this status?", "confirmations.delete_list.confirm": "Hichapụ", "confirmations.domain_block.confirm": "Hide entire domain", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "confirmations.reply.confirm": "Zaa", "conversation.delete": "Hichapụ nkata", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "emoji_button.search": "Chọọ...", @@ -55,8 +53,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -87,7 +83,6 @@ "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.lists": "Ndepụta", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.reblog": "{name} boosted your status", "onboarding.actions.go_to_explore": "See what's trending", "onboarding.actions.go_to_home": "Go to your home feed", @@ -116,7 +111,6 @@ "search_results.total": "{count, plural, one {# result} other {# results}}", "server_banner.active_users": "ojiarụ dị ìrè", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.bookmark": "Kee ebenrụtụakā", "status.copy": "Copy link to status", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index 8b8b447e45..443c73e4ce 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -89,7 +89,6 @@ "column.community": "Lokala tempolineo", "column.directory": "Videz profili", "column.domain_blocks": "Hidden domains", - "column.favourites": "Favorati", "column.follow_requests": "Demandi di sequado", "column.home": "Hemo", "column.lists": "Listi", @@ -152,7 +151,6 @@ "confirmations.mute.explanation": "Co celigos posti de oli e posti quo mencionas oli, ma ol ankore permisas oli vidar vua posti e sequar vu.", "confirmations.mute.message": "Ka vu certe volas silencigar {name}?", "confirmations.redraft.confirm": "Efacez e riskisez", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", "confirmations.reply.confirm": "Respondez", "confirmations.reply.message": "Respondar nun remplos mesajo quon vu nun igas. Ka vu certe volas durar?", "confirmations.unfollow.confirm": "Desequez", @@ -170,7 +168,6 @@ "dismissable_banner.community_timeline": "Co esas maxim recenta publika posti de personi quo havas konto quo hostigesas da {domain}.", "dismissable_banner.dismiss": "Ignorez", "dismissable_banner.explore_links": "Ca nova rakonti parolesas da personi che ca e altra servili di necentraligita situo nun.", - "dismissable_banner.explore_statuses": "Ca posti de ca e altra servili en la necentraligita situo bezonas plu famoza che ca servilo nun.", "dismissable_banner.explore_tags": "Ca hashtagi bezonas plu famoza inter personi che ca e altra servili di la necentraligita situo nun.", "embed.instructions": "Embed this status on your website by copying the code below.", "embed.preview": "Co esas quon ol semblos tale:", @@ -197,8 +194,6 @@ "empty_column.community": "La lokala tempolineo esas vakua. Skribez ulo publike por iniciar la agiveso!", "empty_column.domain_blocks": "There are no hidden domains yet.", "empty_column.explore_statuses": "Nulo esas tendenca nun. Videz itere pose!", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", "empty_column.follow_requests": "Vu ne havas irga sequodemandi til nun. Kande vu ganas talo, ol montresos hike.", "empty_column.hashtag": "Esas ankore nulo en ta gretovorto.", "empty_column.home": "Vua hemtempolineo esas vakua! Sequez plu multa personi por plenigar lu. {suggestions}", @@ -252,14 +247,12 @@ "home.column_settings.show_replies": "Montrar respondi", "home.hide_announcements": "Celez anunci", "home.show_announcements": "Montrez anunci", - "interaction_modal.description.favourite": "Per konto che Mastodon, vu povas favorizar ca posto por savigar postero ke vu gratitudizar lu e retenar por la futuro.", "interaction_modal.description.follow": "Per konto che Mastodon, vu povas sequar {name} por ganar ola posti en vua hemniuzeto.", "interaction_modal.description.reblog": "Per konto che Mastodon, vu povas bustizar ca posti por partigar kun sua sequanti.", "interaction_modal.description.reply": "Per konto che Mastodon, vu povas respondar ca posto.", "interaction_modal.on_another_server": "Che diferanta servilo", "interaction_modal.on_this_server": "Che ca servilo", "interaction_modal.preamble": "Pro ke Mastodon esas necentraligita, on povas uzar vua havata konto quo hostigesas altra servilo di Mastodon o konciliebla metodo se on ne havas konto hike.", - "interaction_modal.title.favourite": "Favorata posto di {name}", "interaction_modal.title.follow": "Sequez {name}", "interaction_modal.title.reblog": "Bustizez posto di {name}", "interaction_modal.title.reply": "Respondez posto di {name}", @@ -275,8 +268,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -334,7 +325,6 @@ "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.edit_profile": "Modifikar profilo", "navigation_bar.explore": "Explorez", - "navigation_bar.favourites": "Favorati", "navigation_bar.filters": "Silencigita vorti", "navigation_bar.follow_requests": "Demandi di sequado", "navigation_bar.follows_and_followers": "Sequati e sequanti", @@ -349,7 +339,6 @@ "not_signed_in_indicator.not_signed_in": "Vu mustas enirar por acesar ca moyeno.", "notification.admin.report": "{name} raportizis {target}", "notification.admin.sign_up": "{name} registresis", - "notification.favourite": "{name} favorizis tua mesajo", "notification.follow": "{name} sequeskis tu", "notification.follow_request": "{name} demandas sequar vu", "notification.mention": "{name} mencionis tu", @@ -363,7 +352,6 @@ "notifications.column_settings.admin.report": "Nova raporti:", "notifications.column_settings.admin.sign_up": "Nova registranti:", "notifications.column_settings.alert": "Desktopavizi", - "notifications.column_settings.favourite": "Favorati:", "notifications.column_settings.filter_bar.advanced": "Montrez omna kategorii", "notifications.column_settings.filter_bar.category": "Rapidfiltrobaro", "notifications.column_settings.filter_bar.show_bar": "Montrez filtrobaro", @@ -381,7 +369,6 @@ "notifications.column_settings.update": "Modifikati:", "notifications.filter.all": "Omna", "notifications.filter.boosts": "Busti", - "notifications.filter.favourites": "Favorati", "notifications.filter.follows": "Sequati", "notifications.filter.mentions": "Mencioni", "notifications.filter.polls": "Votpostorezulti", @@ -502,7 +489,6 @@ "server_banner.server_stats": "Servilstatistiko:", "sign_in_banner.create_account": "Kreez konto", "sign_in_banner.sign_in": "Enirez", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "Apertez jerintervizajo por @{name}", "status.admin_status": "Open this status in the moderation interface", "status.block": "Restriktez @{name}", @@ -516,7 +502,6 @@ "status.edited": "Modifikesis ye {date}", "status.edited_x_times": "Modifikesis {count, plural, one {{count} foyo} other {{count} foyi}}", "status.embed": "Eninsertez", - "status.favourite": "Favorizar", "status.filter": "Filtragez ca posto", "status.filtered": "Filtrita", "status.history.created": "{name} kreis ye {date}", diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json index f430e1f8a7..38edc2b5e3 100644 --- a/app/javascript/mastodon/locales/is.json +++ b/app/javascript/mastodon/locales/is.json @@ -363,6 +363,7 @@ "lightbox.previous": "Fyrra", "limited_account_hint.action": "Birta notandasniðið samt", "limited_account_hint.title": "Þetta notandasnið hefur verið falið af umsjónarmönnum {domain}.", + "link_preview.author": "Eftir {name}", "lists.account.add": "Bæta á lista", "lists.account.remove": "Fjarlægja af lista", "lists.delete": "Eyða lista", @@ -412,7 +413,7 @@ "not_signed_in_indicator.not_signed_in": "Þú þarft að skrá þig inn til að nota þetta tilfang.", "notification.admin.report": "{name} kærði {target}", "notification.admin.sign_up": "{name} skráði sig", - "notification.favourite": "{name} setti færslu þína í eftirlæti", + "notification.favourite": "{name} setti færsluna þína í eftirlæti", "notification.follow": "{name} fylgist með þér", "notification.follow_request": "{name} hefur beðið um að fylgjast með þér", "notification.mention": "{name} minntist á þig", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index 1b6ec49a61..d78514073c 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "Questo nasconderà i post da loro e i post che li menzionano, ma consentirà comunque loro di visualizzare i tuoi post e di seguirti.", "confirmations.mute.message": "Sei sicuro di voler silenziare {name}?", "confirmations.redraft.confirm": "Elimina e riscrivi", - "confirmations.redraft.message": "Sei sicuro di voler eliminare questo post e riscriverlo? I preferiti e i potenziamenti andranno persi e le risposte al post originale non saranno più collegate.", + "confirmations.redraft.message": "Sei sicuro di voler eliminare questo post e riscriverlo? I preferiti e i boost andranno persi e le risposte al post originale non saranno più collegate.", "confirmations.reply.confirm": "Rispondi", "confirmations.reply.message": "Rispondere ora sovrascriverà il messaggio che stai correntemente componendo. Sei sicuro di voler procedere?", "confirmations.unfollow.confirm": "Smetti di seguire", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Questi sono i post pubblici più recenti da persone i cui profili sono ospitati da {domain}.", "dismissable_banner.dismiss": "Ignora", "dismissable_banner.explore_links": "Queste notizie sono discusse da persone su questo e altri server della rete decentralizzata, al momento.", - "dismissable_banner.explore_statuses": "Questi post da questo e altri server nella rete decentralizzata, stanno ottenendo popolarità su questo server al momento.", + "dismissable_banner.explore_statuses": "Questi sono post da tutto il social web che stanno guadagnando popolarità oggi. I post più recenti con più condivisioni e preferiti sono classificati più in alto.", "dismissable_banner.explore_tags": "Questi hashtag stanno ottenendo popolarità tra le persone su questo e altri server della rete decentralizzata, al momento.", "dismissable_banner.public_timeline": "Questi sono i post pubblici più recenti di persone sul social che le persone su {domain} seguono.", "embed.instructions": "Incorpora questo post sul tuo sito web, copiando il seguente codice.", @@ -307,15 +307,15 @@ "home.explore_prompt.title": "Questa è la tua base all'interno di Mastodon.", "home.hide_announcements": "Nascondi annunci", "home.show_announcements": "Mostra annunci", - "interaction_modal.description.favourite": "Con un profilo di Mastodon, puoi salvare questo post tra i preferiti per far sapere all'autore che lo apprezzi e lo hai salvato per dopo.", + "interaction_modal.description.favourite": "Con un account su Mastodon, puoi aggiungere questo post ai preferiti per far sapere all'autore che lo apprezzi e salvarlo per dopo.", "interaction_modal.description.follow": "Con un profilo di Mastodon, puoi seguire {name} per ricevere i suoi post nel feed della tua home.", "interaction_modal.description.reblog": "Con un profilo di Mastodon, puoi rebloggare questo post per condividerlo con i tuoi seguaci.", "interaction_modal.description.reply": "Con un profilo di Mastodon, puoi rispondere a questo post.", "interaction_modal.on_another_server": "Su un altro server", "interaction_modal.on_this_server": "Su questo server", - "interaction_modal.other_server_instructions": "Copia e incolla questo URL nel campo di ricerca della tua app di Mastodon preferita o dell'interfaccia web del tuo server di Mastodon.", + "interaction_modal.other_server_instructions": "Copia e incolla questo URL nel campo di ricerca della tua app Mastodon preferita o nell'interfaccia web del tuo server Mastodon.", "interaction_modal.preamble": "Poiché Mastodon è decentralizzato, puoi utilizzare il tuo profilo esistente ospitato da un altro server di Mastodon on piattaforma compatibile, se non hai un profilo su questo.", - "interaction_modal.title.favourite": "Post preferito di {name}", + "interaction_modal.title.favourite": "Contrassegna il post di {name} come preferito", "interaction_modal.title.follow": "Segui {name}", "interaction_modal.title.reblog": "Reblogga il post di {name}", "interaction_modal.title.reply": "Rispondi al post di {name}", @@ -331,8 +331,8 @@ "keyboard_shortcuts.direct": "per aprire la colonna menzioni private", "keyboard_shortcuts.down": "Scorri in basso nell'elenco", "keyboard_shortcuts.enter": "Apre il post", - "keyboard_shortcuts.favourite": "Salva il post tra i preferiti", - "keyboard_shortcuts.favourites": "Apre l'elenco dei preferiti", + "keyboard_shortcuts.favourite": "Contrassegna il post come preferito", + "keyboard_shortcuts.favourites": "Apri l'elenco dei preferiti", "keyboard_shortcuts.federated": "Apre la cronologia federata", "keyboard_shortcuts.heading": "Scorciatoie da tastiera", "keyboard_shortcuts.home": "Apre la cronologia domestica", @@ -363,6 +363,7 @@ "lightbox.previous": "Precedente", "limited_account_hint.action": "Mostra comunque il profilo", "limited_account_hint.title": "Questo profilo è stato nascosto dai moderatori di {domain}.", + "link_preview.author": "Di {name}", "lists.account.add": "Aggiungi alla lista", "lists.account.remove": "Togli dalla lista", "lists.delete": "Elimina lista", @@ -412,7 +413,7 @@ "not_signed_in_indicator.not_signed_in": "Devi accedere per consultare questa risorsa.", "notification.admin.report": "{name} ha segnalato {target}", "notification.admin.sign_up": "{name} si è iscritto", - "notification.favourite": "{name} ha salvato il tuo post tra i preferiti", + "notification.favourite": "{name} ha aggiunto il tuo post ai preferiti", "notification.follow": "{name} ha iniziato a seguirti", "notification.follow_request": "{name} ha richiesto di seguirti", "notification.mention": "{name} ti ha menzionato", @@ -595,7 +596,7 @@ "server_banner.server_stats": "Statistiche del server:", "sign_in_banner.create_account": "Crea un profilo", "sign_in_banner.sign_in": "Accedi", - "sign_in_banner.text": "Accedi per seguire profili o hashtag, segnare messaggi come preferiti, condividere e rispondere ai messaggi. Puoi anche interagire dal tuo account su un server diverso.", + "sign_in_banner.text": "Accedi per seguire profili o hashtag, condividere, rispondere e aggiungere post ai preferiti. Puoi anche interagire dal tuo account su un server diverso.", "status.admin_account": "Apri interfaccia di moderazione per @{name}", "status.admin_domain": "Apri l'interfaccia di moderazione per {domain}", "status.admin_status": "Apri questo post nell'interfaccia di moderazione", @@ -612,7 +613,7 @@ "status.edited": "Modificato il {date}", "status.edited_x_times": "Modificato {count, plural, one {{count} volta} other {{count} volte}}", "status.embed": "Incorpora", - "status.favourite": "Salva preferito", + "status.favourite": "Preferito", "status.filter": "Filtra questo post", "status.filtered": "Filtrato", "status.hide": "Nascondi il post", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index dbeda7bfd7..91b7255ebd 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -96,7 +96,7 @@ "bundle_column_error.network.title": "ネットワークエラー", "bundle_column_error.retry": "再試行", "bundle_column_error.return": "ホームに戻る", - "bundle_column_error.routing.body": "要求されたページは見つかりませんでした。アドレスバーの URL は正しいですか？", + "bundle_column_error.routing.body": "要求されたページは見つかりませんでした。アドレスバーのURLは正しいですか？", "bundle_column_error.routing.title": "404", "bundle_modal_error.close": "閉じる", "bundle_modal_error.message": "コンポーネントの読み込み中に問題が発生しました。", @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "これにより相手の投稿と返信は見えなくなりますが、相手はあなたをフォローし続け投稿を見ることができます。", "confirmations.mute.message": "本当に{name}さんをミュートしますか？", "confirmations.redraft.confirm": "削除して下書きに戻す", - "confirmations.redraft.message": "本当にこの投稿を削除して下書きに戻しますか？ この投稿へのお気に入り登録やブーストは失われ、返信は孤立することになります。", + "confirmations.redraft.message": "投稿を削除して下書きに戻します。この投稿へのお気に入り登録やブーストは失われ、返信は孤立することになります。よろしいですか？", "confirmations.reply.confirm": "返信", "confirmations.reply.message": "今返信すると現在作成中のメッセージが上書きされます。本当に実行しますか？", "confirmations.unfollow.confirm": "フォロー解除", @@ -202,9 +202,9 @@ "dismissable_banner.community_timeline": "これらは{domain}がホストしている人たちの最新の公開投稿です。", "dismissable_banner.dismiss": "閉じる", "dismissable_banner.explore_links": "ネットワーク上で話題になっているニュースです。たくさんのユーザーにシェアされた記事ほど上位に表示されます。", - "dismissable_banner.explore_statuses": "ネットワーク上で注目を集めている投稿です。ブーストやお気に入り登録の多い投稿が上位に表示されます。", + "dismissable_banner.explore_statuses": "ネットワーク上で注目を集めている投稿です。ブーストやお気に入り登録の多い新しい投稿が上位に表示されます。", "dismissable_banner.explore_tags": "ネットワーク上でトレンドになっているハッシュタグです。たくさんのユーザーに使われたタグほど上位に表示されます。", - "dismissable_banner.public_timeline": "{domain} のユーザーがリモートフォローしているアカウントからの公開投稿のタイムラインです。", + "dismissable_banner.public_timeline": "{domain}のユーザーがリモートフォローしているアカウントからの公開投稿のタイムラインです。", "embed.instructions": "下記のコードをコピーしてウェブサイトに埋め込みます。", "embed.preview": "表示例:", "emoji_button.activity": "活動", @@ -231,8 +231,8 @@ "empty_column.direct": "非公開の返信はまだありません。非公開でやりとりをするとここに表示されます。", "empty_column.domain_blocks": "ブロックしているドメインはありません。", "empty_column.explore_statuses": "まだ何もありません。後で確認してください。", - "empty_column.favourited_statuses": "まだ何もお気に入り登録していません。お気に入り登録するとここに表示されます。", - "empty_column.favourites": "まだ誰もお気に入り登録していません。お気に入り登録されるとここに表示されます。", + "empty_column.favourited_statuses": "お気に入りの投稿はまだありません。お気に入りに登録すると、ここに表示されます。", + "empty_column.favourites": "まだ誰もこの投稿をお気に入りに登録していません。お気に入りに登録されると、ここに表示されます。", "empty_column.follow_requests": "まだフォローリクエストを受けていません。フォローリクエストを受けるとここに表示されます。", "empty_column.followed_tags": "まだハッシュタグをフォローしていません。フォローするとここに表示されます。", "empty_column.hashtag": "このハッシュタグはまだ使われていません。", @@ -304,18 +304,18 @@ "home.column_settings.show_reblogs": "ブースト表示", "home.column_settings.show_replies": "返信表示", "home.explore_prompt.body": "ユーザーやハッシュタグをフォローすると、この「ホーム」タイムラインに投稿やブーストが流れるようになります。タイムラインをもう少し、にぎやかにしてみませんか？", - "home.explore_prompt.title": "Mastodon のタイムラインへようこそ。", + "home.explore_prompt.title": "Mastodonのタイムラインへようこそ。", "home.hide_announcements": "お知らせを隠す", "home.show_announcements": "お知らせを表示", - "interaction_modal.description.favourite": "Mastodonのアカウントでこの投稿をお気に入りに入れて投稿者に感謝を知らせたり保存することができます。", + "interaction_modal.description.favourite": "Mastodonのアカウントがあれば投稿をお気に入り登録して投稿者に気持ちを伝えたり、あとで見返すことができます。", "interaction_modal.description.follow": "Mastodonのアカウントで{name}さんをフォローしてホームフィードで投稿を受け取れます。", "interaction_modal.description.reblog": "Mastodonのアカウントでこの投稿をブーストして自分のフォロワーに共有できます。", "interaction_modal.description.reply": "Mastodonのアカウントでこの投稿に反応できます。", "interaction_modal.on_another_server": "別のサーバー", "interaction_modal.on_this_server": "このサーバー", - "interaction_modal.other_server_instructions": "このURLをお気に入りのMastodonアプリやMastodonサーバーのWebインターフェースの検索フィールドにコピーして貼り付けます。", + "interaction_modal.other_server_instructions": "以下のURLをコピーして、Mastodon対応アプリや自分のサーバーの検索欄に貼り付けます。", "interaction_modal.preamble": "Mastodonは分散化されているためアカウントを持っていなくても別のMastodonサーバーまたは互換性のあるプラットフォームでホストされているアカウントを使用できます。", - "interaction_modal.title.favourite": "{name}さんの投稿をお気に入り", + "interaction_modal.title.favourite": "{name}さんの投稿をお気に入り登録", "interaction_modal.title.follow": "{name}さんをフォロー", "interaction_modal.title.reblog": "{name}さんの投稿をブースト", "interaction_modal.title.reply": "{name}さんの投稿にリプライ", @@ -331,8 +331,8 @@ "keyboard_shortcuts.direct": "非公開の返信のカラムを開く", "keyboard_shortcuts.down": "カラム内一つ下に移動", "keyboard_shortcuts.enter": "投稿の詳細を表示", - "keyboard_shortcuts.favourite": "お気に入り", - "keyboard_shortcuts.favourites": "お気に入り登録のリストを開く", + "keyboard_shortcuts.favourite": "お気に入りの投稿", + "keyboard_shortcuts.favourites": "お気に入りリストを開く", "keyboard_shortcuts.federated": "連合タイムラインを開く", "keyboard_shortcuts.heading": "キーボードショートカット", "keyboard_shortcuts.home": "ホームタイムラインを開く", @@ -363,6 +363,7 @@ "lightbox.previous": "前", "limited_account_hint.action": "構わず表示する", "limited_account_hint.title": "このプロフィールは{domain}のモデレーターによって非表示にされています。", + "link_preview.author": "{name} が作成", "lists.account.add": "リストに追加", "lists.account.remove": "リストから外す", "lists.delete": "リストを削除", @@ -412,7 +413,7 @@ "not_signed_in_indicator.not_signed_in": "この機能を使うにはログインする必要があります。", "notification.admin.report": "{name}さんが{target}さんを通報しました", "notification.admin.sign_up": "{name}さんがサインアップしました", - "notification.favourite": "{name}さんがあなたの投稿をお気に入りに登録しました", + "notification.favourite": "{name}さんがあなたの投稿をお気に入りに追加しました。", "notification.follow": "{name}さんにフォローされました", "notification.follow_request": "{name}さんがあなたにフォローリクエストしました", "notification.mention": "{name}さんがあなたに返信しました", @@ -464,22 +465,22 @@ "onboarding.actions.go_to_home": "タイムラインに移動", "onboarding.compose.template": "#Mastodon はじめました", "onboarding.follows.empty": "おすすめに表示できるアカウントはまだありません。検索や「見つける」を活用して、ほかのアカウントを探してみましょう。", - "onboarding.follows.lead": "ホームタイムラインは Mastodon の軸足となる場所です。たくさんのユーザーをフォローすることで、ホームタイムラインはよりにぎやかでおもしろいものになります。手はじめに、おすすめのアカウントから何人かフォローしてみましょう:", + "onboarding.follows.lead": "ホームタイムラインはMastodonの軸足となる場所です。たくさんのユーザーをフォローすることで、ホームタイムラインはよりにぎやかでおもしろいものになります。手はじめに、おすすめのアカウントから何人かフォローしてみましょう:", "onboarding.follows.title": "ホームタイムラインを埋める", - "onboarding.share.lead": "新しい Mastodon アカウントをみんなに紹介しましょう。", + "onboarding.share.lead": "新しいMastodonのアカウントをみんなに紹介しましょう。", "onboarding.share.message": "「{username}」で #Mastodon はじめました！ {url}", "onboarding.share.next_steps": "次のステップに進む:", "onboarding.share.title": "プロフィールをシェアする", - "onboarding.start.lead": "Mastodon へようこそ。Mastodon は非中央集権型SNSのひとつで、ユーザーそれぞれの考えかたを尊重するプラットフォームです。ユーザーはどんな「好き」も自由に追いかけることができます。次のステップに進んで、新天地でのつながりをみつけましょう:", + "onboarding.start.lead": "Mastodonへようこそ。Mastodonは非中央集権型SNSのひとつで、ユーザーそれぞれの考えかたを尊重するプラットフォームです。ユーザーはどんな「好き」も自由に追いかけることができます。次のステップに進んで、新天地でのつながりをみつけましょう:", "onboarding.start.skip": "チュートリアルをスキップする:", "onboarding.start.title": "はじめに", - "onboarding.steps.follow_people.body": "ユーザーをフォローしてみましょう。これが Mastodon を楽しむ基本です。", + "onboarding.steps.follow_people.body": "ユーザーをフォローしてみましょう。これがMastodonを楽しむ基本です。", "onboarding.steps.follow_people.title": "ホームタイムラインを埋める", "onboarding.steps.publish_status.body": "試しになにか書いてみましょう。写真、ビデオ、アンケートなど、なんでも大丈夫です {emoji}", "onboarding.steps.publish_status.title": "はじめての投稿", "onboarding.steps.setup_profile.body": "ほかのユーザーが親しみやすいように、プロフィールを整えましょう。", "onboarding.steps.setup_profile.title": "プロフィールを完成させる", - "onboarding.steps.share_profile.body": "Mastodon アカウントをほかの人に紹介しましょう。", + "onboarding.steps.share_profile.body": "Mastodonのアカウントをほかの人に紹介しましょう。", "onboarding.steps.share_profile.title": "プロフィールをシェアする", "onboarding.tips.2fa": "ワンポイント アカウント設定から2要素認証を有効にして、アカウントのセキュリティを強化しておきましょう。認証には任意のワンタイムパスワード（TOTP）アプリを利用でき、電話番号は不要です。", "onboarding.tips.accounts_from_other_servers": "ワンポイント Mastodon はたくさんのサーバーがつながりあってできている非中央集権型のSNSです。いくつかのアカウントはこことは別のサーバーに所属していることがありますが、サーバーの違いを意識しなくても同じようにフォローすることができます。サーバーが異なる場合は、ユーザー名の後半にサーバー名が表示されます。", @@ -571,11 +572,11 @@ "report_notification.open": "通報を開く", "search.no_recent_searches": "検索履歴はありません", "search.placeholder": "検索", - "search.quick_action.account_search": "{x} に該当するプロフィール", - "search.quick_action.go_to_account": "{x} のプロフィールを見る", - "search.quick_action.go_to_hashtag": "{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": "MastodonでURLを開く", - "search.quick_action.status_search": "{x} に該当する投稿", + "search.quick_action.status_search": "{x}に該当する投稿", "search.search_or_paste": "検索またはURLを入力", "search_popout.quick_actions": "クイック操作", "search_popout.recent": "最近の検索", @@ -595,7 +596,7 @@ "server_banner.server_stats": "サーバーの情報", "sign_in_banner.create_account": "アカウント作成", "sign_in_banner.sign_in": "ログイン", - "sign_in_banner.text": "ログインしてプロファイルやハッシュタグ、お気に入りをフォローしたり、投稿を共有したり、返信したり、別のサーバーのアカウントと交流したりできます。", + "sign_in_banner.text": "アカウントがあればユーザーやハッシュタグをフォローしたり、投稿のお気に入り登録やブースト、投稿への返信ができます。別のサーバーのユーザーとの交流も可能です。", "status.admin_account": "@{name}さんのモデレーション画面を開く", "status.admin_domain": "{domain}のモデレーション画面を開く", "status.admin_status": "この投稿をモデレーション画面で開く", @@ -648,7 +649,7 @@ "status.show_more": "もっと見る", "status.show_more_all": "全て見る", "status.show_original": "原文を表示", - "status.title.with_attachments": "{user} の投稿 {attachmentCount, plural, other {({attachmentCount}件のメディア)}}", + "status.title.with_attachments": "{user}さんの投稿 {attachmentCount, plural, other {({attachmentCount}件のメディア)}}", "status.translate": "翻訳", "status.translated_from_with": "{provider}を使って{lang}から翻訳", "status.uncached_media_warning": "プレビューは使用できません", diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json index e92cc49baf..50e3794a07 100644 --- a/app/javascript/mastodon/locales/ka.json +++ b/app/javascript/mastodon/locales/ka.json @@ -46,7 +46,6 @@ "column.blocks": "დაბლოკილი მომხმარებლები", "column.community": "ლოკალური თაიმლაინი", "column.domain_blocks": "დამალული დომენები", - "column.favourites": "ფავორიტები", "column.follow_requests": "დადევნების მოთხოვნები", "column.home": "სახლი", "column.lists": "სიები", @@ -87,11 +86,9 @@ "confirmations.mute.confirm": "გაჩუმება", "confirmations.mute.message": "დარწმუნებული ხართ, გსურთ გააჩუმოთ {name}?", "confirmations.redraft.confirm": "გაუქმება და გადანაწილება", - "confirmations.redraft.message": "დარწმუნებული ხართ, გსურთ გააუქმოთ ეს სტატუსი და გადაანაწილოთ? დაკარგავთ ყველა პასუხს, ბუსტს და მასზედ არსებულ ფავორიტს.", "confirmations.unfollow.confirm": "ნუღარ მიჰყვები", "confirmations.unfollow.message": "დარწმუნებული ხართ, აღარ გსურთ მიჰყვებოდეთ {name}-ს?", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "ეს სტატუსი ჩასვით თქვენს ვებ-საიტზე შემდეგი კოდის კოპირებით.", "embed.preview": "ესაა თუ როგორც გამოჩნდება:", @@ -113,8 +110,6 @@ "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", "empty_column.community": "ლოკალური თაიმლაინი ცარიელია. დაწერეთ რაიმე ღიად ან ქენით რაიმე სხვა!", "empty_column.domain_blocks": "There are no hidden domains yet.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", "empty_column.hashtag": "ამ ჰეშტეგში ჯერ არაფერია.", "empty_column.home": "თქვენი სახლის თაიმლაინი ცარიელია! ესტუმრეთ {public}-ს ან დასაწყისისთვის გამოიყენეთ ძებნა, რომ შეხვდეთ სხვა მომხმარებლებს.", "empty_column.list": "ამ სიაში ჯერ არაფერია. როდესაც სიის წევრები დაპოსტავენ ახალ სტატუსებს, ისინი გამოჩნდებიან აქ.", @@ -136,8 +131,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "სიაში ქვემოთ გადასაადგილებლად", "keyboard_shortcuts.enter": "სტატუსის გასახსნელად", - "keyboard_shortcuts.favourite": "ფავორიტად ქცევისთვის", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "კლავიატურის სწრაფი ბმულები", "keyboard_shortcuts.home": "to open home timeline", @@ -181,7 +174,6 @@ "navigation_bar.discover": "აღმოაჩინე", "navigation_bar.domain_blocks": "დამალული დომენები", "navigation_bar.edit_profile": "შეცვალე პროფილი", - "navigation_bar.favourites": "ფავორიტები", "navigation_bar.filters": "გაჩუმებული სიტყვები", "navigation_bar.follow_requests": "დადევნების მოთხოვნები", "navigation_bar.lists": "სიები", @@ -193,14 +185,12 @@ "navigation_bar.public_timeline": "ფედერალური თაიმლაინი", "navigation_bar.security": "უსაფრთხოება", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name}-მა თქვენი სტატუსი აქცია ფავორიტად", "notification.follow": "{name} გამოგყვათ", "notification.mention": "{name}-მა გასახელათ", "notification.reblog": "{name}-მა დაბუსტა თქვენი სტატუსი", "notifications.clear": "შეტყობინებების გასუფთავება", "notifications.clear_confirmation": "დარწმუნებული ხართ, გსურთ სამუდამოდ წაშალოთ ყველა თქვენი შეტყობინება?", "notifications.column_settings.alert": "დესკტოპ შეტყობინებები", - "notifications.column_settings.favourite": "ფავორიტები:", "notifications.column_settings.follow": "ახალი მიმდევრები:", "notifications.column_settings.mention": "ხსენებები:", "notifications.column_settings.push": "ფუშ შეტყობინებები", @@ -249,7 +239,6 @@ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.block": "დაბლოკე @{name}", "status.cancel_reblog_private": "ბუსტის მოშორება", @@ -258,7 +247,6 @@ "status.delete": "წაშლა", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", "status.embed": "ჩართვა", - "status.favourite": "ფავორიტი", "status.filtered": "ფილტრირებული", "status.load_more": "მეტის ჩატვირთვა", "status.media_hidden": "მედია დამალულია", diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json index a8cbabe344..d13a80fa03 100644 --- a/app/javascript/mastodon/locales/kab.json +++ b/app/javascript/mastodon/locales/kab.json @@ -70,7 +70,6 @@ "column.community": "Tasuddemt tadigant", "column.directory": "Inig deg imaɣnuten", "column.domain_blocks": "Taɣulin yeffren", - "column.favourites": "Ismenyifen", "column.follow_requests": "Isuturen n teḍfeṛt", "column.home": "Agejdan", "column.lists": "Tibdarin", @@ -127,7 +126,6 @@ "confirmations.mute.explanation": "Aya ad yeffer iznan-is d wid i deg d-yettwabder neɣ d-tettwabder, maca xas akka yezmer neɣ tezmer awali n yiznan-inek d uḍfaṛ-ik.", "confirmations.mute.message": "Tetḥeqqeḍ belli tebɣiḍ ad ttegugmeḍ {name}?", "confirmations.redraft.confirm": "Sfeḍ & Ɛiwed tira", - "confirmations.redraft.message": "Tetḥeqqeḍ belli tebɣiḍ tuksa n waddad-agi iwakken ad s-tɛiwdeḍ tira? Ismenyifen d beḍḍuwat ad ṛuḥen, ma d tiririyin-is ad uɣalent d tigujilin.", "confirmations.reply.confirm": "Err", "confirmations.reply.message": "Tiririt akka tura ad k-degger izen-agi i tettaruḍ. Tebɣiḍ ad tkemmleḍ?", "confirmations.unfollow.confirm": "Ur ḍḍafaṛ ara", @@ -144,7 +142,6 @@ "directory.recently_active": "Yermed xas melmi kan", "disabled_account_banner.account_settings": "Iγewwaṛen n umiḍan", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Ẓẓu addad-agi deg usmel-inek s wenγal n tangalt yellan sdaw-agi.", "embed.preview": "Akka ara d-iban:", @@ -169,8 +166,6 @@ "empty_column.bookmarked_statuses": "Ulac tijewwaqin i terniḍ ɣer yismenyifen-ik ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.", "empty_column.community": "Tasuddemt tazayezt tadigant n yisallen d tilemt. Aru ihi kra akken ad tt-teččareḍ!", "empty_column.domain_blocks": "Ulac kra n taɣult yettwaffren ar tura.", - "empty_column.favourited_statuses": "Ulac ula yiwet n tjewwaqt deg yismenyifen-ik ar tura. Ticki Tella-d yiwet, ad d-ban da.", - "empty_column.favourites": "Ula yiwen ur yerri tajewwaqt-agi deg yismenyifen-is. Melmi i d-yella waya, ad d-yettwasken da.", "empty_column.follow_requests": "Ulac ɣur-k ula yiwen n usuter n teḍfeṛt. Ticki teṭṭfeḍ-d yiwen ad d-yettwasken da.", "empty_column.hashtag": "Ar tura ulac kra n ugbur yesɛan assaɣ ɣer uhacṭag-agi.", "empty_column.home": "Tasuddemt tagejdant n yisallen d tilemt! Ẓer {public} neɣ nadi ad tafeḍ imseqdacen-nniḍen ad ten-ḍefṛeḍ.", @@ -230,8 +225,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "i kennu ɣer wadda n tebdart", "keyboard_shortcuts.enter": "i tildin n tsuffeɣt", - "keyboard_shortcuts.favourite": "akken ad ternuḍ ɣer yismenyifen", - "keyboard_shortcuts.favourites": "i tildin umuɣ n yismenyifen", "keyboard_shortcuts.federated": "i tildin n tsuddemt tamatut n yisallen", "keyboard_shortcuts.heading": "Inegzumen n unasiw", "keyboard_shortcuts.home": "i tildin n tsuddemt tagejdant n yisallen", @@ -288,7 +281,6 @@ "navigation_bar.domain_blocks": "Tiɣula yeffren", "navigation_bar.edit_profile": "Ẓreg amaɣnu", "navigation_bar.explore": "Snirem", - "navigation_bar.favourites": "Ismenyifen", "navigation_bar.filters": "Awalen i yettwasgugmen", "navigation_bar.follow_requests": "Isuturen n teḍfeṛt", "navigation_bar.follows_and_followers": "Imeḍfaṛen akked wid i teṭṭafaṛeḍ", @@ -302,7 +294,6 @@ "navigation_bar.search": "Nadi", "navigation_bar.security": "Taɣellist", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} yesmenyef tasuffeɣt-ik·im", "notification.follow": "{name} yeṭṭafaṛ-ik", "notification.follow_request": "{name} yessuter-d ad k-yeḍfeṛ", "notification.mention": "{name} yebder-ik-id", @@ -313,7 +304,6 @@ "notifications.clear": "Sfeḍ tilɣa", "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?", "notifications.column_settings.alert": "Tilɣa n tnarit", - "notifications.column_settings.favourite": "Ismenyifen:", "notifications.column_settings.filter_bar.advanced": "Ssken-d meṛṛa tiggayin", "notifications.column_settings.filter_bar.category": "Iri n usizdeg uzrib", "notifications.column_settings.follow": "Imeḍfaṛen imaynuten:", @@ -327,7 +317,6 @@ "notifications.column_settings.status": "Tiẓenẓunin timaynutin:", "notifications.filter.all": "Akk", "notifications.filter.boosts": "Seǧhed", - "notifications.filter.favourites": "Ismenyifen", "notifications.filter.follows": "Yeṭafaṛ", "notifications.filter.mentions": "Abdar", "notifications.filter.polls": "Igemmaḍ n usenqed", @@ -408,7 +397,6 @@ "server_banner.learn_more": "Issin ugar", "sign_in_banner.create_account": "Snulfu-d amiḍan", "sign_in_banner.sign_in": "Qqen", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.block": "Seḥbes @{name}", "status.bookmark": "Creḍ", @@ -420,7 +408,6 @@ "status.edited": "Tettwaẓreg deg {date}", "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}", "status.embed": "Seddu", - "status.favourite": "Rnu ɣer yismenyifen", "status.filtered": "Yettwasizdeg", "status.load_more": "Sali ugar", "status.media_hidden": "Taɣwalt tettwaffer", diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json index 125ccc12a0..9e4855efde 100644 --- a/app/javascript/mastodon/locales/kk.json +++ b/app/javascript/mastodon/locales/kk.json @@ -75,7 +75,6 @@ "column.community": "Жергілікті желі", "column.directory": "Профильдерді аралау", "column.domain_blocks": "Жасырылған домендер", - "column.favourites": "Таңдаулылар", "column.follow_requests": "Жазылу сұранымдары", "column.home": "Басты бет", "column.lists": "Тізімдер", @@ -129,7 +128,6 @@ "confirmations.mute.explanation": "Олардың посттары же олар туралы меншндар сізге көрінбейді, бірақ олар сіздің посттарды көре алады және жазыла алады.", "confirmations.mute.message": "{name} атты қолданушы үнсіз болсын ба?", "confirmations.redraft.confirm": "Өшіруді құптау", - "confirmations.redraft.message": "Бұл жазбаны өшіріп, нобайларға жібереміз бе? Барлық жауаптар мен лайктарды жоғалтасыз.", "confirmations.reply.confirm": "Жауап", "confirmations.reply.message": "Жауабыңыз жазып жатқан жазбаңыздың үстіне кетеді. Жалғастырамыз ба?", "confirmations.unfollow.confirm": "Оқымау", @@ -144,7 +142,6 @@ "directory.new_arrivals": "Жаңадан келгендер", "directory.recently_active": "Жақында кіргендер", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Төмендегі кодты көшіріп алу арқылы жазбаны басқа сайттарға да орналастыра аласыз.", "embed.preview": "Былай көрінетін болады:", @@ -168,8 +165,6 @@ "empty_column.bookmarked_statuses": "Ешқандай жазба Бетбелгілер тізіміне қосылмапты. Қосылғаннан кейін осында жинала бастайды.", "empty_column.community": "Жергілікті желі бос. Сіз бастап жазыңыз!", "empty_column.domain_blocks": "Бұғатталған домен жоқ.", - "empty_column.favourited_statuses": "Ешқандай жазба 'Таңдаулылар' тізіміне қосылмапты. Қосылғаннан кейін осында жинала бастайды.", - "empty_column.favourites": "Бұл постты әлі ешкім 'Таңдаулылар' тізіміне қоспапты. Біреу бастағаннан кейін осында көрінетін болады.", "empty_column.follow_requests": "Әлі ешқандай жазылуға сұранымдар келмеді. Жаңа сұранымдар осында көрінетін болады.", "empty_column.hashtag": "Бұндай хэштегпен әлі ешкім жазбапты.", "empty_column.home": "Әлі ешкімге жазылмапсыз. Бәлкім {public} жазбаларын қарап немесе іздеуді қолданып көрерсіз.", @@ -212,8 +207,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "тізімде төмен түсу", "keyboard_shortcuts.enter": "жазбаны ашу", - "keyboard_shortcuts.favourite": "таңдаулыға қосу", - "keyboard_shortcuts.favourites": "таңдаулылар тізімін ашу", "keyboard_shortcuts.federated": "жаңандық желіні ашу", "keyboard_shortcuts.heading": "Қысқа кодтар тақтасы", "keyboard_shortcuts.home": "жергілікті жазбаларды қарау", @@ -260,7 +253,6 @@ "navigation_bar.discover": "шарлау", "navigation_bar.domain_blocks": "Жабық домендер", "navigation_bar.edit_profile": "Профиль түзету", - "navigation_bar.favourites": "Таңдаулылар", "navigation_bar.filters": "Үнсіз сөздер", "navigation_bar.follow_requests": "Жазылуға сұранғандар", "navigation_bar.follows_and_followers": "Жазылымдар және оқырмандар", @@ -273,7 +265,6 @@ "navigation_bar.public_timeline": "Жаһандық желі", "navigation_bar.security": "Қауіпсіздік", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} жазбаңызды таңдаулыға қосты", "notification.follow": "{name} сізге жазылды", "notification.follow_request": "{name} сізге жазылғысы келеді", "notification.mention": "{name} сізді атап өтті", @@ -283,7 +274,6 @@ "notifications.clear": "Ескертпелерді тазарт", "notifications.clear_confirmation": "Шынымен барлық ескертпелерді өшіресіз бе?", "notifications.column_settings.alert": "Үстел ескертпелері", - "notifications.column_settings.favourite": "Таңдаулылар:", "notifications.column_settings.filter_bar.advanced": "Барлық категорияны көрсет", "notifications.column_settings.filter_bar.category": "Жедел сүзгі", "notifications.column_settings.follow": "Жаңа оқырмандар:", @@ -297,7 +287,6 @@ "notifications.column_settings.status": "New toots:", "notifications.filter.all": "Барлығы", "notifications.filter.boosts": "Бөлісулер", - "notifications.filter.favourites": "Таңдаулылар", "notifications.filter.follows": "Жазылулар", "notifications.filter.mentions": "Аталымдар", "notifications.filter.polls": "Сауалнама нәтижелері", @@ -352,7 +341,6 @@ "search_results.statuses_fts_disabled": "Mastodon серверінде постты толық мәтінмен іздей алмайсыз.", "search_results.total": "{count, number} {count, plural, one {нәтиже} other {нәтиже}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "@{name} үшін модерация интерфейсін аш", "status.admin_status": "Бұл жазбаны модерация интерфейсінде аш", "status.block": "Бұғаттау @{name}", @@ -364,7 +352,6 @@ "status.detailed_status": "Толық пікірталас көрінісі", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", "status.embed": "Embеd", - "status.favourite": "Таңдаулы", "status.filtered": "Фильтрленген", "status.load_more": "Тағы әкел", "status.media_hidden": "Жабық медиа", diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json index 45e5ff5052..ee00de2c1b 100644 --- a/app/javascript/mastodon/locales/kn.json +++ b/app/javascript/mastodon/locales/kn.json @@ -32,16 +32,12 @@ "compose_form.spoiler.unmarked": "Text is not hidden", "confirmations.delete.message": "Are you sure you want to delete this status?", "confirmations.domain_block.confirm": "Hide entire domain", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "empty_column.account_timeline": "No toots here!", "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", "empty_column.domain_blocks": "There are no hidden domains yet.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}", "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.", "hashtag.column_settings.tag_toggle": "Include additional tags in this column", @@ -53,8 +49,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -81,7 +75,6 @@ "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.pins": "Pinned toots", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.reblog": "{name} boosted your status", "notifications.column_settings.status": "New toots:", "onboarding.actions.go_to_explore": "See what's trending", @@ -110,7 +103,6 @@ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.copy": "Copy link to status", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index be63be7e1c..ea887b32dc 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -331,7 +331,7 @@ "keyboard_shortcuts.direct": "개인적인 멘션 컬럼 열기", "keyboard_shortcuts.down": "리스트에서 아래로 이동", "keyboard_shortcuts.enter": "게시물 열기", - "keyboard_shortcuts.favourite": "관심글 지정", + "keyboard_shortcuts.favourite": "게시물 좋아요", "keyboard_shortcuts.favourites": "좋아요 목록 열기", "keyboard_shortcuts.federated": "연합 타임라인 열기", "keyboard_shortcuts.heading": "키보드 단축키", @@ -363,6 +363,7 @@ "lightbox.previous": "이전", "limited_account_hint.action": "그래도 프로필 보기", "limited_account_hint.title": "이 프로필은 {domain}의 중재자에 의해 숨겨진 상태입니다.", + "link_preview.author": "{name}", "lists.account.add": "리스트에 추가", "lists.account.remove": "리스트에서 제거", "lists.delete": "리스트 삭제", @@ -412,7 +413,7 @@ "not_signed_in_indicator.not_signed_in": "이 정보에 접근하려면 로그인을 해야 합니다.", "notification.admin.report": "{name} 님이 {target}를 신고했습니다", "notification.admin.sign_up": "{name} 님이 가입했습니다", - "notification.favourite": "{name} 님이 당신의 게시물을 마음에 들어합니다", + "notification.favourite": "{name} 님이 내 게시물을 마음에 들어했습니다", "notification.follow": "{name} 님이 나를 팔로우했습니다", "notification.follow_request": "{name} 님이 팔로우 요청을 보냈습니다", "notification.mention": "{name} 님의 멘션", diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json index 007db00c20..bacd599102 100644 --- a/app/javascript/mastodon/locales/ku.json +++ b/app/javascript/mastodon/locales/ku.json @@ -104,7 +104,6 @@ "column.direct": "Qalkirinên taybet", "column.directory": "Li profîlan bigere", "column.domain_blocks": "Navperên astengkirî", - "column.favourites": "Bijarte", "column.follow_requests": "Daxwazên şopandinê", "column.home": "Rûpela sereke", "column.lists": "Lîste", @@ -168,7 +167,6 @@ "confirmations.mute.explanation": "Ev ê şandinên ji wan tê û şandinên ku behsa wan dike veşêre, lê hê jî maf dide ku ew şandinên te bibînin û te bişopînin.", "confirmations.mute.message": "Bi rastî tu dixwazî {name} bêdeng bikî?", "confirmations.redraft.confirm": "Jê bibe & ji nû ve serrast bike", - "confirmations.redraft.message": "Bi rastî tu dixwazî şandî ye jê bibî û ji nû ve reşnivîsek çê bikî? Bijarte û şandî wê wenda bibin û bersivên ji bo şandiyê resen wê sêwî bimînin.", "confirmations.reply.confirm": "Bersivê bide", "confirmations.reply.message": "Bersiva niha li ser peyama ku tu niha berhev dikî dê binivsîne. Ma pê bawer î ku tu dixwazî bidomînî?", "confirmations.unfollow.confirm": "Neşopîne", @@ -188,7 +186,6 @@ "dismissable_banner.community_timeline": "Ev şandiyên giştî yên herî dawî ji kesên ku ajimêrê wan ji aliyê {domain} ve têne pêşkêşkirin.", "dismissable_banner.dismiss": "Paşguh bike", "dismissable_banner.explore_links": "Ev çîrokên nûçeyan niha li ser vê û rajekarên din ên tora nenavendî ji aliyê mirovan ve têne axaftin.", - "dismissable_banner.explore_statuses": "Ev şandiyên ji vê û rajekarên din ên di tora nenavendî de niha li ser vê rajekarê balê dikşînin.", "dismissable_banner.explore_tags": "Ev hashtagên ji vê û rajekarên din ên di tora nenavendî de niha li ser vê rajekarê balê dikşînin.", "embed.instructions": "Bi jêgirtina koda jêrîn vê şandiyê li ser malpera xwe bi cih bike.", "embed.preview": "Ew ê çawa xuya bibe li vir tê nîşandan:", @@ -215,8 +212,6 @@ "empty_column.community": "Demnameya herêmî vala ye. Tiştek ji raya giştî re binivsînin da ku rûpel biherike!", "empty_column.domain_blocks": "Hîn tu navperên ku hatine astengkirin tune ne.", "empty_column.explore_statuses": "Tiştek niha di rojevê de tune. Paşê vegere!", - "empty_column.favourited_statuses": "Hîn tu peyamên te yên bijare tunene. Gava ku te yekî bijart, ew ê li vir xûya bike.", - "empty_column.favourites": "Hîn tu kes vê peyamê nebijartiye. Gava ku hin kes bijartin, ew ê li vir xûya bikin.", "empty_column.follow_requests": "Hê jî daxwaza şopandinê tunne ye. Dema daxwazek hat, yê li vir were nîşan kirin.", "empty_column.hashtag": "Di vê hashtagê de hêj tiştekî tune.", "empty_column.home": "Rojeva demnameya te vala ye! Ji bona tijîkirinê bêtir mirovan bişopîne. {suggestions}", @@ -281,15 +276,12 @@ "home.column_settings.show_replies": "Bersivan nîşan bide", "home.hide_announcements": "Reklaman veşêre", "home.show_announcements": "Reklaman nîşan bide", - "interaction_modal.description.favourite": "Bi ajimêrek li ser Mastodon re, tu dikarî vê şandiyê bijarte bikî da ku nivîskar bizanibe ku tu wê/î re rêzê digirî û wê ji bo paşê biparêzî.", "interaction_modal.description.follow": "Bi ajimêrekê li ser Mastodon, tu dikarî {name} bişopînî da ku şandiyan li ser rojeva rûpela xwe bi dest bixe.", "interaction_modal.description.reblog": "Bi ajimêrekê li ser Mastodon, tu dikarî vê şandiyê bilind bikî da ku wê bi şopînerên xwe re parve bikî.", "interaction_modal.description.reply": "Bi ajimêrekê li ser Mastodon, tu dikarî bersiva vê şandiyê bidî.", "interaction_modal.on_another_server": "Li ser rajekareke cuda", "interaction_modal.on_this_server": "Li ser ev rajekar", - "interaction_modal.other_server_instructions": "Vê girêdanê jê bigire û pêve bike di zeviya lêgerînê de ji sepana xwe ya Mastodon a bijartekirî yan jî navrûyê bikarhêneriyê ya tevnê ji rajekarê Mastodon.", "interaction_modal.preamble": "Ji ber ku Mastodon nenavendî ye, tu dikarî ajimêrê xwe ya heyî ku ji aliyê rajekarek din a Mastodon an platformek lihevhatî ve hatî pêşkêşkirin bi kar bînî ku ajimêrê te li ser vê yekê tune be.", - "interaction_modal.title.favourite": "Şandiyê {name} bijarte bike", "interaction_modal.title.follow": "{name} bişopîne", "interaction_modal.title.reblog": "Şandiyê {name} bilind bike", "interaction_modal.title.reply": "Bersivê bide şandiyê {name}", @@ -305,8 +297,6 @@ "keyboard_shortcuts.direct": "ji bo vekirina stûna qalkirinên taybet", "keyboard_shortcuts.down": "Di lîsteyê de dakêşe jêr", "keyboard_shortcuts.enter": "Şandiyê veke", - "keyboard_shortcuts.favourite": "Şandiya bijarte", - "keyboard_shortcuts.favourites": "Rêzokê bijarteyan veke", "keyboard_shortcuts.federated": "Demnameya giştî veke", "keyboard_shortcuts.heading": "Kurterêyên klavyeyê", "keyboard_shortcuts.home": "Demnameyê veke", @@ -367,7 +357,6 @@ "navigation_bar.domain_blocks": "Navperên astengkirî", "navigation_bar.edit_profile": "Profîlê serrast bike", "navigation_bar.explore": "Vekole", - "navigation_bar.favourites": "Bijarte", "navigation_bar.filters": "Peyvên bêdengkirî", "navigation_bar.follow_requests": "Daxwazên şopandinê", "navigation_bar.followed_tags": "Etîketên şopandî", @@ -384,7 +373,6 @@ "not_signed_in_indicator.not_signed_in": "Divê tu têketinê bikî da ku tu bigihîjî vê çavkaniyê.", "notification.admin.report": "{name} hate ragihandin {target}", "notification.admin.sign_up": "{name} tomar bû", - "notification.favourite": "{name} şandiya te hez kir", "notification.follow": "{name} te şopand", "notification.follow_request": "{name} dixwazê te bişopîne", "notification.mention": "{name} qale te kir", @@ -398,7 +386,6 @@ "notifications.column_settings.admin.report": "Ragihandinên nû:", "notifications.column_settings.admin.sign_up": "Tomarkirinên nû:", "notifications.column_settings.alert": "Agahdariyên sermaseyê", - "notifications.column_settings.favourite": "Bijarte:", "notifications.column_settings.filter_bar.advanced": "Hemû beşan nîşan bide", "notifications.column_settings.filter_bar.category": "Şivika parzûna bilêz", "notifications.column_settings.filter_bar.show_bar": "Darika parzûnê nîşan bide", @@ -416,7 +403,6 @@ "notifications.column_settings.update": "Serrastkirin:", "notifications.filter.all": "Hemû", "notifications.filter.boosts": "Bilindkirî", - "notifications.filter.favourites": "Bijarte", "notifications.filter.follows": "Dişopîne", "notifications.filter.mentions": "Qalkirin", "notifications.filter.polls": "Encamên rapirsiyê", @@ -548,7 +534,6 @@ "server_banner.server_stats": "Amarên rajekar:", "sign_in_banner.create_account": "Ajimêr biafirîne", "sign_in_banner.sign_in": "Têkeve", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "Ji bo @{name} navrûya venihêrtinê veke", "status.admin_domain": "Navrûya bikarhêneriyê ji bo {domain} veke", "status.admin_status": "Vê şandîyê di navrûya venihêrtinê de veke", @@ -565,7 +550,6 @@ "status.edited": "Di {date} de hate serrastkirin", "status.edited_x_times": "{count, plural, one {{count} car} other {{count} car}} hate serrastkirin", "status.embed": "Bi cih bike", - "status.favourite": "Bijarte bike", "status.filter": "Vê şandiyê parzûn bike", "status.filtered": "Parzûnkirî", "status.hide": "Şandiyê veşêre", diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json index 1a0715afbd..4b14caac8a 100644 --- a/app/javascript/mastodon/locales/kw.json +++ b/app/javascript/mastodon/locales/kw.json @@ -57,7 +57,6 @@ "column.community": "Amserlin leel", "column.directory": "Peuri profilys", "column.domain_blocks": "Gorfarthow lettys", - "column.favourites": "Re drudh", "column.follow_requests": "Govynnow holya", "column.home": "Tre", "column.lists": "Rolyow", @@ -112,7 +111,6 @@ "confirmations.mute.explanation": "Hemm a wra kudha postow anedha ha postow orth aga meneges, mes hwath aga gasa dhe weles agas postow ha'gas holya.", "confirmations.mute.message": "Owgh hwi sur a vynnes tawhe {name}?", "confirmations.redraft.confirm": "Dilea & daskynskrifa", - "confirmations.redraft.message": "Owgh hwi sur a vynnes dilea'n post ma ha'y dhaskynskrifa? Re drudh ha kenerthow a vydh kellys, ha gorthebow orth an post derowel a vydh omdhivesys.", "confirmations.reply.confirm": "Gorthebi", "confirmations.reply.message": "Gorthebi lemmyn a wra ughskrifa'n messach esowgh hwi orth y skrifa lemmyn. Owgh hwi sur a vynnes pesya?", "confirmations.unfollow.confirm": "Anholya", @@ -126,7 +124,6 @@ "directory.new_arrivals": "Devedhyansow nowydh", "directory.recently_active": "Bew a-gynsow", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Stagewgh an post ma a-berth yn agas gwiasva ow tasskrifa'n kod a-wòles.", "embed.preview": "Ottomma fatel hevel:", @@ -151,8 +148,6 @@ "empty_column.bookmarked_statuses": "Nyns eus dhywgh postow gans folennos hwath. Pan wrewgh gorra onan, ev a wra omdhiskwedhes omma.", "empty_column.community": "An amserlin leel yw gwag. Skrifewgh neppytn yn poblek dh'y lonchya!", "empty_column.domain_blocks": "Nyns eus gorfarthow lettys hwath.", - "empty_column.favourited_statuses": "Nyns eus dhywgh postow drudh hwath. Pan wrewgh merkya onan vel drudh, ev a wra omdhiskwedhes omma.", - "empty_column.favourites": "Ny wrug nagonan merkya'n post ma vel drudh hwath. Pan wra, hynn a wra omdhiskwedhes omma.", "empty_column.follow_requests": "Nyns eus dhywgh govynnow holya hwath. Pan wrewgh degemeres onan, ev a wra omdhiskwedhes omma.", "empty_column.hashtag": "Nyns eus travyth y'n bòlnos ma hwath.", "empty_column.home": "Agas amserlin dre yw gwag! Holyewgh moy a dus dh'y lenwel. {suggestions}", @@ -198,8 +193,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "Movya war-nans y'n rol", "keyboard_shortcuts.enter": "Ygeri post", - "keyboard_shortcuts.favourite": "Merkya post vel drudh", - "keyboard_shortcuts.favourites": "Ygeri rol re drudh", "keyboard_shortcuts.federated": "Ygeri amserlin geffrysys", "keyboard_shortcuts.heading": "Kottfordhow an vysowek", "keyboard_shortcuts.home": "Ygeri amserlin dre", @@ -254,7 +247,6 @@ "navigation_bar.discover": "Diskudha", "navigation_bar.domain_blocks": "Gorfarthow lettys", "navigation_bar.edit_profile": "Golegi profil", - "navigation_bar.favourites": "Re drudh", "navigation_bar.filters": "Geryow tawhes", "navigation_bar.follow_requests": "Govynnow holya", "navigation_bar.follows_and_followers": "Holyansow ha holyoryon", @@ -267,7 +259,6 @@ "navigation_bar.public_timeline": "Amserlin geffrysys", "navigation_bar.security": "Diogeledh", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} a wrug merkya agas post vel drudh", "notification.follow": "{name} a wrug agas holya", "notification.follow_request": "{name} a bysis agas holya", "notification.mention": "{name} a wrug agas meneges", @@ -278,7 +269,6 @@ "notifications.clear": "Dilea gwarnyansow", "notifications.clear_confirmation": "Owgh hwi sur a vynnes dilea agas gwarnyansow oll yn fast?", "notifications.column_settings.alert": "Gwarnyansow pennskrin", - "notifications.column_settings.favourite": "Re drudh:", "notifications.column_settings.filter_bar.advanced": "Displetya rummow oll", "notifications.column_settings.filter_bar.category": "Barr sidhla skav", "notifications.column_settings.follow": "Holyoryon nowydh:", @@ -292,7 +282,6 @@ "notifications.column_settings.status": "Postow nowydh:", "notifications.filter.all": "Oll", "notifications.filter.boosts": "Kenerthow", - "notifications.filter.favourites": "Re drudh", "notifications.filter.follows": "Holyansow", "notifications.filter.mentions": "Menegow", "notifications.filter.polls": "Sewyansow an sondyans", @@ -357,7 +346,6 @@ "search_results.statuses_fts_disabled": "Nyns yw hwilas postow der aga dalgh gweythresys y'n leuren Mastodon ma.", "search_results.total": "{count, number} {count, plural, one {sewyans} other {sewyans}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "Ygeri ynterfas koswa rag @{name}", "status.admin_status": "Ygeri an post ma y'n ynterfas koswa", "status.block": "Lettya @{name}", @@ -369,7 +357,6 @@ "status.detailed_status": "Gwel kesklapp a-vanyl", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", "status.embed": "Staga", - "status.favourite": "Merkya vel drudh", "status.filtered": "Sidhlys", "status.load_more": "Karga moy", "status.media_hidden": "Myski kudhys", diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json index 6ead191caa..bedbbec001 100644 --- a/app/javascript/mastodon/locales/la.json +++ b/app/javascript/mastodon/locales/la.json @@ -23,7 +23,6 @@ "bundle_modal_error.retry": "Retemptare", "column.about": "De", "column.bookmarks": "Signa paginales", - "column.favourites": "Dilecti", "column.home": "Domi", "column.lists": "Catalogi", "column.pins": "Pinned post", @@ -46,10 +45,8 @@ "confirmations.delete_list.confirm": "Oblitterare", "confirmations.domain_block.confirm": "Hide entire domain", "confirmations.mute.confirm": "Confutare", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "confirmations.reply.confirm": "Respondere", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "emoji_button.food": "cibus et potus", @@ -71,8 +68,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "Aperire contributum", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -99,7 +94,6 @@ "lightbox.next": "Secundum", "navigation_bar.domain_blocks": "Hidden domains", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.reblog": "{name} boosted your status", "notifications.filter.all": "Omnia", "notifications.filter.polls": "Eventus electionis", @@ -145,7 +139,6 @@ "search_results.total": "{count, plural, one {# result} other {# results}}", "server_banner.learn_more": "Discere plura", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.block": "Impedire @{name}", "status.bookmark": "Signa paginaris", diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json index 91fb62d019..68b52a4f0b 100644 --- a/app/javascript/mastodon/locales/lt.json +++ b/app/javascript/mastodon/locales/lt.json @@ -34,7 +34,6 @@ "account_note.placeholder": "Click to add a note", "alert.unexpected.title": "Oi!", "column.domain_blocks": "Hidden domains", - "column.favourites": "Mėgstamiausi", "column.lists": "Sąrašai", "column.mutes": "Užtildyti vartotojai", "column.pins": "Pinned toot", @@ -53,16 +52,12 @@ "compose_form.spoiler.unmarked": "Text is not hidden", "confirmations.delete.message": "Are you sure you want to delete this status?", "confirmations.domain_block.confirm": "Hide entire domain", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "empty_column.account_timeline": "No toots here!", "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", "empty_column.domain_blocks": "There are no hidden domains yet.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}", "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.", "hashtag.column_settings.tag_toggle": "Include additional tags in this column", @@ -74,8 +69,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -102,7 +95,6 @@ "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.pins": "Pinned toots", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.reblog": "{name} boosted your status", "notifications.column_settings.status": "New toots:", "onboarding.actions.go_to_explore": "See what's trending", @@ -131,7 +123,6 @@ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.copy": "Copy link to status", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json index d360200aa0..3e96087281 100644 --- a/app/javascript/mastodon/locales/lv.json +++ b/app/javascript/mastodon/locales/lv.json @@ -104,7 +104,6 @@ "column.direct": "Privāti pieminēti", "column.directory": "Pārlūkot profilus", "column.domain_blocks": "Bloķētie domēni", - "column.favourites": "Izlases", "column.follow_requests": "Sekošanas pieprasījumi", "column.home": "Sākums", "column.lists": "Saraksti", @@ -169,7 +168,6 @@ "confirmations.mute.explanation": "Šādi no viņiem tiks slēptas ziņas un ziņas, kurās viņi tiek pieminēti, taču viņi joprojām varēs redzēt tavas ziņas un sekot tev.", "confirmations.mute.message": "Vai tiešām vēlies apklusināt {name}?", "confirmations.redraft.confirm": "Dzēst un pārrakstīt", - "confirmations.redraft.message": "Vai tiešām vēlies dzēst un pārrakstīt šo ierakstu? Favorīti un pastiprinātie ieraksti tiks dzēsti, un atbildes tiks atsaistītas no šī ieraksta.", "confirmations.reply.confirm": "Atbildēt", "confirmations.reply.message": "Ja tagad atbildēsi, tavs ziņas uzmetums tiks dzēsts. Vai tiešām vēlies turpināt?", "confirmations.unfollow.confirm": "Pārstāt sekot", @@ -190,7 +188,6 @@ "dismissable_banner.community_timeline": "Šīs ir jaunākās publiskās ziņas no personām, kuru kontus mitina {domain}.", "dismissable_banner.dismiss": "Atcelt", "dismissable_banner.explore_links": "Par šiem jaunumiem šobrīd runā cilvēki šajā un citos decentralizētā tīkla serveros.", - "dismissable_banner.explore_statuses": "Šīs ziņas no šī un citiem decentralizētajā tīkla serveriem šobrīd gūst panākumus šajā serverī.", "dismissable_banner.explore_tags": "Šie tēmturi šobrīd kļūst arvien populārāki cilvēku vidū šajā un citos decentralizētā tīkla serveros.", "embed.instructions": "Iestrādā šo ziņu savā mājaslapā, kopējot zemāk redzamo kodu.", "embed.preview": "Tas izskatīsies šādi:", @@ -218,8 +215,6 @@ "empty_column.direct": "Jums vēl nav nevienas privātas pieminēšanas. Nosūtot vai saņemot to, tas tiks parādīts šeit.", "empty_column.domain_blocks": "Vēl nav neviena bloķēta domēna.", "empty_column.explore_statuses": "Pašlaik nekā aktuāla nav. Pārbaudi vēlāk!", - "empty_column.favourited_statuses": "Tev vēl nav nevienas iecienītākās ziņas. Kad pievienosi kādu izlasei, tas tiks parādīts šeit.", - "empty_column.favourites": "Šo ziņu neviens vēl nav pievienojis izlasei. Kad kāds to izdarīs, tas parādīsies šeit.", "empty_column.follow_requests": "Šobrīd tev nav sekošanas pieprasījumu. Kad kāds pieteiksies tev sekot, pieprasījums parādīsies šeit.", "empty_column.followed_tags": "Tu vēl neesi sekojis nevienam tēmturim. Kad to izdarīsi, tie tiks parādīti šeit.", "empty_column.hashtag": "Ar šo tēmturi nekas nav atrodams.", @@ -287,15 +282,12 @@ "home.column_settings.show_replies": "Rādīt atbildes", "home.hide_announcements": "Slēpt anonsus", "home.show_announcements": "Rādīt anonsus", - "interaction_modal.description.favourite": "Ar Mastodon kontu tu vari pievienot šo ziņu izlasei, lai informētu autoru, ka to novērtē, un saglabātu to vēlākai lasīšanai.", "interaction_modal.description.follow": "Ar Mastodon kontu tu vari sekot {name}, lai saņemtu viņu ziņas savā mājas plūsmā.", "interaction_modal.description.reblog": "Izmantojot kontu Mastodon, tu vari izcelt šo ziņu, lai kopīgotu to ar saviem sekotājiem.", "interaction_modal.description.reply": "Ar Mastodon kontu tu vari atbildēt uz šo ziņu.", "interaction_modal.on_another_server": "Citā serverī", "interaction_modal.on_this_server": "Šajā serverī", - "interaction_modal.other_server_instructions": "Nokopē un ielīmē šo URL savas Mastodon lietotnes vai Mastodon tīmekļa vietnes meklēšanas laukā.", "interaction_modal.preamble": "Tā kā Mastodon ir decentralizēts, tu vari izmantot savu esošo kontu, ko mitina cits Mastodon serveris vai saderīga platforma, ja tev nav konta šajā serverī.", - "interaction_modal.title.favourite": "Pievienot {name} ziņu izlasei", "interaction_modal.title.follow": "Sekot {name}", "interaction_modal.title.reblog": "Pastiprināt {name} ierakstu", "interaction_modal.title.reply": "Atbildēt uz {name} ziņu", @@ -311,8 +303,6 @@ "keyboard_shortcuts.direct": "lai atvērtu privāto pieminējumu sleju", "keyboard_shortcuts.down": "Pārvietoties lejup sarakstā", "keyboard_shortcuts.enter": "Atvērt ziņu", - "keyboard_shortcuts.favourite": "Pievienot izlasei", - "keyboard_shortcuts.favourites": "Atvērt izlašu sarakstu", "keyboard_shortcuts.federated": "Atvērt apvienoto laika līniju", "keyboard_shortcuts.heading": "Īsinājumtaustiņi", "keyboard_shortcuts.home": "Atvērt mājas laika līniju", @@ -373,7 +363,6 @@ "navigation_bar.domain_blocks": "Bloķētie domēni", "navigation_bar.edit_profile": "Rediģēt profilu", "navigation_bar.explore": "Pārlūkot", - "navigation_bar.favourites": "Izlases", "navigation_bar.filters": "Apklusinātie vārdi", "navigation_bar.follow_requests": "Sekošanas pieprasījumi", "navigation_bar.followed_tags": "Sekojamie tēmturi", @@ -390,7 +379,6 @@ "not_signed_in_indicator.not_signed_in": "Lai piekļūtu šim resursam, tev ir jāpierakstās.", "notification.admin.report": "{name} sūdzējās par {target}", "notification.admin.sign_up": "{name} pierakstījās", - "notification.favourite": "{name} pievienoja tavu ziņu izlasei", "notification.follow": "{name} uzsāka tev sekot", "notification.follow_request": "{name} nosūtīja tev sekošanas pieprasījumu", "notification.mention": "{name} pieminēja tevi", @@ -404,7 +392,6 @@ "notifications.column_settings.admin.report": "Jaunas sūdzības:", "notifications.column_settings.admin.sign_up": "Jaunas pierakstīšanās:", "notifications.column_settings.alert": "Darbvirsmas paziņojumi", - "notifications.column_settings.favourite": "Izlases:", "notifications.column_settings.filter_bar.advanced": "Rādīt visas kategorijas", "notifications.column_settings.filter_bar.category": "Ātro filtru josla", "notifications.column_settings.filter_bar.show_bar": "Rādīt filtru joslu", @@ -422,7 +409,6 @@ "notifications.column_settings.update": "Labojumi:", "notifications.filter.all": "Visi", "notifications.filter.boosts": "Pastiprinātie ieraksti", - "notifications.filter.favourites": "Izlases", "notifications.filter.follows": "Sekošana", "notifications.filter.mentions": "Pieminējumi", "notifications.filter.polls": "Aptauju rezultāti", @@ -569,7 +555,6 @@ "server_banner.server_stats": "Servera statistika:", "sign_in_banner.create_account": "Izveidot kontu", "sign_in_banner.sign_in": "Pierakstīties", - "sign_in_banner.text": "Pierakstieties, lai sekotu profiliem vai atsaucēm, pievienotu izlasei, kopīgotu ziņas un atbildētu uz tām. Varat arī mijiedarboties no sava konta citā serverī.", "status.admin_account": "Atvērt @{name} moderēšanas saskarni", "status.admin_domain": "Atvērt {domain} moderēšanas saskarni", "status.admin_status": "Atvērt šo ziņu moderācijas saskarnē", @@ -586,7 +571,6 @@ "status.edited": "Rediģēts {date}", "status.edited_x_times": "Rediģēts {count, plural, one {{count} reizi} other {{count} reizes}}", "status.embed": "Iestrādāt", - "status.favourite": "Patīk", "status.filter": "Filtrē šo ziņu", "status.filtered": "Filtrēts", "status.hide": "Slēpt ierakstu", diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json index e60287a2e0..6327404cb6 100644 --- a/app/javascript/mastodon/locales/mk.json +++ b/app/javascript/mastodon/locales/mk.json @@ -59,7 +59,6 @@ "column.community": "Локална временска зона", "column.directory": "Види профили", "column.domain_blocks": "Скриени домеини", - "column.favourites": "Омилени", "column.home": "Дома", "column.lists": "Листа", "column.mutes": "Заќутени корисници", @@ -103,7 +102,6 @@ "confirmations.mute.confirm": "Заќути", "confirmations.mute.explanation": "Ќе сокрие објави од нив и објави кои ги спомнуваат нив, но сеуште ќе им дозволи да ги видат вашите постови и ве следат.", "confirmations.mute.message": "Дали ќе го заќутите {name}?", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "confirmations.reply.confirm": "Одговори", "confirmations.unfollow.confirm": "Одследи", "confirmations.unfollow.message": "Сигурни сте дека ќе го отследите {name}?", @@ -114,7 +112,6 @@ "directory.federated": "Од познати fediverse", "directory.local": "Само од {domain}", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "emoji_button.activity": "Активност", @@ -133,8 +130,6 @@ "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", "empty_column.community": "Локалниот времеплов е празен. Објавете нешто јавно за да може да почне шоуто!", "empty_column.domain_blocks": "Немате сокриени домеини уште.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}", "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.", "errors.unexpected_crash.report_issue": "Пријавете проблем", @@ -164,8 +159,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -191,7 +184,6 @@ "navigation_bar.compose": "Compose new toot", "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.edit_profile": "Уреди профил", - "navigation_bar.favourites": "Омилени", "navigation_bar.filters": "Замолќени зборови", "navigation_bar.follow_requests": "Следи покани", "navigation_bar.follows_and_followers": "Следења и следбеници", @@ -203,7 +195,6 @@ "navigation_bar.public_timeline": "Федеративен времеплов", "navigation_bar.security": "Безбедност", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.reblog": "{name} boosted your status", "notifications.column_settings.poll": "Резултати од анкета:", "notifications.column_settings.push": "Пуш нотификации", @@ -213,7 +204,6 @@ "notifications.column_settings.status": "New toots:", "notifications.filter.all": "Сите", "notifications.filter.boosts": "Бустови", - "notifications.filter.favourites": "Омилени", "notifications.filter.follows": "Следења", "notifications.filter.mentions": "Спомнувања", "notifications.filter.polls": "Резултати од анкета", @@ -266,7 +256,6 @@ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.copy": "Copy link to status", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json index 9fbb51e9d5..630d5c430e 100644 --- a/app/javascript/mastodon/locales/ml.json +++ b/app/javascript/mastodon/locales/ml.json @@ -79,7 +79,6 @@ "column.community": "പ്രാദേശികമായ സമയരേഖ", "column.directory": "പ്രൊഫൈലുകൾ മറിച്ചുനോക്കുക", "column.domain_blocks": "മറയ്ക്കപ്പെട്ട മേഖലകൾ", - "column.favourites": "പ്രിയപ്പെട്ടവ", "column.follow_requests": "പിന്തുടരാനുള്ള അഭ്യർത്ഥനകൾ", "column.home": "ഹോം", "column.lists": "പട്ടികകൾ", @@ -128,7 +127,6 @@ "confirmations.logout.message": "നിങ്ങൾക്ക് ലോഗ് ഔട്ട് ചെയ്യണമെന്ന് ഉറപ്പാണോ?", "confirmations.mute.confirm": "നിശ്ശബ്ദമാക്കുക", "confirmations.redraft.confirm": "മായിച്ച് മാറ്റങ്ങൾ വരുത്തി വീണ്ടും എഴുതുക", - "confirmations.redraft.message": "നിങ്ങൾ ഉറപ്പായും ഈ കുറിപ്പ് മായ്ച്ച് മാറ്റങ്ങൾ വരുത്തി വീണ്ടും എഴുതുവാൻ താല്പര്യപ്പെടുന്നുവോ? അങ്ങനെ ചെയ്യുന്ന പക്ഷം ഇതിനു ലഭിച്ചിരിക്കുന്ന പ്രിയപ്പെടലുകളും ബൂസ്റ്റുകളും ആദ്യമുണ്ടായിരുന്ന കുറിപ്പിന് ലഭിച്ചിരുന്ന മറുപടികൾ ഒറ്റപ്പെടുകയും ചെയ്യും.", "confirmations.reply.confirm": "മറുപടി", "confirmations.reply.message": "ഇപ്പോൾ മറുപടി കൊടുക്കുന്നത് നിങ്ങൾ എഴുതിക്കൊണ്ടിരിക്കുന്ന സന്ദേശത്തിന് മുകളിൽ എഴുതാൻ കാരണമാകും. തീർച്ചയായും മുൻപോട്ട് പോകാൻ തീരുമാനിച്ചുവോ?", "confirmations.unfollow.confirm": "പിന്തുടരുന്നത് നിര്‍ത്തുക", @@ -145,7 +143,6 @@ "directory.recently_active": "അടുത്തിടെയായി സജീവമായ", "disabled_account_banner.text": "നിങ്ങളുടെ {disabledAccount} എന്ന അക്കൗണ്ട് ഇപ്പോൾ പ്രവർത്തനരഹിതമാണ്.", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "ചുവടെയുള്ള കോഡ് പകർത്തിക്കൊണ്ട് നിങ്ങളുടെ വെബ്‌സൈറ്റിൽ ഈ ടൂട്ട് ഉൾച്ചേർക്കുക.", "embed.preview": "ഇത് ഇങ്ങനെ കാണപ്പെടും:", @@ -170,8 +167,6 @@ "empty_column.bookmarked_statuses": "നിങ്ങൾക് ഇതുവരെ അടയാളപ്പെടുത്തിയ ടൂട്ടുകൾ ഇല്ല. അടയാളപ്പെടുത്തിയാൽ അത് ഇവിടെ വരും.", "empty_column.community": "പ്രാദേശികമായ സമയരേഖ ശൂന്യമാണ്. എന്തെങ്കിലും പരസ്യമായി എഴുതി തുടക്കം കുറിക്കു!", "empty_column.domain_blocks": "മറയ്ക്കപ്പെട്ടിരിക്കുന്ന മേഖലകൾ ഇതുവരെ ഇല്ല.", - "empty_column.favourited_statuses": "നിങ്ങൾക്ക് ഇത് വരെ ഒരു പ്രിയപ്പെട്ട ടൂട്ടും ഇല്ല. നിങ്ങൾ അങ്ങനെ ഒന്ന് പ്രിയപ്പെടുന്ന പക്ഷം അതിവിടെ കാണപ്പെടുന്നതാണ്.", - "empty_column.favourites": "ഇതുവരെ ആരും ഈ ടൂട്ട് പ്രിയപ്പെട്ടതായി അടയാളപ്പെടുത്തിയിട്ടില്ല. ആരെങ്കിലും അങ്ങനെ ചെയ്യുന്നപക്ഷം അതിവിടെ കാണപ്പെടുന്നതാണ്.", "empty_column.hashtag": "ഈ ഹാഷ്‌ടാഗിൽ ഇതുവരെ ഒന്നുമില്ല.", "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}", "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.", @@ -209,8 +204,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "ടൂട്ട് എടുക്കാൻ", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "കീബോർഡ് എളുപ്പവഴികൾ", "keyboard_shortcuts.home": "ഹോം ടൈംലൈൻ തുറക്കുന്നതിന്", @@ -255,7 +248,6 @@ "navigation_bar.discover": "കണ്ടെത്തുക", "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക", - "navigation_bar.favourites": "പ്രിയപ്പെട്ടവ", "navigation_bar.follow_requests": "പിന്തുടരാനുള്ള അഭ്യർത്ഥനകൾ", "navigation_bar.lists": "ലിസ്റ്റുകൾ", "navigation_bar.logout": "ലോഗൗട്ട്", @@ -264,7 +256,6 @@ "navigation_bar.preferences": "ക്രമീകരണങ്ങൾ", "navigation_bar.security": "സുരക്ഷ", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.follow": "{name} നിങ്ങളെ പിന്തുടർന്നു", "notification.follow_request": "{name} നിങ്ങളെ പിന്തുടരാൻ അഭ്യർത്ഥിച്ചു", "notification.mention": "{name} നിങ്ങളെ സൂചിപ്പിച്ചു", @@ -274,7 +265,6 @@ "notifications.clear": "അറിയിപ്പ് മായ്ക്കുക", "notifications.clear_confirmation": "നിങ്ങളുടെ എല്ലാ അറിയിപ്പുകളും ശാശ്വതമായി മായ്‌ക്കണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?", "notifications.column_settings.alert": "ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകൾ", - "notifications.column_settings.favourite": "പ്രിയപ്പെട്ടവ:", "notifications.column_settings.filter_bar.advanced": "എല്ലാ വിഭാഗങ്ങളും പ്രദർശിപ്പിക്കുക", "notifications.column_settings.follow": "പുതിയ പിന്തുടരുന്നവർ:", "notifications.column_settings.follow_request": "പുതിയ പിന്തുടരൽ അഭ്യർത്ഥനകൾ:", @@ -286,7 +276,6 @@ "notifications.column_settings.status": "പുതിയ ടൂട്ടുകൾ:", "notifications.filter.all": "എല്ലാം", "notifications.filter.boosts": "ബൂസ്റ്റുകൾ", - "notifications.filter.favourites": "പ്രിയപ്പെട്ടവ", "notifications.filter.follows": "പിന്തുടരുന്നു", "notifications.filter.mentions": "സൂചനകൾ", "notifications.filter.polls": "പോൾ ഫലങ്ങൾ", @@ -340,7 +329,6 @@ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.block": "@{name} -നെ തടയുക", "status.bookmark": "ബുക്ക്മാർക്ക്", @@ -350,7 +338,6 @@ "status.detailed_status": "വിശദമായ സംഭാഷണ കാഴ്‌ച", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", "status.embed": "ഉൾച്ചേർക്കുക", - "status.favourite": "പ്രിയപ്പെട്ടത്", "status.filtered": "ഫിൽട്ടർ ചെയ്‌തു", "status.load_more": "കൂടുതൽ ലോഡു ചെയ്യുക", "status.media_hidden": "മീഡിയ മറച്ചു", diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json index a4ba1b8c50..126df3a7e8 100644 --- a/app/javascript/mastodon/locales/mr.json +++ b/app/javascript/mastodon/locales/mr.json @@ -81,7 +81,6 @@ "bundle_modal_error.retry": "पुन्हा प्रयत्न करा", "column.blocks": "ब्लॉक केलेले खातेधारक", "column.domain_blocks": "गुप्त डोमेन्स", - "column.favourites": "आवडते", "column.follow_requests": "अनुचरण विनंत्या", "column.home": "मुख्यपृष्ठ", "column.lists": "याद्या", @@ -114,16 +113,12 @@ "confirmations.domain_block.confirm": "संपूर्ण डोमेन लपवा", "confirmations.logout.message": "तुमची खात्री आहे की तुम्ही लॉग आउट करू इच्छिता?", "confirmations.mute.confirm": "आवाज बंद करा", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "empty_column.account_timeline": "No toots here!", "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", "empty_column.domain_blocks": "There are no hidden domains yet.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}", "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.", "hashtag.column_settings.tag_mode.all": "यातील सर्व", @@ -137,15 +132,12 @@ "home.column_settings.show_replies": "उत्तरे दाखवा", "home.hide_announcements": "घोषणा लपवा", "home.show_announcements": "घोषणा दाखवा", - "interaction_modal.description.favourite": "मॅस्टोडॉनवरील खात्यासह, तुम्ही हे पोस्ट आवडते म्हणून लेखकाला कळवून तुम्ही त्याचे कौतुक करू शकता आणि ते नंतरसाठी जतन करू शकता.", "interaction_modal.description.follow": "मॅस्टोडॉन वरील खात्यासह, तुम्ही त्यांच्या पोस्ट तुमच्या होम फीडमध्ये प्राप्त करण्यासाठी {name} चे अनुसरण करू शकता.", "interaction_modal.description.reblog": "मॅस्टोडॉन वरील खात्यासह, तुम्ही ही पोस्ट तुमच्या स्वतःच्या अनुयायांसह शेअर करण्यासाठी बूस्ट करू शकता.", "interaction_modal.description.reply": "मॅस्टोडॉनवरील खात्यासह, तुम्ही या पोस्टला प्रतिसाद देऊ शकता.", "interaction_modal.on_another_server": "वेगळ्या सर्व्हरवर", "interaction_modal.on_this_server": "या सर्व्हरवर", - "interaction_modal.other_server_instructions": "तुमच्या आवडत्या मॅस्टोडॉन अँपच्या सर्च फिल्डमध्ये किंवा तुमच्या मॅस्टोडॉन सर्व्हरच्या वेब इंटरफेसमध्ये ही URL कॉपी आणि पेस्ट करा.", "interaction_modal.preamble": "मास्टोडॉन विकेंद्रित असल्याने, तुमचे खाते नसेल तर तुम्ही दुसरे मॅस्टोडॉन सर्व्हर किंवा सुसंगत प्लॅटफॉर्मद्वारे होस्ट केलेले तुमचे विद्यमान खाते वापरू शकता.", - "interaction_modal.title.favourite": "आवडत्या {name} ची पोस्ट", "interaction_modal.title.follow": "{name} चे अनुसरण करा", "interaction_modal.title.reblog": "{name} ची पोस्ट बूस्ट करा", "interaction_modal.title.reply": "{name} च्या पोस्टला उत्तर द्या", @@ -161,8 +153,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -212,7 +202,6 @@ "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.pins": "Pinned toots", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.reblog": "{name} boosted your status", "notifications.column_settings.push": "सूचना", "notifications.column_settings.reblog": "बूस्ट:", @@ -224,7 +213,6 @@ "notifications.column_settings.update": "संपादने:", "notifications.filter.all": "सर्व", "notifications.filter.boosts": "बूस्ट", - "notifications.filter.favourites": "आवडते", "notifications.filter.follows": "अनुयायी आहे", "notifications.filter.mentions": "उल्लेख केलेले", "notifications.filter.polls": "मतदान परिणाम", @@ -255,7 +243,6 @@ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.copy": "Copy link to status", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json index 685398b869..a1f1d61f3d 100644 --- a/app/javascript/mastodon/locales/ms.json +++ b/app/javascript/mastodon/locales/ms.json @@ -102,7 +102,6 @@ "column.community": "Garis masa tempatan", "column.directory": "Layari profil", "column.domain_blocks": "Domain disekat", - "column.favourites": "Kegemaran", "column.follow_requests": "Permintaan ikutan", "column.home": "Laman Utama", "column.lists": "Senarai", @@ -165,7 +164,6 @@ "confirmations.mute.explanation": "Ini akan menyembunyikan hantaran daripada mereka dan juga hantaran yang menyebut mereka, tetapi ia masih membenarkan mereka melihat hantaran anda dan mengikuti anda.", "confirmations.mute.message": "Adakah anda pasti anda ingin membisukan {name}?", "confirmations.redraft.confirm": "Padam & rangka semula", - "confirmations.redraft.message": "Adakah anda pasti anda ingin memadam hantaran ini dan merangkanya semula? Kegemaran dan galakan akan hilang, dan balasan ke hantaran asal akan menjadi yatim.", "confirmations.reply.confirm": "Balas", "confirmations.reply.message": "Membalas sekarang akan menulis ganti mesej yang anda sedang karang. Adakah anda pasti anda ingin teruskan?", "confirmations.unfollow.confirm": "Nyahikut", @@ -185,7 +183,6 @@ "dismissable_banner.community_timeline": "Inilah hantaran awam terkini daripada orang yang akaun dihos oleh {domain}.", "dismissable_banner.dismiss": "Ketepikan", "dismissable_banner.explore_links": "Berita-berita ini sedang dibualkan oleh orang di pelayar ini dan pelayar lain dalam rangkaian terpencar sekarang.", - "dismissable_banner.explore_statuses": "Hantaran-hantaran ini daripada pelayar ini dan pelayar lain dalam rangkaian terpencar sedang hangat pada pelayar ini sekarang.", "dismissable_banner.explore_tags": "Tanda-tanda pagar ini daripada pelayar ini dan pelayar lain dalam rangkaian terpencar sedang hangat pada pelayar ini sekarang.", "embed.instructions": "Benam hantaran ini di laman sesawang anda dengan menyalin kod berikut.", "embed.preview": "Begini rupanya nanti:", @@ -212,8 +209,6 @@ "empty_column.community": "Garis masa tempatan kosong. Tulislah secara awam untuk memulakan sesuatu!", "empty_column.domain_blocks": "Belum ada domain yang disekat.", "empty_column.explore_statuses": "Tiada apa-apa yang sohor kini sekarang. Semaklah kemudian!", - "empty_column.favourited_statuses": "Anda belum ada hantaran yang digemari. Apabila anda menggemari sesuatu, ia akan muncul di sini.", - "empty_column.favourites": "Tiada sesiapa yang menggemari hantaran ini. Apabila ada yang menggemari, ia akan muncul di sini.", "empty_column.follow_requests": "Anda belum mempunyai permintaan ikutan. Ia akan terpapar di sini apabila ada nanti.", "empty_column.followed_tags": "You have not followed any hashtags yet. When you do, they will show up here.", "empty_column.hashtag": "Belum ada apa-apa dengan tanda pagar ini.", @@ -280,15 +275,12 @@ "home.column_settings.show_replies": "Tunjukkan balasan", "home.hide_announcements": "Sembunyikan pengumuman", "home.show_announcements": "Tunjukkan pengumuman", - "interaction_modal.description.favourite": "Dengan akaun pada Mastodon, anda boleh menggemarkan hantaran ini untuk memberitahu penulis bahawa anda menghargainya dan menyimpannya untuk kemudian.", "interaction_modal.description.follow": "Dengan akaun pada Mastodon, anda boleh mengikut {name} untuk menerima hantaran mereka di suapan rumah anda.", "interaction_modal.description.reblog": "Dengan akaun pada Mastodon, anda boleh menggalakkan hantaran ini untuk dikongsi dengan pengikut anda.", "interaction_modal.description.reply": "Dengan akaun pada Mastodon, anda boleh membalas kepada hantaran ini.", "interaction_modal.on_another_server": "Di pelayan lain", "interaction_modal.on_this_server": "Pada pelayan ini", - "interaction_modal.other_server_instructions": "Salin dan tampal URL ini ke dalam medan carian app Mastodon kegemaran anda atau antara muka web pelayan Mastodon anda.", "interaction_modal.preamble": "Oleh sebab Mastodon terpencar, anda boleh menggunakan akaun sedia ada anda yang dihos oleh pelayan Mastodon lain atau platform yang serasi jika anda tidak mempunyai akaun pada platform ini.", - "interaction_modal.title.favourite": "Menggemarkan hantaran {name}", "interaction_modal.title.follow": "Ikuti {name}", "interaction_modal.title.reblog": "Galak hantaran {name}", "interaction_modal.title.reply": "Balas siaran {name}", @@ -304,8 +296,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "Buka hantaran", - "keyboard_shortcuts.favourite": "Hantaran kegemaran", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Pintasan papan kekunci", "keyboard_shortcuts.home": "to open home timeline", @@ -365,7 +355,6 @@ "navigation_bar.domain_blocks": "Domain disekat", "navigation_bar.edit_profile": "Sunting profil", "navigation_bar.explore": "Teroka", - "navigation_bar.favourites": "Kegemaran", "navigation_bar.filters": "Perkataan yang dibisukan", "navigation_bar.follow_requests": "Permintaan ikutan", "navigation_bar.followed_tags": "Ikuti hashtag", @@ -382,7 +371,6 @@ "not_signed_in_indicator.not_signed_in": "Anda perlu daftar masuk untuk mencapai sumber ini.", "notification.admin.report": "{name} melaporkan {target}", "notification.admin.sign_up": "{name} mendaftar", - "notification.favourite": "{name} menggemari hantaran anda", "notification.follow": "{name} mengikuti anda", "notification.follow_request": "{name} meminta untuk mengikuti anda", "notification.mention": "{name} menyebut anda", @@ -396,7 +384,6 @@ "notifications.column_settings.admin.report": "Laporan baru:", "notifications.column_settings.admin.sign_up": "Pendaftaran baru:", "notifications.column_settings.alert": "Pemberitahuan atas meja", - "notifications.column_settings.favourite": "Kegemaran:", "notifications.column_settings.filter_bar.advanced": "Papar semua kategori", "notifications.column_settings.filter_bar.category": "Bar penapis pantas", "notifications.column_settings.filter_bar.show_bar": "Paparkan bar penapis", @@ -414,7 +401,6 @@ "notifications.column_settings.update": "Suntingan:", "notifications.filter.all": "Semua", "notifications.filter.boosts": "Galakan", - "notifications.filter.favourites": "Kegemaran", "notifications.filter.follows": "Ikutan", "notifications.filter.mentions": "Sebutan", "notifications.filter.polls": "Keputusan undian", @@ -536,7 +522,6 @@ "server_banner.server_stats": "Statistik pelayan:", "sign_in_banner.create_account": "Cipta akaun", "sign_in_banner.sign_in": "Daftar masuk", - "sign_in_banner.text": "Daftar masuk untuk mengikut profil atau tanda pagar, menggemari, mengkongsi dan membalas kepada hantaran, atau berinteraksi daripada akaun anda pada pelayan lain.", "status.admin_account": "Buka antara muka penyederhanaan untuk @{name}", "status.admin_domain": "antara muka penyederhanaan", "status.admin_status": "Buka hantaran ini dalam antara muka penyederhanaan", @@ -551,7 +536,6 @@ "status.edited": "Disunting {date}", "status.edited_x_times": "Disunting {count, plural, other {{count} kali}}", "status.embed": "Benaman", - "status.favourite": "Kegemaran", "status.filter": "Tapiskan hantaran ini", "status.filtered": "Ditapis", "status.history.created": "{name} mencipta pada {date}", diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json index 15e48092de..fadc89a7bd 100644 --- a/app/javascript/mastodon/locales/my.json +++ b/app/javascript/mastodon/locales/my.json @@ -113,7 +113,7 @@ "column.direct": "သီးသန့်ဖော်ပြခြင်း", "column.directory": "ပရိုဖိုင်များကို ရှာဖွေမည်\n", "column.domain_blocks": " ဒိုမိန်းကိုပိတ်မည်", - "column.favourites": "အကြိုက်ဆုံးများ", + "column.favourites": "Favorites", "column.firehose": "တိုက်ရိုက်ထုတ်လွှင့်မှုများ", "column.follow_requests": "စောင့်ကြည့်ရန် တောင်းဆိုမှုများ", "column.home": "ပင်မစာမျက်နှာ", @@ -181,7 +181,6 @@ "confirmations.mute.explanation": "၎င်းသည် ၎င်းတို့ထံမှ ပို့စ်များနှင့် ၎င်းတို့ကို ဖော်ပြထားသော ပို့စ်များကို ဖျောက်ထားမည်ဖြစ်ပြီး၊ သို့သော် ၎င်းတို့သည် သင့်ပို့စ်များကို မြင်နိုင်ပြီး သင့်အား လိုက်ကြည့်နိုင်စေမည်ဖြစ်သည်။", "confirmations.mute.message": "{name} ကို မမြင်လိုသည်မှာ သေချာပါသလား။ ", "confirmations.redraft.confirm": "ဖျက်ပြီး ပြန်လည်ရေးမည်။", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "confirmations.reply.confirm": "စာပြန်မည်", "confirmations.reply.message": "စာပြန်လျှင်ယခင်စာများကိုအလိုအလျောက်ပျက်သွားစေမည်။ ဆက်လက်လုပ်ဆောင်မည်လား?", "confirmations.unfollow.confirm": "စောင့်ကြည့်ခြင်းအား ပယ်ဖျက်မည်", @@ -202,7 +201,6 @@ "dismissable_banner.community_timeline": "အကောင့်များမှ လတ်တလောတင်ထားသည့်အများမြင်ပို့စ်များမှာ {domain} တွင် တင်ထားသောပို့စ်များဖြစ်သည်။", "dismissable_banner.dismiss": "ပယ်ရန်", "dismissable_banner.explore_links": "ဤသတင်းများကို ယခုအချိန်တွင် ဗဟိုချုပ်ကိုင်မှုလျှော့ချထားသော ကွန်ရက်၏ အခြားဆာဗာများမှ လူများက ပြောဆိုနေကြပါသည်။", - "dismissable_banner.explore_statuses": "ဤစာများနှင့် ဗဟိုချုပ်ကိုင်မှုလျှော့ချထားသော ကွန်ရက်ရှိ အခြားဆာဗာများမှ ဤပို့စ်များသည် ယခုဆာဗာပေါ်တွင် ဆွဲဆောင်မှု ရှိလာပါသည်။", "dismissable_banner.explore_tags": "ဤ hashtag များသည် ယခုအချိန်တွင် ဗဟိုချုပ်ကိုင်မှုလျှော့ချထားသော ကွန်ရက်၏ အခြားဆာဗာများပေါ်ရှိ လူများကြားတွင် ဆွဲဆောင်မှုရှိလာပါသည်", "dismissable_banner.public_timeline": "ဤအရာများသည် {domain} ရှိလူများ လိုက်နာသော လူမှုဝဘ်ပေါ်ရှိ လူများထံမှ လတ်တလော အများမြင်ပို့စ်များဖြစ်သည်။", "embed.instructions": "Embed this status on your website by copying the code below.", @@ -231,8 +229,8 @@ "empty_column.direct": "သင့်တွင် သီးသန့်ဖော်ပြချက်များ မရှိသေးပါ။ ပေးပို့ခြင်း သို့မဟုတ် လက်ခံသောအခါ၊ ၎င်းသည် ဤနေရာတွင် ပေါ်လာလိမ့်မည်။", "empty_column.domain_blocks": "သင်ပိတ်ထားသော ဒိုမိန်းမရှိသေးပါ", "empty_column.explore_statuses": "အခုလောလောဆယ်တွင် ရေပန်းစားနေသောပို့စ်များ မရှိသေးပါ။ နောက်မှ ပြန်စစ်ဆေးပါရန်။", - "empty_column.favourited_statuses": "သင့်တွင် အကြိုက်ဆုံးပို့စ်များ မရှိသေးပါ။ တစ်ခုကို သင်နှစ်သက်ထားပါက ၎င်းကို ဤနေရာတွင် ပြထားပါမည်။", - "empty_column.favourites": "ဤပို့စ်ကို အကြိုက်တွေ့သူ မရှိသေးပါ။ တစ်စုံတစ်ယောက်က ကြိုက်နှစ်သက်ပါက ဤနေရာတွင် ပြထားပါမည်။", + "empty_column.favourited_statuses": "သင့်တွင် favorite ပို့စ်များ မရှိသေးပါ။ သင် favorite ရွေးချယ်လိုက်ပါက ဤနေရာတွင်ပေါ်လာပါမည်။", + "empty_column.favourites": "ဤပို့စ်ကို favorite ပြုလုပ်ထားသူ မရှိသေးပါ။ တစ်စုံတစ်ယောက် favorite ပြုလုပ်လိုက်ပါက ဤနေရာတွင် ပြပါမည်။", "empty_column.follow_requests": "သင့်တွင် စောင့်ကြည့်ရန် တောင်းဆိုမှုများ မရှိသေးပါ။ သင်လက်ခံရရှိပါက ၎င်းကို ဤနေရာတွင် ပြထားပါမည်။", "empty_column.followed_tags": "သင်သည် မည်သည့် hashtag ကိုမျှ စောင့်မကြည့်ရသေးပါ။ စောင့်ကြည့်ပါက ဤနေရာတွင် ပြပေးပါမည်။", "empty_column.hashtag": "ဤ hashtag တွင် မည်သည့်အရာမျှ မရှိသေးပါ။", @@ -307,7 +305,7 @@ "home.explore_prompt.title": "ဤသည်မှာ Mastodon ရှိ သင့်ပင်မစာမျက်နှာဖြစ်သည်။", "home.hide_announcements": "ကြေညာချက်များကို ဖျောက်ပါ", "home.show_announcements": "ကြေညာချက်များကို ပြပါ", - "interaction_modal.description.favourite": "Mastodon အကောင့်တစ်ခုဖြင့် ဤပို့စ်ကို နှစ်သက်ကြောင်းနှင့် စာရေးသူအား သင်နှစ်သက်ကြောင်း အသိပေးပြီးနောက် ၎င်းကို နောက်မှ သိမ်းဆည်းနိုင်သည်။", + "interaction_modal.description.favourite": "Mastodon အကောင့်ဖြင့် ဤပို့စ်ကို သင် favorite ပြုလုပ်ကြောင်း စာရေးသူအား အသိပေးပြီး နောက်ပိုင်းတွင် သိမ်းဆည်းနိုင်သည်။", "interaction_modal.description.follow": "Mastodon အကောင့်ဖြင့် သင်၏ ပင်မစာမျက်နှာတွင် ၎င်းတို့၏ ပို့စ်များကို ရရှိရန်အတွက် {name} ကို စောင့်ကြည့်နိုင်ပါသည်။", "interaction_modal.description.reblog": "Mastodon အကောင့်တစ်ခုဖြင့် သင်၏စောင့်ကြည့်သူများကို မျှဝေရန်အတွက် ဤပို့စ်ကို Boost လုပ်ပါ။", "interaction_modal.description.reply": "Mastodon အကောင့်တစ်ခုဖြင့် သင် ဤပို့စ်ကို တုံ့ပြန်နိုင်ပါသည်။", @@ -315,7 +313,7 @@ "interaction_modal.on_this_server": "ဤဆာဗာတွင်", "interaction_modal.other_server_instructions": "သင်အကြိုက်ဆုံး Mastodon အက်ပ် သို့မဟုတ် သင့် Mastodon ဆာဗာ၏ ဝဘ်ရှိ ရှာဖွေမှုနေရာတွင် ဤ URL ကို ကူးယူပြီး ထည့်ပါ။", "interaction_modal.preamble": "Mastodon မှာ ဗဟိုချုပ်ကိုင်မှု မရှိခြင်းကြောင့် ဤတစ်ခုအတွက် သင့်တွင်အကောင့်မရှိပါက အခြား Mastodon ဆာဗာ သို့မဟုတ် အဆင်ပြေသောပလက်ဖောင်းတွင် ရှိသော သင့်လက်ရှိအကောင့်ဖြင့် အသုံးပြုနိုင်ပါသည်။", - "interaction_modal.title.favourite": "အကြိုက်ဆုံး {name} ၏ ပို့စ်", + "interaction_modal.title.favourite": "Favorite {name} ၏ ပို့စ်", "interaction_modal.title.follow": "{name} ကို စောင့်ကြည့်မယ်", "interaction_modal.title.reblog": "{name} ၏ ပို့စ်ကို Boost လုပ်ပါ", "interaction_modal.title.reply": "{name} ၏ ပို့စ်ကို စာပြန်မယ်", @@ -331,8 +329,8 @@ "keyboard_shortcuts.direct": "သီးသန့်ဖော်ပြချက်များကော်လံကိုဖွင့်ရန်", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", + "keyboard_shortcuts.favourite": "Favorite ပို့စ်", + "keyboard_shortcuts.favourites": " favorite များ စာရင်းကို ဖွင့်ပါ", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -395,7 +393,7 @@ "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.edit_profile": "ကိုယ်ရေးမှတ်တမ်းပြင်ဆင်မည်", "navigation_bar.explore": "စူးစမ်းရန်", - "navigation_bar.favourites": "အကြိုက်ဆုံးများ", + "navigation_bar.favourites": "Favorites", "navigation_bar.filters": "စကားလုံးများ ပိတ်ထားပါ", "navigation_bar.follow_requests": "စောင့်ကြည့်ရန် တောင်းဆိုမှုများ", "navigation_bar.followed_tags": "Hashtag ကို စောင့်ကြည့်မယ်", @@ -412,7 +410,7 @@ "not_signed_in_indicator.not_signed_in": "ဤရင်းမြစ်သို့ ဝင်ရောက်ရန်အတွက် သင်သည် အကောင့်ဝင်ရန် လိုအပ်ပါသည်။", "notification.admin.report": "{name} က {target} ကို တိုင်ကြားခဲ့သည်", "notification.admin.sign_up": "{name} က အကောင့်ဖွင့်ထားသည်", - "notification.favourite": "{name} favourited your status", + "notification.favourite": "{name} က သင့်ပို့စ်ကို နှစ်သက်ခဲ့သည်", "notification.follow": "{name} က သင့်ကို စောင့်ကြည့်ခဲ့သည်", "notification.follow_request": "{name} က သင့်ကို စောင့်ကြည့်ရန် တောင်းဆိုထားသည်", "notification.mention": "{name} က သင့်ကို ဖော်ပြခဲ့သည်", @@ -426,7 +424,7 @@ "notifications.column_settings.admin.report": "တိုင်ကြားစာအသစ်များ -", "notifications.column_settings.admin.sign_up": "အကောင့်အသစ်များ -", "notifications.column_settings.alert": "Desktop သတိပေးချက်များ", - "notifications.column_settings.favourite": "ကြိုက်နှစ်သက်မှုများ", + "notifications.column_settings.favourite": "Favorites:", "notifications.column_settings.filter_bar.advanced": "ခေါင်းစဥ်အားလုံးများကိုဖော်ပြပါ", "notifications.column_settings.filter_bar.category": "အမြန်စစ်ထုတ်မှုဘား", "notifications.column_settings.filter_bar.show_bar": "စစ်ထုတ်မှုဘားကို ပြပါ", @@ -444,7 +442,7 @@ "notifications.column_settings.update": "ပြင်ဆင်ထားမှုများ -", "notifications.filter.all": "အားလုံး", "notifications.filter.boosts": "အားပေးမည်", - "notifications.filter.favourites": "ကြိုက်နှစ်သက်မှုများ", + "notifications.filter.favourites": "Favorites", "notifications.filter.follows": "စောင့်ကြည့်မယ်", "notifications.filter.mentions": " မန်းရှင်းမည်", "notifications.filter.polls": "စစ်တမ်းရလဒ်", @@ -595,7 +593,6 @@ "server_banner.server_stats": "ဆာဗာအား လက်ရှိအသုံးပြုသူများ -", "sign_in_banner.create_account": "အကောင့်ဖန်တီးမည်", "sign_in_banner.sign_in": "အကောင့်ဝင်မည်", - "sign_in_banner.text": "ပရိုဖိုင်များ သို့မဟုတ် hashtags များ၊ အကြိုက်ဆုံး၊ မျှဝေပြီး ပို့စ်များနှင့် ပို့စ် ပြန်ကြားစာများ ကြည့်ရှုရန်အတွက် အကောင့်ဝင်ရောက်ပါ။ အခြားဆာဗာတစ်ခုပေါ်ရှိ သင့်အကောင့်မှလည်း အပြန်အလှန် ဖလှယ်နိုင်ပါသည်။", "status.admin_account": "@{name} အတွက် စိစစ်ခြင်းကြားခံနယ်ကို ဖွင့်ပါ", "status.admin_domain": "{domain} အတွက် စိစစ်ခြင်းကြားခံနယ်ကို ဖွင့်ပါ", "status.admin_status": "Open this status in the moderation interface", @@ -612,7 +609,7 @@ "status.edited": "{date} ကို ပြင်ဆင်ပြီးပါပြီ", "status.edited_x_times": "{count, plural, one {{count} time} other {{count} times}} ပြင်ဆင်ခဲ့သည်", "status.embed": "Embed", - "status.favourite": "ကြိုက်နှစ်သက်မှုများ", + "status.favourite": "Favorite", "status.filter": "ဤပို့စ်ကို စစ်ထုတ်ပါ", "status.filtered": "စစ်ထုတ်ထားသည်", "status.hide": "ပို့စ်ကိုပိတ်ထားမည်", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index ecc342dc55..d09d472766 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -331,8 +331,8 @@ "keyboard_shortcuts.direct": "om de kolom met privéberichten te openen", "keyboard_shortcuts.down": "Naar beneden in de lijst bewegen", "keyboard_shortcuts.enter": "Volledig bericht tonen", - "keyboard_shortcuts.favourite": "Als favoriet markeren", - "keyboard_shortcuts.favourites": "Favorieten tonen", + "keyboard_shortcuts.favourite": "Bericht als favoriet markeren", + "keyboard_shortcuts.favourites": "Lijst met favorieten tonen", "keyboard_shortcuts.federated": "Globale tijdlijn tonen", "keyboard_shortcuts.heading": "Sneltoetsen", "keyboard_shortcuts.home": "Starttijdlijn tonen", @@ -363,6 +363,7 @@ "lightbox.previous": "Vorige", "limited_account_hint.action": "Alsnog het profiel tonen", "limited_account_hint.title": "Dit profiel is door de moderatoren van {domain} verborgen.", + "link_preview.author": "Door {name}", "lists.account.add": "Aan lijst toevoegen", "lists.account.remove": "Uit lijst verwijderen", "lists.delete": "Lijst verwijderen", diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json index 76484fa8a4..fad76036fd 100644 --- a/app/javascript/mastodon/locales/nn.json +++ b/app/javascript/mastodon/locales/nn.json @@ -113,7 +113,6 @@ "column.direct": "Private omtaler", "column.directory": "Sjå gjennom profilar", "column.domain_blocks": "Skjulte domene", - "column.favourites": "Favorittar", "column.firehose": "Tidslinjer", "column.follow_requests": "Fylgjeførespurnadar", "column.home": "Heim", @@ -181,7 +180,6 @@ "confirmations.mute.explanation": "Dette vil skjula innlegg som kjem frå og som nemner dei, men vil framleis la dei sjå innlegga dine og fylgje deg.", "confirmations.mute.message": "Er du sikker på at du vil målbinda {name}?", "confirmations.redraft.confirm": "Slett & skriv på nytt", - "confirmations.redraft.message": "Er du sikker på at du vil sletta denne statusen og skriva han på nytt? Då misser du favorittar og framhevingar, og eventuelle svar til det opprinnelege innlegget vert foreldrelause.", "confirmations.reply.confirm": "Svar", "confirmations.reply.message": "Å svara no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?", "confirmations.unfollow.confirm": "Slutt å fylgja", @@ -202,7 +200,6 @@ "dismissable_banner.community_timeline": "Dette er dei nylegaste offentlege innlegga frå personar med kontoar frå {domain}.", "dismissable_banner.dismiss": "Avvis", "dismissable_banner.explore_links": "Desse nyhendesakene snakkast om av folk på denne og andre tenarar på det desentraliserte nettverket no.", - "dismissable_banner.explore_statuses": "Desse innlegga frå denne tenaren og andre tenarar i det desentraliserte nettverket er i støytet på denne tenaren nett no.", "dismissable_banner.explore_tags": "Desse emneknaggane er populære blant folk på denne tenaren og andre tenarar i det desentraliserte nettverket nett no.", "dismissable_banner.public_timeline": "Dette er de siste offentlige innleggene fra mennesker på det sosiale nettet som folk på {domain} følger.", "embed.instructions": "Bygg inn denne statusen på nettsida di ved å kopiera koden nedanfor.", @@ -231,8 +228,6 @@ "empty_column.direct": "Du har ingen private omtaler enda. Etter du har sendt eller mottatt en, så vil den dukke opp her.", "empty_column.domain_blocks": "Det er ingen skjulte domene til no.", "empty_column.explore_statuses": "Ingenting er i støytet nett no. Prøv igjen seinare!", - "empty_column.favourited_statuses": "Du har ingen favoritt-tut ennå. Når du merkjer eit som favoritt, så dukkar det opp her.", - "empty_column.favourites": "Ingen har merkt dette tutet som favoritt enno. Når nokon gjer det, så dukkar det opp her.", "empty_column.follow_requests": "Du har ingen følgjeførespurnadar ennå. Når du får ein, så vil den dukke opp her.", "empty_column.followed_tags": "Du fylgjer ingen emneknaggar enno. Når du gjer det, vil dei syna her.", "empty_column.hashtag": "Det er ingenting i denne emneknaggen enno.", @@ -307,15 +302,12 @@ "home.explore_prompt.title": "Dette er hjemmet ditt i Mastodon.", "home.hide_announcements": "Skjul kunngjeringar", "home.show_announcements": "Vis kunngjeringar", - "interaction_modal.description.favourite": "Med ein konto på Mastodon kan du favorittmerkja dette innlegget for å visa forfattaren at du set pris på det, og for å lagra det til seinare.", "interaction_modal.description.follow": "Med ein konto på Mastodon kan du fylgja {name} for å sjå innlegga deira i din heimestraum.", "interaction_modal.description.reblog": "Med ein konto på Mastodon kan du framheva dette innlegget for å dela det med dine eigne fylgjarar.", "interaction_modal.description.reply": "Med ein konto på Mastodon kan du svara på dette innlegget.", "interaction_modal.on_another_server": "På ein annan tenar", "interaction_modal.on_this_server": "På denne tenaren", - "interaction_modal.other_server_instructions": "Kopier og lim inn denne URLen i søkefeltet til din favoritt Mastodon-app eller web-grensesnittet i din Mastodon server.", "interaction_modal.preamble": "Sidan Mastodon er desentralisert, kan du bruke ein konto frå ein annan Mastodontenar eller frå ei anna kompatibel plattform dersom du ikkje har konto på denne tenaren.", - "interaction_modal.title.favourite": "Favorittmarker innlegget til {name}", "interaction_modal.title.follow": "Fylg {name}", "interaction_modal.title.reblog": "Framhev {name} sitt innlegg", "interaction_modal.title.reply": "Svar på innlegge til {name}", @@ -331,8 +323,6 @@ "keyboard_shortcuts.direct": "åpne kolonnen ned private omtaler", "keyboard_shortcuts.down": "Flytt nedover i lista", "keyboard_shortcuts.enter": "Opne innlegg", - "keyboard_shortcuts.favourite": "Merk som favoritt", - "keyboard_shortcuts.favourites": "Opne favorittlista", "keyboard_shortcuts.federated": "Opne den samla tidslina", "keyboard_shortcuts.heading": "Snøggtastar", "keyboard_shortcuts.home": "Opne heimetidslina", @@ -395,7 +385,6 @@ "navigation_bar.domain_blocks": "Skjulte domene", "navigation_bar.edit_profile": "Rediger profil", "navigation_bar.explore": "Utforsk", - "navigation_bar.favourites": "Favorittar", "navigation_bar.filters": "Målbundne ord", "navigation_bar.follow_requests": "Fylgjeførespurnader", "navigation_bar.followed_tags": "Fylgde emneknaggar", @@ -412,7 +401,6 @@ "not_signed_in_indicator.not_signed_in": "Du må logga inn for å få tilgang til denne ressursen.", "notification.admin.report": "{name} rapporterte {target}", "notification.admin.sign_up": "{name} er registrert", - "notification.favourite": "{name} merkte statusen din som favoritt", "notification.follow": "{name} fylgde deg", "notification.follow_request": "{name} har bedt om å fylgja deg", "notification.mention": "{name} nemnde deg", @@ -426,7 +414,6 @@ "notifications.column_settings.admin.report": "Nye rapportar:", "notifications.column_settings.admin.sign_up": "Nyleg registrerte:", "notifications.column_settings.alert": "Skrivebordsvarsel", - "notifications.column_settings.favourite": "Favorittar:", "notifications.column_settings.filter_bar.advanced": "Vis alle kategoriar", "notifications.column_settings.filter_bar.category": "Snarfilterlinje", "notifications.column_settings.filter_bar.show_bar": "Vis filterlinja", @@ -444,7 +431,6 @@ "notifications.column_settings.update": "Redigeringar:", "notifications.filter.all": "Alle", "notifications.filter.boosts": "Framhevingar", - "notifications.filter.favourites": "Favorittar", "notifications.filter.follows": "Fylgjer", "notifications.filter.mentions": "Omtalar", "notifications.filter.polls": "Røysteresultat", @@ -595,7 +581,6 @@ "server_banner.server_stats": "Tenarstatistikk:", "sign_in_banner.create_account": "Opprett konto", "sign_in_banner.sign_in": "Logg inn", - "sign_in_banner.text": "Logg inn for å fylgja profilar eller emneknaggar, og for å lika, dela og svara på innlegg. Du kan òg samhandla med aktivitet på denne tenaren frå kontoar på andre tenarar.", "status.admin_account": "Opne moderasjonsgrensesnitt for @{name}", "status.admin_domain": "Opna moderatorgrensesnittet for {domain}", "status.admin_status": "Opne denne statusen i moderasjonsgrensesnittet", @@ -612,7 +597,6 @@ "status.edited": "Redigert {date}", "status.edited_x_times": "Redigert {count, plural, one {{count} gong} other {{count} gonger}}", "status.embed": "Bygg inn", - "status.favourite": "Favoritt", "status.filter": "Filtrer dette innlegget", "status.filtered": "Filtrert", "status.hide": "Skjul innlegget", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index 2bb00ae290..77172517c4 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -113,7 +113,6 @@ "column.direct": "Private omtaler", "column.directory": "Bla gjennom profiler", "column.domain_blocks": "Skjulte domener", - "column.favourites": "Favoritter", "column.firehose": "Tidslinjer", "column.follow_requests": "Følgeforespørsler", "column.home": "Hjem", @@ -181,7 +180,6 @@ "confirmations.mute.explanation": "Dette vil skjule innlegg fra dem og innlegg som nevner dem, men det vil fortsatt la dem se dine innlegg og å følge deg.", "confirmations.mute.message": "Er du sikker på at du vil dempe {name}?", "confirmations.redraft.confirm": "Slett og skriv på nytt", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", "confirmations.reply.confirm": "Svar", "confirmations.reply.message": "Å svare nå vil overskrive meldingen du skriver for øyeblikket. Er du sikker på at du vil fortsette?", "confirmations.unfollow.confirm": "Slutt å følge", @@ -202,7 +200,6 @@ "dismissable_banner.community_timeline": "Dette er de nyeste offentlige innleggene fra personer med kontoer på {domain}.", "dismissable_banner.dismiss": "Avvis", "dismissable_banner.explore_links": "Disse nyhetene snakker folk om akkurat nå på denne og andre servere i det desentraliserte nettverket.", - "dismissable_banner.explore_statuses": "Disse innleggene fra denne og andre servere i det desentraliserte nettverket får økt oppmerksomhet på denne serveren akkurat nå.", "dismissable_banner.explore_tags": "Disse emneknaggene snakker folk om akkurat nå, på denne og andre servere i det desentraliserte nettverket.", "dismissable_banner.public_timeline": "Dette er de siste offentlige innleggene fra mennesker på det sosiale nettet som folk på {domain} følger.", "embed.instructions": "Kopier koden under for å bygge inn denne statusen på hjemmesiden din.", @@ -231,8 +228,6 @@ "empty_column.direct": "Du har ingen private omtaler enda. Etter du har sendt eller mottatt en, så vil den dukke opp her.", "empty_column.domain_blocks": "Det er ingen skjulte domener enda.", "empty_column.explore_statuses": "Ingenting er populært akkurat nå. Prøv igjen senere!", - "empty_column.favourited_statuses": "Du har ikke noen favorittinnlegg enda. Når du favorittmarkerer et inlegg, vil det dukke opp her.", - "empty_column.favourites": "Ingen har favorittmarkert dette innlegget ennå. Når noen gjør det, vil de dukke opp her.", "empty_column.follow_requests": "Du har ingen følgeforespørsler enda. Når du mottar en, vil den dukke opp her.", "empty_column.followed_tags": "Du har ikke fulgt noen emneknagger ennå. Når du gjør det, vil de vises her.", "empty_column.hashtag": "Det er ingenting i denne emneknaggen ennå.", @@ -307,15 +302,12 @@ "home.explore_prompt.title": "Dette er hjemmet ditt i Mastodon.", "home.hide_announcements": "Skjul kunngjøring", "home.show_announcements": "Vis kunngjøring", - "interaction_modal.description.favourite": "Med en konto på Mastodon, kan du favorittmarkere dette innlegget for å la forfatteren vite at du satte pris på det, og lagre innlegget til senere.", "interaction_modal.description.follow": "Med en konto på Mastodon, kan du følge {name} for å få innleggene deres i tidslinjen din.", "interaction_modal.description.reblog": "Med en konto på Mastodon, kan du fremheve dette innlegget for å dele det med dine egne følgere.", "interaction_modal.description.reply": "Med en konto på Mastodon, kan du svare på dette innlegget.", "interaction_modal.on_another_server": "På en annen server", "interaction_modal.on_this_server": "På denne serveren", - "interaction_modal.other_server_instructions": "Kopier og lim inn denne URLen i søkefeltet til din favoritt Mastodon-app eller web-grensesnittet i din Mastodon server.", "interaction_modal.preamble": "Siden Mastodon er desentralisert, kan du bruke din eksisterende konto på en annen Mastodon-tjener eller en kompatibel plattform hvis du ikke har en konto her.", - "interaction_modal.title.favourite": "Favorittmarker innlegget til {name}", "interaction_modal.title.follow": "Følg {name}", "interaction_modal.title.reblog": "Fremhev {name} sitt innlegg", "interaction_modal.title.reply": "Svar på {name} sitt innlegg", @@ -331,8 +323,6 @@ "keyboard_shortcuts.direct": "åpne kolonnen ned private omtaler", "keyboard_shortcuts.down": "Flytt nedover i listen", "keyboard_shortcuts.enter": "Åpne innlegg", - "keyboard_shortcuts.favourite": "Marker innlegg som favoritt", - "keyboard_shortcuts.favourites": "Åpne listen over favoritter", "keyboard_shortcuts.federated": "Åpne fellestidslinjen", "keyboard_shortcuts.heading": "Hurtigtaster", "keyboard_shortcuts.home": "Åpne hjemmetidslinjen", @@ -395,7 +385,6 @@ "navigation_bar.domain_blocks": "Skjulte domener", "navigation_bar.edit_profile": "Rediger profil", "navigation_bar.explore": "Utforsk", - "navigation_bar.favourites": "Favoritter", "navigation_bar.filters": "Stilnede ord", "navigation_bar.follow_requests": "Følgeforespørsler", "navigation_bar.followed_tags": "Fulgte emneknagger", @@ -412,7 +401,6 @@ "not_signed_in_indicator.not_signed_in": "Du må logge inn for å få tilgang til denne ressursen.", "notification.admin.report": "{name} rapporterte {target}", "notification.admin.sign_up": "{name} registrerte seg", - "notification.favourite": "{name} favorittmarkerte innlegget ditt", "notification.follow": "{name} fulgte deg", "notification.follow_request": "{name} har bedt om å få følge deg", "notification.mention": "{name} nevnte deg", @@ -426,7 +414,6 @@ "notifications.column_settings.admin.report": "Nye rapporter:", "notifications.column_settings.admin.sign_up": "Nye registreringer:", "notifications.column_settings.alert": "Skrivebordsvarslinger", - "notifications.column_settings.favourite": "Favoritter:", "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier", "notifications.column_settings.filter_bar.category": "Hurtigfiltreringslinje", "notifications.column_settings.filter_bar.show_bar": "Vis filterlinjen", @@ -444,7 +431,6 @@ "notifications.column_settings.update": "Redigeringer:", "notifications.filter.all": "Alle", "notifications.filter.boosts": "Fremhevinger", - "notifications.filter.favourites": "Favoritter", "notifications.filter.follows": "Følginger", "notifications.filter.mentions": "Nevnelser", "notifications.filter.polls": "Avstemningsresultater", @@ -595,7 +581,6 @@ "server_banner.server_stats": "Serverstatistikk:", "sign_in_banner.create_account": "Opprett konto", "sign_in_banner.sign_in": "Logg inn", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "Åpne moderatorgrensesnittet for @{name}", "status.admin_domain": "Åpne moderatorgrensesnittet for {domain}", "status.admin_status": "Åpne denne statusen i moderatorgrensesnittet", @@ -612,7 +597,6 @@ "status.edited": "Redigert {date}", "status.edited_x_times": "Redigert {count, plural,one {{count} gang} other {{count} ganger}}", "status.embed": "Bygge inn", - "status.favourite": "Marker som favoritt", "status.filter": "Filtrer dette innlegget", "status.filtered": "Filtrert", "status.hide": "Skjul innlegg", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index 71855f7788..f3b9f04042 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -90,7 +90,6 @@ "column.community": "Flux public local", "column.directory": "Percórrer los perfils", "column.domain_blocks": "Domenis resconduts", - "column.favourites": "Favorits", "column.follow_requests": "Demandas d’abonament", "column.home": "Acuèlh", "column.lists": "Listas", @@ -152,7 +151,6 @@ "confirmations.mute.explanation": "Aquò lor escondrà las publicacions e mencions, mas aquò lor permetrà encara de veire vòstra publicacions e de vos sègre.", "confirmations.mute.message": "Volètz vertadièrament rescondre {name} ?", "confirmations.redraft.confirm": "Escafar & tornar formular", - "confirmations.redraft.message": "Volètz vertadièrament escafar aqueste estatut e lo reformular ? Totes sos partiments e favorits seràn perduts, e sas responsas seràn orfanèlas.", "confirmations.reply.confirm": "Respondre", "confirmations.reply.message": "Respondre remplaçarà lo messatge que sètz a escriure. Volètz vertadièrament contunhar ?", "confirmations.unfollow.confirm": "Quitar de sègre", @@ -172,7 +170,6 @@ "dismissable_banner.community_timeline": "Vaquí las publicacions mai recentas del monde amb un compte albergat per {domain}.", "dismissable_banner.dismiss": "Ignorar", "dismissable_banner.explore_links": "Aquestas istòrias ne parlan lo monde d’aqueste servidor e dels autres servidors del malhum descentralizat d’aquesta passa.", - "dismissable_banner.explore_statuses": "Aquí las publicacions d’aqueste servidor e dels autres del malhum descentralizat que ganhan en popularitat d’aquesta passa.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embarcar aqueste estatut per lo far veire sus un site Internet en copiar lo còdi çai-jos.", "embed.preview": "Semblarà aquò :", @@ -199,8 +196,6 @@ "empty_column.community": "Lo flux public local es void. Escrivètz quicòm per lo garnir !", "empty_column.domain_blocks": "I a pas encara cap de domeni amagat.", "empty_column.explore_statuses": "I a pas res en tendéncia pel moment. Tornatz mai tard !", - "empty_column.favourited_statuses": "Avètz pas encara cap de tut favorit. Quand n’auretz un, apareisserà aquí.", - "empty_column.favourites": "Degun a pas encara mes en favorit aqueste tut. Quand qualqu’un o farà, apareisserà aquí.", "empty_column.follow_requests": "Avètz pas encara de demanda d’abonament. Quand n’auretz una apareisserà aquí.", "empty_column.hashtag": "I a pas encara de contengut ligat a aquesta etiqueta.", "empty_column.home": "Vòstre flux d’acuèlh es void. Visitatz {public} o utilizatz la recèrca per vos connectar a d’autras personas.", @@ -262,7 +257,6 @@ "home.show_announcements": "Mostrar las anóncias", "interaction_modal.on_another_server": "Sus un autre servidor", "interaction_modal.on_this_server": "Sus aqueste servidor", - "interaction_modal.title.favourite": "Metre en favorit la publicacion de {name}", "interaction_modal.title.follow": "Sègre {name}", "interaction_modal.title.reblog": "Partejar la publicacion de {name}", "interaction_modal.title.reply": "Respondre a la publicacion de {name}", @@ -278,8 +272,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "far davalar dins la lista", "keyboard_shortcuts.enter": "dobrir los estatuts", - "keyboard_shortcuts.favourite": "apondre als favorits", - "keyboard_shortcuts.favourites": "dobrir la lista de favorits", "keyboard_shortcuts.federated": "dobrir lo flux public global", "keyboard_shortcuts.heading": "Acorchis clavièr", "keyboard_shortcuts.home": "dobrir lo flux public local", @@ -338,7 +330,6 @@ "navigation_bar.domain_blocks": "Domenis resconduts", "navigation_bar.edit_profile": "Modificar lo perfil", "navigation_bar.explore": "Explorar", - "navigation_bar.favourites": "Favorits", "navigation_bar.filters": "Mots ignorats", "navigation_bar.follow_requests": "Demandas d’abonament", "navigation_bar.followed_tags": "Etiquetas seguidas", @@ -355,7 +346,6 @@ "not_signed_in_indicator.not_signed_in": "Devètz vos connectar per accedir a aquesta ressorsa.", "notification.admin.report": "{name} senhalèt {target}", "notification.admin.sign_up": "{name} se marquèt", - "notification.favourite": "{name} a ajustat a sos favorits", "notification.follow": "{name} vos sèc", "notification.follow_request": "{name} a demandat a vos sègre", "notification.mention": "{name} vos a mencionat", @@ -369,7 +359,6 @@ "notifications.column_settings.admin.report": "Senhalaments novèls :", "notifications.column_settings.admin.sign_up": "Nòus inscrits :", "notifications.column_settings.alert": "Notificacions localas", - "notifications.column_settings.favourite": "Favorits :", "notifications.column_settings.filter_bar.advanced": "Mostrar totas las categorias", "notifications.column_settings.filter_bar.category": "Barra de recèrca rapida", "notifications.column_settings.filter_bar.show_bar": "Afichar la barra de filtres", @@ -387,7 +376,6 @@ "notifications.column_settings.update": "Modificacions :", "notifications.filter.all": "Totas", "notifications.filter.boosts": "Partages", - "notifications.filter.favourites": "Favorits", "notifications.filter.follows": "Seguiments", "notifications.filter.mentions": "Mencions", "notifications.filter.polls": "Resultats del sondatge", @@ -498,7 +486,6 @@ "server_banner.server_stats": "Estatisticas del servidor :", "sign_in_banner.create_account": "Crear un compte", "sign_in_banner.sign_in": "Se connectar", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "Dobrir l’interfàcia de moderacion per @{name}", "status.admin_domain": "Dobrir l’interfàcia de moderacion per {domain}", "status.admin_status": "Dobrir aqueste estatut dins l’interfàcia de moderacion", @@ -513,7 +500,6 @@ "status.edited": "Modificat {date}", "status.edited_x_times": "Modificat {count, plural, un {{count} còp} other {{count} còps}}", "status.embed": "Embarcar", - "status.favourite": "Apondre als favorits", "status.filter": "Filtrar aquesta publicacion", "status.filtered": "Filtrat", "status.hide": "Amagar la publicacion", diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json index 4ac18b87eb..ea30790115 100644 --- a/app/javascript/mastodon/locales/pa.json +++ b/app/javascript/mastodon/locales/pa.json @@ -54,7 +54,6 @@ "confirmations.edit.confirm": "ਸੋਧ", "confirmations.logout.confirm": "ਬਾਹਰ ਹੋਵੋ", "confirmations.mute.confirm": "ਮੌਨ ਕਰੋ", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "confirmations.reply.confirm": "ਜਵਾਬ ਦੇਵੋ", "confirmations.unfollow.confirm": "ਪ੍ਰਸ਼ੰਸਕੀ ਰੱਦ ਕਰੋ", "copypaste.copied": "ਕਾਪੀ ਕੀਤਾ", @@ -63,7 +62,6 @@ "disabled_account_banner.account_settings": "ਖਾਤੇ ਦੀਆਂ ਸੈਟਿੰਗਾਂ", "dismissable_banner.dismiss": "ਰੱਦ ਕਰੋ", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "emoji_button.activity": "ਗਤੀਵਿਧੀਆਂ", @@ -76,8 +74,6 @@ "emoji_button.people": "ਲੋਕ", "empty_column.account_timeline": "No toots here!", "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}", "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.", "errors.unexpected_crash.report_issue": "ਮੁੱਦੇ ਦੀ ਰਿਪੋਰਟ ਕਰੋ", @@ -101,8 +97,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -145,7 +139,6 @@ "navigation_bar.search": "ਖੋਜੋ", "navigation_bar.security": "ਸੁਰੱਖਿਆ", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.reblog": "{name} boosted your status", "notifications.column_settings.status": "New toots:", "notifications.filter.all": "ਸਭ", @@ -197,7 +190,6 @@ "server_banner.learn_more": "ਹੋਰ ਜਾਣੋ", "sign_in_banner.create_account": "ਖਾਤਾ ਬਣਾਓ", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.copy": "Copy link to status", "status.delete": "ਮਿਟਾਓ", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 376caaa673..2fce76fc5d 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -76,9 +76,9 @@ "admin.dashboard.retention.average": "Średnia", "admin.dashboard.retention.cohort": "Miesiąc rejestracji", "admin.dashboard.retention.cohort_size": "Nowi użytkownicy", - "admin.impact_report.instance_accounts": "Profile kont, które usuną", - "admin.impact_report.instance_followers": "Obserwujący stracili nasi użytkownicy", - "admin.impact_report.instance_follows": "Obserwujący ich użytkownicy stracą", + "admin.impact_report.instance_accounts": "Usuniętych profili kont", + "admin.impact_report.instance_followers": "Obserwujący, których straciliby nasi użytkownicy", + "admin.impact_report.instance_follows": "Obserwujący, których straciliby ich użytkownicy", "admin.impact_report.title": "Podsumowanie wpływu", "alert.rate_limited.message": "Spróbuj ponownie po {retry_time, time, medium}.", "alert.rate_limited.title": "Ograniczony czasowo", @@ -304,7 +304,7 @@ "home.column_settings.show_reblogs": "Pokazuj podbicia", "home.column_settings.show_replies": "Pokazuj odpowiedzi", "home.explore_prompt.body": "Twój kanał główny będzie zawierał kombinację postów z tagów, które wybrano do obserwacji, osoby, które wybrano obserwować i wpisy, które one podbijają. Obecnie jest tu całkiem cicho, więc co myślisz o:", - "home.explore_prompt.title": "To twoja baza domowa w Mastodon.", + "home.explore_prompt.title": "To twój punkt podparcia w Mastodonie.", "home.hide_announcements": "Ukryj ogłoszenia", "home.show_announcements": "Pokaż ogłoszenia", "interaction_modal.description.favourite": "Mając konto na Mastodonie, możesz dodawać wpisy do ulubionych by dać znać jego autorowi, że podoba Ci się ten wpis i zachować go na później.", @@ -331,8 +331,8 @@ "keyboard_shortcuts.direct": "aby otworzyć kolumnę z wzmiankami prywatnymi", "keyboard_shortcuts.down": "aby przejść na dół listy", "keyboard_shortcuts.enter": "aby otworzyć wpis", - "keyboard_shortcuts.favourite": "aby dodać do ulubionych", - "keyboard_shortcuts.favourites": "aby przejść do listy ulubionych wpisów", + "keyboard_shortcuts.favourite": "Polub wpis", + "keyboard_shortcuts.favourites": "Otwórz listę ulubionych wpisów", "keyboard_shortcuts.federated": "aby otworzyć oś czasu federacji", "keyboard_shortcuts.heading": "Skróty klawiszowe", "keyboard_shortcuts.home": "aby otworzyć stronę główną", @@ -363,6 +363,7 @@ "lightbox.previous": "Poprzednie", "limited_account_hint.action": "Pokaż profil mimo to", "limited_account_hint.title": "Ten profil został ukryty przez moderatorów {domain}.", + "link_preview.author": "{name}", "lists.account.add": "Dodaj do listy", "lists.account.remove": "Usunąć z listy", "lists.delete": "Usuń listę", @@ -426,7 +427,7 @@ "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:", + "notifications.column_settings.favourite": "Ulubione:", "notifications.column_settings.filter_bar.advanced": "Wyświetl wszystkie kategorie", "notifications.column_settings.filter_bar.category": "Szybkie filtrowanie", "notifications.column_settings.filter_bar.show_bar": "Pokaż filtry", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index b65273144d..e3889263d5 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -113,7 +113,6 @@ "column.direct": "Menções privadas", "column.directory": "Explorar perfis", "column.domain_blocks": "Domínios bloqueados", - "column.favourites": "Favoritos", "column.firehose": "Feeds ao vivo", "column.follow_requests": "Seguidores pendentes", "column.home": "Página inicial", @@ -181,7 +180,6 @@ "confirmations.mute.explanation": "Isso ocultará toots do usuário e toots que o mencionam, mas ainda permitirá que ele veja teus toots e te siga.", "confirmations.mute.message": "Você tem certeza de que deseja silenciar {name}?", "confirmations.redraft.confirm": "Excluir e rascunhar", - "confirmations.redraft.message": "Você tem certeza de que deseja apagar o toot e usá-lo como rascunho? Boosts e favoritos serão perdidos e as respostas ao toot original ficarão desconectadas.", "confirmations.reply.confirm": "Responder", "confirmations.reply.message": "Responder agora sobrescreverá o toot que você está compondo. Deseja continuar?", "confirmations.unfollow.confirm": "Deixar de seguir", @@ -202,7 +200,6 @@ "dismissable_banner.community_timeline": "Estas são as publicações públicas mais recentes das pessoas cujas contas são hospedadas por {domain}.", "dismissable_banner.dismiss": "Dispensar", "dismissable_banner.explore_links": "Estas novas histórias estão sendo contadas por pessoas neste e em outros servidores da rede descentralizada no momento.", - "dismissable_banner.explore_statuses": "Estas publicações deste e de outros servidores na rede descentralizada estão ganhando popularidade neste servidor agora.", "dismissable_banner.explore_tags": "Estas hashtags estão ganhando popularidade no momento entre as pessoas deste e de outros servidores da rede descentralizada.", "dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas na rede social que pessoas em {domain} seguem.", "embed.instructions": "Incorpore este toot no seu site ao copiar o código abaixo.", @@ -231,8 +228,6 @@ "empty_column.direct": "Você ainda não tem mensagens privadas. Quando você enviar ou receber uma, será exibida aqui.", "empty_column.domain_blocks": "Nada aqui.", "empty_column.explore_statuses": "Nada está em alta no momento. Volte mais tarde!", - "empty_column.favourited_statuses": "Nada aqui. Quando você favoritar um toot, ele aparecerá aqui.", - "empty_column.favourites": "Nada aqui. Quando alguém favoritar, o autor aparecerá aqui.", "empty_column.follow_requests": "Nada aqui. Quando você tiver seguidores pendentes, eles aparecerão aqui.", "empty_column.followed_tags": "Você ainda não seguiu nenhuma hashtag. Quando seguir uma, elas serão exibidas aqui.", "empty_column.hashtag": "Nada aqui.", @@ -307,15 +302,12 @@ "home.explore_prompt.title": "Esta é a sua base principal dentro do Mastodon.", "home.hide_announcements": "Ocultar comunicados", "home.show_announcements": "Mostrar comunicados", - "interaction_modal.description.favourite": "Com uma conta no Mastodon, você pode favoritar esta publicação para que o autor saiba que você gostou e salvá-lo para mais ler mais tarde.", "interaction_modal.description.follow": "Com uma conta no Mastodon, você pode seguir {name} para receber publicações na sua página inicial.", "interaction_modal.description.reblog": "Com uma conta no Mastodon, você pode impulsionar esta publicação para compartilhá-lo com seus próprios seguidores.", "interaction_modal.description.reply": "Com uma conta no Mastodon, você pode responder a esta publicação.", "interaction_modal.on_another_server": "Em um servidor diferente", "interaction_modal.on_this_server": "Neste servidor", - "interaction_modal.other_server_instructions": "Copie e cole este URL no campo de pesquisa de seu aplicativo Mastodon favorito ou na interface web de seu servidor Mastodon.", "interaction_modal.preamble": "Como o Mastodon é descentralizado, você pode usar sua conta existente em outro servidor Mastodon ou plataforma compatível se você não tiver uma conta neste servidor.", - "interaction_modal.title.favourite": "Favoritar publicação de {name}", "interaction_modal.title.follow": "Seguir {name}", "interaction_modal.title.reblog": "Impulsionar publicação de {name}", "interaction_modal.title.reply": "Responder à publicação de {name}", @@ -331,8 +323,6 @@ "keyboard_shortcuts.direct": "para abrir a coluna de menções privadas", "keyboard_shortcuts.down": "mover para baixo", "keyboard_shortcuts.enter": "abrir toot", - "keyboard_shortcuts.favourite": "favoritar toot", - "keyboard_shortcuts.favourites": "abrir favoritos", "keyboard_shortcuts.federated": "abrir linha global", "keyboard_shortcuts.heading": "Atalhos de teclado", "keyboard_shortcuts.home": "abrir página inicial", @@ -395,7 +385,6 @@ "navigation_bar.domain_blocks": "Domínios bloqueados", "navigation_bar.edit_profile": "Editar perfil", "navigation_bar.explore": "Explorar", - "navigation_bar.favourites": "Favoritos", "navigation_bar.filters": "Palavras filtradas", "navigation_bar.follow_requests": "Seguidores pendentes", "navigation_bar.followed_tags": "Hashtags seguidas", @@ -412,7 +401,6 @@ "not_signed_in_indicator.not_signed_in": "Você precisa se autenticar para acessar este recurso.", "notification.admin.report": "{name} denunciou {target}", "notification.admin.sign_up": "{name} se inscreveu", - "notification.favourite": "{name} favoritou teu toot", "notification.follow": "{name} te seguiu", "notification.follow_request": "{name} quer te seguir", "notification.mention": "{name} te mencionou", @@ -426,7 +414,6 @@ "notifications.column_settings.admin.report": "Novas denúncias:", "notifications.column_settings.admin.sign_up": "Novas inscrições:", "notifications.column_settings.alert": "Notificações no computador", - "notifications.column_settings.favourite": "Favoritos:", "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias", "notifications.column_settings.filter_bar.category": "Barra de filtro rápido das notificações", "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtro", @@ -444,7 +431,6 @@ "notifications.column_settings.update": "Editar:", "notifications.filter.all": "Tudo", "notifications.filter.boosts": "Boosts", - "notifications.filter.favourites": "Favoritos", "notifications.filter.follows": "Seguidores", "notifications.filter.mentions": "Menções", "notifications.filter.polls": "Enquetes", @@ -595,7 +581,6 @@ "server_banner.server_stats": "Estatísticas do servidor:", "sign_in_banner.create_account": "Criar conta", "sign_in_banner.sign_in": "Entrar", - "sign_in_banner.text": "Entre para seguir perfis ou hashtags, favoritar, compartilhar e responder publicações. Você também pode interagir a partir da sua conta em um servidor diferente.", "status.admin_account": "Abrir interface de moderação para @{name}", "status.admin_domain": "Abrir interface de moderação para {domain}", "status.admin_status": "Abrir este toot na interface de moderação", @@ -612,7 +597,6 @@ "status.edited": "Editado em {date}", "status.edited_x_times": "Editado {count, plural, one {{count} hora} other {{count} vezes}}", "status.embed": "Incorporar", - "status.favourite": "Favoritar", "status.filter": "Filtrar esta publicação", "status.filtered": "Filtrado", "status.hide": "Ocultar publicação", diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json index 8d9f4a6117..570fd4644c 100644 --- a/app/javascript/mastodon/locales/pt-PT.json +++ b/app/javascript/mastodon/locales/pt-PT.json @@ -113,7 +113,7 @@ "column.direct": "Menções privadas", "column.directory": "Explorar perfis", "column.domain_blocks": "Domínios bloqueados", - "column.favourites": "Preferidos", + "column.favourites": "Favoritos", "column.firehose": "Cronologias", "column.follow_requests": "Seguidores pendentes", "column.home": "Início", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Estas são as publicações públicas mais recentes de pessoas cujas contas são hospedadas por {domain}.", "dismissable_banner.dismiss": "Descartar", "dismissable_banner.explore_links": "Essas histórias de notícias estão, no momento, a ser faladas por pessoas neste e noutros servidores da rede descentralizada.", - "dismissable_banner.explore_statuses": "Estas publicações, deste e de outros servidores na rede descentralizada, estão, neste momento, a ganhar atenção neste servidor.", + "dismissable_banner.explore_statuses": "Estas são publicações de toda a rede social que estão a ganhar popularidade atualmente. As mensagens mais recentes com mais partilhas e favoritos obtêm uma classificação mais elevada.", "dismissable_banner.explore_tags": "Estas #etiquetas estão presentemente a ganhar atenção entre as pessoas neste e noutros servidores da rede descentralizada.", "dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas na rede social que as pessoas em {domain} seguem.", "embed.instructions": "Incorpore esta publicação no seu site copiando o código abaixo.", @@ -231,8 +231,8 @@ "empty_column.direct": "Ainda não tem qualquer menção privada. Quando enviar ou receber uma, ela irá aparecer aqui.", "empty_column.domain_blocks": "Ainda não há qualquer domínio escondido.", "empty_column.explore_statuses": "Nada está em alta no momento. Volte mais tarde!", - "empty_column.favourited_statuses": "Ainda não tens quaisquer publicações nos marcadores. Quando tiveres, aparecerão aqui.", - "empty_column.favourites": "Ainda ninguém tem esta publicação nos seus marcadores. Quando alguém o tiver, ele irá aparecer aqui.", + "empty_column.favourited_statuses": "Ainda não assinalou qualquer publicação como favorita. Quando o fizer, aparecerá aqui.", + "empty_column.favourites": "Ainda ninguém assinalou esta publicação como favorita. Quando alguém o fizer, aparecerá aqui.", "empty_column.follow_requests": "Ainda não tens nenhum pedido de seguidor. Quando receberes algum, ele irá aparecer aqui.", "empty_column.followed_tags": "Ainda não segue nenhuma hashtag. Quando o fizer, ela aparecerá aqui.", "empty_column.hashtag": "Não foram encontradas publicações com essa #etiqueta.", @@ -307,7 +307,7 @@ "home.explore_prompt.title": "Esta é a sua base principal dentro do Mastodon.", "home.hide_announcements": "Ocultar comunicações", "home.show_announcements": "Exibir comunicações", - "interaction_modal.description.favourite": "Com uma conta no Mastodon, pode adicionar esta publicação aos marcadores para que o autor saiba que gostou e guardá-la para mais tarde.", + "interaction_modal.description.favourite": "Com uma conta no Mastodon, pode adicionar assinalar esta publicação como favorita para que o autor saiba que gostou e guardá-la para mais tarde.", "interaction_modal.description.follow": "Com uma conta no Mastodon, pode seguir {name} para receber as suas publicações na sua página inicial.", "interaction_modal.description.reblog": "Com uma conta no Mastodon, pode impulsionar esta publicação para compartilhá-lo com os seus seguidores.", "interaction_modal.description.reply": "Com uma conta no Mastodon, pode responder a esta publicação.", @@ -315,7 +315,7 @@ "interaction_modal.on_this_server": "Neste servidor", "interaction_modal.other_server_instructions": "Copie e cole este URL no campo de pesquisa da sua aplicação Mastodon preferida, ou da interface web do seu servidor Mastodon.", "interaction_modal.preamble": "Uma vez que o Mastodon é descentralizado, caso não tenha uma conta neste servidor, pode utilizar a sua conta existente noutro servidor Mastodon ou plataforma compatível.", - "interaction_modal.title.favourite": "Adicionar a publicação de {name} aos marcadores", + "interaction_modal.title.favourite": "Assinalar a publicação de {name} como favorita", "interaction_modal.title.follow": "Seguir {name}", "interaction_modal.title.reblog": "Impulsionar a publicação de {name}", "interaction_modal.title.reply": "Responder à publicação de {name}", @@ -331,8 +331,8 @@ "keyboard_shortcuts.direct": "para abrir a coluna de menções privadas", "keyboard_shortcuts.down": "para mover para baixo na lista", "keyboard_shortcuts.enter": "para expandir uma publicação", - "keyboard_shortcuts.favourite": "Juntar aos marcadores", - "keyboard_shortcuts.favourites": "Abrir lista de marcadores", + "keyboard_shortcuts.favourite": "Assinalar como favorita", + "keyboard_shortcuts.favourites": "Abrir lista de favoritos", "keyboard_shortcuts.federated": "para abrir a cronologia federada", "keyboard_shortcuts.heading": "Atalhos de teclado", "keyboard_shortcuts.home": "para abrir a cronologia inicial", @@ -412,7 +412,7 @@ "not_signed_in_indicator.not_signed_in": "Necessita de iniciar sessão para utilizar esta funcionalidade.", "notification.admin.report": "{name} denunciou {target}", "notification.admin.sign_up": "{name} inscreveu-se", - "notification.favourite": "{name} adicionou a tua publicação aos favoritos", + "notification.favourite": "{name} assinalou a sua publicação como favorita", "notification.follow": "{name} começou a seguir-te", "notification.follow_request": "{name} pediu para segui-lo", "notification.mention": "{name} mencionou-te", @@ -426,7 +426,7 @@ "notifications.column_settings.admin.report": "Novas denúncias:", "notifications.column_settings.admin.sign_up": "Novas inscrições:", "notifications.column_settings.alert": "Notificações no ambiente de trabalho", - "notifications.column_settings.favourite": "Marcadores:", + "notifications.column_settings.favourite": "Favoritos:", "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias", "notifications.column_settings.filter_bar.category": "Barra de filtros rápidos", "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros", @@ -444,7 +444,7 @@ "notifications.column_settings.update": "Edições:", "notifications.filter.all": "Todas", "notifications.filter.boosts": "Reforços", - "notifications.filter.favourites": "Marcadores", + "notifications.filter.favourites": "Favoritos", "notifications.filter.follows": "Seguidores", "notifications.filter.mentions": "Menções", "notifications.filter.polls": "Resultados do inquérito", @@ -595,7 +595,7 @@ "server_banner.server_stats": "Estatísticas do servidor:", "sign_in_banner.create_account": "Criar conta", "sign_in_banner.sign_in": "Iniciar sessão", - "sign_in_banner.text": "Inicie sessão para seguir perfis ou hashtags, adicionar aos favoritos, partilhar ou responder a publicações. Pode ainda interagir através da sua conta noutro servidor.", + "sign_in_banner.text": "Inicie sessão para seguir perfis ou hashtags, assinalar como favorito, partilhar ou responder a publicações. Pode ainda interagir através da sua conta noutro servidor.", "status.admin_account": "Abrir a interface de moderação para @{name}", "status.admin_domain": "Abrir interface de moderação para {domain}", "status.admin_status": "Abrir esta publicação na interface de moderação", @@ -612,7 +612,7 @@ "status.edited": "Editado em {date}", "status.edited_x_times": "Editado {count, plural,one {{count} vez} other {{count} vezes}}", "status.embed": "Embutir", - "status.favourite": "Adicionar aos marcadores", + "status.favourite": "Assinalar como favorito", "status.filter": "Filtrar esta publicação", "status.filtered": "Filtrada", "status.hide": "Ocultar publicação", diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json index b4dbc7fc8c..9dc98306fa 100644 --- a/app/javascript/mastodon/locales/ro.json +++ b/app/javascript/mastodon/locales/ro.json @@ -101,7 +101,6 @@ "column.community": "Cronologie locală", "column.directory": "Explorează profiluri", "column.domain_blocks": "Domenii blocate", - "column.favourites": "Favorite", "column.follow_requests": "Cereri de abonare", "column.home": "Acasă", "column.lists": "Liste", @@ -164,7 +163,6 @@ "confirmations.mute.explanation": "Postările acestei persoane și postările în care este menționată vor fi ascunse, însă tot va putea să îți vadă postările și să se aboneze la tine.", "confirmations.mute.message": "Ești sigur că vrei să ignori pe {name}?", "confirmations.redraft.confirm": "Șterge și scrie din nou", - "confirmations.redraft.message": "Ești sigur că vrei să ștergi această postare și să o rescrii? Favoritele și distribuirile se vor pierde, iar răspunsurile către postarea originală vor rămâne orfane.", "confirmations.reply.confirm": "Răspunde", "confirmations.reply.message": "Dacă răspunzi acum, mesajul pe care îl scrii în acest moment va fi șters. Ești sigur că vrei să continui?", "confirmations.unfollow.confirm": "Dezabonează-te", @@ -184,7 +182,6 @@ "dismissable_banner.community_timeline": "Acestea sunt cele mai recente postări publice de la persoane ale căror conturi sunt găzduite de {domain}.", "dismissable_banner.dismiss": "Renunțare", "dismissable_banner.explore_links": "În acest moment, oamenii vorbesc despre aceste știri, pe acesta dar și pe alte servere ale rețelei descentralizate.", - "dismissable_banner.explore_statuses": "Aceste postări de pe acesta dar și alte servere din rețeaua descentralizată câștigă teren pe acest server chiar acum.", "dismissable_banner.explore_tags": "Aceste hashtag-uri câștigă teren în rândul oamenilor de pe acesta și pe alte servere ale rețelei descentralizate chiar acum.", "embed.instructions": "Integrează această postare în site-ul tău copiind codul de mai jos.", "embed.preview": "Iată cum va arăta:", @@ -211,8 +208,6 @@ "empty_column.community": "Nu există nimic în cronologia locală. Postează ceva public pentru a sparge gheața!", "empty_column.domain_blocks": "Momentan nu există domenii blocate.", "empty_column.explore_statuses": "Nimic nu figurează în tendințe în acest moment. Verifică din nou mai târziu!", - "empty_column.favourited_statuses": "Momentan nu ai nicio postare favorită. Când vei adăuga una, va apărea aici.", - "empty_column.favourites": "Momentan nimeni nu a adăugat această postare la favorite. Când cineva o va face, va apărea aici.", "empty_column.follow_requests": "Momentan nu ai nicio cerere de abonare. Când vei primi una, va apărea aici.", "empty_column.followed_tags": "Încă nu urmăriți niciun harstag -uri. Când o vei face, vor apărea aici.", "empty_column.hashtag": "Acest hashtag încă nu a fost folosit.", @@ -279,15 +274,12 @@ "home.column_settings.show_replies": "Afișează răspunsurile", "home.hide_announcements": "Ascunde anunțurile", "home.show_announcements": "Afișează anunțurile", - "interaction_modal.description.favourite": "Cu un cont pe Mastodon, poți adăuga această postare la favorite pentru a-l informa pe autorul ei că o apreciezi și pentru a o salva pentru mai târziu.", "interaction_modal.description.follow": "Cu un cont Mastodon, poți urmări pe {name} pentru a vedea postările sale în cronologia ta principală.", "interaction_modal.description.reblog": "Cu un cont pe Mastodon, poți distribui această postare pentru a le-o arăta și celor abonați ție.", "interaction_modal.description.reply": "Cu un cont pe Mastodon, poți răspunde acestei postări.", "interaction_modal.on_another_server": "Pe un alt server", "interaction_modal.on_this_server": "Pe acest server", - "interaction_modal.other_server_instructions": "Copiază și lipește acest URL în câmpul de căutare al aplicației tale preferate Mastodon sau în interfața web a serverului tău Mastodon.", "interaction_modal.preamble": "De vreme ce Mastodon este descentralizat, poți folosi contul tău existent, găzduit de un alt server Mastodon, sau o platformă compatibilă dacă nu ai un cont pe acesta.", - "interaction_modal.title.favourite": "Adaugă la favorite postarea lui {name}", "interaction_modal.title.follow": "Urmărește pe {name}", "interaction_modal.title.reblog": "Distribuie postarea lui {name}", "interaction_modal.title.reply": "Răspunde postării lui {name}", @@ -303,8 +295,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "Coboară în listă", "keyboard_shortcuts.enter": "Deschide postarea", - "keyboard_shortcuts.favourite": "Adaugă postarea la favorite", - "keyboard_shortcuts.favourites": "Deschide lista de favorite", "keyboard_shortcuts.federated": "Afișează cronologia globală", "keyboard_shortcuts.heading": "Comenzi rapide ale tastaturii", "keyboard_shortcuts.home": "Afișează cronologia principală", @@ -364,7 +354,6 @@ "navigation_bar.domain_blocks": "Domenii blocate", "navigation_bar.edit_profile": "Modifică profilul", "navigation_bar.explore": "Explorează", - "navigation_bar.favourites": "Favorite", "navigation_bar.filters": "Cuvinte ignorate", "navigation_bar.follow_requests": "Cereri de abonare", "navigation_bar.followed_tags": "Hashtag-uri urmărite", @@ -381,7 +370,6 @@ "not_signed_in_indicator.not_signed_in": "Trebuie să te conectezi pentru a accesa această resursă.", "notification.admin.report": "{name} a raportat pe {target}", "notification.admin.sign_up": "{name} s-a înscris", - "notification.favourite": "{name} a adăugat postarea ta la favorite", "notification.follow": "{name} s-a abonat la tine", "notification.follow_request": "{name} a trimis o cerere de abonare", "notification.mention": "{name} te-a menționat", @@ -395,7 +383,6 @@ "notifications.column_settings.admin.report": "Raportări noi:", "notifications.column_settings.admin.sign_up": "Înscrieri noi:", "notifications.column_settings.alert": "Notificări pe desktop", - "notifications.column_settings.favourite": "Favorite:", "notifications.column_settings.filter_bar.advanced": "Afișează toate categoriile", "notifications.column_settings.filter_bar.category": "Bară de filtrare rapidă", "notifications.column_settings.filter_bar.show_bar": "Arată bara de filtrare", @@ -413,7 +400,6 @@ "notifications.column_settings.update": "Modificări:", "notifications.filter.all": "Toate", "notifications.filter.boosts": "Distribuiri", - "notifications.filter.favourites": "Favorite", "notifications.filter.follows": "Abonați", "notifications.filter.mentions": "Mențiuni", "notifications.filter.polls": "Rezultate sondaj", @@ -535,7 +521,6 @@ "server_banner.server_stats": "Statisticile serverului:", "sign_in_banner.create_account": "Creează-ți un cont", "sign_in_banner.sign_in": "Conectează-te", - "sign_in_banner.text": "Conectează-te pentru a te abona la profiluri și haștaguri, pentru a aprecia, distribui și a răspunde postărilor, sau interacționează folosindu-ți contul de pe un alt server.", "status.admin_account": "Deschide interfața de moderare pentru @{name}", "status.admin_status": "Deschide această stare în interfața de moderare", "status.block": "Blochează pe @{name}", @@ -549,7 +534,6 @@ "status.edited": "Modificat în data de {date}", "status.edited_x_times": "Modificată {count, plural, one {o dată} few {de {count} ori} other {de {count} de ori}}", "status.embed": "Înglobează", - "status.favourite": "Favorite", "status.filter": "Filtrează această postare", "status.filtered": "Sortate", "status.history.created": "creată de {name} pe {date}", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index d15d36e348..a7bbdc9b41 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -113,7 +113,7 @@ "column.direct": "Личные упоминания", "column.directory": "Просмотр профилей", "column.domain_blocks": "Заблокированные домены", - "column.favourites": "Избранное", + "column.favourites": "Избранные", "column.firehose": "Живая лента", "column.follow_requests": "Запросы на подписку", "column.home": "Главная", @@ -202,7 +202,6 @@ "dismissable_banner.community_timeline": "Это самые последние публичные сообщения от людей, чьи учетные записи размещены в {domain}.", "dismissable_banner.dismiss": "Закрыть", "dismissable_banner.explore_links": "Об этих новостях прямо сейчас говорят люди на этом и других серверах децентрализованной сети.", - "dismissable_banner.explore_statuses": "Эти сообщения с этого и других серверов в децентрализованной сети сейчас набирают популярность на этом сервере.", "dismissable_banner.explore_tags": "Эти хэштеги привлекают людей на этом и других серверах децентрализованной сети прямо сейчас.", "dismissable_banner.public_timeline": "Это самые последние публичные сообщения от людей в социальной сети, за которыми подписались пользователи {domain}.", "embed.instructions": "Встройте этот пост на свой сайт, скопировав следующий код:", @@ -228,7 +227,7 @@ "empty_column.blocks": "Вы ещё никого не заблокировали.", "empty_column.bookmarked_statuses": "У вас пока нет постов в закладках. Как добавите один, он отобразится здесь.", "empty_column.community": "Локальная лента пуста. Напишите что-нибудь, чтобы разогреть народ!", - "empty_column.direct": "У вас пока нет личных сообщений. Как только вы отправите или получите одно, оно появится здесь.", + "empty_column.direct": "У вас пока нет личных сообщений. Как только вы отправите или получите сообщение, оно появится здесь.", "empty_column.domain_blocks": "Скрытых доменов пока нет.", "empty_column.explore_statuses": "Нет актуального. Проверьте позже!", "empty_column.favourited_statuses": "Вы не добавили ни один пост в «Избранное». Как только вы это сделаете, он появится здесь.", @@ -331,8 +330,8 @@ "keyboard_shortcuts.direct": "чтобы открыть столбец личных упоминаний", "keyboard_shortcuts.down": "вниз по списку", "keyboard_shortcuts.enter": "открыть пост", - "keyboard_shortcuts.favourite": "в избранное", - "keyboard_shortcuts.favourites": "открыть «Избранное»", + "keyboard_shortcuts.favourite": "Добавить пост в избранное", + "keyboard_shortcuts.favourites": "Открыть «Избранное»", "keyboard_shortcuts.federated": "перейти к глобальной ленте", "keyboard_shortcuts.heading": "Сочетания клавиш", "keyboard_shortcuts.home": "перейти к домашней ленте", @@ -363,6 +362,7 @@ "lightbox.previous": "Назад", "limited_account_hint.action": "Все равно показать профиль", "limited_account_hint.title": "Этот профиль был скрыт модераторами {domain}.", + "link_preview.author": "По алфавиту", "lists.account.add": "Добавить в список", "lists.account.remove": "Убрать из списка", "lists.delete": "Удалить список", @@ -395,7 +395,7 @@ "navigation_bar.domain_blocks": "Скрытые домены", "navigation_bar.edit_profile": "Изменить профиль", "navigation_bar.explore": "Обзор", - "navigation_bar.favourites": "Избранное", + "navigation_bar.favourites": "Избранные", "navigation_bar.filters": "Игнорируемые слова", "navigation_bar.follow_requests": "Запросы на подписку", "navigation_bar.followed_tags": "Отслеживаемые хэштеги", @@ -426,7 +426,7 @@ "notifications.column_settings.admin.report": "Новые жалобы:", "notifications.column_settings.admin.sign_up": "Новые регистрации:", "notifications.column_settings.alert": "Уведомления на рабочем столе", - "notifications.column_settings.favourite": "Ваш пост добавили в «избранное»:", + "notifications.column_settings.favourite": "Избранные:", "notifications.column_settings.filter_bar.advanced": "Отображать все категории", "notifications.column_settings.filter_bar.category": "Панель сортировки", "notifications.column_settings.filter_bar.show_bar": "Отображать панель сортировки", @@ -444,7 +444,7 @@ "notifications.column_settings.update": "Правки:", "notifications.filter.all": "Все", "notifications.filter.boosts": "Продвижения", - "notifications.filter.favourites": "Отметки «избранного»", + "notifications.filter.favourites": "Избранное", "notifications.filter.follows": "Подписки", "notifications.filter.mentions": "Упоминания", "notifications.filter.polls": "Результаты опросов", @@ -612,7 +612,7 @@ "status.edited": "Последнее изменение: {date}", "status.edited_x_times": "{count, plural, one {{count} изменение} many {{count} изменений} other {{count} изменения}}", "status.embed": "Встроить на свой сайт", - "status.favourite": "В избранное", + "status.favourite": "Избранное", "status.filter": "Фильтровать этот пост", "status.filtered": "Отфильтровано", "status.hide": "Скрыть пост", @@ -634,7 +634,7 @@ "status.reblog_private": "Продвинуть для своей аудитории", "status.reblogged_by": "{name} продвинул(а)", "status.reblogs.empty": "Никто ещё не продвинул этот пост. Как только кто-то это сделает, они появятся здесь.", - "status.redraft": "Удалить и исправить", + "status.redraft": "Создать заново", "status.remove_bookmark": "Убрать из закладок", "status.replied_to": "Ответил(а) {name}", "status.reply": "Ответить", diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json index c4cbff744b..ee60315863 100644 --- a/app/javascript/mastodon/locales/sa.json +++ b/app/javascript/mastodon/locales/sa.json @@ -104,7 +104,6 @@ "column.direct": "गोपनीयरूपेण उल्लिखितानि", "column.directory": "व्यक्तित्वानि दृश्यन्ताम्", "column.domain_blocks": "निषिद्धप्रदेशाः", - "column.favourites": "प्रियाः", "column.follow_requests": "अनुसरणानुरोधाः", "column.home": "गृहम्", "column.lists": "सूचयः", @@ -169,7 +168,6 @@ "confirmations.mute.explanation": "एतेन तेषां पत्राणि तथा च यत्र ते उल्लिखिताः तानि छाद्यन्ते, किन्त्वेवं सत्यपि ते त्वामनुसर्तुं ततश्च पत्राणि द्रष्टुं शक्नुवन्ति ।", "confirmations.mute.message": "किं निश्चयेन निःशब्दं भवेत् {name} मित्रमेतत् ?", "confirmations.redraft.confirm": "मार्जय पुनश्च लिख्यताम्", - "confirmations.redraft.message": "किं वा निश्चयेन नष्टुमिच्छसि पत्रमेतत्तथा च पुनः लेखितुं? प्रकाशनानि प्रीतयश्च विनष्टा भविष्यन्ति, प्रत्युत्तराण्यपि नश्यन्ते ।", "confirmations.reply.confirm": "उत्तरम्", "confirmations.reply.message": "प्रत्युत्तरमिदानीं लिख्यते तर्हि पूर्वलिखितसन्देशं विनश्य पुनः लिख्यते । निश्चयेनैवं कर्तव्यम् ?", "confirmations.unfollow.confirm": "अनुसरणं नश्यताम्", @@ -190,7 +188,6 @@ "dismissable_banner.community_timeline": "तानि तेषां जनानां नूतनतमानि सार्वजनिकानि पत्राणि सन्ति येषामेकौण्टः {domain} द्वारा होस्त् भवन्ति।", "dismissable_banner.dismiss": "अपास्य", "dismissable_banner.explore_links": "एतासां वार्तानां विषये अधुना अकेन्द्रीकृतजालस्य अस्मिनन्येषु च सर्वर्षु जनैश्चर्चा क्रियते।", - "dismissable_banner.explore_statuses": "अकेन्द्रीकृतजालस्य अस्मदन्येभ्यश्च सर्वर्भ्यः एतानि पत्राणि इदानीमस्मिन्सर्वरि कर्षणं प्राप्नुवन्ति।", "dismissable_banner.explore_tags": "अकेन्द्रीकृतजालस्य अस्मदन्येभ्यश्च सर्वर्भ्यः एतानि प्रचलितवस्तूनि इदानीमस्मिन्सर्वरि कर्षणं प्राप्नुवन्ति।", "embed.instructions": "पत्रमेतत्स्वीयजालस्थाने स्थापयितुमधो लिखितो विध्यादेशो युज्यताम्", "embed.preview": "अत्रैवं दृश्यते तत्:", @@ -218,8 +215,6 @@ "empty_column.direct": "नैकोऽपि साक्षदुल्लिखितं वर्तते। यदा प्रेष्यते वा प्राप्यतेऽत्र दृश्यते।", "empty_column.domain_blocks": "न निषिद्धप्रदेशाः सन्ति ।", "empty_column.explore_statuses": "अधुना किमपि न प्रचलति। परे पुनः पश्य!", - "empty_column.favourited_statuses": "न तव अधुना पर्यन्तं प्रियपत्राणि सन्ति। यदा प्रीतिरित्यङ्क्यतेऽत्र दृश्यते।", - "empty_column.favourites": "नैतत्पत्रं प्रियमस्ति कस्मै अपि। यदा कस्मै प्रियं भवति तदाऽत्र दृश्यते।", "empty_column.follow_requests": "नाऽनुसरणानुरोधस्ते वर्तते । यदैको प्राप्यतेऽत्र दृश्यते ।", "empty_column.followed_tags": "कान्यपि प्रचलितवस्तूनीदानीमपि नान्वसार्षीः। यदा अनुसरसि तदा तानि इह दृश्यन्ते।", "empty_column.hashtag": "नाऽस्मिन् प्रचलितवस्तुचिह्ने किमपि ।", @@ -287,15 +282,12 @@ "home.column_settings.show_replies": "उत्तराणि दर्शय", "home.hide_announcements": "विज्ञापनानि प्रच्छादय", "home.show_announcements": "विज्ञापनानि दर्शय", - "interaction_modal.description.favourite": "मास्टोडोनि एकौण्टा, पत्रमिदं प्रियं कर्तुं शक्नोषि तस्य लेखकं प्रशंसां करोषीति ज्ञापयितुमिदं पश्चाद्रक्षितुञ्च।", "interaction_modal.description.follow": "मास्टोडोनि एकौण्टा {name} नाम्ना उपभोक्तारमनुसर्तुं शक्नोषि तस्य पत्राणि लब्धुं ते गृहनिरासे।", "interaction_modal.description.reblog": "मास्टोडिनि एकौण्टा पत्रमिदं बुस्तिति कर्तुं शक्नोषि ते स्वानुसारिणो भागं कर्तुम्।", "interaction_modal.description.reply": "मास्टोडोनि एकौण्टा पत्रमिदं प्रतिवादयितुं शक्नोषि।", "interaction_modal.on_another_server": "अन्यस्मिन्सर्वरि", "interaction_modal.on_this_server": "अस्मिन्सर्वरि", - "interaction_modal.other_server_instructions": "एतत् URL प्रतिलिपिं कृत्वा स्वस्य प्रियस्य मास्टोडोन ऐपोऽन्वेषणक्षेत्रे उत स्वस्य मास्तोडोन्सर्वरो जालमध्यस्थे चिनु।", "interaction_modal.preamble": "यतो मास्टोडोन्विकेन्द्रीयकृतोऽस्ति, अन्येन मास्टोडोन्सर्वरा उत सुसङ्गतेन आश्रयेण ते वर्तमानौकौण्टं प्रयोक्तुं शक्नोषि यदि अस्मिन्कोऽपि ते एकौण्ट् नास्ति।", - "interaction_modal.title.favourite": "प्रियस्य {name} नाम्ना उपभोक्तुः पत्रम्।", "interaction_modal.title.follow": "{name} अनुसर", "interaction_modal.title.reblog": "{name} नाम्ना उपभोक्तुः पत्रं बुस्त्कुरु", "interaction_modal.title.reply": "{name} नाम्ना उपभोक्तुःपत्रं प्रतिवादय", @@ -311,8 +303,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "पत्रं उद्घाटय", - "keyboard_shortcuts.favourite": "पत्रं प्रियं कुरु", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -373,7 +363,6 @@ "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.edit_profile": "प्रोफैलं सम्पाद्यताम्", "navigation_bar.explore": "अन्विच्छ", - "navigation_bar.favourites": "प्रियाः", "navigation_bar.filters": "मूकीकृतानि पदानि", "navigation_bar.follow_requests": "अनुसरणानुरोधाः", "navigation_bar.followed_tags": "अनुसरितानि प्रचलितवस्तूनि", @@ -390,7 +379,6 @@ "not_signed_in_indicator.not_signed_in": "उपायमिमं लब्धुं सम्प्रवेश आवश्यकः।", "notification.admin.report": "{name} {target} प्रतिवेदयञ्चकार", "notification.admin.sign_up": "{name} संविवेश", - "notification.favourite": "{name} तव पत्रं प्रियमकार्षीत्", "notification.follow": "{name} त्वामनुससार", "notification.follow_request": "{name} त्वामनुसर्तुमयाचीत्", "notification.mention": "{name} त्वामुल्लिलेख", @@ -404,7 +392,6 @@ "notifications.column_settings.admin.report": "नूतनावेदनानि", "notifications.column_settings.admin.sign_up": "नूतनपञ्जीकरणम्:", "notifications.column_settings.alert": "देस्क्टप्विज्ञापनानि", - "notifications.column_settings.favourite": "प्रियाः", "notifications.column_settings.filter_bar.advanced": "सर्वाणि वर्गाणि प्रदर्शय", "notifications.column_settings.filter_bar.category": "द्रुतशोधकशलाका", "notifications.column_settings.filter_bar.show_bar": "शोधकशालकां दर्शय", @@ -422,7 +409,6 @@ "notifications.column_settings.update": "सम्पादनानि :", "notifications.filter.all": "सर्वम्", "notifications.filter.boosts": "बुस्तः", - "notifications.filter.favourites": "प्रियाः", "notifications.filter.follows": "अनुसरति", "notifications.filter.mentions": "उल्लिखितानि", "notifications.filter.polls": "मतदानस्य परिणामः", @@ -555,7 +541,6 @@ "server_banner.server_stats": "सर्वरः स्थितिविषयकानि :", "sign_in_banner.create_account": "समयं संसृज", "sign_in_banner.sign_in": "सम्प्रवेशं कुरु", - "sign_in_banner.text": "प्रोफैल्युत प्रचलितवस्तूनि अनुसर्तुं, प्रियं, भागः, पत्राणि प्रतिवादयितुञ्च सम्प्रवेशः कर्तव्यः। अन्यसर्वर्यपि तव समयात्संवादयितुं शक्नोषि।", "status.admin_account": "@{name} कृते अनतिक्रममध्यस्थमुद्धाटय", "status.admin_domain": "{domain} कृते अनतिक्रममध्यस्थमुद्धाटय", "status.admin_status": "पत्रमिदमुद्घाटय अनतिक्रममध्यस्थे", @@ -570,7 +555,6 @@ "status.edited": "सम्पादितं {date}", "status.edited_x_times": "Edited {count, plural, one {{count} वारम्} other {{count} वारम्}}", "status.embed": "निहितम्", - "status.favourite": "प्रियम्", "status.filter": "पत्रमिदं फिल्तरं कुरु", "status.filtered": "फिल्तर्कृतम्", "status.hide": "प्रेषरणं प्रच्छादय", diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json index 11523b00c3..3b3b4ca8ad 100644 --- a/app/javascript/mastodon/locales/sc.json +++ b/app/javascript/mastodon/locales/sc.json @@ -72,7 +72,6 @@ "column.community": "Lìnia de tempus locale", "column.directory": "Nàviga in is profilos", "column.domain_blocks": "Domìnios blocados", - "column.favourites": "Preferidos", "column.follow_requests": "Rechestas de sighidura", "column.home": "Printzipale", "column.lists": "Listas", @@ -129,7 +128,6 @@ "confirmations.mute.explanation": "Custu at a cuare is publicatziones issoro e is messàgios chi ddos mèntovant, ma ant a pòdere bìdere is messàgios tuos e t'ant a pòdere sighire.", "confirmations.mute.message": "Seguru chi boles pònnere a {name} a sa muda?", "confirmations.redraft.confirm": "Cantzella e torra a fàghere", - "confirmations.redraft.message": "Seguru chi boles cantzellare a torrare a fàghere custa publicatzione? As a pèrdere is preferidos e is cumpartziduras, e is rispostas a su messàgiu originale ant a abarrare òrfanas.", "confirmations.reply.confirm": "Risponde", "confirmations.reply.message": "Rispondende immoe as a subrascrìere su messàgiu chi ses iscriende. Seguru chi boles sighire?", "confirmations.unfollow.confirm": "Non sigas prus", @@ -143,7 +141,6 @@ "directory.new_arrivals": "Arribos noos", "directory.recently_active": "Cun atividade dae pagu", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Inserta custa publicatzione in su situ web tuo copiende su còdighe de suta.", "embed.preview": "At a aparèssere aici:", @@ -168,8 +165,6 @@ "empty_column.bookmarked_statuses": "Non tenes ancora peruna publicatzione in is marcadores. Cando nd'as a agiùnghere una, at a èssere ammustrada inoghe.", "empty_column.community": "Sa lìnia de tempus locale est bòida. Iscrie inoghe pro cumintzare sa festa!", "empty_column.domain_blocks": "Non tenes ancora perunu domìniu blocadu.", - "empty_column.favourited_statuses": "Non tenes ancora peruna publicatzione in is preferidos. Cando nd'as a agiùnghere una, at a èssere ammustrada inoghe.", - "empty_column.favourites": "Nemos at marcadu ancora custa publicatzione comente preferida. Cando calicunu dd'at a fàghere, at a èssere ammustrada inoghe.", "empty_column.follow_requests": "Non tenes ancora peruna rechesta de sighidura. Cando nd'as a retzire una, at a èssere ammustrada inoghe.", "empty_column.hashtag": "Ancora nudda in custa eticheta.", "empty_column.home": "Sa lìnia de tempus printzipale tua est bòida. Visita {public} o imprea sa chirca pro cumintzare e agatare àteras persones.", @@ -225,8 +220,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "pro mòere in bàsciu in sa lista", "keyboard_shortcuts.enter": "pro abèrrere una publicatzione", - "keyboard_shortcuts.favourite": "pro marcare comente a preferidu", - "keyboard_shortcuts.favourites": "pro abèrrere sa lista de preferidos", "keyboard_shortcuts.federated": "pro abèrrere sa lìnia de tempus federada", "keyboard_shortcuts.heading": "Incurtzaduras de tecladu", "keyboard_shortcuts.home": "pro abèrrere sa lìnia de tempus printzipale", @@ -283,7 +276,6 @@ "navigation_bar.discover": "Iscoberi", "navigation_bar.domain_blocks": "Domìnios blocados", "navigation_bar.edit_profile": "Modìfica profilu", - "navigation_bar.favourites": "Preferidos", "navigation_bar.filters": "Faeddos a sa muda", "navigation_bar.follow_requests": "Rechestas de sighidura", "navigation_bar.follows_and_followers": "Gente chi sighis e sighiduras", @@ -297,7 +289,6 @@ "navigation_bar.search": "Chirca", "navigation_bar.security": "Seguresa", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} at marcadu sa publicatzione tua comente a preferida", "notification.follow": "{name} ti sighit", "notification.follow_request": "{name} at dimandadu de ti sighire", "notification.mention": "{name} t'at mentovadu", @@ -308,7 +299,6 @@ "notifications.clear": "Lìmpia notìficas", "notifications.clear_confirmation": "Seguru chi boles isboidare in manera permanente totu is notìficas tuas?", "notifications.column_settings.alert": "Notìficas de iscrivania", - "notifications.column_settings.favourite": "Preferidos:", "notifications.column_settings.filter_bar.advanced": "Ammustra totu is categorias", "notifications.column_settings.filter_bar.category": "Barra lestra de filtros", "notifications.column_settings.follow": "Sighiduras noas:", @@ -322,7 +312,6 @@ "notifications.column_settings.status": "Publicatziones noas:", "notifications.filter.all": "Totus", "notifications.filter.boosts": "Cumpartziduras", - "notifications.filter.favourites": "Preferidos", "notifications.filter.follows": "Sighende", "notifications.filter.mentions": "Mèntovos", "notifications.filter.polls": "Resurtados de su sondàgiu", @@ -387,7 +376,6 @@ "search_results.statuses_fts_disabled": "Sa chirca de publicatziones pro su cuntenutu issoro no est abilitada in custu serbidore de Mastodon.", "search_results.total": "{count, number} {count, plural, one {resurtadu} other {resurtados}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "Aberi s'interfache de moderatzione pro @{name}", "status.admin_status": "Aberi custa publicatzione in s'interfache de moderatzione", "status.block": "Bloca a @{name}", @@ -399,7 +387,6 @@ "status.detailed_status": "Visualizatzione de detàlliu de arresonada", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", "status.embed": "Afissa", - "status.favourite": "Preferidos", "status.filtered": "Filtradu", "status.load_more": "Càrriga·nde àteros", "status.media_hidden": "Elementos multimediales cuados", diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json index 386a3f6426..ad5c9e28d3 100644 --- a/app/javascript/mastodon/locales/sco.json +++ b/app/javascript/mastodon/locales/sco.json @@ -100,7 +100,6 @@ "column.community": "Local timeline", "column.directory": "Broose profiles", "column.domain_blocks": "Dingied domains", - "column.favourites": "Best anes", "column.follow_requests": "Follae requests", "column.home": "Hame", "column.lists": "Lists", @@ -163,7 +162,6 @@ "confirmations.mute.explanation": "This'll hide posts fae them an posts mentionin them, but it'll stull alloo them tae see yer posts an follae ye.", "confirmations.mute.message": "Ye sure thit ye'r wantin tae wheesht {name}?", "confirmations.redraft.confirm": "Delete an stert anew", - "confirmations.redraft.message": "Ye shuir thit ye'r wantin tae delete this post an stert again? Favourites an boosts'll be lost, an the replies tae the original post'll be orphant.", "confirmations.reply.confirm": "Reply", "confirmations.reply.message": "Replyin noo'll owerwrite the message ye'r screivin the noo. Ur ye sure thit ye'r wantin tae dae that?", "confirmations.unfollow.confirm": "Unfollae", @@ -183,7 +181,6 @@ "dismissable_banner.community_timeline": "Here the maist recent public posts fae fowk thit's accoonts is hostit bi {domain}.", "dismissable_banner.dismiss": "Pit awa", "dismissable_banner.explore_links": "Thir news stories is bein talked aboot bi fowk on this an ither servers o the decentralized netwirk richt noo.", - "dismissable_banner.explore_statuses": "Thir posts fae this an ither servers in this decentralized netwirk ur gainin traction on this server richt noo.", "dismissable_banner.explore_tags": "Thir hashtags is gaitherin traction amang the fowk on thit an ither servers o the decentralized netwirk richt noo.", "embed.instructions": "Embed this post on yer wabsteid bi copyin the code ablow.", "embed.preview": "Here whit it'll luik lik:", @@ -210,8 +207,6 @@ "empty_column.community": "The loval timeline is toum. Screive socht public fir tae get gaun!", "empty_column.domain_blocks": "There nae dingied domains yit.", "empty_column.explore_statuses": "Naethin is trendin the noo. Check back efter!", - "empty_column.favourited_statuses": "Ye dinnae hae onie favourite posts yit. Whan ye favourite ane, it'll shaw up here.", - "empty_column.favourites": "Naebody haes favouritit this post yit. Whan somebody dis, they'll shaw up here.", "empty_column.follow_requests": "Ye dinnae hae onie follaer requests yit. Whan ye get ane, it'll shaw up here.", "empty_column.hashtag": "There naethin in this hashtag yit.", "empty_column.home": "Yer hame timeline is toum! Follae mair fowk fir tae full it up. {suggestions}", @@ -272,15 +267,12 @@ "home.column_settings.show_replies": "Shaw replies", "home.hide_announcements": "Hide annooncements", "home.show_announcements": "Shaw annooncements", - "interaction_modal.description.favourite": "Wi a accoont on Mastodon ye kinnfavourite this post fir tae let the writer ken thit ye like it an save it fir efter.", "interaction_modal.description.follow": "Wi a accoont on Mastodon, ye kin follae {name} tae get their posts on yer hame feed.", "interaction_modal.description.reblog": "Wi a accoont on Mastodon, ye kin heeze this post tae ahare it wi yer ain follaers.", "interaction_modal.description.reply": "Wi a accoont on Mastodon, ye kin sen a repone tae this post.", "interaction_modal.on_another_server": "On a different server", "interaction_modal.on_this_server": "On this server", - "interaction_modal.other_server_instructions": "Copy an paste this URL intae the seirch field o yer favourite Mastodon app or the wab interface o yer Mastodon server.", "interaction_modal.preamble": "Seein Mastodon is decentralized, ye kin uise the accoont thit ye awriddy hae hostit on anither Mastodon server or compatable platforn gien thit dinnae hae a accoont in this yin.", - "interaction_modal.title.favourite": "Favourite {name}'s post", "interaction_modal.title.follow": "Follae {name}", "interaction_modal.title.reblog": "Heeze {name}'s post", "interaction_modal.title.reply": "Reply tae {name}'s post", @@ -296,8 +288,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "Muive doon in the list", "keyboard_shortcuts.enter": "Open post", - "keyboard_shortcuts.favourite": "Favourite post", - "keyboard_shortcuts.favourites": "Open favourites list", "keyboard_shortcuts.federated": "Open federatit timeline", "keyboard_shortcuts.heading": "Keyboord shortcuts", "keyboard_shortcuts.home": "Open hame timeline", @@ -357,7 +347,6 @@ "navigation_bar.domain_blocks": "Dingied domains", "navigation_bar.edit_profile": "Edit profile", "navigation_bar.explore": "Splore", - "navigation_bar.favourites": "Best anes", "navigation_bar.filters": "Wheesht wirds", "navigation_bar.follow_requests": "Follae requests", "navigation_bar.follows_and_followers": "Follaes an follaers", @@ -373,7 +362,6 @@ "not_signed_in_indicator.not_signed_in": "Ye'r needin tae sign in fir tae access this resoorce.", "notification.admin.report": "{name} reportit {target}", "notification.admin.sign_up": "{name} signed up", - "notification.favourite": "{name} favouritit yer post", "notification.follow": "{name} follaed ye", "notification.follow_request": "{name} is wantin tae follae ye", "notification.mention": "{name} menshied ye", @@ -387,7 +375,6 @@ "notifications.column_settings.admin.report": "New reports:", "notifications.column_settings.admin.sign_up": "New sign-ups:", "notifications.column_settings.alert": "Desktap notes", - "notifications.column_settings.favourite": "Best anes:", "notifications.column_settings.filter_bar.advanced": "Shaw aw caitegories", "notifications.column_settings.filter_bar.category": "Quick filter baur", "notifications.column_settings.filter_bar.show_bar": "Shaw filter baur", @@ -405,7 +392,6 @@ "notifications.column_settings.update": "Edits:", "notifications.filter.all": "Aw", "notifications.filter.boosts": "Heezes", - "notifications.filter.favourites": "Best anes", "notifications.filter.follows": "Follaes", "notifications.filter.mentions": "Menshies", "notifications.filter.polls": "Poll results", @@ -527,7 +513,6 @@ "server_banner.server_stats": "Server stats:", "sign_in_banner.create_account": "Mak accoont", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "Open moderation interface fir @{name}", "status.admin_status": "Open this post in the moderation interface", "status.block": "Dingie @{name}", @@ -541,7 +526,6 @@ "status.edited": "Editit {date}", "status.edited_x_times": "Editit {count, plural, one {{count} time} other {{count} times}}", "status.embed": "Embed", - "status.favourite": "Favourite", "status.filter": "Filter this post", "status.filtered": "Filtert", "status.history.created": "{name} creatit {date}", diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json index 918bf97f79..c83c97e932 100644 --- a/app/javascript/mastodon/locales/si.json +++ b/app/javascript/mastodon/locales/si.json @@ -67,7 +67,6 @@ "column.community": "දේශීය කාලරේඛාව", "column.directory": "පැතිකඩ පිරික්සන්න", "column.domain_blocks": "අවහිර කළ වසම්", - "column.favourites": "ප්‍රියතමයන්", "column.follow_requests": "අනුගමන ඉල්ලීම්", "column.home": "මුල් පිටුව", "column.lists": "ලේඛන", @@ -128,7 +127,6 @@ "confirmations.mute.explanation": "මෙය ඔවුන්ගෙන් පළ කිරීම් සහ ඒවා සඳහන් කරන පළ කිරීම් සඟවයි, නමුත් එය ඔවුන්ට ඔබේ පළ කිරීම් බැලීමට සහ ඔබව අනුගමනය කිරීමට තවමත් ඉඩ ලබා දේ.", "confirmations.mute.message": "ඔබට {name} නිශ්ශබ්ද කිරීමට අවශ්‍ය බව විශ්වාසද?", "confirmations.redraft.confirm": "මකන්න සහ නැවත කෙටුම්පත් කරන්න", - "confirmations.redraft.message": "ඔබට මෙම තත්ත්වය මකා එය නැවත කෙටුම්පත් කිරීමට අවශ්‍ය බව විශ්වාසද? ප්‍රියතමයන් සහ බූස්ට් අහිමි වනු ඇත, මුල් පළ කිරීම සඳහා පිළිතුරු අනාථ වනු ඇත.", "confirmations.reply.confirm": "පිළිතුර", "confirmations.reply.message": "දැන් පිළිතුරු දීම ඔබ දැනට රචනා කරන පණිවිඩය උඩින් ලියයි. ඔබට ඉදිරියට යාමට අවශ්‍ය බව විශ්වාසද?", "confirmations.unfollow.confirm": "අනුගමනය නොකරන්න", @@ -144,7 +142,6 @@ "directory.new_arrivals": "නව පැමිණීම්", "directory.recently_active": "මෑත දී සක්‍රියයි", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "පහත කේතය පිටපත් කිරීමෙන් මෙම තත්ත්වය ඔබේ වෙබ් අඩවියට ඇතුළත් කරන්න.", "embed.preview": "එය පෙනෙන්නේ කෙසේද යන්න මෙන්න:", @@ -171,8 +168,6 @@ "empty_column.community": "දේශීය කාලරේඛාව හිස් ය. පන්දුව පෙරළීමට ප්‍රසිද්ධියේ යමක් ලියන්න!", "empty_column.domain_blocks": "අවහිර කරන ලද වසම් නැත.", "empty_column.explore_statuses": "දැන් කිසිවක් නැඹුරු නොවේ. පසුව නැවත පරීක්ෂා කරන්න!", - "empty_column.favourited_statuses": "ඔබට තවමත් ප්‍රියතම දත් කිසිවක් නැත. ඔබ කැමති එකක් වූ විට, එය මෙහි පෙන්වනු ඇත.", - "empty_column.favourites": "කිසිවෙකු තවමත් මෙම මෙවලමට ප්‍රිය කර නැත. යමෙකු එසේ කළ විට, ඔවුන් මෙහි පෙන්වනු ඇත.", "empty_column.follow_requests": "ඔබට තවමත් අනුගමනය කිරීමේ ඉල්ලීම් කිසිවක් නොමැත. ඔබට එකක් ලැබුණු විට, එය මෙහි පෙන්වනු ඇත.", "empty_column.hashtag": "මෙම හැෂ් ටැග් එකේ තවම කිසිවක් නොමැත.", "empty_column.home": "ඔබගේ නිවසේ කාලරේඛාව හිස්ය! එය පිරවීම සඳහා තවත් පුද්ගලයින් අනුගමනය කරන්න. {suggestions}", @@ -226,8 +221,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "ලැයිස්තුවේ පහළට ගමන් කිරීමට", "keyboard_shortcuts.enter": "ලිපිය අරින්න", - "keyboard_shortcuts.favourite": "කැමති කිරීමට", - "keyboard_shortcuts.favourites": "ප්රියතම ලැයිස්තුව විවෘත කිරීමට", "keyboard_shortcuts.federated": "ෆෙඩරේටඩ් කාලරාමුව විවෘත කිරීමට", "keyboard_shortcuts.heading": "යතුරුපුවරු කෙටිමං", "keyboard_shortcuts.home": "නිවසේ කාලරේඛාව විවෘත කිරීමට", @@ -284,7 +277,6 @@ "navigation_bar.domain_blocks": "අවහිර කළ වසම්", "navigation_bar.edit_profile": "පැතිකඩ සංස්කරණය", "navigation_bar.explore": "ගවේෂණය කරන්න", - "navigation_bar.favourites": "ප්‍රියතමයන්", "navigation_bar.filters": "නිහඬ කළ වචන", "navigation_bar.follow_requests": "අනුගමන ඉල්ලීම්", "navigation_bar.follows_and_followers": "අනුගමනය හා අනුගාමිකයින්", @@ -299,7 +291,6 @@ "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", "notification.admin.report": "{name} වාර්තා {target}", "notification.admin.sign_up": "{name} අත්සන් කර ඇත", - "notification.favourite": "{name} ඔබගේ තත්වයට කැමති විය", "notification.follow": "{name} ඔබව අනුගමනය කළා", "notification.follow_request": "{name} ඔබව අනුගමනය කිරීමට ඉල්ලා ඇත", "notification.mention": "{name} ඔබව සඳහන් කර ඇත", @@ -313,7 +304,6 @@ "notifications.column_settings.admin.report": "නව වාර්තා:", "notifications.column_settings.admin.sign_up": "නව ලියාපදිංචි:", "notifications.column_settings.alert": "වැඩතල දැනුම්දීම්", - "notifications.column_settings.favourite": "ප්‍රියතමයන්:", "notifications.column_settings.filter_bar.advanced": "සියළු ප්‍රවර්ග පෙන්වන්න", "notifications.column_settings.filter_bar.category": "ඉක්මන් පෙරහන් තීරුව", "notifications.column_settings.filter_bar.show_bar": "පෙරහන් තීරුව පෙන්වන්න", @@ -331,7 +321,6 @@ "notifications.column_settings.update": "සංශෝධන:", "notifications.filter.all": "සියල්ල", "notifications.filter.boosts": "බූස්ට් කරයි", - "notifications.filter.favourites": "ප්‍රියතමයන්", "notifications.filter.follows": "අනුගමනය", "notifications.filter.mentions": "සැඳහුම්", "notifications.filter.polls": "ඡන්ද ප්‍රතිඵල", @@ -442,7 +431,6 @@ "search_results.statuses_fts_disabled": "මෙම Mastodon සේවාදායකයේ ඒවායේ අන්තර්ගතය අනුව මෙවලම් සෙවීම සබල නොවේ.", "search_results.total": "{count, number} {count, plural, one {ප්රතිඵලය} other {ප්රතිපල}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "@{name}සඳහා මධ්‍යස්ථ අතුරුමුහුණත විවෘත කරන්න", "status.admin_status": "මධ්‍යස්ථ අතුරුමුහුණතෙහි මෙම තත්ත්වය විවෘත කරන්න", "status.block": "@{name} අවහිර", @@ -455,7 +443,6 @@ "status.edited": "සංශෝධිතයි {date}", "status.edited_x_times": "සංශෝධිතයි {count, plural, one {වාර {count}} other {වාර {count}}}", "status.embed": "කාවැද්දූ", - "status.favourite": "ප්‍රියතම", "status.filtered": "පෙරන ලද", "status.history.created": "{name} නිර්මාණය {date}", "status.history.edited": "{name} සංස්කරණය {date}", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index 0c7804787f..71a4228395 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -130,6 +130,7 @@ "community.column_settings.remote_only": "Iba odľahlé", "compose.language.change": "Zmeň jazyk", "compose.language.search": "Hľadaj medzi jazykmi...", + "compose.published.body": "Príspevok zverejnený.", "compose.published.open": "Otvor", "compose_form.direct_message_warning_learn_more": "Zisti viac", "compose_form.encryption_warning": "Príspevky na Mastodon nie sú end-to-end šifrované. Nezdieľajte cez Mastodon žiadne citlivé informácie.", @@ -175,7 +176,6 @@ "confirmations.mute.explanation": "Toto nastavenie skryje ich príspevky, alebo príspevky od iných v ktorých sú spomenutí, ale umožní im vidieť tvoje príspevky, aj ťa nasledovať.", "confirmations.mute.message": "Naozaj si chceš nevšímať {name}?", "confirmations.redraft.confirm": "Vyčisti a prepíš", - "confirmations.redraft.message": "Si si istý/á, že chceš premazať a prepísať tento príspevok? Jeho nadobudnuté vyzdvihnutia a obľúbenia, ale i odpovede na pôvodný príspevok budú odlúčené.", "confirmations.reply.confirm": "Odpovedz", "confirmations.reply.message": "Odpovedaním akurát teraz prepíšeš správu, ktorú máš práve rozpísanú. Si si istý/á, že chceš pokračovať?", "confirmations.unfollow.confirm": "Nesleduj", @@ -196,7 +196,6 @@ "dismissable_banner.community_timeline": "Toto sú najnovšie verejné príspevky od ľudí, ktorých účty sú hostované na {domain}.", "dismissable_banner.dismiss": "Zrušiť", "dismissable_banner.explore_links": "O týchto správach práve teraz hovoria ľudia na tomto a ďalších serveroch decentralizovanej siete.", - "dismissable_banner.explore_statuses": "Tieto príspevky z tohto a ďalších serverov v decentralizovanej sieti získavajú na tomto serveri práve teraz na sile.", "dismissable_banner.explore_tags": "Tieto hashtagy práve teraz získavajú popularitu medzi ľuďmi na tomto a ďalších serveroch decentralizovanej siete.", "embed.instructions": "Umiestni kód uvedený nižšie pre pridanie tohto statusu na tvoju web stránku.", "embed.preview": "Tu je ako to bude vyzerať:", @@ -224,8 +223,6 @@ "empty_column.direct": "Ešte nemáš žiadne priame zmienky. Keď nejakú pošleš alebo dostaneš, ukáže sa tu.", "empty_column.domain_blocks": "Žiadne domény ešte niesú skryté.", "empty_column.explore_statuses": "Momentálne nie je nič trendové. Pozrite sa neskôr!", - "empty_column.favourited_statuses": "Nemáš obľúbené ešte žiadne príspevky. Keď si nejaký obľúbiš, bude zobrazený práve tu.", - "empty_column.favourites": "Ešte si tento príspevok nikto neobľúbil. Keď si ho niekto obľúbi, bude zobrazený tu.", "empty_column.follow_requests": "Ešte nemáš žiadne požiadavky o následovanie. Keď nejaké dostaneš, budú tu zobrazené.", "empty_column.followed_tags": "Ešte nenasleduješ žiadne haštagy. Keď tak urobíš, zobrazia sa tu.", "empty_column.hashtag": "Pod týmto hashtagom sa ešte nič nenachádza.", @@ -297,15 +294,12 @@ "home.column_settings.show_replies": "Ukáž odpovede", "home.hide_announcements": "Skry oboznámenia", "home.show_announcements": "Ukáž oboznámenia", - "interaction_modal.description.favourite": "S účtom na Mastodone môžete tento príspevok obľúbiť, aby ste dali autorovi vedieť, že ho oceňujete, a uložiť si ho na neskôr.", "interaction_modal.description.follow": "Ak máte konto na Mastodone, môžete sledovať {name} a dostávať príspevky do svojho domovského kanála.", "interaction_modal.description.reblog": "Ak máte účet na Mastodone, môžete tento príspevok posilniť a zdieľať ho s vlastnými sledovateľmi.", "interaction_modal.description.reply": "Ak máte účet na Mastodone, môžete reagovať na tento príspevok.", "interaction_modal.on_another_server": "Na inom serveri", "interaction_modal.on_this_server": "Na tomto serveri", - "interaction_modal.other_server_instructions": "Skopírujte a vložte túto adresu URL do vyhľadávacieho poľa vašej obľúbenej aplikácie Mastodon alebo do webového rozhrania vášho servera Mastodon.", "interaction_modal.preamble": "Keďže Mastodon je decentralizovaný, ak nemáte účet na tomto serveri, môžete použiť svoj existujúci účet hostovaný na inom serveri Mastodon alebo kompatibilnej platforme.", - "interaction_modal.title.favourite": "Obľúbiť si {name}ov/in príspevok", "interaction_modal.title.follow": "Nasleduj {name}", "interaction_modal.title.reblog": "Vyzdvihni {name}ov/in príspevok", "interaction_modal.title.reply": "Odpovedz na {name}ov/in príspevok", @@ -321,8 +315,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "posunúť sa dole v zozname", "keyboard_shortcuts.enter": "Otvor príspevok", - "keyboard_shortcuts.favourite": "pridaj do obľúbených", - "keyboard_shortcuts.favourites": "otvor zoznam obľúbených", "keyboard_shortcuts.federated": "otvor federovanú časovú os", "keyboard_shortcuts.heading": "Klávesové skratky", "keyboard_shortcuts.home": "otvor domácu časovú os", @@ -383,7 +375,6 @@ "navigation_bar.domain_blocks": "Skryté domény", "navigation_bar.edit_profile": "Uprav profil", "navigation_bar.explore": "Objavuj", - "navigation_bar.favourites": "Obľúbené", "navigation_bar.filters": "Filtrované slová", "navigation_bar.follow_requests": "Žiadosti o sledovanie", "navigation_bar.followed_tags": "Nasledované haštagy", @@ -400,7 +391,6 @@ "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, musíte sa prihlásiť.", "notification.admin.report": "{name} nahlásil/a {target}", "notification.admin.sign_up": "{name} sa zaregistroval/a", - "notification.favourite": "{name} si obľúbil/a tvoj príspevok", "notification.follow": "{name} ťa začal/a nasledovať", "notification.follow_request": "{name} ťa žiada nasledovať", "notification.mention": "{name} ťa spomenul/a", @@ -453,6 +443,7 @@ "onboarding.compose.template": "Nazdar #Mastodon!", "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!", "onboarding.follows.title": "Popular on Mastodon", + "onboarding.share.title": "Zdieľaj svoj profil", "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:", "onboarding.start.skip": "Want to skip right ahead?", "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.", @@ -566,7 +557,6 @@ "server_banner.server_stats": "Serverové štatistiky:", "sign_in_banner.create_account": "Vytvor účet", "sign_in_banner.sign_in": "Prihlás sa", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "Otvor moderovacie rozhranie užívateľa @{name}", "status.admin_status": "Otvor tento príspevok v moderovacom rozhraní", "status.block": "Blokuj @{name}", @@ -581,13 +571,14 @@ "status.edited": "Upravené {date}", "status.edited_x_times": "Upravený {count, plural, one {{count} krát} other {{count} krát}}", "status.embed": "Vložiť", - "status.favourite": "Páči sa mi", "status.filter": "Filtrovanie tohto príspevku", "status.filtered": "Filtrované", "status.hide": "Skry príspevok", "status.history.created": "{name} vytvoril/a {date}", "status.history.edited": "{name} upravil/a {date}", "status.load_more": "Ukáž viac", + "status.media.open": "Klikni pre otvorenie", + "status.media.show": "Kliknutím zobrazíš", "status.media_hidden": "Skryté médiá", "status.mention": "Spomeň @{name}", "status.more": "Viac", diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json index 57cba68dd1..e513f6a436 100644 --- a/app/javascript/mastodon/locales/sl.json +++ b/app/javascript/mastodon/locales/sl.json @@ -112,7 +112,7 @@ "column.direct": "Zasebne omembe", "column.directory": "Prebrskaj profile", "column.domain_blocks": "Blokirane domene", - "column.favourites": "Priljubljene", + "column.favourites": "Priljubljeni", "column.firehose": "Viri v živo", "column.follow_requests": "Sledi prošnjam", "column.home": "Domov", @@ -301,6 +301,7 @@ "home.column_settings.basic": "Osnovno", "home.column_settings.show_reblogs": "Pokaži izpostavitve", "home.column_settings.show_replies": "Pokaži odgovore", + "home.explore_prompt.title": "To je vaš dom v okviru Mastodona.", "home.hide_announcements": "Skrij obvestila", "home.show_announcements": "Pokaži obvestila", "interaction_modal.description.favourite": "Z računom na Mastodonu lahko to objavo postavite med priljubljene in tako avtorju nakažete, da jo cenite, in jo shranite za kasneje.", @@ -327,7 +328,7 @@ "keyboard_shortcuts.direct": "za odpiranje stolpca zasebnih omemb", "keyboard_shortcuts.down": "Premakni navzdol po seznamu", "keyboard_shortcuts.enter": "Odpri objavo", - "keyboard_shortcuts.favourite": "Vzljubi objavo", + "keyboard_shortcuts.favourite": "Priljubljena objava", "keyboard_shortcuts.favourites": "Odpri seznam priljubljenih", "keyboard_shortcuts.federated": "Odpri združeno časovnico", "keyboard_shortcuts.heading": "Tipkovne bližnjice", @@ -364,6 +365,7 @@ "lists.delete": "Izbriši seznam", "lists.edit": "Uredi seznam", "lists.edit.submit": "Spremeni naslov", + "lists.exclusive": "Skrij te objave od doma", "lists.new.create": "Dodaj seznam", "lists.new.title_placeholder": "Nov naslov seznama", "lists.replies_policy.followed": "Vsem sledenim uporabnikom", @@ -407,7 +409,7 @@ "not_signed_in_indicator.not_signed_in": "Za dostop do tega vira se morate prijaviti.", "notification.admin.report": "{name} je prijavil/a {target}", "notification.admin.sign_up": "{name} se je vpisal/a", - "notification.favourite": "{name} je vzljubil/a vaš status", + "notification.favourite": "{name} je vzljubil/a vašo objavo", "notification.follow": "{name} vam sledi", "notification.follow_request": "{name} vam želi slediti", "notification.mention": "{name} vas je omenil/a", @@ -539,6 +541,7 @@ "report.reasons.dislike": "Ni mi všeč", "report.reasons.dislike_description": "To ni tisto, kar želim videti", "report.reasons.legal": "To ni legalno", + "report.reasons.legal_description": "Ste mnenja, da krši zakonodajo vaše države ali države strežnika", "report.reasons.other": "Gre za nekaj drugega", "report.reasons.other_description": "Težava ne sodi v druge kategorije", "report.reasons.spam": "To je neželena vsebina", @@ -606,7 +609,7 @@ "status.edited": "Urejeno {date}", "status.edited_x_times": "Urejeno {count, plural, one {#-krat} two {#-krat} few {#-krat} other {#-krat}}", "status.embed": "Vdelaj", - "status.favourite": "Priljubljen", + "status.favourite": "Priljubljen_a", "status.filter": "Filtriraj to objavo", "status.filtered": "Filtrirano", "status.hide": "Skrij objavo", diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json index d71eb8cb70..915d374312 100644 --- a/app/javascript/mastodon/locales/sq.json +++ b/app/javascript/mastodon/locales/sq.json @@ -113,7 +113,6 @@ "column.direct": "Përmendje private", "column.directory": "Shfletoni profile", "column.domain_blocks": "Përkatësi të bllokuara", - "column.favourites": "Të parapëlqyer", "column.firehose": "Prurje “live”", "column.follow_requests": "Kërkesa për ndjekje", "column.home": "Kreu", @@ -181,7 +180,6 @@ "confirmations.mute.explanation": "Kjo do t’u fshehë postimet dhe përmendje postimesh, por ende do t’u lejojë të shohin postimet tuaja dhe t’ju ndjekin.", "confirmations.mute.message": "Jeni i sigurt se doni të heshtohet {name}?", "confirmations.redraft.confirm": "Fshijeni & rihartojeni", - "confirmations.redraft.message": "Jeni i sigurt se doni të fshihet kjo gjendje dhe të rihartohet? Parapëlqimet dhe përforcimet do të humbin, ndërsa përgjigjet te postimi origjinal do të bëhen jetime.", "confirmations.reply.confirm": "Përgjigjuni", "confirmations.reply.message": "Po të përgjigjeni tani, mesazhi që po hartoni, do të mbishkruhet. Jeni i sigurt se doni të vazhdohet më tej?", "confirmations.unfollow.confirm": "Resht së ndjekuri", @@ -202,7 +200,6 @@ "dismissable_banner.community_timeline": "Këto janë postimet më të freskëta publike nga persona llogaritë e të cilëve strehohen nga {domain}.", "dismissable_banner.dismiss": "Hidhe tej", "dismissable_banner.explore_links": "Këto histori të reja po tirren nga persona në këtë shërbyes dhe të tjerë të tillë të rrjetit të decentralizuar mu tani.", - "dismissable_banner.explore_statuses": "Këto postime nga ky shërbyes dhe të tjerë në rrjetin e decentralizuar po tërheqin vëmendjen tani.", "dismissable_banner.explore_tags": "Këta hashtag-ë po tërheqin vëmendjen mes personave në këtë shërbyes dhe të tjerë të tillë të rrjetit të decentralizuar mu tani.", "dismissable_banner.public_timeline": "Këto janë postimet më të reja publike prej personash në rrjetin shoqëror që ndjekin njerëzit në {domain}.", "embed.instructions": "Trupëzojeni këtë gjendje në sajtin tuaj duke kopjuar kodin më poshtë.", @@ -231,8 +228,6 @@ "empty_column.direct": "S’keni ende ndonjë përmendje private. Kur dërgoni ose merrni një të tillë, do të shfaqet këtu.", "empty_column.domain_blocks": "Ende s’ka përkatësi të fshehura.", "empty_column.explore_statuses": "Asgjë në modë tani. Kontrolloni më vonë!", - "empty_column.favourited_statuses": "S’keni ende ndonjë mesazh të parapëlqyer. Kur parapëlqeni një të tillë, ai do të shfaqet këtu.", - "empty_column.favourites": "Askush s’e ka parapëlqyer ende këtë mesazh. Kur e bën dikush, ai do të shfaqet këtu.", "empty_column.follow_requests": "Ende s’keni ndonjë kërkesë ndjekjeje. Kur të merrni një të tillë, do të shfaqet këtu.", "empty_column.followed_tags": "S’keni ndjekur ende nodnjë hashtag. Kur të ndiqni të tillë, do të shfaqen këtu.", "empty_column.hashtag": "Ende s’ka gjë nën këtë hashtag.", @@ -307,15 +302,12 @@ "home.explore_prompt.title": "Kjo është baza juaj brenda Mastodon-it.", "home.hide_announcements": "Fshihi lajmërimet", "home.show_announcements": "Shfaqi lajmërimet", - "interaction_modal.description.favourite": "Me një llogari në Mastodon, mund ta pëlqeni këtë postim, për t’i bërë të ditur autorit se e çmoni dhe e ruani për më vonë.", "interaction_modal.description.follow": "Me një llogari në Mastodon, mund ta ndiqni {name} për të marrë postimet e tyre në prurjen tuaj të kreut.", "interaction_modal.description.reblog": "Me një llogari në Mastodon, mund ta përforconi këtë postim për ta ndarë me ndjekësit tuaj.", "interaction_modal.description.reply": "Me një llogari në Mastodon, mund t’i përgjigjeni këtij postimi.", "interaction_modal.on_another_server": "Në një tjetër shërbyes", "interaction_modal.on_this_server": "Në këtë shërbyes", - "interaction_modal.other_server_instructions": "Kopjojeni dhe ngjiteni këtë URL te fusha e kërkimeve të aplikacionit tuaj të parapëlqyer Mastodon, ose të ndërfaqes web të shërbyesit tuaj Mastodon.", "interaction_modal.preamble": "Ngaqë Mastodon-i është i decentralizuar, mund të përdorni llogarinë tuaj ekzistuese të strehuar nga një tjetër shërbyes Mastodon, ose platformë e përputhshme, nëse s’keni një llogari në këtë shërbyes.", - "interaction_modal.title.favourite": "Parapëlqejeni postimin e {name}", "interaction_modal.title.follow": "Ndiq {name}", "interaction_modal.title.reblog": "Përforconi postimin e {name}", "interaction_modal.title.reply": "Përgjigjuni postimit të {name}", @@ -331,8 +323,6 @@ "keyboard_shortcuts.direct": "që të hapni shtyllën e përmendjeve private", "keyboard_shortcuts.down": "Për zbritje poshtë nëpër listë", "keyboard_shortcuts.enter": "Për hapje postimi", - "keyboard_shortcuts.favourite": "Për t’i vënë shenjë si të parapëlqyer një postimi", - "keyboard_shortcuts.favourites": "Për hapje liste të parapëlqyerish", "keyboard_shortcuts.federated": "Për hapje rrjedhe kohore të të federuarave", "keyboard_shortcuts.heading": "Shkurtore tastiere", "keyboard_shortcuts.home": "Për hapje rrjedhe kohore vetjake", @@ -385,7 +375,6 @@ "mute_modal.hide_notifications": "Të kalohen të fshehura njoftimet prej këtij përdoruesi?", "mute_modal.indefinite": "E pacaktuar", "navigation_bar.about": "Mbi", - "navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan", "navigation_bar.blocks": "Përdorues të bllokuar", "navigation_bar.bookmarks": "Faqerojtës", "navigation_bar.community_timeline": "Rrjedhë kohore vendore", @@ -395,7 +384,6 @@ "navigation_bar.domain_blocks": "Përkatësi të bllokuara", "navigation_bar.edit_profile": "Përpunoni profilin", "navigation_bar.explore": "Eksploroni", - "navigation_bar.favourites": "Të parapëlqyer", "navigation_bar.filters": "Fjalë të heshtuara", "navigation_bar.follow_requests": "Kërkesa për ndjekje", "navigation_bar.followed_tags": "Hashtag-ë të ndjekur", @@ -412,7 +400,6 @@ "not_signed_in_indicator.not_signed_in": "Që të përdorni këtë burim, lypset të bëni hyrjen.", "notification.admin.report": "{name} raportoi {target}", "notification.admin.sign_up": "{name} u regjistrua", - "notification.favourite": "{name} pëlqeu mesazhin tuaj", "notification.follow": "{name} zuri t’ju ndjekë", "notification.follow_request": "{name} ka kërkuar t’ju ndjekë", "notification.mention": "{name} ju ka përmendur", @@ -426,7 +413,6 @@ "notifications.column_settings.admin.report": "Raportime të reja:", "notifications.column_settings.admin.sign_up": "Regjistrime të reja:", "notifications.column_settings.alert": "Njoftime desktopi", - "notifications.column_settings.favourite": "Të parapëlqyer:", "notifications.column_settings.filter_bar.advanced": "Shfaq krejt kategoritë", "notifications.column_settings.filter_bar.category": "Shtyllë filtrimesh të shpejta", "notifications.column_settings.filter_bar.show_bar": "Shfaq shtyllë filtrash", @@ -444,7 +430,6 @@ "notifications.column_settings.update": "Përpunime:", "notifications.filter.all": "Krejt", "notifications.filter.boosts": "Përforcime", - "notifications.filter.favourites": "Të parapëlqyer", "notifications.filter.follows": "Ndjekje", "notifications.filter.mentions": "Përmendje", "notifications.filter.polls": "Përfundime pyetësori", @@ -595,7 +580,6 @@ "server_banner.server_stats": "Statistika shërbyesi:", "sign_in_banner.create_account": "Krijoni llogari", "sign_in_banner.sign_in": "Hyni", - "sign_in_banner.text": "Që të ndiqni profile ose hashtagë, t’u vini shenjë si të parapëlqyer, të ndani me të tjerë dhe t’i ripostoni në postime, bëni hyrjen në llogari. Mundeni edhe të ndërveproni që nga llogaria juaj në një shërbyes tjetër.", "status.admin_account": "Hap ndërfaqe moderimi për @{name}", "status.admin_domain": "Hap ndërfaqe moderimi për {domain}", "status.admin_status": "Hape këtë mesazh te ndërfaqja e moderimit", @@ -612,7 +596,6 @@ "status.edited": "Përpunuar më {date}", "status.edited_x_times": "Përpunuar {count, plural, one {{count} herë} other {{count} herë}}", "status.embed": "Trupëzim", - "status.favourite": "I parapëlqyer", "status.filter": "Filtroje këtë postim", "status.filtered": "I filtruar", "status.hide": "Fshihe postimin", diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json index 49011e0de3..4ea3f74dcf 100644 --- a/app/javascript/mastodon/locales/sr-Latn.json +++ b/app/javascript/mastodon/locales/sr-Latn.json @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Ovo su najnovije javne objave ljudi čije naloge hostuje {domain}.", "dismissable_banner.dismiss": "Odbaci", "dismissable_banner.explore_links": "O ovim vestima trenutno razgovaraju ljudi na ovom i drugim serverima decentralizovane mreže.", - "dismissable_banner.explore_statuses": "Ove objave sa ovog i drugih servera u decentralizovanoj mreži postaju sve popularnije na ovom serveru.", + "dismissable_banner.explore_statuses": "Ovo su objave širom društvenog veba koje danas postaju sve popularnije. Novije objave sa više podržavanja i omiljene su rangirane više.", "dismissable_banner.explore_tags": "Ove heš oznake postaju sve popularnije među ljudima na ovom i drugim serverima decentralizovane mreže.", "dismissable_banner.public_timeline": "Ovo su najnovije javne objave ljudi sa društvenog veba koje ljudi na {domain}-u prate.", "embed.instructions": "Ugradite ovu objavu na svoj veb sajt kopiranjem koda ispod.", @@ -363,6 +363,7 @@ "lightbox.previous": "Prethodno", "limited_account_hint.action": "Ipak prikaži profil", "limited_account_hint.title": "Ovaj profil su sakrili moderatori {domain}.", + "link_preview.author": "Po {name}", "lists.account.add": "Dodaj na listu", "lists.account.remove": "Ukloni sa liste", "lists.delete": "Izbriši listu", @@ -426,7 +427,7 @@ "notifications.column_settings.admin.report": "Nove prijave:", "notifications.column_settings.admin.sign_up": "Nove ragistracije:", "notifications.column_settings.alert": "Obaveštenja na radnoj površini", - "notifications.column_settings.favourite": "Omiljeni:", + "notifications.column_settings.favourite": "Omiljeno:", "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije", "notifications.column_settings.filter_bar.category": "Traka za brzo filtriranje", "notifications.column_settings.filter_bar.show_bar": "Prikaži traku sa filterima", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index 97a0a81802..e1a5315e94 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Ово су најновије јавне објаве људи чије налоге хостује {domain}.", "dismissable_banner.dismiss": "Одбаци", "dismissable_banner.explore_links": "О овим вестима тренутно разговарају људи на овом и другим серверима децентрализоване мреже.", - "dismissable_banner.explore_statuses": "Ове објаве са овог и других сервера у децентрализованој мрежи постају све популарније на овом серверу.", + "dismissable_banner.explore_statuses": "Ово су објаве широм друштвеног веба које данас постају све популарније. Новије објаве са више подржавања и омиљене су рангиране више.", "dismissable_banner.explore_tags": "Ове хеш ознаке постају све популарније међу људима на овом и другим серверима децентрализоване мреже.", "dismissable_banner.public_timeline": "Ово су најновије јавне објаве људи са друштвеног веба које људи на {domain}-у прате.", "embed.instructions": "Уградите ову објаву на свој веб сајт копирањем кода испод.", @@ -363,6 +363,7 @@ "lightbox.previous": "Претходно", "limited_account_hint.action": "Ипак прикажи профил", "limited_account_hint.title": "Овај профил су сакрили модератори {domain}.", + "link_preview.author": "По {name}", "lists.account.add": "Додај на листу", "lists.account.remove": "Уклони са листе", "lists.delete": "Избриши листу", @@ -426,7 +427,7 @@ "notifications.column_settings.admin.report": "Нове пријаве:", "notifications.column_settings.admin.sign_up": "Нове рагистрације:", "notifications.column_settings.alert": "Обавештења на радној површини", - "notifications.column_settings.favourite": "Омиљени:", + "notifications.column_settings.favourite": "Омиљено:", "notifications.column_settings.filter_bar.advanced": "Прикажи све категорије", "notifications.column_settings.filter_bar.category": "Трака за брзо филтрирање", "notifications.column_settings.filter_bar.show_bar": "Прикажи траку са филтерима", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index 06d8b4d93c..ea0d2205d0 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -177,7 +177,6 @@ "confirmations.mute.explanation": "Detta kommer dölja inlägg från hen och inlägg som nämner hen, men hen tillåts fortfarande se dina inlägg och följa dig.", "confirmations.mute.message": "Är du säker på att du vill tysta {name}?", "confirmations.redraft.confirm": "Radera & gör om", - "confirmations.redraft.message": "Är du säker på att du vill radera detta inlägg och göra om det? Favoritmarkeringar, boostar och svar till det ursprungliga inlägget kommer förlora sitt sammanhang.", "confirmations.reply.confirm": "Svara", "confirmations.reply.message": "Om du svarar nu kommer det att ersätta meddelandet du håller på att skapa. Är du säker på att du vill fortsätta?", "confirmations.unfollow.confirm": "Avfölj", @@ -198,7 +197,6 @@ "dismissable_banner.community_timeline": "Dessa är de senaste offentliga inläggen från personer vars konton tillhandahålls av {domain}.", "dismissable_banner.dismiss": "Avfärda", "dismissable_banner.explore_links": "Dessa nyheter pratas det om just nu, på denna och på andra servrar i det decentraliserade nätverket.", - "dismissable_banner.explore_statuses": "Dessa inlägg, från denna och andra servrar i det decentraliserade nätverket, pratas det om just nu på denna server.", "dismissable_banner.explore_tags": "Dessa hashtaggar pratas det om just nu bland folk på denna och andra servrar i det decentraliserade nätverket.", "embed.instructions": "Bädda in detta inlägg på din webbplats genom att kopiera koden nedan.", "embed.preview": "Så här kommer det att se ut:", @@ -226,8 +224,6 @@ "empty_column.direct": "Du har inga privata nämningar. När du skickar eller tar emot ett direktmeddelande kommer det att visas här.", "empty_column.domain_blocks": "Det finns ännu inga dolda domäner.", "empty_column.explore_statuses": "Ingenting är trendigt just nu. Kom tillbaka senare!", - "empty_column.favourited_statuses": "Du har inga favoritmarkerade inlägg än. När du favoritmarkerar ett inlägg kommer det visas här.", - "empty_column.favourites": "Ingen har favoritmarkerat detta inlägg än. När någon gör det kommer de synas här.", "empty_column.follow_requests": "Du har inga följarförfrågningar än. När du får en kommer den visas här.", "empty_column.followed_tags": "Du följer inga hashtaggar ännu. När du gör det kommer de att dyka upp här.", "empty_column.hashtag": "Det finns inget i denna hashtag ännu.", @@ -299,15 +295,12 @@ "home.column_settings.show_replies": "Visa svar", "home.hide_announcements": "Dölj notiser", "home.show_announcements": "Visa notiser", - "interaction_modal.description.favourite": "Med ett Mastodon-konto kan du favoritmarkera detta inlägg för att visa författaren att du gillar det och för att spara det till senare.", "interaction_modal.description.follow": "Med ett Mastodon-konto kan du följa {name} för att se hens inlägg i ditt hemflöde.", "interaction_modal.description.reblog": "Med ett Mastodon-konto kan du boosta detta inlägg för att dela den med dina egna följare.", "interaction_modal.description.reply": "Med ett Mastodon-konto kan du svara på detta inlägg.", "interaction_modal.on_another_server": "På en annan server", "interaction_modal.on_this_server": "På denna server", - "interaction_modal.other_server_instructions": "Kopiera och klistra in denna URL i sökfältet i din favorit-Mastodon-app eller webbgränssnittet på din Mastodon-server.", "interaction_modal.preamble": "Eftersom Mastodon är decentraliserat kan du använda ditt befintliga konto från en annan Mastodonserver, eller annan kompatibel plattform, om du inte har ett konto på denna.", - "interaction_modal.title.favourite": "Favoritmarkera {name}s inlägg", "interaction_modal.title.follow": "Följ {name}", "interaction_modal.title.reblog": "Boosta {name}s inlägg", "interaction_modal.title.reply": "Svara på {name}s inlägg", @@ -323,8 +316,6 @@ "keyboard_shortcuts.direct": "för att öppna privata nämningskolumnen", "keyboard_shortcuts.down": "för att flytta nedåt i listan", "keyboard_shortcuts.enter": "Öppna inlägg", - "keyboard_shortcuts.favourite": "Favoritmarkera inlägg", - "keyboard_shortcuts.favourites": "för att öppna Favoriter", "keyboard_shortcuts.federated": "Öppna federerad tidslinje", "keyboard_shortcuts.heading": "Tangentbordsgenvägar", "keyboard_shortcuts.home": "för att öppna Hem-tidslinjen", @@ -355,6 +346,7 @@ "lightbox.previous": "Tidigare", "limited_account_hint.action": "Visa profil ändå", "limited_account_hint.title": "Denna profil har dolts av {domain}s moderatorer.", + "link_preview.author": "Av {name}", "lists.account.add": "Lägg till i lista", "lists.account.remove": "Ta bort från lista", "lists.delete": "Radera lista", @@ -402,7 +394,6 @@ "not_signed_in_indicator.not_signed_in": "Du behöver logga in för att få åtkomst till denna resurs.", "notification.admin.report": "{name} rapporterade {target}", "notification.admin.sign_up": "{name} registrerade sig", - "notification.favourite": "{name} favoritmarkerade din status", "notification.follow": "{name} följer dig", "notification.follow_request": "{name} har begärt att följa dig", "notification.mention": "{name} nämnde dig", @@ -416,7 +407,6 @@ "notifications.column_settings.admin.report": "Nya rapporter:", "notifications.column_settings.admin.sign_up": "Nya registreringar:", "notifications.column_settings.alert": "Skrivbordsaviseringar", - "notifications.column_settings.favourite": "Favoriter:", "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier", "notifications.column_settings.filter_bar.category": "Snabbfilter", "notifications.column_settings.filter_bar.show_bar": "Visa filterfält", @@ -573,7 +563,6 @@ "server_banner.server_stats": "Serverstatistik:", "sign_in_banner.create_account": "Skapa konto", "sign_in_banner.sign_in": "Logga in", - "sign_in_banner.text": "Logga in för att följa profiler eller hashtags, favoritmarkera, dela och svara på inlägg. Du kan också interagera med ditt konto på en annan server.", "status.admin_account": "Öppet modereringsgränssnitt för @{name}", "status.admin_domain": "Öppet modereringsgränssnitt för @{domain}", "status.admin_status": "Öppna detta inlägg i modereringsgränssnittet", @@ -590,7 +579,6 @@ "status.edited": "Ändrad {date}", "status.edited_x_times": "Redigerad {count, plural, one {{count} gång} other {{count} gånger}}", "status.embed": "Bädda in", - "status.favourite": "Favorit", "status.filter": "Filtrera detta inlägg", "status.filtered": "Filtrerat", "status.hide": "Dölj inlägg", diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json index b4d74044e5..6094326cf2 100644 --- a/app/javascript/mastodon/locales/szl.json +++ b/app/javascript/mastodon/locales/szl.json @@ -35,15 +35,11 @@ "compose_form.spoiler.unmarked": "Text is not hidden", "confirmations.delete.message": "Are you sure you want to delete this status?", "confirmations.domain_block.confirm": "Hide entire domain", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "empty_column.account_timeline": "No toots here!", "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}", "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.", "hashtag.column_settings.tag_toggle": "Include additional tags in this column", @@ -55,8 +51,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -83,7 +77,6 @@ "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.pins": "Pinned toots", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.reblog": "{name} boosted your status", "notifications.column_settings.status": "New toots:", "onboarding.actions.go_to_explore": "See what's trending", @@ -110,7 +103,6 @@ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.copy": "Copy link to status", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json index 69b7c69ef8..72d911afcb 100644 --- a/app/javascript/mastodon/locales/ta.json +++ b/app/javascript/mastodon/locales/ta.json @@ -71,7 +71,6 @@ "column.community": "சுய நிகழ்வு காலவரிசை", "column.directory": "சுயவிவரங்களை உலாவு", "column.domain_blocks": "மறைந்திருக்கும் திரளங்கள்", - "column.favourites": "பிடித்தவைகள்", "column.follow_requests": "பின்தொடர அனுமதிகள்", "column.home": "முகப்பு", "column.lists": "பட்டியல்கள்", @@ -132,7 +131,6 @@ "confirmations.mute.explanation": "இந்தத் தேர்வு அவர்களின் பதிவுகளையும், அவர்களைக் குறிப்பிடும் பதிவுகளையும் மறைத்துவிடும். ஆனால், அவர்களால் உங்களைப் பின்தொடர்ந்து உங்கள் பதிவுகளைக் காண முடியும்.", "confirmations.mute.message": "{name}-ஐ நிச்சயமாக நீங்கள் அமைதியாக்க விரும்புகிறீர்களா?", "confirmations.redraft.confirm": "பதிவை நீக்கி மறுவரைவு செய்", - "confirmations.redraft.message": "நிச்சயமாக நீங்கள் இந்தப் பதிவை நீக்கி மறுவரைவு செய்ய விரும்புகிறீர்களா? விருப்பங்களும் பகிர்வுகளும் அழிந்துபோகும், மேலும் மூலப் பதிவிற்கு வந்த மறுமொழிகள் தனித்துவிடப்படும்.", "confirmations.reply.confirm": "மறுமொழி", "confirmations.reply.message": "ஏற்கனவே ஒரு பதிவு எழுதப்பட்டுக்கொண்டிருக்கிறது. இப்பொழுது பதில் எழுத முனைந்தால் அது அழிக்கப்படும். பரவாயில்லையா?", "confirmations.unfollow.confirm": "விலகு", @@ -146,7 +144,6 @@ "directory.new_arrivals": "புதிய வரவு", "directory.recently_active": "சற்றுமுன் செயல்பாட்டில் இருந்தவர்கள்", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "இந்தப் பதிவை உங்கள் வலைதளத்தில் பொதிக்கக் கீழே உள்ள வரிகளை காப்பி செய்யவும்.", "embed.preview": "பார்க்க இப்படி இருக்கும்:", @@ -172,8 +169,6 @@ "empty_column.bookmarked_statuses": "உங்களிடம் அடையாளக்குறியிட்ட டூட்டுகள் எவையும் இல்லை. அடையாளக்குறியிட்ட பிறகு அவை இங்கே காட்டப்படும்.", "empty_column.community": "உங்கள் மாஸ்டடான் முச்சந்தியில் யாரும் இல்லை. எதையேனும் எழுதி ஆட்டத்தைத் துவக்குங்கள்!", "empty_column.domain_blocks": "தடுக்கப்பட்டக் களங்கள் இதுவரை இல்லை.", - "empty_column.favourited_statuses": "உங்களுக்குப் பிடித்த டூட்டுகள் இதுவரை இல்லை. ஒரு டூட்டில் நீங்கள் விருப்பக்குறி இட்டால், அது இங்கே காண்பிக்கப்படும்.", - "empty_column.favourites": "இந்த டூட்டில் இதுவரை யாரும் விருப்பக்குறி இடவில்லை. யாரேனும் விரும்பினால், அது இங்கே காண்பிக்கப்படும்.", "empty_column.follow_requests": "வாசகர் கோரிக்கைகள் இதுவரை ஏதும் இல்லை. யாரேனும் கோரிக்கையை அனுப்பினால், அது இங்கே காண்பிக்கப்படும்.", "empty_column.hashtag": "இந்த சிட்டையில் இதுவரை ஏதும் இல்லை.", "empty_column.home": "உங்கள் மாஸ்டடான் வீட்டில் யாரும் இல்லை. {public} -இல் சென்று பார்க்கவும், அல்லது தேடல் கருவியைப் பயன்படுத்திப் பிற பயனர்களைக் கண்டடையவும்.", @@ -217,8 +212,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "பட்டியலின் கீழே செல்ல", "keyboard_shortcuts.enter": "டூட்டைத் திறக்க", - "keyboard_shortcuts.favourite": "விருப்பக்குறி இட", - "keyboard_shortcuts.favourites": "விருப்பப் பட்டியலைத் திறக்க", "keyboard_shortcuts.federated": "மாஸ்டடான் ஆலமரத்தைத் திறக்க", "keyboard_shortcuts.heading": "விசைப்பலகை குறுக்குவழிகள்", "keyboard_shortcuts.home": "மாஸ்டடான் வீட்டைத் திறக்க", @@ -265,7 +258,6 @@ "navigation_bar.discover": "கண்டு பிடி", "navigation_bar.domain_blocks": "மறைந்த களங்கள்", "navigation_bar.edit_profile": "சுயவிவரத்தைத் திருத்தவும்", - "navigation_bar.favourites": "விருப்பத்துக்குகந்த", "navigation_bar.filters": "முடக்கப்பட்ட வார்த்தைகள்", "navigation_bar.follow_requests": "கோரிக்கைகளை பின்பற்றவும்", "navigation_bar.follows_and_followers": "பின்பற்றல்கள் மற்றும் பின்பற்றுபவர்கள்", @@ -278,7 +270,6 @@ "navigation_bar.public_timeline": "கூட்டாட்சி காலக்கெடு", "navigation_bar.security": "பத்திரம்", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} ஆர்வம் கொண்டவர், உங்கள் நிலை", "notification.follow": "{name} உங்களைப் பின்தொடர்கிறார்", "notification.follow_request": "{name} உங்களைப் பின்தொடரக் கோருகிறார்", "notification.mention": "{name} நீங்கள் குறிப்பிட்டுள்ளீர்கள்", @@ -288,7 +279,6 @@ "notifications.clear": "அறிவிப்புகளை அழிக்கவும்", "notifications.clear_confirmation": "உங்கள் எல்லா அறிவிப்புகளையும் நிரந்தரமாக அழிக்க விரும்புகிறீர்களா?", "notifications.column_settings.alert": "டெஸ்க்டாப் அறிவிப்புகள்", - "notifications.column_settings.favourite": "பிடித்தவை:", "notifications.column_settings.filter_bar.advanced": "எல்லா வகைகளையும் காட்டு", "notifications.column_settings.filter_bar.category": "விரைவு வடிகட்டி பட்டை", "notifications.column_settings.follow": "புதிய பின்பற்றுபவர்கள்:", @@ -302,7 +292,6 @@ "notifications.column_settings.status": "New toots:", "notifications.filter.all": "எல்லா", "notifications.filter.boosts": "மதிப்பை உயர்த்து", - "notifications.filter.favourites": "விருப்பத்துக்குகந்த", "notifications.filter.follows": "பின்பற்று", "notifications.filter.mentions": "குறிப்பிடுகிறார்", "notifications.filter.polls": "கருத்துக்கணிப்பு முடிவுகள்", @@ -357,7 +346,6 @@ "search_results.statuses_fts_disabled": "டூட்டுகளின் வார்த்தைகளைக்கொண்டு தேடுவது இந்த மச்டோடன் வழங்கியில் இயல்விக்கப்படவில்லை.", "search_results.total": "{count, number} {count, plural, one {result} மற்ற {results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "மிதமான இடைமுகத்தை திறக்க @{name}", "status.admin_status": "மிதமான இடைமுகத்தில் இந்த நிலையை திறக்கவும்", "status.block": "@{name} -ஐத் தடு", @@ -369,7 +357,6 @@ "status.detailed_status": "விரிவான உரையாடல் காட்சி", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", "status.embed": "கிடத்து", - "status.favourite": "விருப்பத்துக்குகந்த", "status.filtered": "வடிகட்டு", "status.load_more": "அதிகமாய் ஏற்று", "status.media_hidden": "மீடியா மறைக்கப்பட்டது", diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json index 9f59ddc20f..74299526e6 100644 --- a/app/javascript/mastodon/locales/tai.json +++ b/app/javascript/mastodon/locales/tai.json @@ -21,15 +21,11 @@ "compose_form.spoiler.unmarked": "Text is not hidden", "confirmations.delete.message": "Are you sure you want to delete this status?", "confirmations.domain_block.confirm": "Hide entire domain", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "empty_column.account_timeline": "No toots here!", "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}", "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.", "hashtag.column_settings.tag_toggle": "Include additional tags in this column", @@ -41,8 +37,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -69,7 +63,6 @@ "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.pins": "Pinned toots", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.reblog": "{name} boosted your status", "notifications.column_settings.status": "New toots:", "onboarding.actions.go_to_explore": "See what's trending", @@ -96,7 +89,6 @@ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.copy": "Copy link to status", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json index 6604074c6a..aa337a46fc 100644 --- a/app/javascript/mastodon/locales/te.json +++ b/app/javascript/mastodon/locales/te.json @@ -43,7 +43,6 @@ "column.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు", "column.community": "స్థానిక కాలక్రమం", "column.domain_blocks": "దాచిన డొమైన్లు", - "column.favourites": "ఇష్టపడినవి", "column.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు", "column.home": "హోమ్", "column.lists": "జాబితాలు", @@ -88,13 +87,11 @@ "confirmations.mute.confirm": "మ్యూట్ చేయి", "confirmations.mute.message": "{name}ను మీరు ఖచ్చితంగా మ్యూట్ చేయాలనుకుంటున్నారా?", "confirmations.redraft.confirm": "తొలగించు & తిరగరాయు", - "confirmations.redraft.message": "మీరు ఖచ్చితంగా ఈ స్టేటస్ ని తొలగించి తిరగరాయాలనుకుంటున్నారా? ఈ స్టేటస్ యొక్క బూస్ట్ లు మరియు ఇష్టాలు పోతాయి,మరియు ప్రత్యుత్తరాలు అనాధలు అయిపోతాయి.", "confirmations.reply.confirm": "ప్రత్యుత్తరమివ్వు", "confirmations.reply.message": "ఇప్పుడే ప్రత్యుత్తరం ఇస్తే మీరు ప్రస్తుతం వ్రాస్తున్న సందేశం తిరగరాయబడుతుంది. మీరు ఖచ్చితంగా కొనసాగించాలనుకుంటున్నారా?", "confirmations.unfollow.confirm": "అనుసరించవద్దు", "confirmations.unfollow.message": "{name}ను మీరు ఖచ్చితంగా అనుసరించవద్దనుకుంటున్నారా?", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "దిగువ కోడ్ను కాపీ చేయడం ద్వారా మీ వెబ్సైట్లో ఈ స్టేటస్ ని పొందుపరచండి.", "embed.preview": "అది ఈ క్రింది విధంగా కనిపిస్తుంది:", @@ -117,8 +114,6 @@ "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", "empty_column.community": "స్థానిక కాలక్రమం ఖాళీగా ఉంది. మొదలుపెట్టడానికి బహిరంగంగా ఏదో ఒకటి వ్రాయండి!", "empty_column.domain_blocks": "దాచబడిన డొమైన్లు ఇంకా ఏమీ లేవు.", - "empty_column.favourited_statuses": "మీకు ఇష్టపడిన టూట్లు ఇంకా ఎమీ లేవు. మీరు ఒకదానిని ఇష్టపడినప్పుడు, అది ఇక్కడ కనిపిస్తుంది.", - "empty_column.favourites": "ఈ టూట్ను ఇంకా ఎవరూ ఇష్టపడలేదు. ఎవరైనా అలా చేసినప్పుడు, అవి ఇక్కడ కనబడతాయి.", "empty_column.follow_requests": "మీకు ఇంకా ఫాలో రిక్వెస్టులు ఏమీ రాలేదు. మీకు ఒకటి రాగానే, అది ఇక్కడ కనబడుతుంది.", "empty_column.hashtag": "ఇంకా హాష్ ట్యాగ్లో ఏమీ లేదు.", "empty_column.home": "మీ హోమ్ కాలక్రమం ఖాళీగా ఉంది! {Public} ను సందర్శించండి లేదా ఇతర వినియోగదారులను కలుసుకోవడానికి మరియు అన్వేషణ కోసం శోధనను ఉపయోగించండి.", @@ -150,8 +145,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "జాబితాలో క్రిందికి వెళ్ళడానికి", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "ఇష్టపడడానికి", - "keyboard_shortcuts.favourites": "ఇష్టాల జాబితాను తెరవడానికి", "keyboard_shortcuts.federated": "సమాఖ్య కాలక్రమాన్ని తెరవడానికి", "keyboard_shortcuts.heading": "కీబోర్డ్ సత్వరమార్గాలు", "keyboard_shortcuts.home": "హోమ్ కాలక్రమాన్ని తెరవడానికి", @@ -196,7 +189,6 @@ "navigation_bar.discover": "కనుగొను", "navigation_bar.domain_blocks": "దాచిన డొమైన్లు", "navigation_bar.edit_profile": "ప్రొఫైల్ని సవరించండి", - "navigation_bar.favourites": "ఇష్టపడినవి", "navigation_bar.filters": "మ్యూట్ చేయబడిన పదాలు", "navigation_bar.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు", "navigation_bar.lists": "జాబితాలు", @@ -208,7 +200,6 @@ "navigation_bar.public_timeline": "సమాఖ్య కాలక్రమం", "navigation_bar.security": "భద్రత", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} మీ స్టేటస్ ను ఇష్టపడ్డారు", "notification.follow": "{name} మిమ్మల్ని అనుసరిస్తున్నారు", "notification.mention": "{name} మిమ్మల్ని ప్రస్తావించారు", "notification.poll": "మీరు పాల్గొనిన ఎన్సిక ముగిసినది", @@ -216,7 +207,6 @@ "notifications.clear": "ప్రకటనలను తుడిచివేయు", "notifications.clear_confirmation": "మీరు మీ అన్ని నోటిఫికేషన్లను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?", "notifications.column_settings.alert": "డెస్క్టాప్ నోటిఫికేషన్లు", - "notifications.column_settings.favourite": "ఇష్టపడినవి:", "notifications.column_settings.filter_bar.advanced": "అన్ని విభాగాలను చూపించు", "notifications.column_settings.filter_bar.category": "క్విక్ ఫిల్టర్ బార్", "notifications.column_settings.follow": "క్రొత్త అనుచరులు:", @@ -229,7 +219,6 @@ "notifications.column_settings.status": "New toots:", "notifications.filter.all": "అన్నీ", "notifications.filter.boosts": "బూస్ట్లు", - "notifications.filter.favourites": "ఇష్టాలు", "notifications.filter.follows": "అనుసరిస్తున్నవి", "notifications.filter.mentions": "పేర్కొన్నవి", "notifications.filter.polls": "ఎన్నిక ఫలితాలు", @@ -275,7 +264,6 @@ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_account": "@{name} కొరకు సమన్వయ వినిమయసీమను తెరువు", "status.admin_status": "సమన్వయ వినిమయసీమలో ఈ స్టేటస్ ను తెరవండి", "status.block": "@{name} ను బ్లాక్ చేయి", @@ -286,7 +274,6 @@ "status.detailed_status": "వివరణాత్మక సంభాషణ వీక్షణ", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", "status.embed": "ఎంబెడ్", - "status.favourite": "ఇష్టపడు", "status.filtered": "వడకట్టబడిన", "status.load_more": "మరిన్ని లోడ్ చేయి", "status.media_hidden": "మీడియా దాచబడింది", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index 2e7220d4f6..8f0cc74564 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -363,6 +363,7 @@ "lightbox.previous": "ก่อนหน้า", "limited_account_hint.action": "แสดงโปรไฟล์ต่อไป", "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้ควบคุมของ {domain}", + "link_preview.author": "โดย {name}", "lists.account.add": "เพิ่มไปยังรายการ", "lists.account.remove": "เอาออกจากรายการ", "lists.delete": "ลบรายการ", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index 4624244529..c0f917ddd9 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -113,7 +113,7 @@ "column.direct": "Özel değinmeler", "column.directory": "Profillere göz at", "column.domain_blocks": "Engellenen alan adları", - "column.favourites": "Favoriler", + "column.favourites": "Gözdeler", "column.firehose": "Anlık Akışlar", "column.follow_requests": "Takip istekleri", "column.home": "Anasayfa", @@ -136,7 +136,7 @@ "compose.language.change": "Dili değiştir", "compose.language.search": "Dilleri ara...", "compose.published.body": "Gönderi yayınlandı.", - "compose.published.open": "Açık", + "compose.published.open": "Aç", "compose_form.direct_message_warning_learn_more": "Daha fazla bilgi edinin", "compose_form.encryption_warning": "Mastodon gönderileri uçtan uca şifrelemeli değildir. Hassas olabilecek herhangi bir bilgiyi Mastodon'da paylaşmayın.", "compose_form.hashtag_warning": "Bu gönderi herkese açık olmadığı için hiç bir etikette yer almayacak. Sadece herkese açık gönderiler etiketlerde bulunabilir.", @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "Bu, onlardan gelen ve bahseden gönderileri gizler. Ancak yine de gönderilerini görmelerine ve seni takip etmelerine izin verilir.", "confirmations.mute.message": "{name} kullanıcısını sessize almak istediğinden emin misin?", "confirmations.redraft.confirm": "Sil Düzenle ve yeniden paylaş", - "confirmations.redraft.message": "Bu tootu silmek ve yeniden taslak yapmak istediğinden emin misin? Favoriler, boostlar kaybolur ve özgün gönderiye verilen yanıtlar sahipsiz kalır.", + "confirmations.redraft.message": "Bu gönderiyi silmek ve yeniden paylaşmak istediğinizden emin misiniz? Favoriler ve güncelemeler kaybolacak ve özgün gönderiye verilen yanıtlar silinecek.", "confirmations.reply.confirm": "Yanıtla", "confirmations.reply.message": "Şimdi yanıtlarken o an oluşturduğun mesajın üzerine yazılır. Devam etmek istediğine emin misin?", "confirmations.unfollow.confirm": "Takibi bırak", @@ -231,8 +231,8 @@ "empty_column.direct": "Henüz doğrudan değinmeniz yok. Bir tane gönderdiğinizde veya aldığınızda burada listelenecekler.", "empty_column.domain_blocks": "Henüz engellenmiş bir alan adı yok.", "empty_column.explore_statuses": "Şu an öne çıkan birşey yok. Daha sonra tekrar bakın!", - "empty_column.favourited_statuses": "Favori tootun yok. Favori tootun olduğunda burada görünür.", - "empty_column.favourites": "Kimse bu gönderiyi favorilerine eklememiş. Biri eklediğinde burada görünecek.", + "empty_column.favourited_statuses": "Henüz gözde gönderileriniz yok. En sevdiğin zaman, burada görünecek.", + "empty_column.favourites": "Bu yazıyı henüz hiç kimse beğenmedi. Biri geldiğinde, buraya gelecekler.", "empty_column.follow_requests": "Hiç takip isteğiniz yok. Bir tane aldığınızda burada görünecek.", "empty_column.followed_tags": "Henüz hiç bir etiket takip etmiyorsunuz. Takip ettiğiniz etiketler burada görüntülenecek.", "empty_column.hashtag": "Henüz bu etikete sahip hiçbir gönderi yok.", @@ -307,15 +307,15 @@ "home.explore_prompt.title": "Burası Mastodon'daki Anasayfanız.", "home.hide_announcements": "Duyuruları gizle", "home.show_announcements": "Duyuruları göster", - "interaction_modal.description.favourite": "Mastodon'da bir hesapla, bu gönderiyi, yazarın onu beğendiğinizi bilmesi ve daha sonrası saklamak için beğenebilirsiniz.", + "interaction_modal.description.favourite": "Mastodon'da bir hesapla, yazarı takdir ettiğinizi bildirmek ve daha sonraya saklamak için bu gönderiyi gözdelerinize ekleyebilirsiniz.", "interaction_modal.description.follow": "Mastodon'daki bir hesapla, {name} kişisini, ana akışınızdaki gönderilerini görmek üzere takip edebilirsiniz.", "interaction_modal.description.reblog": "Mastodon'daki bir hesapla, bu gönderiyi takipçilerinizle paylaşmak için tuşlayabilirsiniz.", "interaction_modal.description.reply": "Mastodon'daki bir hesapla, bu gönderiye yanıt verebilirsiniz.", "interaction_modal.on_another_server": "Farklı bir sunucuda", "interaction_modal.on_this_server": "Bu sunucuda", - "interaction_modal.other_server_instructions": "Bu URL'yi kopyalayın ve Mastodon sunucunuzun web arayüzündeki veya gözde Mastodon uygulamanızdaki arama sahasına yapıştırın.", + "interaction_modal.other_server_instructions": "Bu bağlamtıyı kopyalayıp gözde Mastodon uygulamanızın arama alanına veya Mastodon sunucunuzun web arayüzüne yapıştırın.", "interaction_modal.preamble": "Mastodon merkeziyetsiz olduğu için, bu sunucuda bir hesabınız yoksa bile başka bir Mastodon sunucusunda veya uyumlu bir platformda barındırılan mevcut hesabınızı kullanabilirsiniz.", - "interaction_modal.title.favourite": "{name} kişisinin gönderisini favorilerine ekle", + "interaction_modal.title.favourite": "Gözde {name}'s gönderisi", "interaction_modal.title.follow": "{name} kişisini takip et", "interaction_modal.title.reblog": "{name} kişisinin gönderisini boostla", "interaction_modal.title.reply": "{name} kişisinin gönderisine yanıt ver", @@ -331,8 +331,8 @@ "keyboard_shortcuts.direct": "özel değinmeler sütununu açmak için", "keyboard_shortcuts.down": "Listede aşağıya inmek için", "keyboard_shortcuts.enter": "gönderiyi aç", - "keyboard_shortcuts.favourite": "Gönderiyi favorilerine ekle", - "keyboard_shortcuts.favourites": "Favoriler listesini aç", + "keyboard_shortcuts.favourite": "Gözde gönderi", + "keyboard_shortcuts.favourites": "Gözdendeki listeni aç", "keyboard_shortcuts.federated": "Federe akışı aç", "keyboard_shortcuts.heading": "Klavye kısayolları", "keyboard_shortcuts.home": "Ana akışı aç", @@ -363,6 +363,7 @@ "lightbox.previous": "Önceki", "limited_account_hint.action": "Yine de profili göster", "limited_account_hint.title": "Bu profil {domain} moderatörleri tarafından gizlendi.", + "link_preview.author": "Yazar: {name}", "lists.account.add": "Listeye ekle", "lists.account.remove": "Listeden kaldır", "lists.delete": "Listeyi sil", @@ -395,7 +396,7 @@ "navigation_bar.domain_blocks": "Engellenen alan adları", "navigation_bar.edit_profile": "Profili düzenle", "navigation_bar.explore": "Keşfet", - "navigation_bar.favourites": "Favoriler", + "navigation_bar.favourites": "Gözdelerin", "navigation_bar.filters": "Sessize alınmış kelimeler", "navigation_bar.follow_requests": "Takip istekleri", "navigation_bar.followed_tags": "Takip edilen etiketler", @@ -412,7 +413,7 @@ "not_signed_in_indicator.not_signed_in": "Bu kaynağa erişmek için oturum açmanız gerekir.", "notification.admin.report": "{name}, {target} kişisini bildirdi", "notification.admin.sign_up": "{name} kaydoldu", - "notification.favourite": "{name} gönderini favorilerine ekledi", + "notification.favourite": "{name} gönderinizi beğendi", "notification.follow": "{name} seni takip etti", "notification.follow_request": "{name} size takip isteği gönderdi", "notification.mention": "{name} senden bahsetti", @@ -426,7 +427,7 @@ "notifications.column_settings.admin.report": "Yeni bildirimler:", "notifications.column_settings.admin.sign_up": "Yeni kayıtlar:", "notifications.column_settings.alert": "Masaüstü bildirimleri", - "notifications.column_settings.favourite": "Favoriler:", + "notifications.column_settings.favourite": "Gözdelerin:", "notifications.column_settings.filter_bar.advanced": "Tüm kategorileri görüntüle", "notifications.column_settings.filter_bar.category": "Hızlı filtre çubuğu", "notifications.column_settings.filter_bar.show_bar": "Süzme çubuğunu göster", @@ -444,7 +445,7 @@ "notifications.column_settings.update": "Düzenlemeler:", "notifications.filter.all": "Tümü", "notifications.filter.boosts": "Boostlar", - "notifications.filter.favourites": "Favoriler", + "notifications.filter.favourites": "Gözdelerin", "notifications.filter.follows": "Takip edilenler", "notifications.filter.mentions": "Değinmeler", "notifications.filter.polls": "Anket sonuçları", @@ -595,7 +596,7 @@ "server_banner.server_stats": "Sunucu istatistikleri:", "sign_in_banner.create_account": "Hesap oluştur", "sign_in_banner.sign_in": "Giriş yap", - "sign_in_banner.text": "Profilleri veya etiketleri izlemek, gönderileri beğenmek, paylaşmak ve yanıtlamak için giriş yapın. Başka bir sunucudaki hesabınızla da etkileşebilirsiniz.", + "sign_in_banner.text": "Profilleri veya etiketleri takip etmek, gözdelerin, paylaşımlar ve gönderileri yanıtlamak için giriş yapın. Hesabınızdan farklı bir sunucuda da etkileşim içinde bulunabilirsiniz.", "status.admin_account": "@{name} için denetim arayüzünü açın", "status.admin_domain": "{domain} için denetim arayüzünü açın", "status.admin_status": "Denetim arayüzünde bu gönderiyi açın", @@ -612,7 +613,7 @@ "status.edited": "{date} tarihinde düzenlenmiş", "status.edited_x_times": "{count, plural, one {{count} kez} other {{count} kez}} düzenlendi", "status.embed": "Gömülü", - "status.favourite": "Favorilerine ekle", + "status.favourite": "Gözdem", "status.filter": "Bu gönderiyi filtrele", "status.filtered": "Filtrelenmiş", "status.hide": "Gönderiyi gizle", diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json index 95a7a07cf7..2b9262e695 100644 --- a/app/javascript/mastodon/locales/tt.json +++ b/app/javascript/mastodon/locales/tt.json @@ -103,7 +103,6 @@ "column.direct": "Хосусый искә алулар", "column.directory": "Профильләрне карау", "column.domain_blocks": "Блокланган доменнар", - "column.favourites": "Сайланма", "column.follow_requests": "Язылу сораулары", "column.home": "Баш бит", "column.lists": "Исемлекләр", @@ -167,7 +166,6 @@ "confirmations.mute.explanation": "Бу алардан ураза тотуны һәм алар турында искә алуны яшерәчәк, ләкин бу аларга уразаларыгызны күрергә һәм язылырга мөмкинлек бирәчәк.", "confirmations.mute.message": "Сез тавышны сүндерергә телисез {name}?", "confirmations.redraft.confirm": "Бетерү & эшкәртү", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "confirmations.reply.confirm": "Җавап бирү", "confirmations.reply.message": "Тһеавап хәзер сез ясаган хәбәрне яңадан язуга китерәчәк. Сез дәвам итәсегез киләме?", "confirmations.unfollow.confirm": "Язылуны туктату", @@ -188,7 +186,6 @@ "dismissable_banner.community_timeline": "Бу счетлары урнаштырылган кешеләрдән иң соңгы җәмәгать хәбәрләре {domain}.", "dismissable_banner.dismiss": "Ябу", "dismissable_banner.explore_links": "Бу яңалыклар турында хәзерге вакытта кешеләр һәм башка үзәкләштерелмәгән челтәр серверларында сөйләшәләр.", - "dismissable_banner.explore_statuses": "Бу һәм бүтән серверларның үзәкләштерелмәгән челтәрдәге бу язмалары хәзерге вакытта бу серверда тартыла.", "dismissable_banner.explore_tags": "Бу хэштеглар хәзерге вакытта үзәкләштерелмәгән челтәрнең бүтән серверларында кешеләр арасында кызыксыну уята.", "embed.instructions": "Embed this status on your website by copying the code below.", "embed.preview": "Менә ул нинди булыр:", @@ -211,8 +208,6 @@ "empty_column.account_timeline": "Монда язмалар юк!", "empty_column.account_unavailable": "Профиль кулланып булмады", "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}", "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.", "errors.unexpected_crash.report_issue": "Хата турында белдерү", @@ -259,15 +254,12 @@ "home.column_settings.show_replies": "Җаваплар күрсәтү", "home.hide_announcements": "Игъланнарны яшерү", "home.show_announcements": "Белдерүләр бирегез", - "interaction_modal.description.favourite": "Була торып, аккаунт бу Mastodon, сез куярга, бу постны выбранное авторы белсен өчен, сез цените аны, һәм Саклап калу соңрак.", "interaction_modal.description.follow": "Mastodon аккаунты белән сез иярә аласыз {name} аларның язмаларын өй тасмасында алу өчен.", "interaction_modal.description.reblog": "Mastodon аккаунты ярдәмендә сез бу язманы үз шәкертләрегез белән уртаклашу өчен арттыра аласыз.", "interaction_modal.description.reply": "Mastodon аккаунты белән сез бу язмага җавап бирә аласыз.", "interaction_modal.on_another_server": "Башка серверда", "interaction_modal.on_this_server": "Бу серверда", - "interaction_modal.other_server_instructions": "Бу URL-ны яраткан Mastodon кушымтасының эзләү тартмасына яки Mastodon серверының веб-интерфейсына күчереп языгыз.", "interaction_modal.preamble": "Mastodon үзәкләштерелмәгәнгә, Сез үзегезнең Mastodon серверына урнаштырылган счетыгызны яки бу серверда счетыгыз булмаса, платформага туры килгән платформаны куллана аласыз.", - "interaction_modal.title.favourite": "Яраткан {name} сак", "interaction_modal.title.follow": "Иярү {name}", "interaction_modal.title.reblog": "Арттыру {name} сак", "interaction_modal.title.reply": "Җавап {name} сак", @@ -283,8 +275,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -338,7 +328,6 @@ "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.edit_profile": "Профильны үзгәртү", "navigation_bar.explore": "Күзәтү", - "navigation_bar.favourites": "Сайланмалар", "navigation_bar.lists": "Исемлекләр", "navigation_bar.logout": "Чыгу", "navigation_bar.personal": "Шәхси", @@ -347,18 +336,15 @@ "navigation_bar.search": "Эзләү", "navigation_bar.security": "Хәвефсезлек", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.reblog": "{name} boosted your status", "notifications.clear": "Искәртүләрне чистарту", "notifications.column_settings.admin.report": "Яңа шикаятьләр:", - "notifications.column_settings.favourite": "Сайланмалар:", "notifications.column_settings.mention": "Искә алулар:", "notifications.column_settings.push": "Push-искәртүләр", "notifications.column_settings.sound": "Тавышны уйнату", "notifications.column_settings.status": "New toots:", "notifications.column_settings.update": "Төзәтүләр:", "notifications.filter.all": "Бөтенесе", - "notifications.filter.favourites": "Сайланмалар", "notifications.filter.mentions": "Искә алулар", "notifications.filter.polls": "Сораштыру нәтиҗәләре", "notifications.grant_permission": "Керү мөмкинлеген бирү.", @@ -454,7 +440,6 @@ "server_banner.server_stats": "Сервер статистикасы:", "sign_in_banner.create_account": "Аккаунтны ясау", "sign_in_banner.sign_in": "Керү", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.block": "@{name} блоклау", "status.bookmark": "Кыстыргычларга саклау", @@ -465,7 +450,6 @@ "status.edited": "{date} көнне төзәтте", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", "status.embed": "Веб-биткә кертү", - "status.favourite": "Сайланма", "status.filtered": "Сөзелгән", "status.hide": "Язманы яшерү", "status.history.created": "{name} ясалды {date}", diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json index 057abb3407..28d3e309bd 100644 --- a/app/javascript/mastodon/locales/ug.json +++ b/app/javascript/mastodon/locales/ug.json @@ -16,15 +16,11 @@ "compose_form.spoiler.unmarked": "Text is not hidden", "confirmations.delete.message": "Are you sure you want to delete this status?", "confirmations.domain_block.confirm": "Hide entire domain", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "empty_column.account_timeline": "No toots here!", "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}", "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.", "hashtag.column_settings.tag_toggle": "Include additional tags in this column", @@ -36,8 +32,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -64,7 +58,6 @@ "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.pins": "Pinned toots", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.reblog": "{name} boosted your status", "notifications.column_settings.status": "New toots:", "onboarding.actions.go_to_explore": "See what's trending", @@ -91,7 +84,6 @@ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.copy": "Copy link to status", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index 035c07411b..8c811423a0 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -113,7 +113,7 @@ "column.direct": "Особисті згадки", "column.directory": "Переглянути профілі", "column.domain_blocks": "Заблоковані домени", - "column.favourites": "Вподобане", + "column.favourites": "Уподобане", "column.firehose": "Стрічка новин", "column.follow_requests": "Запити на підписку", "column.home": "Головна", @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "Це сховає дописи від них і дописи зі згадками про них, проте вони все одно матимуть змогу бачити ваші дописи й підписуватися на вас.", "confirmations.mute.message": "Ви впевнені, що хочете приховати {name}?", "confirmations.redraft.confirm": "Видалити та виправити", - "confirmations.redraft.message": "Ви впевнені, що хочете відредагувати допис? Ви втратите всі відповіді, поширення та вподобайки допису.", + "confirmations.redraft.message": "Ви впевнені, що хочете видалити цей допис та переписати його? Додавання у вибране та поширення буде втрачено, а відповіді на оригінальний допис залишаться без першоджерела.", "confirmations.reply.confirm": "Відповісти", "confirmations.reply.message": "Нова відповідь перезапише повідомлення, яке ви зараз пишете. Ви впевнені, що хочете продовжити?", "confirmations.unfollow.confirm": "Відписатися", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Це останні публічні дописи від людей, чиї облікові записи розміщені на {domain}.", "dismissable_banner.dismiss": "Відхилити", "dismissable_banner.explore_links": "Ці новини, які сьогодні широко поширені на цьому та інших серверах. Новіші новини, написані різними людьми, мають вищий рейтинг.", - "dismissable_banner.explore_statuses": "Ці дописи з цього та інших серверів децентралізованої мережі зараз набирають популярності на цьому сервері. Новіші дописи з частішим поширенням та додаванням до обраного мають вищий рейтинг.", + "dismissable_banner.explore_statuses": "Ці дописи з цього та інших серверів децентралізованої мережі зараз набирають популярності на цьому сервері. Новіші дописи з частішим поширенням та додаванням до вподобаного мають вищий рейтинг.", "dismissable_banner.explore_tags": "Ці хештеги зараз набирають популярності серед людей на цьому та інших серверах децентралізованої мережі. Хештеги, які використовуються більшою кількістю людей, мають вищий рейтинг.", "dismissable_banner.public_timeline": "Це найновіші загальнодоступні дописи від людей в соціальній мережі, на які підписані люди в {domain}.", "embed.instructions": "Вбудуйте цей допис до вашого вебсайту, скопіювавши код нижче.", @@ -315,7 +315,7 @@ "interaction_modal.on_this_server": "На цьому сервері", "interaction_modal.other_server_instructions": "Скопіюйте та вставте цю URL-адресу в поле пошуку вашого улюбленого застосунку Mastodon або вебінтерфейсу вашого сервера Mastodon.", "interaction_modal.preamble": "Оскільки Mastodon децентралізований, ви можете використовувати свій наявний обліковий запис, розміщений на іншому сервері Mastodon або сумісній платформі, якщо у вас немає облікового запису на цьому сервері.", - "interaction_modal.title.favourite": "Вподобати допис {name}", + "interaction_modal.title.favourite": "Уподобати допис {name}", "interaction_modal.title.follow": "Підписатися на {name}", "interaction_modal.title.reblog": "Поширити допис {name}", "interaction_modal.title.reply": "Відповісти на допис {name}", @@ -331,8 +331,8 @@ "keyboard_shortcuts.direct": "щоб відкрити стовпець особистих згадок", "keyboard_shortcuts.down": "Рухатися вниз стрічкою", "keyboard_shortcuts.enter": "Відкрити допис", - "keyboard_shortcuts.favourite": "Вподобати допис", - "keyboard_shortcuts.favourites": "Відкрити список вподобаного", + "keyboard_shortcuts.favourite": "Уподобати допис", + "keyboard_shortcuts.favourites": "Відкрити список уподобаного", "keyboard_shortcuts.federated": "Відкрити глобальну стрічку", "keyboard_shortcuts.heading": "Комбінації клавіш", "keyboard_shortcuts.home": "Відкрити домашню стрічку", @@ -363,6 +363,7 @@ "lightbox.previous": "Назад", "limited_account_hint.action": "Усе одно показати профіль", "limited_account_hint.title": "Цей профіль сховали модератори {domain}.", + "link_preview.author": "Від {name}", "lists.account.add": "Додати до списку", "lists.account.remove": "Вилучити зі списку", "lists.delete": "Видалити список", @@ -395,7 +396,7 @@ "navigation_bar.domain_blocks": "Заблоковані домени", "navigation_bar.edit_profile": "Редагувати профіль", "navigation_bar.explore": "Огляд", - "navigation_bar.favourites": "Вподобане", + "navigation_bar.favourites": "Уподобане", "navigation_bar.filters": "Приховані слова", "navigation_bar.follow_requests": "Запити на підписку", "navigation_bar.followed_tags": "Відстежувані хештеґи", @@ -412,7 +413,7 @@ "not_signed_in_indicator.not_signed_in": "Ви повинні увійти, щоб отримати доступ до цього ресурсу.", "notification.admin.report": "Скарга від {name} на {target}", "notification.admin.sign_up": "{name} приєдналися", - "notification.favourite": "Ваш допис подобається {name}", + "notification.favourite": "Ваш допис сподобався {name}", "notification.follow": "{name} підписалися на вас", "notification.follow_request": "{name} відправили запит на підписку", "notification.mention": "{name} згадали вас", @@ -426,7 +427,7 @@ "notifications.column_settings.admin.report": "Нові скарги:", "notifications.column_settings.admin.sign_up": "Нові реєстрації:", "notifications.column_settings.alert": "Сповіщення стільниці", - "notifications.column_settings.favourite": "Вподобане:", + "notifications.column_settings.favourite": "Уподобане:", "notifications.column_settings.filter_bar.advanced": "Показати всі категорії", "notifications.column_settings.filter_bar.category": "Панель швидкого фільтру", "notifications.column_settings.filter_bar.show_bar": "Показати панель фільтра", @@ -444,7 +445,7 @@ "notifications.column_settings.update": "Зміни:", "notifications.filter.all": "Усі", "notifications.filter.boosts": "Поширення", - "notifications.filter.favourites": "Вподобані", + "notifications.filter.favourites": "Уподобане", "notifications.filter.follows": "Підписки", "notifications.filter.mentions": "Згадки", "notifications.filter.polls": "Результати опитування", @@ -595,7 +596,7 @@ "server_banner.server_stats": "Статистика сервера:", "sign_in_banner.create_account": "Створити обліковий запис", "sign_in_banner.sign_in": "Увійти", - "sign_in_banner.text": "Увійдіть, щоб слідкувати за профілями або хештеґами, вподобаними, ділитися і відповідати на дописи. Ви також взаємодіяти з вашого облікового запису на іншому сервері.", + "sign_in_banner.text": "Увійдіть, щоб слідкувати за профілями або хештегами, вподобаними, ділитися і відповідати на дописи. Ви також можете взаємодіяти з вашого облікового запису на іншому сервері.", "status.admin_account": "Відкрити інтерфейс модерації для @{name}", "status.admin_domain": "Відкрити інтерфейс модерації для {domain}", "status.admin_status": "Відкрити цей допис в інтерфейсі модерації", @@ -612,7 +613,7 @@ "status.edited": "Відредаговано {date}", "status.edited_x_times": "Відредаговано {count, plural, one {{count} раз} few {{count} рази} many {{counter} разів} other {{counter} разів}}", "status.embed": "Вбудувати", - "status.favourite": "Подобається", + "status.favourite": "Уподобане", "status.filter": "Фільтрувати цей допис", "status.filtered": "Відфільтровано", "status.hide": "Сховати допис", diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json index 553058ce1e..0004e38486 100644 --- a/app/javascript/mastodon/locales/ur.json +++ b/app/javascript/mastodon/locales/ur.json @@ -64,7 +64,6 @@ "column.community": "مقامی زمانی جدول", "column.directory": "مشخصات کا مطالعہ کریں", "column.domain_blocks": "پوشیدہ ڈومین", - "column.favourites": "پسندیدہ", "column.follow_requests": "پیروی درخواست", "column.home": "خانہ", "column.lists": "فہرستیں", @@ -123,7 +122,6 @@ "confirmations.mute.explanation": "یہ ان سے پوسٹس اور ان کا تذکرہ کرنے والی پوسٹس کو چھپائے گا، لیکن یہ پھر بھی انہیں آپ کی پوسٹس دیکھنے اور آپ کی پیروی کرنے کی اجازت دے گا۔", "confirmations.mute.message": "کیا واقعی آپ {name} کو خاموش کرنا چاہتے ہیں؟", "confirmations.redraft.confirm": "ڈیلیٹ کریں اور دوبارہ ڈرافٹ کریں", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "confirmations.reply.confirm": "جواب دیں", "confirmations.reply.message": "ابھی جواب دینے سے وہ پیغام اوور رائٹ ہو جائے گا جو آپ فی الحال لکھ رہے ہیں۔ کیا آپ واقعی آگے بڑھنا چاہتے ہیں؟", "confirmations.unfollow.confirm": "پیروی ترک کریں", @@ -139,7 +137,6 @@ "directory.recently_active": "حال میں میں ایکٹیو", "dismissable_banner.dismiss": "برخاست کریں", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "embed.preview": "یہ اس طرح نظر آئے گا:", @@ -156,8 +153,6 @@ "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", "empty_column.community": "مقامی جدول خالی ہے. کچھ تحریر کریں تاکہ بات آگے بڑھے!", "empty_column.domain_blocks": "ابھی تک کوئی چھپا ہوا ڈومین نہیں ہے.", - "empty_column.favourited_statuses": "آپ کا کوئی پسندیدہ ٹوٹ نہیں ہے. جب آپ پسند کریں گے، یہاں نظر آئےگا.", - "empty_column.favourites": "ابھی تک کسی نے بھی اس ٹوٹ کو پسند نہیں کیا ہے. جب بھی کوئی اسے پسند کرے گا، ان کا نام یہاں نظر آئے گا.", "empty_column.follow_requests": "ابھی تک آپ کی پیری کرنے کی درخواست نہیں کی ہے. جب کوئی درخواست کرے گا، ان کا نام یہاں نظر آئے گا.", "empty_column.hashtag": "ابھی یہ ہیش ٹیگ خالی ہے.", "empty_column.home": "آپ کا خانگی جدول خالی ہے! {public} دیکھیں یا شروعات کیلئے تلاش کریں اور دیگر صارفین سے ملیں.", @@ -193,8 +188,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -225,7 +218,6 @@ "navigation_bar.discover": "دریافت کریں", "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.edit_profile": "پروفائل میں ترمیم کریں", - "navigation_bar.favourites": "پسندیدہ", "navigation_bar.filters": "خاموش کردہ الفاظ", "navigation_bar.follow_requests": "پیروی کی درخواستیں", "navigation_bar.follows_and_followers": "پیروی کردہ اور پیروکار", @@ -238,7 +230,6 @@ "navigation_bar.public_timeline": "وفاقی ٹائم لائن", "navigation_bar.security": "سیکورٹی", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.follow": "{name} آپ کی پیروی کی", "notification.follow_request": "{name} نے آپ کی پیروی کی درخواست کی", "notification.mention": "{name} نے آپ کا تذکرہ کیا", @@ -249,7 +240,6 @@ "notifications.clear": "اطلاعات ہٹائیں", "notifications.clear_confirmation": "کیا آپ واقعی اپنی تمام اطلاعات کو صاف کرنا چاہتے ہیں؟", "notifications.column_settings.alert": "ڈیسک ٹاپ اطلاعات", - "notifications.column_settings.favourite": "پسندیدہ:", "notifications.column_settings.filter_bar.advanced": "تمام زمرے دکھائیں", "notifications.column_settings.status": "New toots:", "onboarding.actions.go_to_explore": "See what's trending", @@ -278,7 +268,6 @@ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.copy": "Copy link to status", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json index 56fa45c2fa..b6b10b8d1d 100644 --- a/app/javascript/mastodon/locales/uz.json +++ b/app/javascript/mastodon/locales/uz.json @@ -101,7 +101,6 @@ "column.community": "Mahalliy", "column.directory": "Profillarni ko'rish", "column.domain_blocks": "Bloklangan domenlar", - "column.favourites": "Sevimlilar", "column.follow_requests": "So'rovlarni kuzatib boring", "column.home": "Bosh sahifa", "column.lists": "Ro‘yxat", @@ -164,7 +163,6 @@ "confirmations.mute.explanation": "Bu ulardagi postlar va ular haqida eslatib o'tilgan postlarni yashiradi, ammo bu ularga sizning postlaringizni ko'rish va sizni kuzatish imkonini beradi.", "confirmations.mute.message": "Haqiqatan ham {name} ovozini o‘chirib qo‘ymoqchimisiz?", "confirmations.redraft.confirm": "O'chirish va qayta loyihalash", - "confirmations.redraft.message": "Haqiqatan ham bu postni o‘chirib tashlab, uni qayta loyihalashni xohlaysizmi? Sevimlilar va yuksalishlar yo'qoladi va asl postga javoblar yetim qoladi.", "confirmations.reply.confirm": "Javob berish", "confirmations.reply.message": "Hozir javob bersangiz, hozir yozayotgan xabaringiz ustidan yoziladi. Davom etishni xohlaysizmi?", "confirmations.unfollow.confirm": "Kuzatishni To'xtatish", @@ -184,7 +182,6 @@ "dismissable_banner.community_timeline": "Bular akkauntlari {domain} tomonidan joylashtirilgan odamlarning eng soʻnggi ochiq postlari.", "dismissable_banner.dismiss": "Bekor qilish", "dismissable_banner.explore_links": "Ushbu yangiliklar haqida hozirda markazlashtirilmagan tarmoqning ushbu va boshqa serverlarida odamlar gaplashmoqda.", - "dismissable_banner.explore_statuses": "Markazlashtirilmagan tarmoqdagi ushbu va boshqa serverlarning ushbu xabarlari hozirda ushbu serverda qiziqish uyg'otmoqda.", "dismissable_banner.explore_tags": "Ushbu hashtaglar hozirda markazlashtirilmagan tarmoqning ushbu va boshqa serverlarida odamlar orasida qiziqish uyg'otmoqda.", "embed.instructions": "Quyidagi kodni nusxalash orqali ushbu postni veb-saytingizga joylashtiring.", "embed.preview": "Bu qanday ko'rinishda bo'ladi:", @@ -211,8 +208,6 @@ "empty_column.community": "Mahalliy vaqt jadvali boʻsh. To'pni aylantirish uchun hammaga ochiq narsa yozing!", "empty_column.domain_blocks": "Hali bloklangan domenlar mavjud emas.", "empty_column.explore_statuses": "Hozir hech narsa trendda emas. Keyinroq tekshiring!", - "empty_column.favourited_statuses": "Sizda hali sevimli postlar yoʻq. Sizga yoqqanida, u shu yerda chiqadi.", - "empty_column.favourites": "Bu postni hali hech kim yoqtirmagan. Kimdir buni qilsa, ular shu yerda paydo bo'ladi.", "empty_column.follow_requests": "Sizda hali kuzatuv soʻrovlari yoʻq. Bittasini olganingizda, u shu yerda paydo bo'ladi.", "empty_column.followed_tags": "Siz hali hech qanday hashtagga amal qilmagansiz. Qachonki, ular shu yerda paydo bo'ladi.", "empty_column.hashtag": "Ushbu hashtagda hali hech narsa yo'q.", @@ -278,15 +273,12 @@ "home.column_settings.show_replies": "Javoblarni ko'rish", "home.hide_announcements": "E'lonlarni yashirish", "home.show_announcements": "E'lonlarni ko'rsatish", - "interaction_modal.description.favourite": "Mastodonda akkaunt bilan siz muallifga buni qadrlayotganingizni bildirish uchun ushbu postni yoqtirishingiz va keyinroq saqlashingiz mumkin.", "interaction_modal.description.follow": "Mastodon’da akkauntga ega bo‘lgan holda, siz {name} ga obuna bo‘lib, ularning postlarini bosh sahifangizga olishingiz mumkin.", "interaction_modal.description.reblog": "Mastodon-dagi akkaunt yordamida siz ushbu postni o'z izdoshlaringiz bilan baham ko'rish uchun oshirishingiz mumkin.", "interaction_modal.description.reply": "Mastodondagi akkaunt bilan siz ushbu xabarga javob berishingiz mumkin.", "interaction_modal.on_another_server": "Boshqa serverda", "interaction_modal.on_this_server": "Shu serverda", - "interaction_modal.other_server_instructions": "Ushbu URL manzilidan nusxa ko‘chiring va sevimli Mastodon ilovangizning qidirish maydoniga yoki Mastodon serveringiz veb-interfeysiga joylashtiring.", "interaction_modal.preamble": "Mastodon markazlashtirilmaganligi sababli, boshqa Mastodon serverida joylashgan mavjud hisob qaydnomangizdan yoki bu serverda akkauntingiz bo'lmasa, unga mos platformadan foydalanishingiz mumkin.", - "interaction_modal.title.favourite": "{name} posti yoqdi", "interaction_modal.title.follow": "{name} ga ergashing", "interaction_modal.title.reblog": "{name}ning postini boost qilish", "interaction_modal.title.reply": "{name} postiga javob bering", @@ -299,8 +291,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "Yozuvni ochish", - "keyboard_shortcuts.favourite": "Yozuv yoqdi", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -352,7 +342,6 @@ "navigation_bar.domain_blocks": "Bloklangan domenlar", "navigation_bar.edit_profile": "Profilni tahrirlash", "navigation_bar.explore": "O‘rganish", - "navigation_bar.favourites": "Sevimlilar", "navigation_bar.filters": "E'tiborga olinmagan so'zlar", "navigation_bar.followed_tags": "Kuzatilgan hashtaglar", "navigation_bar.follows_and_followers": "Kuzatuvchilar va izdoshlar", @@ -366,7 +355,6 @@ "navigation_bar.search": "Izlash", "navigation_bar.security": "Xavfsizlik", "not_signed_in_indicator.not_signed_in": "Ushbu manbaga kirish uchun tizimga kirishingiz kerak.", - "notification.favourite": "{name} favourited your status", "notification.own_poll": "So‘rovingiz tugadi", "notification.poll": "Siz ovoz bergan soʻrovnoma yakunlandi", "notification.reblog": "{name} boosted your status", @@ -392,7 +380,6 @@ "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.copy": "Copy link to status", "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}", diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json index a3bc66fad8..7ed79545fe 100644 --- a/app/javascript/mastodon/locales/vi.json +++ b/app/javascript/mastodon/locales/vi.json @@ -113,7 +113,7 @@ "column.direct": "Nhắn riêng", "column.directory": "Tìm người cùng sở thích", "column.domain_blocks": "Máy chủ đã chặn", - "column.favourites": "Thích", + "column.favourites": "Lượt thích", "column.firehose": "Bản tin trực tiếp", "column.follow_requests": "Yêu cầu theo dõi", "column.home": "Bảng tin", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "Những tút gần đây của những người có tài khoản thuộc máy chủ {domain}.", "dismissable_banner.dismiss": "Bỏ qua", "dismissable_banner.explore_links": "Những sự kiện đang được thảo luận nhiều trên máy chủ này và những máy chủ khác thuộc mạng liên hợp của nó.", - "dismissable_banner.explore_statuses": "Những tút đang phổ biến trên máy chủ này và những máy chủ khác thuộc mạng liên hợp của nó.", + "dismissable_banner.explore_statuses": "Những tút đang phổ biến trên máy chủ này và mạng liên hợp của nó.", "dismissable_banner.explore_tags": "Những hashtag đang được sử dụng nhiều trên máy chủ này và những máy chủ khác thuộc mạng liên hợp của nó.", "dismissable_banner.public_timeline": "Đây là những tút công khai gần đây nhất của những người trong mạng liên hợp của {domain}.", "embed.instructions": "Sao chép đoạn mã dưới đây và chèn vào trang web của bạn.", @@ -307,7 +307,7 @@ "home.explore_prompt.title": "Đây là ngôi nhà Mastodon của bạn.", "home.hide_announcements": "Ẩn thông báo máy chủ", "home.show_announcements": "Hiện thông báo máy chủ", - "interaction_modal.description.favourite": "Với tài khoản Mastodon, bạn có thể yêu thích tút này để cho người đăng biết bạn thích nó và lưu lại tút.", + "interaction_modal.description.favourite": "Với tài khoản Mastodon, bạn có thể cho người đăng biết bạn thích tút này và lưu lại tút.", "interaction_modal.description.follow": "Với tài khoản Mastodon, bạn có thể theo dõi {name} để nhận những tút của họ trên bảng tin của mình.", "interaction_modal.description.reblog": "Với tài khoản Mastodon, bạn có thể đăng lại tút này để chia sẻ nó với những người đang theo dõi bạn.", "interaction_modal.description.reply": "Với tài khoản Mastodon, bạn có thể bình luận tút này.", @@ -331,8 +331,8 @@ "keyboard_shortcuts.direct": "mở mục nhắn riêng", "keyboard_shortcuts.down": "di chuyển xuống dưới danh sách", "keyboard_shortcuts.enter": "viết tút mới", - "keyboard_shortcuts.favourite": "thích", - "keyboard_shortcuts.favourites": "mở lượt thích", + "keyboard_shortcuts.favourite": "Thích tút", + "keyboard_shortcuts.favourites": "Mở lượt thích", "keyboard_shortcuts.federated": "mở mạng liên hợp", "keyboard_shortcuts.heading": "Các phím tắt", "keyboard_shortcuts.home": "mở bảng tin", @@ -363,6 +363,7 @@ "lightbox.previous": "Trước", "limited_account_hint.action": "Vẫn cứ xem", "limited_account_hint.title": "Người này đã bị ẩn bởi quản trị viên của {domain}.", + "link_preview.author": "Bởi {name}", "lists.account.add": "Thêm vào danh sách", "lists.account.remove": "Xóa khỏi danh sách", "lists.delete": "Xóa danh sách", @@ -395,7 +396,7 @@ "navigation_bar.domain_blocks": "Máy chủ đã ẩn", "navigation_bar.edit_profile": "Sửa hồ sơ", "navigation_bar.explore": "Xu hướng", - "navigation_bar.favourites": "Thích", + "navigation_bar.favourites": "Lượt thích", "navigation_bar.filters": "Bộ lọc từ ngữ", "navigation_bar.follow_requests": "Yêu cầu theo dõi", "navigation_bar.followed_tags": "Hashtag theo dõi", @@ -444,7 +445,7 @@ "notifications.column_settings.update": "Lượt sửa:", "notifications.filter.all": "Toàn bộ", "notifications.filter.boosts": "Đăng lại", - "notifications.filter.favourites": "Thích", + "notifications.filter.favourites": "Lượt thích", "notifications.filter.follows": "Đang theo dõi", "notifications.filter.mentions": "Lượt nhắc đến", "notifications.filter.polls": "Kết quả bình chọn", @@ -554,7 +555,7 @@ "report.rules.subtitle": "Chọn tất cả những gì phù hợp", "report.rules.title": "Vi phạm nội quy nào?", "report.statuses.subtitle": "Chọn tất cả những gì phù hợp", - "report.statuses.title": "Bạn muốn gửi tút nào kèm báo cáo này?", + "report.statuses.title": "Bạn muốn báo cáo tút nào?", "report.submit": "Gửi đi", "report.target": "Báo cáo {target}", "report.thanks.take_action": "Đây là một số cách để kiểm soát thứ bạn nhìn thấy trên Mastodon:", @@ -649,7 +650,7 @@ "status.show_more_all": "Hiển thị tất cả", "status.show_original": "Bản gốc", "status.title.with_attachments": "{user} đã đăng {attachmentCount, plural, other {{attachmentCount} đính kèm}}", - "status.translate": "Dịch Tút", + "status.translate": "Dịch tút", "status.translated_from_with": "Dịch từ {lang} bằng {provider}", "status.uncached_media_warning": "Xem trước không sẵn có", "status.unmute_conversation": "Quan tâm", diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json index 0e45ab746c..1797f7dfff 100644 --- a/app/javascript/mastodon/locales/zgh.json +++ b/app/javascript/mastodon/locales/zgh.json @@ -28,7 +28,6 @@ "bundle_modal_error.close": "ⵔⴳⵍ", "bundle_modal_error.retry": "ⴰⵍⵙ ⴰⵔⵎ", "column.blocks": "ⵉⵏⵙⵙⵎⵔⵙⵏ ⵜⵜⵓⴳⴷⵍⵏⵉⵏ", - "column.favourites": "ⵜⵓⴼⵓⵜⵉⵏ", "column.home": "ⴰⵙⵏⵓⴱⴳ", "column.lists": "ⵜⵉⵍⴳⴰⵎⵉⵏ", "column.notifications": "ⵜⵉⵏⵖⵎⵉⵙⵉⵏ", @@ -61,14 +60,12 @@ "confirmations.logout.confirm": "ⴼⴼⵖ", "confirmations.logout.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴼⴼⵖⴷ?", "confirmations.mute.confirm": "ⵥⵥⵉⵥⵏ", - "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", "confirmations.reply.confirm": "ⵔⴰⵔ", "confirmations.unfollow.confirm": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ", "confirmations.unfollow.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴽⴽⵙⴷ ⴰⴹⴼⴼⵓⵕ ⵉ {name}?", "conversation.delete": "ⴽⴽⵙ ⴰⵎⵙⴰⵡⴰⵍ", "conversation.with": "ⴰⴽⴷ {names}", "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.", - "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.", "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.", "embed.instructions": "Embed this status on your website by copying the code below.", "emoji_button.flags": "ⵉⵛⵏⵢⴰⵍⵏ", @@ -79,8 +76,6 @@ "emoji_button.symbols": "ⵜⵉⵎⴰⵜⴰⵔⵉⵏ", "empty_column.account_timeline": "No toots here!", "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.", - "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", - "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}", "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.", "follow_request.reject": "ⴰⴳⵢ", @@ -98,8 +93,6 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "to favourite", - "keyboard_shortcuts.favourites": "to open favourites list", "keyboard_shortcuts.federated": "to open federated timeline", "keyboard_shortcuts.heading": "Keyboard Shortcuts", "keyboard_shortcuts.home": "to open home timeline", @@ -144,7 +137,6 @@ "navigation_bar.logout": "ⴼⴼⵖ", "navigation_bar.pins": "Pinned toots", "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.", - "notification.favourite": "{name} favourited your status", "notification.follow": "ⵉⴹⴼⴼⴰⵔ ⴽ {name}", "notification.reblog": "{name} boosted your status", "notifications.clear": "ⵙⴼⴹ ⵜⵉⵏⵖⵎⵉⵙⵉⵏ", @@ -193,7 +185,6 @@ "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.", "search_results.total": "{count, plural, one {# result} other {# results}}", "sign_in_banner.sign_in": "Sign in", - "sign_in_banner.text": "Sign in to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.", "status.admin_status": "Open this status in the moderation interface", "status.block": "ⴳⴷⵍ @{name}", "status.copy": "Copy link to status", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index f22a541c71..075643c9eb 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -181,7 +181,7 @@ "confirmations.mute.explanation": "他们的嘟文以及提到他们的嘟文都会隐藏，但他们仍然可以看到你的嘟文，也可以关注你。", "confirmations.mute.message": "你确定要隐藏 {name} 吗？", "confirmations.redraft.confirm": "删除并重新编辑", - "confirmations.redraft.message": "确定删除这条嘟文并重写吗？与它相关的所有转嘟和收藏都会清除，嘟文的回复也会失去关联。", + "confirmations.redraft.message": "确定删除这条嘟文并重写吗？所有相关的喜欢和转嘟都将丢失，嘟文的回复也会失去关联。", "confirmations.reply.confirm": "回复", "confirmations.reply.message": "回复此消息将会覆盖当前正在编辑的信息。确定继续吗？", "confirmations.unfollow.confirm": "取消关注", @@ -202,7 +202,7 @@ "dismissable_banner.community_timeline": "这些是来自 {domain} 用户的最新公共嘟文。", "dismissable_banner.dismiss": "忽略", "dismissable_banner.explore_links": "这些新闻故事正被本站和分布式网络上其他站点的用户谈论。", - "dismissable_banner.explore_statuses": "来自本站和分布式网络上其他站点的这些嘟文正在本站引起关注。", + "dismissable_banner.explore_statuses": "这些是目前在社交网络上引起关注的嘟文。嘟文的喜欢和转嘟次数越多，排名越高。", "dismissable_banner.explore_tags": "这些标签正在本站和分布式网络上其他站点的用户中引起关注。", "dismissable_banner.public_timeline": "这些是在 {domain} 上关注的人们最新发布的公开嘟文。", "embed.instructions": "复制下列代码以在你的网站中嵌入此嘟文。", @@ -228,10 +228,10 @@ "empty_column.blocks": "你还未屏蔽任何用户。", "empty_column.bookmarked_statuses": "你还没有给任何嘟文添加过书签。在你添加书签后，嘟文就会显示在这里。", "empty_column.community": "本站时间轴暂时没有内容，快写点什么让它动起来吧！", - "empty_column.direct": "你还未使用过私信。当你发出或者收到私信时，它将显示在此。", + "empty_column.direct": "你还未使用过私下提及。当你发出或者收到私下提及时，它将显示在此。", "empty_column.domain_blocks": "暂且没有被屏蔽的站点。", "empty_column.explore_statuses": "目前没有热门话题，稍后再来看看吧！", - "empty_column.favourited_statuses": "你还没有喜欢过任何嘟文。喜欢过的嘟文会显示在这里。", + "empty_column.favourited_statuses": "你没有喜欢过任何嘟文。喜欢过的嘟文会显示在这里。", "empty_column.favourites": "没有人喜欢过这条嘟文。如果有人喜欢了，就会显示在这里。", "empty_column.follow_requests": "你还没有收到任何关注请求。当你收到一个关注请求时，它会出现在这里。", "empty_column.followed_tags": "您还没有关注任何话题标签。 当您关注后，它们会出现在这里。", @@ -273,7 +273,7 @@ "firehose.all": "全部", "firehose.local": "此服务器", "firehose.remote": "其他服务器", - "follow_request.authorize": "授权", + "follow_request.authorize": "同意", "follow_request.reject": "拒绝", "follow_requests.unlocked_explanation": "尽管你没有锁嘟，但是 {domain} 的工作人员认为你也许会想手动审核审核这些账号的关注请求。", "followed_tags": "关注的话题标签", @@ -307,13 +307,13 @@ "home.explore_prompt.title": "这是你在 Mastodon 的主页。", "home.hide_announcements": "隐藏公告", "home.show_announcements": "显示公告", - "interaction_modal.description.favourite": "拥有一个 Mastodon 账号，你可以对此嘟文点赞及收藏，并让其作者收到你的赞赏。", + "interaction_modal.description.favourite": "只需一个 Mastodon 账号，即可喜欢这条嘟文，对嘟文的作者展示您欣赏的态度，并保存嘟文以供日后使用。", "interaction_modal.description.follow": "拥有一个 Mastodon 账号，你可以关注 {name} 并在自己的主页上接收对方的新嘟文。", "interaction_modal.description.reblog": "拥有一个 Mastodon 账号，你可以向自己的关注者们转发此嘟文。", "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": "将此URL复制并粘贴到您喜欢的Mastodon应用程序的搜索栏中，或者粘贴到你的Mastodon实例的Web界面中。", "interaction_modal.preamble": "基于 Mastodon 去中心化的特性，如果你在本站没有账号，也可以使用在另一 Mastodon 服务器或其他兼容平台上的已有账号。", "interaction_modal.title.favourite": "喜欢 {name} 的嘟文", "interaction_modal.title.follow": "关注 {name}", @@ -328,11 +328,11 @@ "keyboard_shortcuts.column": "选择某栏", "keyboard_shortcuts.compose": "选择输入框", "keyboard_shortcuts.description": "说明", - "keyboard_shortcuts.direct": "打开私信栏", + "keyboard_shortcuts.direct": "打开私下提及栏", "keyboard_shortcuts.down": "在列表中让光标下移", "keyboard_shortcuts.enter": "展开嘟文", "keyboard_shortcuts.favourite": "喜欢嘟文", - "keyboard_shortcuts.favourites": "打开喜欢的嘟文列表", + "keyboard_shortcuts.favourites": "打开喜欢列表", "keyboard_shortcuts.federated": "打开跨站时间轴", "keyboard_shortcuts.heading": "快捷键列表", "keyboard_shortcuts.home": "打开主页时间轴", @@ -363,6 +363,7 @@ "lightbox.previous": "上一个", "limited_account_hint.action": "仍要显示个人资料", "limited_account_hint.title": "此账号资料已被 {domain} 管理员隐藏。", + "link_preview.author": "由 {name}", "lists.account.add": "添加到列表", "lists.account.remove": "从列表中移除", "lists.delete": "删除列表", @@ -390,7 +391,7 @@ "navigation_bar.bookmarks": "书签", "navigation_bar.community_timeline": "本站时间轴", "navigation_bar.compose": "撰写新嘟文", - "navigation_bar.direct": "私信", + "navigation_bar.direct": "私下提及", "navigation_bar.discover": "发现", "navigation_bar.domain_blocks": "已屏蔽的域名", "navigation_bar.edit_profile": "修改个人资料", @@ -595,7 +596,7 @@ "server_banner.server_stats": "服务器统计数据：", "sign_in_banner.create_account": "创建账户", "sign_in_banner.sign_in": "登录", - "sign_in_banner.text": "登录以关注个人资料、话题标签或喜欢、分享和回复嘟文。您还能用您的账户在另一个服务器上进行互动。", + "sign_in_banner.text": "登录关注用户和话题标签，喜欢、分享和回复嘟文。您还可以与其他服务器上的用户进行互动。", "status.admin_account": "打开 @{name} 的管理界面", "status.admin_domain": "打开 {domain} 的管理界面", "status.admin_status": "打开此帖的管理界面", @@ -606,8 +607,8 @@ "status.copy": "复制嘟文链接", "status.delete": "删除", "status.detailed_status": "详细的对话视图", - "status.direct": "私信 @{name}", - "status.direct_indicator": "私信", + "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/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index 18f62f97e4..7a7c39d5c7 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -76,6 +76,9 @@ "admin.dashboard.retention.average": "平均", "admin.dashboard.retention.cohort": "註冊月份", "admin.dashboard.retention.cohort_size": "新使用者", + "admin.impact_report.instance_accounts": "將會被刪除的用戶個人檔案", + "admin.impact_report.instance_followers": "本站用戶將失去的追隨者", + "admin.impact_report.instance_follows": "其他用戶將失去的追隨者", "admin.impact_report.title": "影響摘要", "alert.rate_limited.message": "請在 {retry_time, time, medium} 後重試", "alert.rate_limited.title": "已限速", @@ -110,7 +113,6 @@ "column.direct": "私人提及", "column.directory": "瀏覽個人資料", "column.domain_blocks": "封鎖的服務站", - "column.favourites": "最愛的文章", "column.firehose": "即時動態", "column.follow_requests": "追蹤請求", "column.home": "主頁", @@ -132,6 +134,7 @@ "community.column_settings.remote_only": "只顯示外站", "compose.language.change": "更改語言", "compose.language.search": "搜尋語言...", + "compose.published.body": "已發佈帖子", "compose_form.direct_message_warning_learn_more": "了解更多", "compose_form.encryption_warning": "Mastodon 上的帖文並未端對端加密。請不要透過 Mastodon 分享任何敏感資訊。", "compose_form.hashtag_warning": "由於此帖文並非公開，因此它不會列在標籤下。只有公開帖文才可以經標籤搜尋。", @@ -176,7 +179,6 @@ "confirmations.mute.explanation": "這將會隱藏來自他們的貼文與通知，但是他們還是可以查閱你的貼文與關注你。", "confirmations.mute.message": "你確定要將{name}靜音嗎？", "confirmations.redraft.confirm": "刪除並編輯", - "confirmations.redraft.message": "你確定要刪除並重新編輯嗎？所有相關的回覆、轉推與最愛都會被刪除。", "confirmations.reply.confirm": "回覆", "confirmations.reply.message": "現在回覆將蓋掉您目前正在撰寫的訊息。是否仍要回覆？", "confirmations.unfollow.confirm": "取消追蹤", @@ -197,7 +199,6 @@ "dismissable_banner.community_timeline": "這些是 {domain} 上用戶的最新公開帖文。", "dismissable_banner.dismiss": "關閉", "dismissable_banner.explore_links": "這些新聞內容正在被本站以及去中心化網路上其他伺服器的人們熱烈討論。", - "dismissable_banner.explore_statuses": "來自本站以及去中心化網路中其他伺服器的這些帖文正在本站引起關注。", "dismissable_banner.explore_tags": "這些主題標籤正在被本站以及去中心化網路上的人們熱烈討論。", "embed.instructions": "要內嵌此文章，請將以下代碼貼進你的網站。", "embed.preview": "看上去會是這樣：", @@ -225,8 +226,6 @@ "empty_column.direct": "你還沒有私人提及。當你發送或收到時，它將顯示在這裏。", "empty_column.domain_blocks": "尚未隱藏任何網域。", "empty_column.explore_statuses": "目前沒有熱門話題，請稍候再回來看看！", - "empty_column.favourited_statuses": "你還沒收藏任何文章。這裡將會顯示你收藏的嘟文。", - "empty_column.favourites": "還沒有人收藏這則文章。這裡將會顯示被收藏的嘟文。", "empty_column.follow_requests": "您尚未收到任何追蹤請求。這裡將會顯示收到的追蹤請求。", "empty_column.followed_tags": "你還沒有追蹤標籤。當你追蹤後，標籤將顯示在此處。", "empty_column.hashtag": "這個標籤暫時未有內容。", @@ -297,15 +296,12 @@ "home.column_settings.show_replies": "顯示回應文章", "home.hide_announcements": "隱藏公告", "home.show_announcements": "顯示公告", - "interaction_modal.description.favourite": "在 Mastodon 上有個帳號的話，您可以點讚並收藏此帖文，讓作者知道您對它的欣賞。", "interaction_modal.description.follow": "在 Mastodon 上有個帳號的話，您可以追蹤 {name} 以於首頁時間軸接收他們的帖文。", "interaction_modal.description.reblog": "在 Mastodon 上有個帳號的話，您可以向自己的追縱者們轉發此帖文。", "interaction_modal.description.reply": "在 Mastodon 上擁有帳號的話，您可以回覆此帖文。", "interaction_modal.on_another_server": "於不同伺服器", "interaction_modal.on_this_server": "於此伺服器", - "interaction_modal.other_server_instructions": "複製此 URL 並貼上到你最喜歡的 Mastodon 應用程式或 Mastodon 伺服器網頁介面的搜尋欄中。", "interaction_modal.preamble": "由於 Mastodon 是去中心化的，即使您於此伺服器上沒有帳號，仍可以利用託管於其他 Mastodon 伺服器或相容平台上的既存帳號。", - "interaction_modal.title.favourite": "將 {name} 的帖文加入最愛", "interaction_modal.title.follow": "追蹤 {name}", "interaction_modal.title.reblog": "轉發 {name} 的帖文", "interaction_modal.title.reply": "回覆 {name} 的帖文", @@ -321,8 +317,6 @@ "keyboard_shortcuts.direct": "以打開私人提及欄", "keyboard_shortcuts.down": "在列表往下移動", "keyboard_shortcuts.enter": "打開文章", - "keyboard_shortcuts.favourite": "收藏文章", - "keyboard_shortcuts.favourites": "開啟最愛的內容", "keyboard_shortcuts.federated": "打開跨站時間軸", "keyboard_shortcuts.heading": "鍵盤快速鍵", "keyboard_shortcuts.home": "開啟個人時間軸", @@ -383,7 +377,6 @@ "navigation_bar.domain_blocks": "封鎖的服務站", "navigation_bar.edit_profile": "修改個人資料", "navigation_bar.explore": "探索", - "navigation_bar.favourites": "最愛的內容", "navigation_bar.filters": "靜音詞彙", "navigation_bar.follow_requests": "追蹤請求", "navigation_bar.followed_tags": "已追蹤標籤", @@ -414,7 +407,6 @@ "notifications.column_settings.admin.report": "新舉報：", "notifications.column_settings.admin.sign_up": "新註冊：", "notifications.column_settings.alert": "顯示桌面通知", - "notifications.column_settings.favourite": "你最愛的文章：", "notifications.column_settings.filter_bar.advanced": "顯示所有分類", "notifications.column_settings.filter_bar.category": "快速過濾欄", "notifications.column_settings.filter_bar.show_bar": "顯示篩選欄", @@ -432,7 +424,6 @@ "notifications.column_settings.update": "編輯：", "notifications.filter.all": "全部", "notifications.filter.boosts": "轉推", - "notifications.filter.favourites": "最愛", "notifications.filter.follows": "追蹤的使用者", "notifications.filter.mentions": "提及", "notifications.filter.polls": "投票結果", @@ -557,7 +548,6 @@ "server_banner.server_stats": "伺服器統計：", "sign_in_banner.create_account": "建立帳號", "sign_in_banner.sign_in": "登入", - "sign_in_banner.text": "登入以追蹤個人檔案和標籤，或最愛、分享和回覆帖文。你也可以使用帳戶在其他伺服器上互動。", "status.admin_account": "開啟 @{name} 的管理介面", "status.admin_domain": "打開 {domain} 管理介面", "status.admin_status": "在管理介面開啟這篇文章", @@ -574,7 +564,6 @@ "status.edited": "編輯於 {date}", "status.edited_x_times": "Edited {count, plural, one {{count} 次} other {{count} 次}}", "status.embed": "嵌入", - "status.favourite": "最愛", "status.filter": "篩選此帖文", "status.filtered": "已過濾", "status.hide": "隱藏帖文", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index bcec52261d..a13504e23e 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -313,9 +313,9 @@ "interaction_modal.description.reply": "在 Mastodon 上有個帳號的話，您可以回覆此嘟文。", "interaction_modal.on_another_server": "於不同伺服器", "interaction_modal.on_this_server": "於此伺服器", - "interaction_modal.other_server_instructions": "複製貼上此 URL 至您愛用的 Mastodon 應用程式或您 Mastodon 伺服器之網頁介面的搜尋欄。", + "interaction_modal.other_server_instructions": "複製貼上此 URL 至您愛用的 Mastodon 應用程式或您 Mastodon 伺服器網頁介面之搜尋欄。", "interaction_modal.preamble": "由於 Mastodon 是去中心化的，即便您於此沒有帳號，仍可以利用託管於其他 Mastodon 伺服器或相容平台上的既存帳號。", - "interaction_modal.title.favourite": "將 {name} 的嘟文加入最愛", + "interaction_modal.title.favourite": "將 {name} 之嘟文加入最愛", "interaction_modal.title.follow": "跟隨 {name}", "interaction_modal.title.reblog": "轉嘟 {name} 的嘟文", "interaction_modal.title.reply": "回覆 {name} 的嘟文", @@ -363,6 +363,7 @@ "lightbox.previous": "上一步", "limited_account_hint.action": "一律顯示個人檔案", "limited_account_hint.title": "此個人檔案已被 {domain} 的管理員隱藏。", + "link_preview.author": "按照 {name}", "lists.account.add": "新增至列表", "lists.account.remove": "從列表中移除", "lists.delete": "刪除列表", diff --git a/config/locales/activerecord.de.yml b/config/locales/activerecord.de.yml index 56df809cd3..d786bf01ed 100644 --- a/config/locales/activerecord.de.yml +++ b/config/locales/activerecord.de.yml @@ -56,4 +56,4 @@ de: webhook: attributes: events: - invalid_permissions: Du kannst keine Ereignisse einschließen, für die du keine Rechte hast + invalid_permissions: kann keine Ereignisse einschließen, für die du keine Berechtigung hast diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml index 585d2ffa96..186104c702 100644 --- a/config/locales/activerecord.es.yml +++ b/config/locales/activerecord.es.yml @@ -36,7 +36,7 @@ es: status: attributes: reblog: - taken: del estado ya existe + taken: de la publicación ya existe user: attributes: email: diff --git a/config/locales/an.yml b/config/locales/an.yml index 2b71c2f58e..b8f53bf834 100644 --- a/config/locales/an.yml +++ b/config/locales/an.yml @@ -728,7 +728,6 @@ an: approved: Se requiere aprebación pa rechistrar-se none: Dengún puede rechistrar-se open: Qualsequiera puede rechistrar-se - title: Achustes d'o Servidor site_uploads: delete: Eliminar fichero puyau destroyed_msg: Carga d'o puesto eliminada con exito! diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 302304f5a3..d8be015f21 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -779,7 +779,6 @@ ar: approved: طلب الموافقة لازم عند إنشاء حساب none: لا أحد يمكنه إنشاء حساب open: يمكن للجميع إنشاء حساب - title: إعدادات الخادم site_uploads: delete: احذف الملف الذي تم تحميله destroyed_msg: تم حذف التحميل مِن الموقع بنجاح! diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 660ea4e238..d526781707 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -336,7 +336,6 @@ ast: approved: Tol mundu pente una aprobación none: Naide open: Tol mundu - title: Configuración del sirvidor site_uploads: delete: Desaniciar el ficheru xubíu statuses: @@ -623,6 +622,7 @@ ast: bookmarks: Marcadores domain_blocking: Llista de dominios bloquiaos following: Llista de siguidores + lists: Llistes muting: Llista de perfiles colos avisos desactivaos upload: Xubir invites: diff --git a/config/locales/be.yml b/config/locales/be.yml index 00f66f5814..5a22953aa4 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -798,7 +798,6 @@ be: approved: Для рэгістрацыі патрабуецца пацвярджэнне none: Нікому не магчыма зарэгістравацца open: Любому магчыма зарэгістравацца - title: Налады сервера site_uploads: delete: Выдаліць запампаваны файл destroyed_msg: Загрузка сайту паспяхова выдалена! diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 1ebd38787a..1b14e5d120 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -770,7 +770,6 @@ bg: approved: Изисква се одобрение за регистриране none: Никой не може да се регистрира open: Всеки може да се регистрира - title: Настройки на сървъра site_uploads: delete: Изтриване на качения файл destroyed_msg: Успешно изтриване на качването на сайта! diff --git a/config/locales/ca.yml b/config/locales/ca.yml index d105f53a6e..62208d4d83 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -770,7 +770,7 @@ ca: approved: Cal l’aprovació per a registrar-se none: No es pot registrar ningú open: Qualsevol pot registrar-se - title: Paràmetres del servidor + title: Configuració del servidor site_uploads: delete: Esborra el fitxer pujat destroyed_msg: La càrrega al lloc s'ha suprimit correctament! @@ -1277,12 +1277,14 @@ ca: bookmarks_html: Ets a punt de reemplaçar els teus marcadors de fins a %{total_items} tuts des de %{filename}. domain_blocking_html: Ets a punt de reemplaçar la teva llista de dominis bloquejats de fins a %{total_items} dominis des de %{filename}. following_html: Ets a punt de seguir fins a %{total_items} comptes des de %{filename} i deixar de seguir a la resta. + lists_html: Estàs a punt de reemplaçar les teves llistes amb contactes de %{filename}. S'afegiran fins a %{total_items} comptes a les noves llistes. muting_html: Ets a punt de reemplaçar la teva llista de comptes silenciats de fins a %{total_items} comptes des de %{filename}. preambles: blocking_html: Ets a punt de bloquejar fins a %{total_items} comptes des de %{filename}. bookmarks_html: Ets a punt d'afegir fins a %{total_items} tuts des de %{filename} als teus marcadors. domain_blocking_html: Ets a punt de bloquejar fins a %{total_items} dominis des de %{filename}. following_html: Ets a punt de seguir fins a %{total_items} comptes des de %{filename}. + lists_html: Estàs a punt d'afegir %{total_items} comptes de %{filename} a les teves llistes. Es crearan noves llistes si no hi ha cap llista on afegir-los. muting_html: Ets a punt de silenciar fins a %{total_items} comptes des de %{filename}. preface: Pots importar algunes les dades que has exportat des d'un altre servidor, com ara el llistat de les persones que estàs seguint o bloquejant. recent_imports: Importacions recents @@ -1299,6 +1301,7 @@ ca: bookmarks: Important marcadors domain_blocking: Important dominis bloquejats following: Important comptes seguits + lists: Important llistes muting: Important comptes silenciats type: Tipus d'importació type_groups: @@ -1309,6 +1312,7 @@ ca: bookmarks: Marcadors domain_blocking: Llistat de dominis bloquejats following: Llista de seguits + lists: Llistes muting: Llista de silenciats upload: Carrega invites: @@ -1780,7 +1784,7 @@ ca: verification: extra_instructions_html: Consell: l'enllaç al vostre lloc web pot ser invisible. La part important és rel="me" que evita que us suplantin la identitat a llocs web amb contingut generat pels usuaris. Fins i tot podeu generar una etiqueta link a la capçalera de la pàgina en comptes d'una a, però el codi HTML ha de ser accessible sense requerir executar JavaScript. here_is_how: Així és com - hint_html: "Verifikimi i identitetit të secilit në Mastodon është për këdo. Bazuar në standarde web të hapët, falas për so dhe për mot. Krejt ç’ju duhet është një sajt personal me të cilin ju njohin njerëzit. Kur bëni lidhjen me këtë sajt që nga profili juaj, do të kontrollojmë nëse sajti përgjigjet me një lidhje për te profili juaj dhe shfaq një tregues në të." + hint_html: "Verificar la pròpia identitat a Mastodon és per a tothom. Basat en estàndarts webs oberts, ara i per sempre. Només et cat un lloc web personal que la gent reconegui com a teu. Quan hi enllacis des del teu perfil, comprovarem que el web retorna l'enllaç al perfil i hi posarem un indicador visual." instructions_html: Copieu i enganxeu el següent codi HTML al vostre lloc web. Després, afegiu l'adreça del vostre lloc web dins d'un dels camps extres del vostre perfil i deseu els canvis. verification: Verificació verified_links: Els teus enllaços verificats diff --git a/config/locales/cs.yml b/config/locales/cs.yml index d7059c55db..8d031c9103 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -786,7 +786,6 @@ cs: approved: Pro registraci je vyžadováno schválení none: Nikdo se nemůže registrovat open: Kdokoliv se může registrovat - title: Nastavení serveru site_uploads: delete: Odstranit nahraný soubor destroyed_msg: Upload stránky byl úspěšně smazán! diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 8ac9895b3b..24d544bd67 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -17,7 +17,7 @@ cy: zero: Dilynwyr following: Yn dilyn instance_actor_flash: Mae'r cyfrif hwn yn actor rhithwir sy'n cael ei ddefnyddio i gynrychioli'r gweinydd ei hun ac nid unrhyw ddefnyddiwr unigol. Fe'i defnyddir at ddibenion ffederasiwn ac ni ddylid ei atal. - last_active: diweddaraf + last_active: y diweddaraf link_verified_on: Gwiriwyd perchnogaeth y ddolen yma ar %{date} nothing_here: Does dim byd yma! pin_errors: @@ -826,7 +826,7 @@ cy: approved: Mae angen cymeradwyaeth i gofrestru none: Nid oes neb yn gallu cofrestru open: Gall unrhyw un cofrestru - title: Gosodiadau Gweinydd + title: Gosodiadau gweinydd site_uploads: delete: Dileu ffeil sydd wedi'i llwytho destroyed_msg: Llwytho i fyny i'r wefan wedi'i dileu yn llwyddiannus! diff --git a/config/locales/da.yml b/config/locales/da.yml index a5bc68c04e..3cf7d51667 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -383,13 +383,13 @@ da: domain_blocks: add_new: Tilføj ny domæneblokering confirm_suspension: - cancel: Fortryd + cancel: Annuller confirm: Suspendér permanent_action: Fortrydelse af suspensionen vil ikke genoprette nogen data eller sammenhæng. preamble_html: Du er ved at suspendere %{domain} og dets underdomæner. remove_all_data: Dette vil fjerne alt indhold, medier og profildata for dette domænes konti fra din server. stop_communication: Din server vil stoppe kommunikationen med disse servere. - title: Annullér domæneblokering for domænet %{domain} + title: Bekræft blokering af domænet %{domain} undo_relationships: Dette vil fortryde ethvert følgeforhold mellem konti for disse servere og din. created_msg: Domæneblokering under behandling destroyed_msg: Domæneblokering er blevet fjernet @@ -977,7 +977,7 @@ da: notification_preferences: Skift e-mailpræferencer salutation: "%{name}" settings: 'Skift e-mailpræferencer: %{link}' - unsubscribe: Opsig abonnement + unsubscribe: Afmeld notifikationer view: 'Vis:' view_profile: Vis profil view_status: Vis status @@ -992,8 +992,8 @@ da: auth: apply_for_account: Anmod om en konto captcha_confirmation: - help_html: Hvis du har problemer med at løse CAPTCHA, kan du komme i kontakt med os via %{email} og vi kan hjælpe dig. - hint_html: Bare en ting mere! Vi er nødt til at bekræfte, at du er et menneske (dette er, så vi kan holde spam ud!). Løs CAPTCHA nedenfor og klik på "Fortsæt". + help_html: Hvis du har problemer med at løse CAPTCHA'en, kan du kontakte os via %{email}, så vi kan hjælpe dig. + hint_html: Bare en ting mere! Vi er nødt til at bekræfte, at du er et menneske (dette er for at vi kan holde spam ude!). Løs CAPTCHA'en nedenfor og klik på "Fortsæt". title: Sikkerhedstjek confirmations: wrong_email_hint: Er denne e-mailadresse ikke korrekt, kan den ændres i kontoindstillinger. @@ -1035,7 +1035,7 @@ da: preamble: Disse er opsat og håndhæves af %{domain}-moderatorerne. preamble_invited: Før du fortsætter, bedes du overveje de grundregler, der er fastsat af moderatorerne af %{domain}. title: Nogle grundregler. - title_invited: Du er blevet spiddet! + title_invited: Du er blevet inviteret. security: Sikkerhed set_new_password: Opsæt ny adgangskode setup: @@ -1152,7 +1152,7 @@ da: basic_information: Oplysninger hint_html: "Tilpas hvad folk ser på din offentlige profil og ved siden af dine indlæg. Andre personer vil mere sandsynligt følge dig tilbage og interagere med dig, når du har en udfyldt profil og et profilbillede." other: Andre - safety_and_privacy: Sikkerhed og Privatliv + safety_and_privacy: Sikkerhed og privatliv errors: '400': Din indsendte anmodning er ugyldig eller fejlbehæftet. '403': Du har ikke tilladelse til at se denne side. @@ -1277,12 +1277,14 @@ da: bookmarks_html: Du er ved at erstatte bogmærkelisten med op til %{total_items} emner fra %{filename}. domain_blocking_html: Du er ved at erstatte domæneblokeringslisten med op til %{total_items} domæner fra %{filename}. following_html: Du er ved at følge op til %{total_items} konti fra %{filename} og stoppe med at følge alle andre. + lists_html: Du er ved at erstatte dine lister med indholdet af %{filename}. Op til %{total_items} konti tilføjes nye lister. muting_html: Du er ved at erstatte listen over tavsgjorte konti med op til %{total_items} konti fra %{filename}. preambles: blocking_html: Du er ved at blokere op til %{total_items} konti fra %{filename}. bookmarks_html: Du er ved at føje op til %{total_items} indlæg fra %{filename} til bogmærkelisten. domain_blocking_html: Du er ved at blokere op til %{total_items} domæner fra %{filename}. following_html: Du er ved at følge op til %{total_items} konti fra %{filename}. + lists_html: Du er ved at tilføje op til %{total_items} konti fra %{filename} til dine lister. Nye lister oprettes, hvis der ikke er nogen liste at føje konti til. muting_html: Du er ved at tavsgøre op til %{total_items} konti fra %{filename}. preface: Du kan importere data, du har eksporteret fra en anden server, såsom en liste over folk du følger eller blokerer. recent_imports: Seneste importer @@ -1299,6 +1301,7 @@ da: bookmarks: Importerer bogmærker domain_blocking: Importerer blokerede konti following: Importerer fulgte konti + lists: Import af lister muting: Importerer tavsgjorte konti type: Importtype type_groups: @@ -1309,6 +1312,7 @@ da: bookmarks: Bogmærker domain_blocking: Domæneblokeringsliste following: Følgningsliste + lists: Lister muting: Tavsgørelsesliste upload: Upload invites: @@ -1350,16 +1354,16 @@ da: mail_subscriptions: unsubscribe: action: Ja, afmeld - complete: Frameldt + complete: Afmeldt confirmation_html: Er du sikker på, at du vil afmelde dig fra at modtage %{type} for Mastodon på %{domain} til din e-mail på %{email}? Du kan altid gentilmelde dig dine e-mail-notifikationsindstillinger. emails: notification_emails: - favourite: favorit notifikations e-mails - follow: favorit notifikations e-mails - follow_request: følg anmodning e-mails - mention: favorit notifikations e-mails - reblog: favorit notifikations e-mails - resubscribe_html: Hvis du ved en fejl har afmeldt dig, kan du gentilmelde dig dine e-mail-notifikationsindstillinger. + favourite: e-mailnotifikationer om favoritmarkeringer + follow: e-mailnotifikationer om nye følgere + follow_request: e-mailnotifikationer om følgeanmodninger + mention: e-mailnotifikationer om omtaler + reblog: e-mailnotifikationer om boosts + resubscribe_html: Hvis du har afmeldt dig ved en fejl, kan du gentilmelde dig under dine e-mail-notifikationsindstillinger. success_html: Du vil ikke længere modtage %{type} for Mastodon på %{domain} til din e-mail på %{email}. title: Opsig abonnement media_attachments: @@ -1458,7 +1462,7 @@ da: code_hint: Angiv koden genereret af godkendelses-appen for at bekræfte description_html: Aktiveres tofaktorgodkendelse vha. af en godkendelses-app, vil man skulle benytte sin mobil, der genererer det token, der skal angives ved indlogning. enable: Aktivér - instructions_html: "Skan denne QR-kode i Google Autehnticator eller en lign. TOTP-app på mobilen. Fremadrettet vil appen generere de tokens, som vil skulle angives ifm. indlogning." + instructions_html: "Skan denne QR-kode i Google Authenticator eller en lign. TOTP-app på mobilen. Fremadrettet vil appen generere de tokens, som vil skulle angives ifm. indlogning." manual_instructions: 'Kan QR-koden ikke skannes, så man er nødt til manuelt at angive den, er her en simplel tekst-hemmelighed:' setup: Opsæt wrong_code: Den angivne kode er ugyldig! Er server- og enhedsklokkeslæt korrekte? @@ -1477,7 +1481,7 @@ da: expired: Afstemningen er allerede afsluttet invalid_choice: Den valgte stemmemulighed findes ikke over_character_limit: må maks. udgøre %{max} tegn hver - self_vote: Du kan ikke stemme på dit eget indlæg. + self_vote: Du kan ikke stemme i dine egne afstemninger too_few_options: skal have flere end ét valg too_many_options: for mange svar (maks. %{max}) preferences: @@ -1587,7 +1591,7 @@ da: migrate: Kontomigrering notifications: Notifikationer preferences: Præferencer - profile: Profil + profile: Offentlig profil relationships: Følger og følgere statuses_cleanup: Auto-indlægssletning strikes: Moderationsadvarsler @@ -1617,7 +1621,7 @@ da: open_in_web: Åbn i webbrowser over_character_limit: grænsen på %{max} tegn overskredet pin_errors: - direct: Indlæg, som kun kan ses af nævnte brugere, kan ikke fastgøres + direct: Indlæg, som kun kan ses af omtalte brugere, kan ikke fastgøres limit: Maksimalt antal indlæg allerede fastgjort ownership: Andres indlæg kan ikke fastgøres reblog: Et boost kan ikke fastgøres diff --git a/config/locales/de.yml b/config/locales/de.yml index 945c25cbf1..71959fc860 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1,7 +1,7 @@ --- de: about: - about_mastodon_html: 'Das soziale Netzwerk der Zukunft: Keine Werbung, keine Überwachung durch Unternehmen, dafür dezentral und mit Anstand! Beherrsche deine Daten mit Mastodon!' + about_mastodon_html: 'Das soziale Netzwerk der Zukunft: Keine Werbung, keine Überwachung durch Unternehmen – dafür dezentral und mit Anstand! Beherrsche deine Daten mit Mastodon!' contact_missing: Nicht festgelegt contact_unavailable: Nicht verfügbar hosted_on: Mastodon, gehostet auf %{domain} @@ -10,7 +10,7 @@ de: follow: Folgen followers: one: Follower - other: Folgende + other: Follower following: Folge ich instance_actor_flash: Dieses Konto ist ein virtueller Akteur, der den Server selbst repräsentiert, und kein persönliches Profil. Es wird für Föderationszwecke verwendet und sollte daher nicht gesperrt werden. last_active: zuletzt aktiv @@ -51,29 +51,29 @@ de: title: Rolle für %{username} ändern confirm: Bestätigen confirmed: Bestätigt - confirming: Auf Bestätigung wartend + confirming: Bestätigung custom: Angepasst delete: Daten löschen deleted: Gelöscht demote: Zurückstufen destroyed_msg: Daten von %{username} wurden zum Löschen in die Warteschlange eingereiht disable: Einfrieren - disable_sign_in_token_auth: E-Mail-Token-Authentisierung deaktivieren + disable_sign_in_token_auth: Zwei-Faktor-Authentisierung (2FA) per E-Mail deaktivieren disable_two_factor_authentication: Zwei-Faktor-Authentisierung (2FA) deaktivieren disabled: Eingefroren - display_name: Angezeigter Name + display_name: Anzeigename domain: Domain edit: Bearbeiten email: E-Mail-Adresse email_status: Status der E-Mail-Adresse enable: Freischalten - enable_sign_in_token_auth: E-Mail-Token-Authentisierung aktivieren + enable_sign_in_token_auth: Zwei-Faktor-Authentisierung (2FA) per E-Mail aktivieren enabled: Freigegeben enabled_msg: Konto von %{username} erfolgreich freigegeben followers: Follower follows: Folge ich header: Titelbild - inbox_url: Privates Postfach (URL) + inbox_url: Posteingangsadresse invite_request_text: Begründung für das Beitreten invited_by: Eingeladen von ip: IP-Adresse @@ -84,7 +84,7 @@ de: remote: Extern title: Herkunft login_status: Status - media_attachments: Speicherplatz + media_attachments: Medieninhalte memorialize: In Gedenkseite umwandeln memorialized: Gedenkseite memorialized_msg: "%{username} wurde erfolgreich in ein Gedenkseiten-Konto umgewandelt" @@ -118,7 +118,7 @@ de: reject: Ablehnen rejected_msg: Antrag zur Registrierung von %{username} erfolgreich abgelehnt remote_suspension_irreversible: Die Daten dieses Kontos wurden unwiderruflich gelöscht. - remote_suspension_reversible_hint_html: Das Konto wurde auf dem Server gesperrt und sämtliche Daten werden am %{date} entfernt. Bis dahin kann der Server dieses Konto ohne negative Auswirkungen wiederherstellen. Wenn du schon jetzt alle Daten des Kontos unwiderruflich löschen möchtest, kannst du dies nachfolgend tun. + remote_suspension_reversible_hint_html: Das Konto wurde auf dem externen Server gesperrt – und sämtliche Daten werden am %{date} entfernt. Bis dahin kann dieser Server das Konto ohne negative Auswirkungen wiederherstellen. Wenn du schon jetzt alle Daten des Kontos unwiderruflich löschen möchtest, kannst du dies nachfolgend tun. remove_avatar: Profilbild entfernen remove_header: Titelbild entfernen removed_avatar_msg: Profilbild von %{username} erfolgreich entfernt @@ -132,15 +132,15 @@ de: resubscribe: Erneut abonnieren role: Rolle search: Suchen - search_same_email_domain: Andere Benutzer*innen mit der gleichen E-Mail-Domain - search_same_ip: Andere Benutzer*innen mit derselben IP-Adresse + search_same_email_domain: Andere Konten mit der gleichen E-Mail-Domain + search_same_ip: Andere Konten mit derselben IP-Adresse security: Sicherheit security_measures: only_password: Nur Passwort password_and_2fa: Passwort und 2FA sensitive: Inhaltswarnung sensitized: Mit Inhaltswarnung versehen - shared_inbox_url: Gemeinsames Postfach (URL) + shared_inbox_url: Geteilte Posteingangsadresse show: created_reports: Erstellte Meldungen targeted_reports: Von Anderen gemeldet @@ -173,7 +173,7 @@ de: approve_appeal: Einspruch zulassen approve_user: Benutzer*in genehmigen assigned_to_self_report: Bericht zuweisen - change_email_user: E-Mail des Profils ändern + change_email_user: E-Mail-Adresse des Kontos ändern change_role_user: Rolle des Profils ändern confirm_user: Benutzer*in bestätigen create_account_warning: Warnung erstellen @@ -195,7 +195,7 @@ de: destroy_email_domain_block: E-Mail-Domain-Sperre löschen destroy_instance: Domain-Daten entfernen destroy_ip_block: IP-Regel löschen - destroy_status: Beitrag löschen + destroy_status: Beitrag entfernen destroy_unavailable_domain: Nicht-verfügbare Domain entfernen destroy_user_role: Rolle entfernen disable_2fa_user: 2FA deaktivieren @@ -221,7 +221,7 @@ de: unblock_email_account: E-Mail-Adresse entsperren unsensitive_account: Konto mit erzwungener Inhaltswarnung rückgängig machen unsilence_account: Konto nicht mehr stummschalten - unsuspend_account: Konto nicht mehr sperren + unsuspend_account: Konto entsperren update_announcement: Ankündigung aktualisieren update_custom_emoji: Eigenes Emoji aktualisieren update_domain_block: Domain-Sperre aktualisieren @@ -240,30 +240,30 @@ de: create_canonical_email_block_html: "%{name} hat die E-Mail mit dem Hash %{target} gesperrt" create_custom_emoji_html: "%{name} lud das neue Emoji %{target} hoch" create_domain_allow_html: "%{name} erlaubte die Föderation mit der Domain %{target}" - create_domain_block_html: "%{name} hat die Domain %{target} gesperrt" + create_domain_block_html: "%{name} sperrte die Domain %{target}" create_email_domain_block_html: "%{name} hat die E-Mail-Domain %{target} gesperrt" - create_ip_block_html: "%{name} hat eine IP-Regel für %{target} erstellt" + create_ip_block_html: "%{name} erstellte eine IP-Regel für %{target}" create_unavailable_domain_html: "%{name} beendete die Zustellung an die Domain %{target}" create_user_role_html: "%{name} erstellte die Rolle %{target}" - demote_user_html: "%{name} hat %{target} heruntergestuft" + demote_user_html: "%{name} stufte %{target} herunter" destroy_announcement_html: "%{name} löschte die Ankündigung %{target}" destroy_canonical_email_block_html: "%{name} hat die E-Mail mit dem Hash %{target} entsperrt" destroy_custom_emoji_html: "%{name} löschte das Emoji %{target}" destroy_domain_allow_html: "%{name} verwehrte die Föderation mit der Domain %{target}" - destroy_domain_block_html: "%{name} hat die Domain %{target} entsperrt" + destroy_domain_block_html: "%{name} entsperrte die Domain %{target}" destroy_email_domain_block_html: "%{name} hat die E-Mail-Domain %{target} entsperrt" destroy_instance_html: "%{name} entfernte die Daten der Domain %{target} von diesem Server" - destroy_ip_block_html: "%{name} hat eine IP-Regel für %{target} entfernt" + destroy_ip_block_html: "%{name} entfernte eine IP-Regel für %{target}" destroy_status_html: "%{name} entfernte einen Beitrag von %{target}" destroy_unavailable_domain_html: "%{name} nahm die Zustellung an die Domain %{target} wieder auf" destroy_user_role_html: "%{name} löschte die Rolle %{target}" - disable_2fa_user_html: "%{name} hat die Zwei-Faktor-Authentisierung für %{target} deaktiviert" + disable_2fa_user_html: "%{name} deaktivierte die Zwei-Faktor-Authentisierung für %{target}" disable_custom_emoji_html: "%{name} deaktivierte das Emoji %{target}" disable_sign_in_token_auth_user_html: "%{name} hat die E-Mail-Token-Authentisierung für %{target} deaktiviert" - disable_user_html: "%{name} hat den Zugang für %{target} deaktiviert" + disable_user_html: "%{name} deaktivierte den Zugang für %{target}" enable_custom_emoji_html: "%{name} aktivierte das Emoji %{target}" enable_sign_in_token_auth_user_html: "%{name} hat die E-Mail-Token-Authentifizierung für %{target} aktiviert" - enable_user_html: "%{name} hat den Zugang für %{target} aktiviert" + enable_user_html: "%{name} aktivierte den Zugang für %{target}" memorialize_account_html: "%{name} wandelte das Konto von %{target} in eine Gedenkseite um" promote_user_html: "%{name} beförderte %{target}" reject_appeal_html: "%{name} hat den Moderations-Beschlussantrag von %{target} abgelehnt" @@ -272,8 +272,8 @@ de: reopen_report_html: "%{name} öffnete die Meldung %{target} wieder" resend_user_html: "%{name} hat erneut eine Bestätigungs-E-Mail für %{target} gesendet" reset_password_user_html: "%{name} setzte das Passwort von %{target} zurück" - resolve_report_html: "%{name} hat die Meldung %{target} geklärt" - sensitive_account_html: "%{name} hat die Medien von %{target} mit einer Inhaltswarnung versehen" + resolve_report_html: "%{name} klärte die Meldung %{target}" + sensitive_account_html: "%{name} versah die Medien von %{target} mit einer Inhaltswarnung" silence_account_html: "%{name} schaltete das Konto von %{target} stumm" suspend_account_html: "%{name} sperrte das Konto von %{target}" unassigned_report_html: "%{name} entfernte die Zuweisung der Meldung %{target}" @@ -283,7 +283,7 @@ de: unsuspend_account_html: "%{name} entsperrte das Konto von %{target}" update_announcement_html: "%{name} überarbeitete die Ankündigung %{target}" update_custom_emoji_html: "%{name} bearbeitete das Emoji %{target}" - update_domain_block_html: "%{name} hat die Domain-Sperre für %{target} aktualisiert" + update_domain_block_html: "%{name} aktualisierte die Domain-Sperre für %{target}" update_ip_block_html: "%{name} änderte die Regel für die IP-Adresse %{target}" update_status_html: "%{name} überarbeitete einen Beitrag von %{target}" update_user_role_html: "%{name} änderte die Rolle von %{target}" @@ -328,9 +328,9 @@ de: enabled_msg: Dieses Emoji wurde erfolgreich aktiviert image_hint: PNG oder GIF bis %{size} list: Anzeigen - listed: Angezeigt + listed: Sichtbar new: - title: Benutzerdefiniertes Emoji hinzufügen + title: Eigenes Emoji hinzufügen no_emoji_selected: Keine Emojis wurden bearbeitet, da keine ausgewählt wurden not_permitted: Du bist für die Durchführung dieses Vorgangs nicht berechtigt overwrite: Überschreiben @@ -339,15 +339,15 @@ de: title: Eigene Emojis uncategorized: Unkategorisiert unlist: Nicht anzeigen - unlisted: Nicht aufgeführt + unlisted: Nicht sichtbar update_failed_msg: Konnte dieses Emoji nicht bearbeiten updated_msg: Emoji erfolgreich bearbeitet! upload: Hochladen dashboard: - active_users: aktive Benutzer*innen + active_users: aktive Profile interactions: Interaktionen media_storage: Medien - new_users: neue Benutzer*innen + new_users: neue Profile opened_reports: ungelöste Meldungen pending_appeals_html: one: "%{count} ausstehender Einspruch" @@ -378,7 +378,7 @@ de: created_msg: Domain wurde erfolgreich zur Whitelist hinzugefügt destroyed_msg: Domain wurde von der Föderation ausgeschlossen export: Exportieren - import: Import + import: Importieren undo: Von der Föderation ausschließen domain_blocks: add_new: Neue Domain einschränken @@ -387,10 +387,10 @@ de: confirm: Sperren permanent_action: Das Aufheben der Sperre wird keine Daten oder Beziehungen wiederherstellen. preamble_html: Du bist dabei, %{domain} und alle Subdomains zu sperren. - remove_all_data: Dadurch werden alle Inhalte, Medien und Profildaten für die Konten dieser Domain von deinem Server entfernt. - stop_communication: Dein Server wird die Kommunikation mit diesen Servern einstellen. + remove_all_data: Alle Inhalte, Medien und Profildaten werden für die Konten dieser Domain von deinem Server entfernt. + stop_communication: Dein Server wird nicht länger mit diesen Servern kommunizieren. title: Sperre für Domain %{domain} bestätigen - undo_relationships: Dadurch wird jede Folgebeziehung zwischen den Konten dieser und deinem Server rückgängig gemacht. + undo_relationships: Jede Follower-Beziehung, die zwischen deinem und deren Server besteht, wird aufgelöst. created_msg: Die Domain ist jetzt gesperrt bzw. eingeschränkt destroyed_msg: Die Einschränkungen zu dieser Domain wurde entfernt domain: Domain @@ -403,7 +403,7 @@ de: create: Server einschränken hint: Die Einschränkung einer Domain wird nicht verhindern, dass Konteneinträge in der Datenbank erstellt werden. Es werden aber alle Moderationsmethoden rückwirkend und automatisch auf diese Konten angewendet. severity: - desc_html: "Stummschaltung wird die Beiträge von Konten unter dieser Domain für alle unsichtbar machen, die den Konten nicht folgen. Eine Sperre wird alle Inhalte, Medien und Profildaten für Konten dieser Domain von deinem Server entfernen. Verwende keine, um nur Mediendateien abzulehnen." + desc_html: "Stummschalten wird Beiträge von Konten unter dieser Domain für alle unsichtbar machen, die den Konten nicht folgen. Sperren wird alle Inhalte, Medien und Profildaten für die Konten dieser Domain von deinem Server entfernen. Verwende Kein, wenn du nur Medieninhalte ablehnen möchtest." noop: Kein silence: Stummschaltung suspend: Sperren @@ -412,7 +412,7 @@ de: not_permitted: Dir ist es nicht erlaubt, diese Handlung durchzuführen obfuscate: Domain-Name verschleiern obfuscate_hint: Den Domain-Namen öffentlich nur teilweise bekannt geben, sofern die Liste der Domain-Beschränkungen aktiviert ist - private_comment: Private bzw. nicht-öffentliche Notiz + private_comment: Interne bzw. nicht-öffentliche Notiz private_comment_hint: Kommentar zu dieser Domain-Beschränkung für die interne Nutzung durch die Moderator*innen. public_comment: Öffentliche Notiz public_comment_hint: Öffentlicher Hinweis zu dieser Domain-Beschränkung, sofern das Veröffentlichen von Sperrlisten grundsätzlich aktiviert ist. @@ -481,7 +481,7 @@ de: back_to_limited: Stummgeschaltet back_to_warning: Warnung by_domain: Domain - confirm_purge: Bist du dir sicher, dass du die Daten von dieser Domain dauerhaft löschen möchtest? + confirm_purge: Möchtest du die Daten von dieser Domain wirklich dauerhaft löschen? content_policies: comment: Interne Notiz description_html: Du kannst Inhaltsrichtlinien definieren, die auf alle Konten dieser Domain und einer ihrer Subdomains angewendet werden. @@ -499,7 +499,7 @@ de: instance_accounts_measure: deren Konten hier im Cache instance_followers_measure: eigene Follower dort instance_follows_measure: deren Follower hier - instance_languages_dimension: Meistverwendete Sprachen + instance_languages_dimension: Häufigste Sprachen instance_media_attachments_measure: deren Medien hier im Cache instance_reports_measure: Meldungen zu deren Accounts instance_statuses_measure: deren Beiträge hier im Cache @@ -525,13 +525,13 @@ de: private_comment: Privater Kommentar public_comment: Öffentlicher Kommentar purge: Säubern - purge_description_html: Wenn du glaubst, dass diese Domain endgültig offline ist, dann kannst du alle Kontodatensätze und zugehörigen Daten dieser Domain löschen. Das kann eine Weile dauern. + purge_description_html: Wenn du glaubst, dass diese Domain endgültig offline ist, kannst du alle Kontodatensätze und zugehörigen Daten von diesem Server löschen. Das kann eine Weile dauern. title: Föderation total_blocked_by_us: Von uns gesperrt total_followed_by_them: Gefolgt von denen total_followed_by_us: Gefolgt von uns total_reported: Beschwerden über sie - total_storage: Medienanhänge + total_storage: Medieninhalte totals_time_period_hint_html: Die unten angezeigten Summen enthalten Daten für alle Zeiten. invites: deactivate_all: Alle deaktivieren @@ -561,7 +561,7 @@ de: relays: add_new: Neues Relais hinzufügen delete: Entfernen - description_html: Ein Föderierungsrelai ist ein vermittelnder Server, der eine große Anzahl öffentlicher Beiträge zwischen Servern, die das Relai abonnieren und zu ihm veröffentlichen, austauscht. Es kann kleinen und mittleren Servern dabei helfen, Inhalte des Fediverse zu entdecken, was andernfalls das manuelle Folgen anderer Leute auf entfernten Servern durch lokale Nutzer erfordern würde. + description_html: Ein Föderierungsrelais ist ein vermittelnder Server, der eine große Anzahl öffentlicher Beiträge zwischen Servern, die das Relais abonnieren und zu ihm veröffentlichen, austauscht. Es kann kleinen und mittleren Servern dabei helfen, Inhalte des Fediverse zu entdecken, was andernfalls das manuelle Folgen anderer Leute auf externen Servern durch lokale Nutzer*innen erfordern würde. disable: Ausschalten disabled: Ausgeschaltet enable: Einschalten @@ -571,7 +571,7 @@ de: pending: Warte auf Zustimmung des Relays save_and_enable: Speichern und aktivieren setup: Neues Relais verbinden - signatures_not_enabled: Die Relais funktionieren nicht korrekt, wenn der "secure mode" aktiviert oder die Föderation eingeschränkt ist + signatures_not_enabled: Die Relais funktionieren nicht korrekt, wenn der abgesicherte Modus aktiviert oder die Föderation eingeschränkt ist status: Status title: Relais report_notes: @@ -586,7 +586,7 @@ de: action_taken_by: Maßnahme ergriffen von actions: delete_description_html: Der gemeldete Beitrag wird gelöscht und die ergriffene Maßnahme wird aufgezeichnet, um dir bei zukünftigen Verstößen des gleichen Kontos zu helfen. - mark_as_sensitive_description_html: Die Medien in den gemeldeten Beiträgen werden mit einer Inhaltswarnung versehen und ein Verstoß wird vermerkt, um bei zukünftigen Verstößen desselben Kontos besser reagieren zu können. + mark_as_sensitive_description_html: Die Medien in den gemeldeten Beiträgen werden mit einer Inhaltswarnung versehen und der Vorfall wird gesichert, um bei zukünftigen Verstößen desselben Kontos besser reagieren zu können. other_description_html: Weitere Optionen zur Steuerung des Kontoverhaltens und zur Anpassung der Kommunikation mit dem gemeldeten Konto. resolve_description_html: Es wird keine Maßnahme gegen das gemeldete Konto ergriffen und der Vorgang wird nicht aufgezeichnet – die Meldung wird hiermit geschlossen. silence_description_html: Das Konto wird nur für diejenigen sichtbar sein, die dem Konto bereits folgen oder es manuell suchen, was die Reichweite stark einschränkt. Kann jederzeit rückgängig gemacht werden. Alle Meldungen zu diesem Konto werden geschlossen. @@ -672,7 +672,7 @@ de: moderation: Moderation special: Besonderheit delete: Entfernen - description_html: Mit Benutzer*inn-Rollen kannst du die Funktionen und Bereiche von Mastodon anpassen, auf die deine Benutzer*innen zugreifen können. + description_html: Mit Rollen kannst du die Funktionen und Bereiche von Mastodon anpassen, auf die deine Benutzer*innen zugreifen können. edit: Rolle „%{name}“ bearbeiten everyone: Standard everyone_full_description_html: Das ist die Basis-Rolle, die für alle Benutzer*innen gilt – auch für diejenigen ohne zugewiesene Rolle. Alle anderen Rollen erben Berechtigungen davon. @@ -682,12 +682,12 @@ de: privileges: administrator: Administrator*in administrator_description: Benutzer*innen mit dieser Berechtigung werden alle Beschränkungen umgehen - delete_user_data: Profildaten löschen + delete_user_data: Kontodaten löschen delete_user_data_description: Erlaubt Benutzer*innen, die Daten anderer Benutzer*innen sofort zu löschen - invite_users: Benutzer*innen einladen + invite_users: Leute einladen invite_users_description: Erlaubt bereits registrierten Benutzer*innen, neue Leute zum Server einzuladen manage_announcements: Ankündigungen verwalten - manage_announcements_description: Erlaubt Benutzer*innen, Ankündigungen auf dem Server zu verwalten + manage_announcements_description: Erlaubt Profilen, Ankündigungen auf dem Server zu verwalten manage_appeals: Einsprüche verwalten manage_appeals_description: Erlaubt es Benutzer*innen, Entscheidungen der Moderator*innen zu widersprechen manage_blocks: Sperrungen verwalten @@ -708,9 +708,9 @@ de: manage_settings_description: Erlaubt Nutzer*innen, Einstellungen dieses Servers zu ändern manage_taxonomies: Taxonomien verwalten manage_taxonomies_description: Ermöglicht Benutzer*innen, die Trends zu überprüfen und die Hashtag-Einstellungen zu aktualisieren - manage_user_access: Benutzer*in-Zugriff verwalten + manage_user_access: Kontozugriff verwalten manage_user_access_description: Erlaubt es Benutzer*innen, die Zwei-Faktor-Authentisierung (2FA) anderer zu deaktivieren, ihre E-Mail-Adresse zu ändern und ihr Passwort zurückzusetzen - manage_users: Benutzer*innen verwalten + manage_users: Konten verwalten manage_users_description: Erlaubt es Benutzer*innen, die Details anderer Profile einzusehen und diese Accounts zu moderieren manage_webhooks: Webhooks verwalten manage_webhooks_description: Erlaubt es Benutzer*innen, Webhooks für administrative Vorkommnisse einzurichten @@ -735,7 +735,7 @@ de: rules_hint: Es gibt einen eigenen Bereich für Regeln, die deine Benutzer*innen einhalten müssen. title: Über appearance: - preamble: Die Oberfläche von Mastodon anpassen. + preamble: Passe das Webinterface von Mastodon an. title: Design branding: preamble: Das Branding deines Servers unterscheidet ihn von anderen Servern im Netzwerk. Diese Informationen können in einer Vielzahl von Umgebungen angezeigt werden, z. B. in der Weboberfläche von Mastodon, in nativen Anwendungen, in Linkvorschauen auf anderen Websites und in Messaging-Apps und so weiter. Aus diesem Grund ist es am besten, diese Informationen klar, kurz und prägnant zu halten. @@ -744,17 +744,17 @@ de: desc_html: Dies beruht auf externen Skripten von hCaptcha, die ein Sicherheits- und Datenschutzproblem darstellen könnten. Darüber hinaus kann das den Registrierungsprozess für manche Menschen (insbesondere für Menschen mit Behinderung) erheblich erschweren. Aus diesen Gründen solltest du alternative Maßnahmen wie Zulassungs- oder Einladungs-basierte Registrierungen in Erwägung ziehen. title: Neue Nutzer*innen müssen ein CAPTCHA lösen, um das Konto zu bestätigen content_retention: - preamble: Lege fest, wie lange nutzergenerierte Inhalte auf deiner Mastodon-Instanz gespeichert werden. + preamble: Lege fest, wie lange Inhalte von Nutzer*innen auf deinem Mastodon-Server gespeichert bleiben. title: Cache & Archive default_noindex: - desc_html: Betrifft alle Benutzer*innen, die diese Einstellung bei sich nicht geändert haben + desc_html: Betrifft alle Profile, die diese Einstellung bei sich nicht geändert haben title: Profile standardmäßig von der Suchmaschinen-Indizierung ausnehmen discovery: follow_recommendations: Folgeempfehlungen preamble: Das Auffinden interessanter Inhalte ist wichtig, um neue Nutzer einzubinden, die Mastodon noch nicht kennen. Bestimme, wie verschiedene Suchfunktionen auf deinem Server funktionieren. profile_directory: Profilverzeichnis public_timelines: Öffentliche Timeline - publish_discovered_servers: Entdeckte Server offenlegen + publish_discovered_servers: Publish discovered servers publish_statistics: Statistiken veröffentlichen title: Entdecken trends: Trends @@ -763,14 +763,14 @@ de: disabled: Niemandem users: Für angemeldete lokale Benutzer*innen registrations: - preamble: Lege fest, wer auf Deinem Server ein Konto erstellen darf. + preamble: Lege fest, wer auf deinem Server ein Konto erstellen darf. title: Registrierungen registrations_mode: modes: approved: Registrierung muss genehmigt werden none: Niemand darf sich registrieren open: Alle können sich registrieren - title: Server-Einstellungen + title: Servereinstellungen site_uploads: delete: Hochgeladene Datei löschen destroyed_msg: Upload erfolgreich gelöscht! @@ -804,7 +804,7 @@ de: delete_statuses: "%{name} entfernte die Beiträge von %{target}" disable: "%{name} fror das Konto von %{target} ein" mark_statuses_as_sensitive: "%{name} hat die Beiträge von %{target} mit einer Inhaltswarnung versehen" - none: "%{name} schickte eine Warnung an %{target}" + none: "%{name} sendete eine Warnung an %{target}" sensitive: "%{name} versah das Konto von %{target} mit einer Inhaltswarnung" silence: "%{name} schaltete das Konto von %{target} stumm" suspend: "%{name} sperrte das Konto von %{target}" @@ -832,7 +832,7 @@ de: message_html: "Die Konfiguration deines Objektspeichers ist fehlerhaft. Die Privatsphäre deiner Benutzer*innen ist gefährdet." tags: review: Prüfstatus - updated_msg: Hashtag-Einstellungen wurden erfolgreich aktualisiert + updated_msg: Hashtag-Einstellungen erfolgreich aktualisiert title: Administration trends: allow: Erlauben @@ -856,18 +856,18 @@ de: only_allowed: Nur Genehmigte pending_review: Überprüfung ausstehend preview_card_providers: - allowed: Links von diesem Herausgeber können angesagt sein + allowed: Links von diesem/dieser Herausgeber*in können im Trend liegen description_html: Dies sind Domains, von denen Links oft auf deinem Server geteilt werden. Links werden nicht öffentlich trenden, es sei denn, die Domain des Links wird genehmigt. Deine Zustimmung (oder Ablehnung) erstreckt sich auf Subdomains. - rejected: Links von diesem Herausgeber können nicht angesagt sein + rejected: Links von diesem/dieser Herausgeber*in werden nicht im Trend liegen title: Herausgeber rejected: Abgelehnt statuses: allow: Beitrag erlauben - allow_account: Autor*in erlauben + allow_account: Profil erlauben description_html: Dies sind Beiträge, von denen dein Server weiß, dass sie derzeit viel geteilt und favorisiert werden. Dies kann neuen und wiederkehrenden Personen helfen, weitere Profile zu finden, denen sie folgen können. Die Beiträge werden erst dann öffentlich angezeigt, wenn du die Person genehmigst und sie es zulässt, dass ihr Profil anderen vorgeschlagen wird. Du kannst auch einzelne Beiträge zulassen oder ablehnen. disallow: Beitrag verbieten - disallow_account: Autor*in verweigern - no_status_selected: Keine angesagten Beiträge wurden geändert, da keine ausgewählt wurden + disallow_account: Profil verweigern + no_status_selected: Die im Trend liegenden Beiträge wurden nicht geändert, da keine ausgewählt wurden not_discoverable: Autor*in hat sich dafür entschieden, nicht entdeckt zu werden shared_by: one: Einmal geteilt oder favorisiert @@ -877,8 +877,8 @@ de: current_score: Aktuelle Punktzahl %{score} dashboard: tag_accounts_measure: eindeutige Verwendungen - tag_languages_dimension: Meistverwendete Sprachen - tag_servers_dimension: Top-Server + tag_languages_dimension: Häufigste Sprachen + tag_servers_dimension: Aktivste Server tag_servers_measure: verschiedene Server tag_uses_measure: Gesamtnutzungen description_html: Diese Hashtags werden derzeit in vielen Beiträgen verwendet, die dein Server sieht. Dies kann deinen Nutzer*innen helfen, herauszufinden, worüber die Leute im Moment am meisten schreiben. Hashtags werden erst dann öffentlich angezeigt, wenn du sie genehmigst. @@ -894,16 +894,16 @@ de: usable: Darf verwendet werden usage_comparison: Heute %{today}-mal und gestern %{yesterday}-mal verwendet used_by_over_week: - one: In der letzten Woche von einer Person verwendet - other: In der letzten Woche von %{count} Personen verwendet + one: In der letzten Woche von einem Profil verwendet + other: In der letzten Woche von %{count} Profilen verwendet title: Trends trending: Angesagt warning_presets: add_new: Neu hinzufügen delete: Löschen - edit_preset: Warnungsvorlage bearbeiten - empty: Du hast noch keine Moderationsvorlagen hinzugefügt. - title: Moderationsvorlagen verwalten + edit_preset: Warnvorlage bearbeiten + empty: Du hast noch keine Warnvorlagen hinzugefügt. + title: Warnvorlagen verwalten webhooks: add_new: Endpunkt hinzufügen delete: Löschen @@ -929,9 +929,9 @@ de: actions: delete_statuses: das Löschen der Beiträge disable: das Einfrieren der Konten - mark_statuses_as_sensitive: das Markieren der Beiträge mit einer Inhaltswarnung + mark_statuses_as_sensitive: um die Beiträge des Profils mit einer Inhaltswarnung zu versehen none: eine Warnung - sensitive: das Markieren des Profils mit einer Inhaltswarnung + sensitive: das Markieren des Kontos mit einer Inhaltswarnung silence: das Beschränken des Kontos suspend: um deren Konto zu sperren body: "%{target} hat etwas gegen eine Moderationsentscheidung von %{action_taken_by} vom %{date}, die %{type} war. Die Person schrieb:" @@ -964,7 +964,7 @@ de: remove: Alle Aliase aufheben appearance: advanced_web_interface: Erweitertes Webinterface - advanced_web_interface_hint: Wenn du mehr aus deiner Bildschirmbreite herausholen möchtest, kannst du mit dem erweiterten Webinterface weitere Spalten hinzufügen und dadurch mehr Informationen auf einmal sehen, z. B. deine Startseite, die Mitteilungen, die föderierte Timeline sowie beliebig viele deiner Listen und Hashtags. + advanced_web_interface_hint: Wenn du mehr aus deiner Bildschirmbreite herausholen möchtest, kannst du mit dem erweiterten Webinterface weitere Spalten hinzufügen und dadurch mehr Informationen auf einmal sehen, z. B. deine Startseite, die Mitteilungen, die föderierte Timeline sowie beliebig viele deiner Listen und Hashtags. animations_and_accessibility: Animationen und Barrierefreiheit confirmation_dialogs: Bestätigungsdialoge discovery: Entdecken @@ -1008,12 +1008,12 @@ de: forgot_password: Passwort vergessen? invalid_reset_password_token: Das Token zum Zurücksetzen des Passworts ist ungültig oder abgelaufen. Bitte fordere ein neues an. link_to_otp: Gib einen Zwei-Faktor-Code von deinem Smartphone oder einen Wiederherstellungscode ein - link_to_webauth: Verwende dein Sicherheitsschlüsselgerät + link_to_webauth: Verwende deinen Sicherheitsschlüssel log_in_with: Anmelden mit login: Anmelden logout: Abmelden migrate_account: Zu einem anderen Konto umziehen - migrate_account_html: Wenn du dieses Konto auf ein anderes umleiten möchtest, kannst du es hier konfigurieren. + migrate_account_html: Wenn du dieses Konto auf ein anderes weiterleiten möchtest, kannst du es hier konfigurieren. or_log_in_with: Oder anmelden mit privacy_policy_agreement_html: Ich habe die Datenschutzerklärung gelesen und stimme ihr zu progress: @@ -1069,7 +1069,7 @@ de: following: 'Erfolg! Du folgst nun:' post_follow: close: Oder du schließt einfach dieses Fenster. - return: Benutzerprofil anzeigen + return: Profil anzeigen web: Im Webinterface öffnen title: "%{acct} folgen" challenge: @@ -1129,7 +1129,7 @@ de: approve_appeal: Einspruch annehmen associated_report: Zugehöriger Bericht created_at: Datum - description_html: Dies sind Maßnahmen, die gegen dein Konto ergriffen worden sind, und Warnungen, die dir die Mitarbeiter*innen von %{instance} geschickt haben. + description_html: Dies sind Maßnahmen, die gegen dein Konto ergriffen worden sind, und Warnungen, die dir die Mitarbeiter*innen von %{instance} gesendet haben. recipient: Adressiert an reject_appeal: Einspruch ablehnen status: "%{id}. Beitrag" @@ -1164,19 +1164,19 @@ de: title: Sicherheitsüberprüfung fehlgeschlagen '429': Zu viele Anfragen '500': - content: Bitte verzeih', etwas ist bei uns schiefgegangen. + content: Wir bitten um Verzeihung, aber etwas ist bei uns schiefgegangen. title: Diese Seite enthält einen Fehler '503': Die Seite konnte wegen eines temporären Serverfehlers nicht angezeigt werden. - noscript_html: Bitte aktiviere JavaScript, um die Mastodon-Web-Anwendung zu verwenden. Alternativ kannst du auch eine der nativen Mastodon-Anwendungen für deine Plattform probieren. + noscript_html: Bitte aktiviere JavaScript, um das Webinterface von Mastodon zu verwenden. Alternativ kannst du auch eine der nativen Apps für Mastodon nutzen. existing_username_validator: - not_found: kann lokale*n Benutzer*in mit diesem Profilnamen nicht finden + not_found: kann lokale Konten mit diesem Profilnamen nicht finden not_found_multiple: "%{usernames} konnten nicht gefunden werden" exports: archive_takeout: date: Datum download: Archiv jetzt herunterladen hint_html: Du kannst ein Archiv deiner Beiträge, Listen, hochgeladenen Medien usw. anfordern. Die exportierten Daten werden im ActivityPub-Format gespeichert und können mit geeigneter Software ausgewertet und angezeigt werden. Du kannst alle 7 Tage ein Archiv erstellen lassen. - in_progress: Persönliches Archiv wird erstellt … + in_progress: Persönliches Archiv wird erstellt … request: Dein Archiv anfordern size: Dateigröße blocks: Blockierte Profile @@ -1277,17 +1277,19 @@ de: bookmarks_html: Du bist dabei, deine Lesezeichen durch bis zu %{total_items} Beiträge aus %{filename} zu ersetzen. domain_blocking_html: Du bist dabei, deine Liste blockierter Domains durch bis zu %{total_items} Domains aus %{filename} zu ersetzen. following_html: Du bist dabei, bis zu %{total_items} Konten aus %{filename} zu folgen und niemand anderes zu folgen. + lists_html: Du bist dabei, deine Listen durch den Inhalt aus %{filename} zu ersetzen. Es werden bis zu %{total_items} Konten zu neuen Listen hinzugefügt. muting_html: Du bist dabei, deine Liste stummgeschalteter Konten durch bis zu %{total_items} Konten aus %{filename} zu ersetzen. preambles: blocking_html: Du bist dabei, bis zu %{total_items}%{total_items} Konten aus %{filename} zu blockieren. bookmarks_html: Du bist dabei, bis zu %{total_items} Beiträge aus %{filename} zu deinen Lesezeichen hinzuzufügen. domain_blocking_html: Du bist dabei, bis zu %{total_items} Domains aus %{filename} zu blockieren. following_html: Du bist dabei, bis zu %{total_items} Konten aus %{filename} zu folgen. + lists_html: Du bist dabei, bis zu %{total_items} Konten aus %{filename} zu deinen Listen hinzuzufügen. Wenn es keine Liste gibt, zu der etwas hinzugefügt werden kann, dann werden neue Listen erstellt. muting_html: Du bist dabei, bis zu %{total_items} Konten aus %{filename} stummzuschalten. preface: Daten, die du von einem Mastodon-Server exportiert hast, kannst du hierher importieren. Das betrifft beispielsweise die Listen von Profilen, denen du folgst oder die du blockiert hast. recent_imports: Zuletzt importiert states: - finished: Abgeschlossen + finished: Fertig in_progress: In Bearbeitung scheduled: Geplant unconfirmed: Unbestätigt @@ -1299,6 +1301,7 @@ de: bookmarks: Lesezeichen importieren domain_blocking: Blockierte Domains importieren following: Gefolgte Konten importieren + lists: Listen importieren muting: Stummgeschaltete Konten importieren type: Importtyp type_groups: @@ -1309,6 +1312,7 @@ de: bookmarks: Lesezeichen domain_blocking: Blockierte Domains following: Folge ich + lists: Listen muting: Stummgeschaltete Profile upload: Datei importieren invites: @@ -1351,7 +1355,7 @@ de: unsubscribe: action: Ja, abbestellen complete: Abbestellt - confirmation_html: Bist du dir sicher, dass du %{type} für Mastodon auf %{domain} an deine E-Mail-Adresse %{email} abbestellen möchtest? Du kannst dies später in den Einstellungen Benachrichtigungen per E-Mail rückgängig machen. + confirmation_html: Möchtest du %{type} für Mastodon auf %{domain} an deine E-Mail-Adresse %{email} wirklich abbestellen? Du kannst dies später in den Einstellungen Benachrichtigungen per E-Mail rückgängig machen. emails: notification_emails: favourite: E-Mail-Benachrichtigungen für Favoriten @@ -1364,9 +1368,9 @@ de: title: Abbestellen media_attachments: validations: - images_and_video: Es kann kein Video an einen Beitrag, der bereits Bilder enthält, angehängt werden - not_ready: Dateien, die noch nicht bearbeitet wurden, können nicht angehängt werden. Versuche es gleich noch einmal! - too_many: Es können nicht mehr als vier Medien angehängt werden + images_and_video: Es kann kein Video zu einem Beitrag hinzugefügt werden, der bereits Bilder enthält + not_ready: Dateien, die noch nicht verarbeitet wurden, können nicht hinzugefügt werden. Versuche es gleich noch einmal! + too_many: Mehr als vier Medien können nicht hinzugefügt werden migrations: acct: umgezogen nach cancel: Weiterleitung beenden @@ -1380,10 +1384,10 @@ de: on_cooldown: Die Abklingzeit läuft gerade followers_count: Anzahl der Follower zum Zeitpunkt des Umzugs incoming_migrations: Von einem anderen Konto umziehen - incoming_migrations_html: Um von einem anderen Konto zu diesem zu wechseln, musst du zuerst einen Kontoalias erstellen. + incoming_migrations_html: Um von einem anderen Konto zu diesem umzuziehen, musst du zuerst ein Konto-Alias erstellen. moved_msg: Dein Konto wird jetzt auf %{acct} weitergeleitet und deine Follower werden übertragen. not_redirecting: Dein Konto wird derzeit nicht auf ein anderes Konto weitergeleitet. - on_cooldown: Du hast dein Konto vor kurzem migriert. Diese Funktion wird in %{count} Tagen wieder verfügbar sein. + on_cooldown: Du bist mit deinem Konto erst vor Kurzem umgezogen. Diese Funktion wird in %{count} Tagen wieder verfügbar sein. past_migrations: Vorherige Umzüge proceed_with_move: Follower übertragen redirected_msg: Dein Konto wird nun zu %{acct} weitergeleitet. @@ -1415,7 +1419,7 @@ de: favourite: body: 'Dein Beitrag wurde von %{name} favorisiert:' subject: "%{name} favorisierte deinen Beitrag" - title: Neuer Favorit + title: Neue Favorisierung follow: body: "%{name} folgt dir jetzt!" subject: "%{name} folgt dir jetzt" @@ -1449,8 +1453,8 @@ de: decimal_units: format: "%n %u" units: - billion: Mrd - million: Mio + billion: Mrd. + million: Mio. quadrillion: Q thousand: Tsd. trillion: T @@ -1470,16 +1474,16 @@ de: truncate: "…" polls: errors: - already_voted: Du hast an dieser Umfrage bereits teilgenommen + already_voted: An dieser Umfrage hast du bereits teilgenommen duplicate_options: enthält doppelte Einträge duration_too_long: liegt zu weit in der Zukunft duration_too_short: ist zu früh expired: Diese Umfrage ist bereits beendet invalid_choice: Diese Auswahl existiert nicht - over_character_limit: kann nicht länger als jeweils %{max} Zeichen sein + over_character_limit: darf nicht länger als %{max} Zeichen sein self_vote: Du kannst an deinen eigenen Umfragen nicht selbst teilnehmen - too_few_options: muss mindestens einen Eintrag haben - too_many_options: kann nicht mehr als %{max} Einträge beinhalten + too_few_options: muss mehr als ein Auswahlfeld enthalten + too_many_options: darf nicht mehr als %{max} Auswahlfelder enthalten preferences: other: Erweitert posting_defaults: Standardeinstellungen für Beiträge @@ -1493,8 +1497,8 @@ de: relationships: activity: Kontoaktivität confirm_follow_selected_followers: Bist du dir sicher, dass du den ausgewählten Followern folgen möchtest? - confirm_remove_selected_followers: Bist du dir sicher, dass du die ausgewählten Follower entfernen möchtest? - confirm_remove_selected_follows: Bist du dir sicher, dass du den ausgewählten Konten entfolgen möchtest? + confirm_remove_selected_followers: Möchtest du die ausgewählten Follower wirklich entfernen? + confirm_remove_selected_follows: Möchtest du den ausgewählten Konten wirklich entfolgen? dormant: Inaktiv follow_failure: Einigen der ausgewählten Konten konnte nicht gefolgt werden. follow_selected_followers: Ausgewählten Followern folgen @@ -1643,7 +1647,7 @@ de: unlisted: Nicht gelistet unlisted_long: Für alle sichtbar (mit Ausnahme von öffentlichen Timelines) statuses_cleanup: - enabled: Automatisch alte Beiträge löschen + enabled: Alte Beiträge automatisch entfernen enabled_hint: Löscht automatisch deine Beiträge, sobald sie die angegebene Altersgrenze erreicht haben, es sei denn, sie entsprechen einer der unten angegebenen Ausnahmen exceptions: Ausnahmen explanation: Damit Mastodon nicht durch das Löschen von Beiträgen ausgebremst wird, wartet der Server damit, bis wenig los ist. Aus diesem Grund werden deine Beiträge ggf. erst einige Zeit nach Erreichen der Altersgrenze gelöscht. @@ -1653,16 +1657,16 @@ de: interaction_exceptions_explanation: Beachte, dass Beiträge nicht gelöscht werden, sobald deine Grenzwerte für Favoriten oder geteilte Beiträge einmal überschritten wurden – auch dann nicht, wenn diese Schwellenwerte mittlerweile nicht mehr erreicht werden. keep_direct: Direktnachrichten behalten keep_direct_hint: Löscht keine deiner privaten Nachrichten - keep_media: Beiträge mit angehängten Mediendateien behalten - keep_media_hint: Löscht keinen deiner Beiträge mit angehängten Mediendateien + keep_media: Beiträge mit Medien behalten + keep_media_hint: Löscht keinen deiner Beiträge mit Medieninhalten keep_pinned: Angeheftete Beiträge behalten - keep_pinned_hint: Löscht keinen deiner angehefteten Beiträge im Profil + keep_pinned_hint: Löscht keinen deiner angehefteten Beiträge keep_polls: Umfragen behalten keep_polls_hint: Löscht keine deiner Umfragen keep_self_bookmark: Als Lesezeichen markierte Beiträge behalten keep_self_bookmark_hint: Löscht keinen deiner Beiträge, die du als Lesezeichen gesetzt hast keep_self_fav: Favorisierte Beiträge behalten - keep_self_fav_hint: Löscht keinen deiner Beiträge, die du favorisiert hast + keep_self_fav_hint: Löscht keinen deiner eigenen Beiträge, die du favorisiert hast min_age: '1209600': 2 Wochen '15778476': 6 Monate @@ -1675,7 +1679,7 @@ de: min_age_label: Altersgrenze min_favs: Behalte Beiträge, die häufiger favorisiert wurden als … min_favs_hint: Löscht keine Beiträge, die mindestens so oft favorisiert worden sind. Lass das Feld leer, um alle Beiträge – unabhängig der Anzahl an Favoriten – zu löschen - min_reblogs: Beiträge behalten, die mindestens so oft geteilt wurden + min_reblogs: Behalte Beiträge, die häufiger geteilt wurden als … min_reblogs_hint: Löscht keine Beiträge, die mindestens so oft geteilt worden sind. Lass das Feld leer, um alle Beiträge – unabhängig der Anzahl an geteilten Beiträgen – zu löschen stream_entries: sensitive_content: Inhaltswarnung @@ -1701,9 +1705,9 @@ de: enabled: Zwei-Faktor-Authentisierung (2FA) ist aktiviert enabled_success: Zwei-Faktor-Authentisierung (2FA) erfolgreich aktiviert generate_recovery_codes: Wiederherstellungscodes erstellen - lost_recovery_codes: Wiederherstellungscodes ermöglichen es dir, wieder Zugang zu deinem Konto zu erlangen, falls du keinen Zugriff mehr auf dein Smartphone oder zum Sicherheitsschlüssel hast. Solltest du deine Wiederherstellungscodes verloren haben, kannst du sie hier neu generieren. Die alten Wiederherstellungscodes werden dann ungültig. + lost_recovery_codes: Wiederherstellungscodes erlauben es dir, wieder Zugang zu deinem Konto zu erlangen, falls du keinen Zugriff mehr auf die Zwei-Faktor-Authentisierung (2FA) oder den Sicherheitsschlüssel hast. Solltest du diese Wiederherstellungscodes verloren haben, kannst du sie hier neu generieren. Deine alten, bereits erstellten Wiederherstellungscodes werden dadurch ungültig. methods: Methoden der Zwei-Faktor-Authentisierung (2FA) - otp: Authentifizierungs-App + otp: Authentisierungs-App recovery_codes: Wiederherstellungscodes sichern recovery_codes_regenerated: Wiederherstellungscodes erfolgreich neu erstellt recovery_instructions_html: Falls du jemals den Zugang zu deinem Smartphone verlierst, kannst du einen der unten aufgeführten Wiederherstellungscodes verwenden, um wieder Zugang zu deinem Konto zu erhalten. Bewahre die Wiederherstellungscodes sicher auf. Du kannst sie zum Beispiel ausdrucken und zusammen mit anderen wichtigen Dokumenten aufbewahren. @@ -1737,15 +1741,15 @@ de: violation: Inhalt verstößt gegen die folgenden Serverregeln explanation: delete_statuses: Einige deiner Beiträge wurden als Verstoß gegen eine oder mehrere Serverregeln erkannt und von den Moderator*innen von %{instance} entfernt. - disable: Du kannst dein Konto nicht mehr verwenden, aber dein Profil und andere Daten bleiben unversehrt. Du kannst eine Sicherung deiner Daten anfordern, die Kontoeinstellungen ändern oder dein Konto löschen. + disable: Du kannst dein Konto nicht mehr verwenden, aber dein Profil und deine anderen Daten bleiben erhalten. Du kannst eine Sicherung deiner Daten anfordern, die Kontoeinstellungen ändern oder dein Konto löschen. mark_statuses_as_sensitive: Ein oder mehrere deiner Beiträge wurden von den Moderator*innen von %{instance} mit einer Inhaltswarnung versehen. Das bedeutet, dass Besucher*innen diese Medien in den Beiträgen zunächst antippen müssen, um die Vorschau anzuzeigen. Beim Verfassen der nächsten Beiträge kannst du auch selbst eine Inhaltswarnung für hochgeladene Medien festlegen. - sensitive: Von nun an werden alle deine hochgeladenen Mediendateien mit einer Inhaltswarnung versehen und hinter einer Warnung versteckt. + sensitive: Von nun an werden alle deine hochgeladenen Medieninhalte mit einer Inhaltswarnung versehen und hinter einer Warnung versteckt. silence: Du kannst dein Konto weiterhin verwenden, aber nur Personen, die dir bereits folgen, sehen deine Beiträge auf diesem Server. Ebenso kannst du von verschiedenen Entdeckungsfunktionen ausgeschlossen werden. Andere können dir jedoch weiterhin manuell folgen. suspend: Du kannst dein Konto nicht mehr verwenden und dein Profil und andere Daten sind nicht mehr verfügbar. Du kannst dich immer noch anmelden, um eine Sicherung deiner Daten anzufordern, bis die Daten innerhalb von 30 Tagen vollständig gelöscht wurden. Allerdings werden wir einige Daten speichern, um zu verhindern, dass du die Sperrung umgehst. reason: 'Begründung:' statuses: 'Betroffene Beiträge:' subject: - delete_statuses: Deine Beiträge von %{acct} wurden entfernt + delete_statuses: Deine Beiträge von %{acct} sind entfernt worden disable: Dein Konto %{acct} wurde eingefroren mark_statuses_as_sensitive: Deine Beiträge von %{acct} wurden mit einer Inhaltswarnung versehen none: Warnung für %{acct} diff --git a/config/locales/devise.da.yml b/config/locales/devise.da.yml index 18aa431622..bfa8e1b870 100644 --- a/config/locales/devise.da.yml +++ b/config/locales/devise.da.yml @@ -14,7 +14,7 @@ da: not_found_in_database: Ugyldig %{authentication_keys} eller adgangskode. pending: Din konto er stadig under revision. timeout: Session udløbet. Log ind igen for at fortsætte. - unauthenticated: Log ind eller tilmelde dig for at fortsætte. + unauthenticated: Log ind eller tilmeld dig for at fortsætte. unconfirmed: Bekræft din e-mailadresse for at fortsætte. mailer: confirmation_instructions: @@ -22,7 +22,7 @@ da: action_with_app: Bekræft og returnér til %{app} explanation: Du har oprettet en konto på %{host} med denne e-mailadresse og er nu ét klik fra at aktivere den. Har du ikke oprettet dig, så ignorér blot denne e-mail. explanation_when_pending: Du har ansøgt om en invitation til %{host} med denne e-mailadresse. Når du har bekræftet adressen, gennemgås din ansøgning. Du kan logge ind for at ændre oplysninger eller slette kontoen, men hovedparten af funktionerne kan ikke tilgås, før kontoen er godkendt. Afvises ansøgningen, fjernes dine data, så ingen yderligere handling fra dig er nødvendig. Har du ikke ansøgt, så ignorér blot denne e-mail. - extra_html: Tjek også reglerne for serveren samt gældende Tjenestevilkår. + extra_html: Tjek også reglerne for serveren samt vores tjenestevilkår. subject: 'Mastodon: Bekræftelsesinstrukser for %{instance}' title: Bekræft e-mailadresse email_changed: diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml index 0783d468a6..b63e73a736 100644 --- a/config/locales/devise.de.yml +++ b/config/locales/devise.de.yml @@ -79,7 +79,7 @@ de: title: Sicherheitsschlüssel aktiviert omniauth_callbacks: failure: Du konntest nicht mit deinem %{kind}-Konto angemeldet werden, weil „%{reason}“. - success: Du hast dich erfolgreich mit deinem %{kind}-Konto angemeldet. + success: Du hast dich erfolgreich mit deinem Konto %{kind} angemeldet. passwords: no_token: Du kannst diese Seite nur über den Link aus der E-Mail zum Zurücksetzen des Passworts aufrufen. Wenn du einen solchen Link aufgerufen hast, vergewissere dich bitte, dass du die vollständige Adresse aufrufst. send_instructions: Du erhältst in wenigen Minuten eine E-Mail. Darin wird erklärt, wie du dein Passwort zurücksetzen kannst. @@ -91,7 +91,7 @@ de: signed_up: Herzlich willkommen! Du hast dich erfolgreich registriert. signed_up_but_inactive: Du hast dich erfolgreich registriert. Allerdings ist dein Konto noch nicht aktiviert und du kannst dich daher noch nicht anmelden. signed_up_but_locked: Du hast dich erfolgreich registriert. Allerdings ist dein Konto gesperrt und du kannst dich daher nicht anmelden. - signed_up_but_pending: Eine Nachricht mit einem Bestätigungslink wurde an dich per E-Mail geschickt. Nachdem du diesen Link angeklickt hast, werden wir deine Anfrage überprüfen. Du wirst benachrichtigt werden, falls die Anfrage angenommen wurde. + signed_up_but_pending: Eine Nachricht mit einem Bestätigungslink wurde an deine E-Mail-Adresse gesendet. Nachdem du diesen Link angeklickt hast, werden wir deine Bewerbung überprüfen. Sobald sie genehmigt wurde, wirst du benachrichtigt. signed_up_but_unconfirmed: Du hast dich erfolgreich registriert. Wir konnten dich noch nicht anmelden, da dein Konto noch nicht bestätigt ist. Du erhältst in Kürze eine E-Mail. Darin wird erklärt, wie du dein Konto freischalten kannst. update_needs_confirmation: Deine Daten wurden aktualisiert, aber du musst deine neue E-Mail-Adresse bestätigen. Du erhältst in wenigen Minuten eine E-Mail. Darin ist erklärt, wie du die Änderung deiner E-Mail-Adresse abschließen kannst. updated: Dein Konto wurde erfolgreich aktualisiert. diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml index c3f830b0e1..bbf6a6399b 100644 --- a/config/locales/devise.hu.yml +++ b/config/locales/devise.hu.yml @@ -12,38 +12,38 @@ hu: last_attempt: Már csak egy próbálkozásod maradt, mielőtt a fiókodat zároljuk. locked: A fiókodat zároltuk. not_found_in_database: Helytelen %{authentication_keys} vagy jelszó. - pending: A fiók még áttekintés alatt áll. + pending: A fiókod még engedélyezésre vár. timeout: A munkameneted lejárt. A folytatáshoz jelentkezz be újra. unauthenticated: A folytatás előtt be kell jelentkezned vagy regisztrálnod kell. - unconfirmed: A folytatás előtt meg kell erősíteni az email címet. + unconfirmed: A folytatás előtt meg kell erősítened az emailcímedet. mailer: confirmation_instructions: - action: Email cím ellenőrzése + action: Emailcím ellenőrzése action_with_app: 'Megerősítés majd visszatérés: %{app}' - explanation: Ezzel az email címmel kezdeményeztek regisztrációt %{host} kiszolgálón. Csak egy kattintás, és a felhasználói fiók bekapcsolásra kerül. Ha a regisztráció kezdeményezése téves volt, tekintsük ezt az emailt tárgytalannak. - explanation_when_pending: Ezzel az email címmel meghívás kérés történt %{host} kiszolgálón. Az email cím megerősítése után a jelentkezés áttekintésre kerül. Ennek ideje alatt nem lehet belépni. Ha a jelentkezés elutasításra kerül, az adatok törlésre kerülnek, más teendő nincs. Ha a kérelem kezdeményezése téves volt, tekintsük ezt az emailt tárgytalannak. - extra_html: Tekintsük át a a kiszolgáló szabályait és a felhasználási feltételeket. + explanation: Ezzel az emailcímmel kezdeményeztél egy regisztrációt a %{host} kiszolgálón. Csak egy kattintásra vagy az aktiválástól. Ha a regisztrációt nem te indítottad, tekintsd ezt az emailt tárgytalannak. + explanation_when_pending: Ezzel az email címmel meghívást kértél a %{host} kiszolgálóra. Amint az emailcímedet megerősítetted, áttekintjük a jelentkezésedet. Ennek ideje alatt bejelentkezhetsz az adataid módosításához vagy a fiókod törléséhez, de a funkciók többségét nem használhatod a fiókod jóváhagyásáig. Ha a jelentkezésed elutasításra kerül, az adataid törlésre kerülnek, így nincs más teendőd. Ha nem te kezdeményezted ezt, tekintsd ezt az emailt tárgytalannak. + extra_html: Tekintsd át a a kiszolgáló szabályait és a felhasználási feltételeket. subject: 'Mastodon: Megerősítési utasítások: %{instance}' - title: Email cím megerősítése + title: Emailcím megerősítése email_changed: explanation: 'A fiókodhoz tartozó e-mail cím a következőre változik:' extra: Ha nem változtattad meg az e-mail címed, akkor valószínű, hogy valaki hozzáférhetett a fiókodhoz. Kérjük, azonnal változtasd meg a jelszavadat, vagy lépj kapcsolatba a szerver adminisztrátorával, ha ki vagy zárva a fiókodból. - subject: 'Mastodon: a fiókhoz tartozó email cím megváltoztatásra került' - title: Új email cím + subject: 'Mastodon: Email megváltozott' + title: Új emailcím password_change: - explanation: A fiókhoz tartozó jelszó megváltoztatásra került. - extra: Ha a fiók jelszavának módosítási kérelme téves volt, akkor valaki hozzáférhetett a fiókhoz. Legjobb, a jelszó azonnali megváltoztatása vagy ha kizárásra kerültünk a fiókból, vegyük fel a kapcsolatot a kiszolgáló adminisztrátorával. + explanation: A fiókodhoz tartozó jelszót megváltoztattuk. + extra: Ha nem te kérted a fiókod jelszavának módosítását, akkor valaki hozzáférhetett a fiókodhoz. Legjobb, ha azonnal megváltoztatod a jelszavadat; ha nem férsz hozzá a fiókodhoz, vedd fel a kapcsolatot a kiszolgálód adminisztrátorával. subject: 'Mastodon: A jelszó megváltoztatásra került' title: A jelszó megváltoztatásra került reconfirmation_instructions: - explanation: Az email cím megváltoztatásához meg kell erősíteni az új email címet. - extra: Amennyiben a kezdeményezés téves volt, tekintsük ezt az emailt tárgytalannak. A Mastodon fiókhoz tartozó email cím változatlan marad a fenti hivatkozásra kattintásig. + explanation: Az emailcím megváltoztatásához meg kell erősítened az új címet. + extra: Amennyiben nem te kezdeményezted ezt a módosítást, kérjük tekintsd ezt az emailt tárgytalannak. A Mastodon fiókodhoz tartozó emailcímed változatlan marad mindaddig, amíg rá nem kattintasz a fenti linkre. subject: 'Mastodon: Email cím megerősítése: %{instance}' - title: Email cím megerősítése + title: Emailcím megerősítése reset_password_instructions: action: Jelszó módosítása - explanation: A fiókhoz tartozó jelszó módosítása kezdeményezésre került. - extra: Amennyiben a kezdeményezés téves volt, tekintsük ezt az emailt tárgytalannak. A Mastodon fiókhoz tartozó jelszó változatlan marad a fenti hivatkozásra kattintásig. + explanation: A fiókodhoz tartozó jelszó módosítását kezdeményezted. + extra: Amennyiben nem te kezdeményezted a módosítást, kérjük tekintsd ezt az emailt tárgytalannak. A jelszavad változatlan marad mindaddig, amíg újat nem hozol létre a fenti linkre kattintva. subject: 'Mastodon: Jelszó visszaállítási lépések' title: Jelszó visszaállítása two_factor_disabled: @@ -62,46 +62,46 @@ hu: subject: 'Mastodon: Feloldási lépések' webauthn_credential: added: - explanation: A következő biztonsági kulcs a fiókhoz hozzáadásra került + explanation: A következő biztonsági kulcsot hozzáadtuk a fiókodhoz subject: 'Mastodon: Új biztonsági kulcs' title: Új biztonsági kulcs lett hozzáadva deleted: - explanation: A következő biztonsági kulcs törlésre került a fiókból + explanation: A következő biztonsági kulcsot töröltük a fiókodból subject: 'Mastodon: A biztonsági kulcs törlésre került' - title: Az egyik biztonsági kulcs törlésre került + title: Az egyik biztonsági kulcsodat törölték webauthn_disabled: - explanation: A biztonsági kulccsal történő hitelesítés letiltásra kerüt a fióknál. Bejelentkezni csak a párosított TOTP app által generált vezérjellel lehet. + explanation: A biztonsági kulccsal történő hitelesítést letiltottuk a fiókodon. Bejelentkezni csak a párosított TOTP app által generált tokennel lehet. subject: 'Mastodon: A biztonsági kulccsal történő hitelesítés letiltásra került' - title: A bztonsági kulcsok letiltásra kerültek + title: A biztonsági kulcsok letiltásra kerültek webauthn_enabled: - explanation: A biztonsági kulccsal történő hitelesítést engedélyezve lett a fióknál. A biztonsági kulcs mostantól használható a bejelentkezésre. + explanation: A biztonsági kulccsal történő hitelesítést engedélyeztük a fiókodon. A biztonsági kulcsodat mostantól használhatod bejelentkezésre. subject: 'Mastodon: A biztonsági kulcsos hitelesítés engedélyezésre került' - title: A bztonsági kulcsok engedélyezésre kerültek + title: A biztonsági kulcsok engedélyezésre kerültek omniauth_callbacks: failure: Sikertelen hitelesítés %{kind} fiókról, mert "%{reason}". success: Sikeres hitelesítés %{kind} fiókról. passwords: - no_token: Nem lehet hozzáférni ehhez az oldalhoz jelszó visszaállító email nélkül. Ha egy jelszó visszaállító email miatt érkeztünk ide, ellenőrizzük a megadott teljes webcím használatát. - send_instructions: Ha az email cím létezik az adatbázisban, néhány perc alatt megérkezik jelszó helyreállítási hivatkozás az email címre. Ellenőrizzük a spam mappát, ha nem érkezett meg ez az email. - send_paranoid_instructions: Ha az email cím létezik az adatbázisban, néhány perc alatt megérkezik jelszó helyreállítási hivatkozás az email címre. Ellenőrizzük a spam mappát, ha nem érkezett meg ez az email. - updated: A jelszó sikeresen megváltozott. Megtörtént a bejelentkezés. - updated_not_active: A jelszó sikeresen megváltoztatásra került. + no_token: Nem férhetsz hozzá ehhez az oldalhoz jelszó-visszaállító email nélkül. Ha egy jelszó-visszaállító email hozott ide, ellenőrizd, hogy a teljes megadott URL-t használtad-e. + send_instructions: Ha az emailcímed létezik az adatbázisunkban, néhány percen belül kapsz egy jelszó-helyreállítási hivatkozást az emailcímedre. Ellenőrizd a spam mappádat, ha nem kaptad meg ezt az emailt. + send_paranoid_instructions: Ha az emailcímed létezik az adatbázisunkban, néhány percen belül kapsz egy jelszó-helyreállítási hivatkozást az emailcímedre. Ellenőrizd a spam mappádat, ha nem kaptad meg ezt az emailt. + updated: A jelszavad sikeresen megváltozott. Megtörtént a bejelentkezés. + updated_not_active: A jelszavad sikeresen megváltoztatásra került. registrations: - destroyed: Viszontásátásra! A fiók sikeresen törlésre került. Reméljük hamarosan visszatér. + destroyed: Viszlát! A fiókodat sikeresen töröltük. Reméljük hamarosan viszontláthatunk. signed_up: Üdvözlünk! Sikeresen regisztráltál. signed_up_but_inactive: Sikeresen regisztráltál. Ennek ellenére nem tudunk beléptetni, ugyanis a fiókodat még nem aktiválták. signed_up_but_locked: Sikeresen regisztráltál. Ennek ellenére nem tudunk beléptetni, ugyanis a fiókod le van zárva. signed_up_but_pending: Egy megerősítési hivatkozással ellátott üzenetet kiküldtünk az e-mail címedre. Ha kattintasz a hivatkozásra, átnézzük a kérelmedet. Értesítünk, ha jóváhagytuk. signed_up_but_unconfirmed: Egy megerősítési hivatkozással ellátott üzenetet kiküldtünk az e-mail címedre. Kérjük használd a hivatkozást a fiókod aktiválásához. Ellenőrizd a spam mappádat, ha nem kaptad meg ezt a levelet. - update_needs_confirmation: A fiókodat sikeresen frissítésre került, de szükség van az email cím megerősítésére. Ellenőrizzük az emailt és kövessük a benne levő megerősítési hivatkozást az email cím megerősítéséhez. Ellenőrizzük a levélszemét mappát, ha nemérkezett volna meg ez az email. - updated: A fiók sikeresen frissítésre került. + update_needs_confirmation: Sikeresen frissítetted a fiókodat, de szükségünk van az e-mail címed megerősítésére. Kérlek ellenőrizd az e-mailedet és kövesd a levélben szereplő megerősítési linket az e-mail címed megerősítéséhez. Ellenőrizd a levélszemét mappád, ha nem kaptál volna ilyen levelet. + updated: A fiókod sikeresen frissítésre került. sessions: already_signed_out: A kijelentkezés sikeres volt. signed_in: A bejelentkezés sikeres volt. signed_out: A kijelentkezés sikeres volt. unlocks: - send_instructions: Néhány perc múlva egy email érkezik a fiók feloldásáról. Ellenőrizzük a spam mappát, ha nem érkezett volna meg at email. - send_paranoid_instructions: Ha a fiók létezik, pár percen belül egy email érkezik a feloldáshoz szükséges lépésekkel. Ellenőrizzük a levélszemét mappát, ha nem érkezett volna ilyen email. + send_instructions: Pár percen belül egy e-mailt fogsz kapni a feloldáshoz szükséges lépésekkel. Ellenőrizd a levélszemét mappád, ha nem kaptál volna ilyen levelet. + send_paranoid_instructions: Ha a fiókod létezik, pár percen belül egy e-mailt fogsz kapni a feloldáshoz szükséges lépésekkel. Ellenőrizd a levélszemét mappád, ha nem kaptál volna ilyen levelet. unlocked: A fiókod sikeresen feloldásra került. Jelentkezz be a folytatáshoz. errors: messages: diff --git a/config/locales/doorkeeper.af.yml b/config/locales/doorkeeper.af.yml index a513a6a450..504c7f507e 100644 --- a/config/locales/doorkeeper.af.yml +++ b/config/locales/doorkeeper.af.yml @@ -107,7 +107,6 @@ af: bookmarks: Boekmerke conversations: Gesprekke crypto: End-tot-end-enkripsie - favourites: Gunstelinge filters: Filters lists: Lyste media: Media-aanhegsels @@ -138,7 +137,6 @@ af: read:accounts: sien rekeninginligting read:blocks: sien jou blokkerings read:bookmarks: sien jou boekmerke - read:favourites: sien jou gunstelinge read:filters: sien jou filters read:lists: sien jou lyste read:mutes: sien jou uitdowings @@ -151,7 +149,6 @@ af: write:blocks: blokkeer rekeninge en domeine write:bookmarks: laat ’n boekmerk by plasings write:conversations: doof en wis gesprekke uit - write:favourites: merk gunstelingplasings write:filters: skep filters write:follows: volg mense write:lists: skep lyste diff --git a/config/locales/doorkeeper.an.yml b/config/locales/doorkeeper.an.yml index 127366d1c6..1096d8c8dc 100644 --- a/config/locales/doorkeeper.an.yml +++ b/config/locales/doorkeeper.an.yml @@ -127,7 +127,6 @@ an: bookmarks: Marcadors conversations: Conversacions crypto: Zifrau de cabo a cabo - favourites: Favoritos filters: Filtros follow: Seguius, silenciaus y blocaus follows: Seguius @@ -170,7 +169,6 @@ an: read:accounts: veyer información de cuentas read:blocks: veyer a quí has blocau read:bookmarks: veyer los tuyos marcadors - read:favourites: veyer los tuyos favoritos read:filters: veyer los tuyos filtros read:follows: veyer a quí sigues read:lists: veyer las tuyas listas @@ -184,7 +182,6 @@ an: write:blocks: blocar cuentas y dominios write:bookmarks: alzar estaus como marcadors write:conversations: silenciar y eliminar conversacions - write:favourites: publicacions favoritas write:filters: creyar filtros write:follows: seguir usuarios write:lists: creyar listas diff --git a/config/locales/doorkeeper.ar.yml b/config/locales/doorkeeper.ar.yml index b10f5dbeb3..a396742d84 100644 --- a/config/locales/doorkeeper.ar.yml +++ b/config/locales/doorkeeper.ar.yml @@ -127,7 +127,6 @@ ar: bookmarks: الفواصل المرجعية conversations: المحادثات crypto: التشفير من الطرف إلى نهاية الطرف - favourites: المفضلة filters: عوامل التصفية follow: الإشتراكات والحسابات المكتومة والحسابات المحجوبة follows: الإشتراكات @@ -170,7 +169,6 @@ ar: read:accounts: معاينة معلومات الحساب read:blocks: رؤية الحسابات التي قمت بحجبها read:bookmarks: اطّلع على فواصلك المرجعية - read:favourites: رؤية مفضلاتك read:filters: رؤية عوامل التصفية الخاصة بك read:follows: رؤية متابِعيك read:lists: رؤية قوائمك @@ -184,7 +182,6 @@ ar: write:blocks: حجب الحسابات و النطاقات write:bookmarks: الإحتفاظ بالمنشورات في الفواصل المرجعية write:conversations: كتم وحذف المحادثات - write:favourites: الإعجاب بمنشورات write:filters: إنشاء عوامل تصفية write:follows: متابَعة الأشخاص write:lists: إنشاء القوائم diff --git a/config/locales/doorkeeper.ast.yml b/config/locales/doorkeeper.ast.yml index 61d6c4ad1f..0564e49dac 100644 --- a/config/locales/doorkeeper.ast.yml +++ b/config/locales/doorkeeper.ast.yml @@ -78,7 +78,6 @@ ast: bookmarks: Marcadores conversations: Conversaciones crypto: Cifráu de puntu a puntu - favourites: Favoritos filters: Peñeres lists: Llistes media: Elementos multimedia @@ -115,7 +114,6 @@ ast: write:blocks: bloquia cuentes ya dominios write:bookmarks: meter artículos en Marcadores write:conversations: desaniciar ya desactivar los avisos de conversaciones - write:favourites: artículos favoritos write:filters: crea peñeres write:follows: sigue a perfiles write:lists: crea llistes diff --git a/config/locales/doorkeeper.be.yml b/config/locales/doorkeeper.be.yml index 1d0ffda4b2..3166f7b20c 100644 --- a/config/locales/doorkeeper.be.yml +++ b/config/locales/doorkeeper.be.yml @@ -127,7 +127,6 @@ be: bookmarks: Закладкі conversations: Размовы crypto: Скразное шыфраванне - favourites: Абраныя filters: Фільтры follow: Падпіскі, ігнараванне і блакіроўка follows: Падпіскі @@ -170,7 +169,6 @@ be: read:accounts: бачыць інфармацыю аб уліковых запісах read:blocks: бачыць свае блакіроўкі read:bookmarks: бачыць свае закладкі - read:favourites: Бачыць сваё абранае read:filters: бачыць свае фільтры read:follows: бачыць свае падпіскі read:lists: бачыць свае спісы @@ -184,7 +182,6 @@ be: write:blocks: блакіраваць уліковыя запісы і дамены write:bookmarks: закладкі допісаў write:conversations: ігнараваць і выдаляць размовы - write:favourites: дадаваць допісы ва ўпадабанае write:filters: ствараць фільтры write:follows: Сачыць за людзьмі write:lists: ствараць спiсы diff --git a/config/locales/doorkeeper.bg.yml b/config/locales/doorkeeper.bg.yml index 2446b560fa..cd40616012 100644 --- a/config/locales/doorkeeper.bg.yml +++ b/config/locales/doorkeeper.bg.yml @@ -127,7 +127,6 @@ bg: bookmarks: Отметки conversations: Разговори crypto: Криптиране от край до край - favourites: Любими filters: Филтри follow: Последвания, заглушавания и блокирания follows: Последвания @@ -170,7 +169,6 @@ bg: read:accounts: преглед на информация за акаунти read:blocks: преглед на вашите блокирания read:bookmarks: преглед на вашите отметки - read:favourites: преглед на вашите любими read:filters: преглед на вашите филтри read:follows: преглед на вашите последвания read:lists: преглед на вашите списъци @@ -184,7 +182,6 @@ bg: write:blocks: блокиране на акаунти и домейни write:bookmarks: отмятане на публикации write:conversations: заглушаване и изтриване на разговорите - write:favourites: любими публикации write:filters: създаване на филтри write:follows: последване на хора write:lists: създаване на списъци diff --git a/config/locales/doorkeeper.br.yml b/config/locales/doorkeeper.br.yml index 0a81e03bbe..3de6230d4c 100644 --- a/config/locales/doorkeeper.br.yml +++ b/config/locales/doorkeeper.br.yml @@ -125,7 +125,6 @@ br: read:accounts: gwelout titouroù ar c'hontoù read:blocks: gwelout ar pezh a zo stanket ganeoc'h read:bookmarks: gwelout ho sinedoù - read:favourites: gwelout ho muiañ-karet read:filters: gwelout ho siloù read:follows: gwelout ar pezh a zo heuliet ganeoc'h read:lists: gwelout ho listennoù @@ -137,7 +136,6 @@ br: write:accounts: kemmañ ho profil write:blocks: berzañ kontoù ha domanioù write:bookmarks: toudoù enrollet evel sinedoù - write:favourites: merkañ toudoù evel muiañ-karet write:filters: krouiñ siloù write:follows: heuliañ an dud write:lists: krouiñ listennoù diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml index 93fb071b31..d4c694d587 100644 --- a/config/locales/doorkeeper.ca.yml +++ b/config/locales/doorkeeper.ca.yml @@ -127,7 +127,7 @@ ca: bookmarks: Marcadors conversations: Converses crypto: Xifrat d'extrem a extrem - favourites: Preferits + favourites: Favorits filters: Filtres follow: Seguits, Silenciats i Blocats follows: Seguits @@ -170,7 +170,7 @@ ca: read:accounts: mira informació dels comptes read:blocks: mira els teus bloqueigs read:bookmarks: mira els teus marcadors - read:favourites: mira els teus preferits + read:favourites: mira els teus favorits read:filters: mira els teus filtres read:follows: mira els teus seguiments read:lists: mira les teves llistes @@ -184,7 +184,7 @@ ca: write:blocks: bloca comptes i dominis write:bookmarks: marca tuts write:conversations: silencia i esborra converses - write:favourites: afavoreix tuts + write:favourites: tuts favorits write:filters: crea filtres write:follows: segueix gent write:lists: crea llistes diff --git a/config/locales/doorkeeper.ckb.yml b/config/locales/doorkeeper.ckb.yml index 39b9f65f62..f952b6eca9 100644 --- a/config/locales/doorkeeper.ckb.yml +++ b/config/locales/doorkeeper.ckb.yml @@ -126,7 +126,6 @@ ckb: bookmarks: نیشانەکان conversations: گفتوگۆکان crypto: کۆدکردنی کۆتایی بۆ کۆتایی - favourites: دڵخوازەکان filters: پاڵێوراوەکان follows: بەدواداچووان lists: پێرستەکان @@ -158,7 +157,6 @@ ckb: read:accounts: بینینی زانیاری هەژمارەکان read:blocks: بینینی بلۆکەکانت read:bookmarks: نیشانەکان ببینە - read:favourites: بینینی دڵخوازەکانت read:filters: بینینی پاڵافتنەکانت read:follows: سەیری شوێنکەوتەکانت بکە read:lists: بینینی لیستەکانت @@ -172,7 +170,6 @@ ckb: write:blocks: بلۆک کردنی هەژمارەکەی دۆمەینەکان write:bookmarks: بارەکانی نیشانکەر write:conversations: بێدەنگکردن و سڕینەوەی گفتوگۆکان - write:favourites: دۆخی دڵخوازەکان write:filters: پاڵێوەر دروست بکە write:follows: دوای خەڵک بکەوە write:lists: دروستکردنی لیستەکان diff --git a/config/locales/doorkeeper.co.yml b/config/locales/doorkeeper.co.yml index 78c86d0db9..ae89344abd 100644 --- a/config/locales/doorkeeper.co.yml +++ b/config/locales/doorkeeper.co.yml @@ -124,7 +124,6 @@ co: read:accounts: vede l'infurmazione di i conti read:blocks: vede i vostri blucchimi read:bookmarks: vede i vostri segnalibri - read:favourites: vede i vostri favuriti read:filters: vede i vostri filtri read:follows: vede i vostri abbunamenti read:lists: vede e vostre liste @@ -137,7 +136,6 @@ co: write:accounts: mudificà u prufile write:blocks: bluccà conti è dumini write:bookmarks: segnà statuti - write:favourites: aghjustà statuti à i favuriti write:filters: creà filtri write:follows: siguità conti write:lists: creà liste diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml index b8bb6b8540..49d7acad66 100644 --- a/config/locales/doorkeeper.cs.yml +++ b/config/locales/doorkeeper.cs.yml @@ -127,7 +127,6 @@ cs: bookmarks: Záložky conversations: Konverzace crypto: End-to-end šifrování - favourites: Oblíbení filters: Filtry follow: Sledování, ztlumení a blokování follows: Sledovaní @@ -170,7 +169,6 @@ cs: read:accounts: vidět informace o účtech read:blocks: vidět vaše blokace read:bookmarks: vidět vaše záložky - read:favourites: vidět vaše oblíbené příspěvky read:filters: vidět vaše filtry read:follows: vidět vaše sledování read:lists: vidět vaše seznamy @@ -184,7 +182,6 @@ cs: write:blocks: blokovat účty a domény write:bookmarks: přidávat příspěvky do záložek write:conversations: skrývat a mazat konverzace - write:favourites: oblibovat si příspěvky write:filters: vytvářet filtry write:follows: sledovat lidi write:lists: vytvářet seznamy diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml index 0d8c432f48..1b683b1081 100644 --- a/config/locales/doorkeeper.de.yml +++ b/config/locales/doorkeeper.de.yml @@ -31,8 +31,8 @@ de: form: error: Ups! Bitte überprüfe das Formular auf mögliche Fehler help: - native_redirect_uri: Benutze %{native_redirect_uri} für lokale Tests - redirect_uri: Benutze eine Zeile pro URI + native_redirect_uri: Verwende %{native_redirect_uri} für lokale Tests + redirect_uri: Verwende eine Zeile pro URI scopes: Bitte die Befugnisse mit Leerzeichen trennen. Zur Verwendung der Standardwerte freilassen. index: application: Anwendung @@ -132,7 +132,7 @@ de: follow: Folge ich, Stummschaltungen und Blockierungen follows: Folge ich lists: Listen - media: Medienanhänge + media: Medieninhalte mutes: Stummschaltungen notifications: Benachrichtigungen push: Push-Benachrichtigungen @@ -167,11 +167,11 @@ de: follow: Kontenbeziehungen verändern push: deine Push-Benachrichtigungen erhalten read: all deine Daten lesen - read:accounts: deine Konteninformationen einsehen - read:blocks: deine Sperren einsehen + read:accounts: deine Kontoinformationen einsehen + read:blocks: deine Blockierungen einsehen read:bookmarks: deine Lesezeichen lesen - read:favourites: deine Favoriten lesen - read:filters: deine Filter ansehen + read:favourites: deine Favoriten einsehen + read:filters: deine Filter einsehen read:follows: sehen, wem du folgst read:lists: deine Listen sehen read:mutes: deine Stummschaltungen einsehen @@ -179,17 +179,17 @@ de: read:reports: deine Meldungen sehen read:search: in deinem Namen suchen read:statuses: alle Beiträge sehen - write: all deine Benutzerdaten verändern + write: all deine Kontodaten verändern write:accounts: dein Profil bearbeiten - write:blocks: Domains und Konten sperren + write:blocks: Domains und Konten blockieren write:bookmarks: Lesezeichen hinzufügen write:conversations: Unterhaltungen stummschalten und löschen write:favourites: Beiträge favorisieren write:filters: Filter erstellen write:follows: Profilen folgen write:lists: Listen erstellen - write:media: Mediendateien hochladen + write:media: Medieninhalte hochladen write:mutes: Profile und Unterhaltungen stummschalten - write:notifications: deine Benachrichtigungen leeren + write:notifications: deine Mitteilungen löschen write:reports: andere Profile melden write:statuses: Beiträge veröffentlichen diff --git a/config/locales/doorkeeper.el.yml b/config/locales/doorkeeper.el.yml index abb6ccd687..b275af3365 100644 --- a/config/locales/doorkeeper.el.yml +++ b/config/locales/doorkeeper.el.yml @@ -127,7 +127,6 @@ el: bookmarks: Σελιδοδείκτες conversations: Συνομιλίες crypto: Κρυπτογράφηση από άκρο σε άκρο - favourites: Αγαπημένα filters: Φίλτρα follow: Ακολουθείτε, σε Σίγαση και Αποκλεισμοί follows: Ακολουθείτε @@ -170,7 +169,6 @@ el: read:accounts: να βλέπει τα στοιχεία λογαριασμών read:blocks: να βλέπει τους αποκλεισμένους σου read:bookmarks: εμφάνιση των σελιδοδεικτών σας - read:favourites: να βλέπει τα αγαπημένα σου read:filters: να βλέπει τα φίλτρα σου read:follows: να βλέπει ποιους ακολουθείς read:lists: να βλέπει τις λίστες σου @@ -184,7 +182,6 @@ el: write:blocks: να μπλοκάρει λογαριασμούς και τομείς write:bookmarks: προσθήκη σελιδοδεικτών write:conversations: σίγαση και διαγραφή συνομιλιών - write:favourites: να σημειώνει δημοσιεύσεις ως αγαπημένες write:filters: να δημιουργεί φίλτρα write:follows: να ακολουθεί ανθρώπους write:lists: να δημιουργεί λίστες diff --git a/config/locales/doorkeeper.eo.yml b/config/locales/doorkeeper.eo.yml index 5a51edfaea..1c55cd0103 100644 --- a/config/locales/doorkeeper.eo.yml +++ b/config/locales/doorkeeper.eo.yml @@ -127,7 +127,6 @@ eo: bookmarks: Legosignoj conversations: Konversacioj crypto: Fin-al-fina ĉifrado - favourites: Preferaĵoj filters: Filtriloj follow: Abonadoj, silentigitaj kontoj kaj blokitaj kontoj follows: Sekvas @@ -170,7 +169,6 @@ eo: read:accounts: vidi la informojn de la kontoj read:blocks: vidi viajn blokadojn read:bookmarks: vidi viajn legosignojn - read:favourites: vidi viajn stelumojn read:filters: vidi viajn filtrilojn read:follows: vidi viajn sekvatojn read:lists: vidi viajn listojn @@ -184,7 +182,6 @@ eo: write:blocks: bloki kontojn kaj domajnojn write:bookmarks: aldoni mesaĝojn al la legosignoj write:conversations: mallautigi kaj forigi babiladojn - write:favourites: stelumi mesaĝojn write:filters: krei filtrilojn write:follows: sekvi homojn write:lists: krei listojn diff --git a/config/locales/doorkeeper.es-MX.yml b/config/locales/doorkeeper.es-MX.yml index f6b5e4c5dd..76f5eace7c 100644 --- a/config/locales/doorkeeper.es-MX.yml +++ b/config/locales/doorkeeper.es-MX.yml @@ -127,7 +127,6 @@ es-MX: bookmarks: Marcadores conversations: Conversaciones crypto: Cifrado de extremo a extremo - favourites: Favoritos filters: Filtros follow: Seguimientos, silenciados y bloqueos follows: Seguidos @@ -170,7 +169,6 @@ es-MX: read:accounts: ver información de cuentas read:blocks: ver a quién has bloqueado read:bookmarks: ver tus marcadores - read:favourites: ver tus favoritos read:filters: ver tus filtros read:follows: ver a quién sigues read:lists: ver tus listas @@ -184,7 +182,6 @@ es-MX: write:blocks: bloquear cuentas y dominios write:bookmarks: guardar estados como marcadores write:conversations: silenciar y eliminar conversaciones - write:favourites: toots favoritos write:filters: crear filtros write:follows: seguir usuarios write:lists: crear listas diff --git a/config/locales/doorkeeper.es.yml b/config/locales/doorkeeper.es.yml index dc9308e5f8..0a7382a245 100644 --- a/config/locales/doorkeeper.es.yml +++ b/config/locales/doorkeeper.es.yml @@ -127,7 +127,6 @@ es: bookmarks: Marcadores conversations: Conversaciones crypto: Cifrado de extremo a extremo - favourites: Favoritos filters: Filtros follow: Seguimientos, silenciados y bloqueos follows: Seguidos @@ -170,7 +169,6 @@ es: read:accounts: ver información de cuentas read:blocks: ver a quién has bloqueado read:bookmarks: ver tus marcadores - read:favourites: ver tus favoritos read:filters: ver tus filtros read:follows: ver a quién sigues read:lists: ver tus listas @@ -178,13 +176,12 @@ es: read:notifications: ver tus notificaciones read:reports: ver tus informes read:search: buscar en su nombre - read:statuses: ver todos los estados + read:statuses: ver todas las publicaciones write: publicar en tu nombre write:accounts: modifica tu perfil write:blocks: bloquear cuentas y dominios - write:bookmarks: guardar estados como marcadores + write:bookmarks: guardar publicaciones como marcadores write:conversations: silenciar y eliminar conversaciones - write:favourites: publicaciones favoritas write:filters: crear filtros write:follows: seguir usuarios write:lists: crear listas @@ -192,4 +189,4 @@ es: write:mutes: silenciar usuarios y conversaciones write:notifications: limpia tus notificaciones write:reports: reportar a otras personas - write:statuses: publicar estados + write:statuses: publicar mensajes diff --git a/config/locales/doorkeeper.et.yml b/config/locales/doorkeeper.et.yml index 0f8ddd2776..1843031706 100644 --- a/config/locales/doorkeeper.et.yml +++ b/config/locales/doorkeeper.et.yml @@ -170,7 +170,7 @@ et: read:accounts: näha konto informatsiooni read:blocks: näha su blokeeringuid read:bookmarks: näha järjehoidjaid - read:favourites: näha Teie lemmikuid + read:favourites: näha sinu lemmikuid read:filters: näha su filtreid read:follows: näha su jälgimisi read:lists: näha su nimekirju diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml index 8d2a9f3b67..dd77c466c7 100644 --- a/config/locales/doorkeeper.eu.yml +++ b/config/locales/doorkeeper.eu.yml @@ -127,7 +127,6 @@ eu: bookmarks: Laster-markak conversations: Elkarrizketak crypto: Muturretik-muturrerako zifraketa - favourites: Gogokoak filters: Iragazkiak follow: Jarraitzeak, mututzeak eta blokeatzeak follows: Jarraipenak @@ -170,7 +169,6 @@ eu: read:accounts: ikusi kontuaren informazioa read:blocks: ikusi zure blokeoak read:bookmarks: ikusi zure laster-markak - read:favourites: ikusi zure gogokoak read:filters: ikusi zure iragazkiak read:follows: ikusi zuk jarraitutakoak read:lists: ikusi zure zerrendak @@ -184,7 +182,6 @@ eu: write:blocks: kontuak eta domeinuak blokeatzea write:bookmarks: mezuen laster-marka write:conversations: mututu eta ezabatu elkarrizketak - write:favourites: gogoko mezuak write:filters: sortu iragazkiak write:follows: jarraitu jendea write:lists: sortu zerrendak diff --git a/config/locales/doorkeeper.fa.yml b/config/locales/doorkeeper.fa.yml index ea355821c6..0eb1479aa1 100644 --- a/config/locales/doorkeeper.fa.yml +++ b/config/locales/doorkeeper.fa.yml @@ -127,7 +127,6 @@ fa: bookmarks: نشانک‌ها conversations: گفت‌وگوها crypto: رمزگذاری سرتاسری - favourites: پسندیده‌ها filters: پالایه‌ها follow: پی‌گیری، خموشی و مسدودی‌ها follows: پی‌گرفتگان @@ -165,7 +164,6 @@ fa: read:accounts: دیدن اطّلاعات حساب read:blocks: دیدن مسدودهایتان read:bookmarks: دیدن نشانک‌هایتان - read:favourites: دیدن برگزیده‌هایتان read:filters: دیدن پالایه‌هایتان read:follows: دیدن پی‌گیری‌هایتان read:lists: دیدن سیاهه‌هایتان @@ -179,7 +177,6 @@ fa: write:blocks: انسداد حساب‌ها و دامنه‌ها write:bookmarks: نشانک‌گذاری وضعیت‌ها write:conversations: مکالمات را بی‌صدا و حذف کنید - write:favourites: برگزیدن وضعیت‌ها write:filters: ایحاد پالایش‌ها write:follows: پی‌گیری افراد write:lists: ایجاد سیاهه‌ها diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml index 00a23f3a09..71958c5b3d 100644 --- a/config/locales/doorkeeper.fi.yml +++ b/config/locales/doorkeeper.fi.yml @@ -170,7 +170,7 @@ fi: read:accounts: nähdä tilin tiedot read:blocks: katso lohkosi read:bookmarks: katso kirjanmerkkisi - read:favourites: katso suosikkisi + read:favourites: näytä suosikkisi read:filters: katso suodattimesi read:follows: katso ketä seuraat read:lists: katso listasi @@ -184,7 +184,7 @@ fi: write:blocks: estää tilit ja palvelimet write:bookmarks: kirjanmerkki viestit write:conversations: mykistä ja poistaa keskustelut - write:favourites: suosikki viestit + write:favourites: suosikkijulkaisut write:filters: luoda suodattimia write:follows: seurata ihmisiä write:lists: luoda listoja diff --git a/config/locales/doorkeeper.fo.yml b/config/locales/doorkeeper.fo.yml index e4c1a8b8a6..78f8701ae9 100644 --- a/config/locales/doorkeeper.fo.yml +++ b/config/locales/doorkeeper.fo.yml @@ -127,7 +127,7 @@ fo: bookmarks: Bókamerki conversations: Samrøður crypto: Enda-til-enda bronglan - favourites: Yndispostar + favourites: Dámdir postar filters: Filtur follow: Fylgingar, doyvingar og blokeringar follows: Fylgir @@ -170,7 +170,7 @@ fo: read:accounts: vís kontuupplýsingar read:blocks: síggja tínar blokeringar read:bookmarks: síggja tíni bókamerki - read:favourites: síggja tínar yndispostar + read:favourites: sí tínar dámdu postar read:filters: síggja tíni filtur read:follows: síggja hvørji tú fylgir read:lists: síggja tínar listar @@ -184,7 +184,7 @@ fo: write:blocks: blokera kontur og domenir write:bookmarks: bókamerkja postar write:conversations: doyva og strika samrøður - write:favourites: yndismerkja postar + write:favourites: dáma postar write:filters: gera filtur write:follows: fylgja fólki write:lists: gera listar diff --git a/config/locales/doorkeeper.fr-QC.yml b/config/locales/doorkeeper.fr-QC.yml index 6cccf48471..043b4a6cda 100644 --- a/config/locales/doorkeeper.fr-QC.yml +++ b/config/locales/doorkeeper.fr-QC.yml @@ -184,7 +184,7 @@ fr-QC: write:blocks: bloquer des comptes et des domaines write:bookmarks: mettre des messages en marque-pages write:conversations: masquer et effacer les conversations - write:favourites: mettre des messages en favori + write:favourites: publications favorites write:filters: créer des filtres write:follows: suivre des personnes write:lists: créer des listes diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml index d777c925a3..2c37b651a7 100644 --- a/config/locales/doorkeeper.fr.yml +++ b/config/locales/doorkeeper.fr.yml @@ -184,7 +184,7 @@ fr: write:blocks: bloquer des comptes et des domaines write:bookmarks: mettre des messages en marque-pages write:conversations: masquer et effacer les conversations - write:favourites: mettre des messages en favori + write:favourites: messages favoris write:filters: créer des filtres write:follows: suivre des personnes write:lists: créer des listes diff --git a/config/locales/doorkeeper.fy.yml b/config/locales/doorkeeper.fy.yml index 9dd37e62cc..1d985caa71 100644 --- a/config/locales/doorkeeper.fy.yml +++ b/config/locales/doorkeeper.fy.yml @@ -127,7 +127,6 @@ fy: bookmarks: Blêdwizers conversations: Petearen crypto: End-to-end-fersifering - favourites: Favoriten filters: Filters follow: Folgers, negearre en blokkearre brûkers follows: Folgjend @@ -170,7 +169,6 @@ fy: read:accounts: accountynformaasje besjen read:blocks: dyn blokkearre brûkers besjen read:bookmarks: dyn blêdwizers besjen - read:favourites: jo favoriten besjen read:filters: dyn filters besjen read:follows: de accounts dy’tsto folgest besjen read:lists: dyn listen besjen @@ -184,7 +182,6 @@ fy: write:blocks: accounts en domeinen blokkearje write:bookmarks: berjochten oan blêdwizers tafoegje write:conversations: petearen negearre en fuortsmite - write:favourites: berjochten as favoryt markearje write:filters: filters oanmeitsje write:follows: minsken folgje write:lists: listen oanmeitsje diff --git a/config/locales/doorkeeper.ga.yml b/config/locales/doorkeeper.ga.yml index 9bd0d29128..a263a6b15d 100644 --- a/config/locales/doorkeeper.ga.yml +++ b/config/locales/doorkeeper.ga.yml @@ -40,7 +40,6 @@ ga: accounts: Cuntais bookmarks: Leabharmharcanna conversations: Comhráite - favourites: Toghanna filters: Scagairí follows: Cuntais leanta lists: Liostaí diff --git a/config/locales/doorkeeper.gd.yml b/config/locales/doorkeeper.gd.yml index f025a0c555..2541fce889 100644 --- a/config/locales/doorkeeper.gd.yml +++ b/config/locales/doorkeeper.gd.yml @@ -127,7 +127,6 @@ gd: bookmarks: Comharran-lìn conversations: Còmhraidhean crypto: Crioptachadh o cheann gu ceann - favourites: Annsachdan filters: Criathragan follow: Leantainn, mùchaidhean is bacaidhean follows: Leantainn @@ -170,7 +169,6 @@ gd: read:accounts: fiosrachadh nan cunntasan fhaicinn read:blocks: na bacaidhean agad fhaicinn read:bookmarks: na comharran-lìn agad fhaicinn - read:favourites: na h-annsachdan agad fhaicinn read:filters: na criathragan agad fhaicinn read:follows: faicinn cò a tha thu a’ leantainn read:lists: na liostaichean agad fhaicinn @@ -184,7 +182,6 @@ gd: write:blocks: cunntasan is àrainnean a bhacadh write:bookmarks: comharran-lìn a dhèanamh de phostaichean write:conversations: còmhraidhean a mhùchadh is a sguabadh às - write:favourites: postaichean a chur ris na h-annsachdan write:filters: criathragan a chruthachadh write:follows: leantainn dhaoine write:lists: liostaichean a chruthachadh diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml index 1d75beef5a..4559dcbd31 100644 --- a/config/locales/doorkeeper.hu.yml +++ b/config/locales/doorkeeper.hu.yml @@ -25,15 +25,15 @@ hu: edit: Szerkesztés submit: Elküldés confirmations: - destroy: Biztos így legyen? + destroy: Biztos vagy benne? edit: title: Alkalmazás szerkesztése form: - error: Hoppá! Ellenőrizük az űrlapot az esetleges hibák miatt + error: Hoppá! Ellenőrizd az űrlapot az esetleges hibák miatt help: native_redirect_uri: "%{native_redirect_uri} használata a helyi tesztekhez" redirect_uri: Egy sor URI-nként - scopes: A hatóköröket szóközzel válasszuk el. Hagyjuk üresen az alapértelmezett hatókörökhöz. + scopes: A hatóköröket szóközzel válaszd el. Hagyd üresen az alapértelmezett hatókörök használatához. index: application: Alkalmazás callback_url: Visszahívási URL @@ -43,12 +43,12 @@ hu: new: Új alkalmazás scopes: Hatókörök show: Megjelenítés - title: Saját alkalmazások + title: Alkalmazásaid new: title: Új alkalmazás show: actions: Műveletek - application_id: Ügyfél kulcs + application_id: Ügyfélkulcs callback_urls: Visszahívási URL-ek scopes: Hatáskörök secret: Ügyfél titkos kulcs @@ -60,7 +60,7 @@ hu: error: title: Hiba történt new: - prompt_html: "%{client_name} szeretné elérni a fiókomat. Ez egy harmadik féltől származó alkalmazás. Ha nem bízunk meg benne, ne adjunk hitlesítést." + prompt_html: "%{client_name} szeretné elérni a fiókodat. Ez egy harmadik féltől származó alkalmazás. Ha nem bízol meg benne, ne addj felhatalmazást neki." review_permissions: Jogosultságok áttekintése title: Hitelesítés szükséges show: @@ -69,7 +69,7 @@ hu: buttons: revoke: Visszavonás confirmations: - revoke: Biztos így legyen? + revoke: Biztos vagy benne? index: authorized_at: 'Hitelesítés: %{date}' description_html: Ezek olyan alkalmazások, melyek API-n keresztül érhetik el a fiókodat. Ha vannak itt olyanok, melyeket nem ismersz fel, vagy valamelyik alkalmazás rosszul működik, visszavonhatod az engedélyét. @@ -77,7 +77,7 @@ hu: never_used: Soha sem volt használva scopes: Jogosultságok superapp: Belső - title: Hitelesített saját alkalmazások + title: Hitelesített alkalmazásaid errors: messages: access_denied: Az erőforrás tulajdonosa vagy az engedélyező kiszolgáló elutasította a kérést. @@ -92,10 +92,10 @@ hu: invalid_resource_owner: A biztosított erőforrás tulajdonosának hitelesítő adatai nem valósak, vagy az erőforrás tulajdonosa nem található. invalid_scope: A kért nézet érvénytelen, ismeretlen, vagy hibás. invalid_token: - expired: A hozzáférési kulcs lejárt. - revoked: A hozzáférési kulcsot visszavonták. - unknown: A hozzáférési kulcs érvénytelen. - resource_owner_authenticator_not_configured: Az erőforrás tulajdonos keresés megszakadt, ugyanis a Doorkeeper.configure.resource_owner_authenticator beállítatlan. + expired: A hozzáférési kulcs lejárt + revoked: A hozzáférési kulcsot visszavonták + unknown: A hozzáférési kulcs érvénytelen + resource_owner_authenticator_not_configured: Az erőforrás-tulajdonos keresése megszakadt, ugyanis a Doorkeeper.configure.resource_owner_authenticator nem lett beállítva. server_error: Az engedélyező kiszolgáló váratlan körülménybe ütközött, ami megakadályozta, hogy teljesítse a kérést. temporarily_unavailable: Az engedélyezési kiszolgáló jelenleg nem tudja kezelni a kérelmet a kiszolgáló ideiglenes túlterhelése vagy karbantartása miatt. unauthorized_client: A kliens nincs feljogosítva erre a kérésre. @@ -104,7 +104,7 @@ hu: flash: applications: create: - notice: Az alkalmazás létrejött. + notice: Az alkalmazás létrehozva. destroy: notice: Az alkalmazás törlésre került. update: @@ -122,7 +122,7 @@ hu: admin/accounts: Fiókok adminisztrációja admin/all: Minden adminisztratív funkció admin/reports: Bejelentések adminisztrációja - all: Teljes hozzáférés a Mastodon saját fiókhoz + all: Teljes hozzáférés a Mastodon fiókodhoz blocks: Letiltások bookmarks: Könyvjelzők conversations: Beszélgetések @@ -164,12 +164,12 @@ hu: admin:write:ip_blocks: moderáció végrehajtása IP-blokkokon admin:write:reports: moderációs műveletek végzése bejelentéseken crypto: végpontok közti titkosítás használata - follow: fiókok kapcsolatok módosítása + follow: fiókkapcsolatok módosítása push: push értesítések fogadása read: saját fiók adatainak olvasása read:accounts: fiók adatainak megtekintése read:blocks: letiltások megtekintése - read:bookmarks: könyvjelzőik megtekintése + read:bookmarks: könyvjelzőid megtekintése read:favourites: kedvencek megtekintése read:filters: szűrök megtekintése read:follows: követések megtekintése @@ -177,10 +177,10 @@ hu: read:mutes: némítások megtekintése read:notifications: értesítések megtekintése read:reports: bejelentések megtekintése - read:search: keresés saját nevemben + read:search: keresés a saját nevedben read:statuses: bejegyzések megtekintése write: fiókod adatainak megváltoztatása - write:accounts: saját profil megváltoztatása + write:accounts: saját profilod megváltoztatása write:blocks: fiókok és domainek letiltása write:bookmarks: bejegyzések könyvjelzőzése write:conversations: beszélgetések némítása és törlése diff --git a/config/locales/doorkeeper.hy.yml b/config/locales/doorkeeper.hy.yml index 6548d1e5e9..39ffc9898c 100644 --- a/config/locales/doorkeeper.hy.yml +++ b/config/locales/doorkeeper.hy.yml @@ -145,7 +145,7 @@ hy: read:accounts: տեսնել հաշիւների ինֆորմացիան read:blocks: տեսնել արգելափակումները read:bookmarks: տեսնել էջանիշները - read:favourites: տեսնել հաւանումները + read:favourites: տես քո հաւանածները read:filters: տեսնել ֆիլտրերը read:follows: տեսնել հետեւորդներին read:lists: տեսնել ցանկերը @@ -158,7 +158,6 @@ hy: write:accounts: փոփոխել հաշիւը write:blocks: արգելափակել հաշիւները եւ դոմէյնները write:bookmarks: էջանշել գրառումները - write:favourites: հաւանել գրառումները write:filters: "'ստեղծել ֆիլտրեր" write:follows: հետեւել մարդկանց write:lists: ստեղծել ցանկեր diff --git a/config/locales/doorkeeper.id.yml b/config/locales/doorkeeper.id.yml index 55bda04fec..3f9a409c21 100644 --- a/config/locales/doorkeeper.id.yml +++ b/config/locales/doorkeeper.id.yml @@ -126,7 +126,6 @@ id: bookmarks: Markah conversations: Percakapan crypto: Enkripsi end-to-end - favourites: Favorit filters: Saringan follows: Mengikuti lists: Daftar @@ -165,7 +164,6 @@ id: read:accounts: lihat informasi akun read:blocks: lihat blokiran Anda read:bookmarks: lihat markah Anda - read:favourites: lihat favorit Anda read:filters: lihat saringan Anda read:follows: lihat yang Anda ikuti read:lists: lihat daftar Anda @@ -179,7 +177,6 @@ id: write:blocks: blokir akun dan domain write:bookmarks: status markah write:conversations: bisukan dan hapus percakapan - write:favourites: status favorit write:filters: buat saringan write:follows: ikuti orang write:lists: buat daftar diff --git a/config/locales/doorkeeper.io.yml b/config/locales/doorkeeper.io.yml index df56335f84..84275bea1d 100644 --- a/config/locales/doorkeeper.io.yml +++ b/config/locales/doorkeeper.io.yml @@ -126,7 +126,6 @@ io: bookmarks: Libromarki conversations: Konversi crypto: Intersequanta chifro - favourites: Favorati filters: Filtrili follows: Sequati lists: Listi @@ -158,7 +157,6 @@ io: read:accounts: videz kontinformo read:blocks: videz restrikti read:bookmarks: videz vua libromarki - read:favourites: videz vua favorati read:filters: videz vua filtrili read:follows: videz vua sequinti read:lists: videz vua listi @@ -172,7 +170,6 @@ io: write:blocks: restriktez konti e domeni write:bookmarks: libromarkez posti write:conversations: silencigez e efacez konversi - write:favourites: favorata posti write:filters: kreez filtrili write:follows: sequez personi write:lists: kreez listi diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml index 31e09a6af3..3fd998fc4a 100644 --- a/config/locales/doorkeeper.it.yml +++ b/config/locales/doorkeeper.it.yml @@ -170,7 +170,7 @@ it: read:accounts: visualizzare le informazioni sui profili read:blocks: visualizzare i tuoi blocchi read:bookmarks: visualizzare i tuoi segnalibri - read:favourites: visualizzare i tuoi preferiti + read:favourites: vedi i tuoi preferiti read:filters: visualizzare i tuoi filtri read:follows: visualizzare i tuoi seguiti read:lists: visualizzare i tuoi elenchi @@ -184,7 +184,7 @@ it: write:blocks: bloccare profili e domini write:bookmarks: aggiungere post tra i segnalibri write:conversations: silenziare ed eliminare conversazioni - write:favourites: salvare post tra i preferiti + write:favourites: post preferiti write:filters: creare filtri write:follows: seguire persone write:lists: creare elenchi diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml index 0e52e1f09d..62f2a3eb0a 100644 --- a/config/locales/doorkeeper.ja.yml +++ b/config/locales/doorkeeper.ja.yml @@ -184,7 +184,7 @@ ja: write:blocks: ユーザーのブロックやドメインの非表示 write:bookmarks: 投稿のブックマーク登録 write:conversations: 会話のミュートと削除 - write:favourites: 投稿のお気に入り登録 + write:favourites: お気に入りの投稿 write:filters: フィルターの変更 write:follows: あなたの代わりにフォロー、アンフォロー write:lists: リストの変更 diff --git a/config/locales/doorkeeper.ka.yml b/config/locales/doorkeeper.ka.yml index 36df811f1f..4c692cf517 100644 --- a/config/locales/doorkeeper.ka.yml +++ b/config/locales/doorkeeper.ka.yml @@ -112,7 +112,6 @@ ka: read: წაიკითხოს მთელი თქვენი ანგარიშის მონაცემები read:accounts: იხილოს ანგარიშის ინფორმაცია read:blocks: იხილოს თქვენი ბლოკები - read:favourites: იხილოს თქვენი ფავორიტები read:filters: იხილოს თქვენი ფილრები read:follows: იხილოს თქვენი მიდევნებები read:lists: იხილოს თქვენი სიები @@ -124,7 +123,6 @@ ka: write: შეცვალოს მთელი თქვენი ანგარიშის მონაცემები write:accounts: შეცვალოს თქვენი პროფილი write:blocks: დაბლოკოს ანგარიშები და დომენები - write:favourites: ფავორიტი სტატუსები write:filters: შექმნას ფილტრები write:follows: გაყვეს ხალხს write:lists: შექმნას სიები diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml index ba1d7057a1..fe1a8d9c50 100644 --- a/config/locales/doorkeeper.kab.yml +++ b/config/locales/doorkeeper.kab.yml @@ -84,7 +84,6 @@ kab: accounts: Imiḍanen admin/accounts: Tadbelt n imiḍan crypto: Awgelhen seg yixef ɣer yixef - favourites: Ismenyifen filters: Imzizdigen lists: Tibdarin notifications: Tilɣa @@ -107,7 +106,6 @@ kab: read:accounts: ẓer isallen n yimiḍanen read:blocks: ẓer imiḍanen i tesḥebseḍ read:bookmarks: ẓer ticraḍ-ik - read:favourites: ẓer ismenyifen-ik read:filters: ẓer imsizedgen-ik read:follows: ẓer imeḍfaṛen-ik read:lists: ẓer tibdarin-ik·im diff --git a/config/locales/doorkeeper.kk.yml b/config/locales/doorkeeper.kk.yml index daaa3a9ebf..a9668180c0 100644 --- a/config/locales/doorkeeper.kk.yml +++ b/config/locales/doorkeeper.kk.yml @@ -120,7 +120,6 @@ kk: read:accounts: see accounts infоrmation read:blocks: see your blоcks read:bookmarks: белгілегендерді қарау - read:favourites: see your favоurites read:filters: see yоur filters read:follows: see your follоws read:lists: see yоur lists @@ -133,7 +132,6 @@ kk: write:accounts: modify your prоfile write:blocks: block accounts and dоmains write:bookmarks: белгілер статусы - write:favourites: favourite stаtuses write:filters: creаte filters write:follows: follow peоple write:lists: creatе lists diff --git a/config/locales/doorkeeper.ku.yml b/config/locales/doorkeeper.ku.yml index bc4dace468..e3438eb5de 100644 --- a/config/locales/doorkeeper.ku.yml +++ b/config/locales/doorkeeper.ku.yml @@ -127,7 +127,6 @@ ku: bookmarks: Şûnpel conversations: Axaftin crypto: Dawî bi dawî şifrekirî - favourites: Bijarte filters: Parzûn follow: Şopîner, bêdengkirin û astengkirin follows: Dişopîne @@ -170,7 +169,6 @@ ku: read:accounts: zanyariyên ajimêran bibîne read:blocks: ajimêran ku te astenkiriye bibîne read:bookmarks: şûnpelên xwe bibîne - read:favourites: bijarteyên xwe bibîne read:filters: parzûnûn xwe bibîne read:follows: ên tu dişopînî bibîne read:lists: lîsteyên xwe bibîne @@ -184,7 +182,6 @@ ku: write:blocks: ajimêr û navperan asteng bike write:bookmarks: şandiyan di şûnpelê de tomar bike write:conversations: bêdengkirin û jêbirina axaftinan - write:favourites: şandiyên bijarte write:filters: parzûnan çê bike write:follows: kesan bişopîne write:lists: lîsteyan biafirîne diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml index 08d7a0d644..01ec9b9db7 100644 --- a/config/locales/doorkeeper.lv.yml +++ b/config/locales/doorkeeper.lv.yml @@ -127,7 +127,6 @@ lv: bookmarks: Grāmatzīmes conversations: Sarunas crypto: Pilnīga šifrēšana - favourites: Izlases filters: Filtri follow: Seko, Izslēdz un Bloķē follows: Seko @@ -170,7 +169,6 @@ lv: read:accounts: apskatīt kontu informāciju read:blocks: apskatīt savus blokus read:bookmarks: apskatīt savas grāmatzīmes - read:favourites: apskatīt savu izlasi read:filters: apskatīt savus filtrus read:follows: apskatīt savus sekotājus read:lists: apskatīt savus sarakstus @@ -184,7 +182,6 @@ lv: write:blocks: bloķēt kontus un domēnus write:bookmarks: pievienotās grāmatzīmes write:conversations: apklusināt un dzēst sarunas - write:favourites: iecienītākās ziņas write:filters: izveidot filtrus write:follows: seko cilvēkiem write:lists: izveido sarakstus diff --git a/config/locales/doorkeeper.ms.yml b/config/locales/doorkeeper.ms.yml index b84bde805f..c8d3043298 100644 --- a/config/locales/doorkeeper.ms.yml +++ b/config/locales/doorkeeper.ms.yml @@ -48,5 +48,4 @@ ms: admin:write: mengubah semua data pada pelayan read:statuses: lihat semua hantaran write:bookmarks: menandabuku hantaran - write:favourites: hantaran kegemaran write:statuses: terbitkan hantaran diff --git a/config/locales/doorkeeper.my.yml b/config/locales/doorkeeper.my.yml index 241dcb6914..bce6039eae 100644 --- a/config/locales/doorkeeper.my.yml +++ b/config/locales/doorkeeper.my.yml @@ -127,7 +127,7 @@ my: bookmarks: မှတ်ထားသည်များ conversations: စကားဝိုင်းများ crypto: ပေးပို့သူနှင့် ရရှိသူများသာသိနိုင်သော လုံခြုံမှုနည်းလမ်း - favourites: အကြိုက်ဆုံးများ + favourites: Favorites filters: စစ်ထုတ်ထားခြင်းများ follow: စောင့်ကြည့်ခြင်း၊ အသံပိတ်ခြင်းနှင့် ပိတ်ပင်ခြင်းများ follows: စောင့်ကြည့်မယ် @@ -170,7 +170,7 @@ my: read:accounts: အကောင့်အချက်အလက်များကို ကြည့်ပါ read:blocks: သင် ပိတ်ပင်ထားသည်များကို ကြည့်ပါ read:bookmarks: သင် မှတ်ထားသည်များကို ကြည့်ပါ - read:favourites: သင့်အကြိုက်ဆုံးများကို ကြည့်ပါ + read:favourites: favorites များကို ကြည့်ပါ read:filters: သင် စစ်ထုတ်ထားမှုများကို ကြည့်ပါ read:follows: သင့်အားစောင့်ကြည့်နေသူများကို ကြည့်ပါ read:lists: သင့်စာရင်းများကို ကြည့်ပါ @@ -184,7 +184,7 @@ my: write:blocks: အကောင့်များနှင့် ဒိုမိန်းများကို ပိတ်ပင်ပါ write:bookmarks: မှတ်ထားသောပို့စ်များ write:conversations: စကားဝိုင်းများကို အသံပိတ်ပြီး ဖျက်ပါ - write:favourites: အကြိုက်ဆုံးပို့စ်များ + write:favourites: favorite ပို့စ်များ write:filters: စစ်ထုတ်ခြင်းအား ဖန်တီးပါ write:follows: စောင့်ကြည့်ရန် write:lists: စာရင်းများ ဖန်တီးရန် diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml index f9e90e7957..65e2bfcb7a 100644 --- a/config/locales/doorkeeper.nl.yml +++ b/config/locales/doorkeeper.nl.yml @@ -170,7 +170,7 @@ nl: read:accounts: informatie accounts bekijken read:blocks: jouw geblokkeerde gebruikers bekijken read:bookmarks: jouw bladwijzers bekijken - read:favourites: jouw favorieten bekijken + read:favourites: je favorieten tonen read:filters: jouw filters bekijken read:follows: de accounts die jij volgt bekijken read:lists: jouw lijsten bekijken @@ -184,7 +184,7 @@ nl: write:blocks: accounts en domeinen blokkeren write:bookmarks: berichten aan bladwijzers toevoegen write:conversations: gespreken negeren en verwijderen - write:favourites: berichten als favoriet markeren + write:favourites: favoriete berichten write:filters: filters aanmaken write:follows: mensen volgen write:lists: lijsten aanmaken diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml index 0582b53f8a..594b6e27b0 100644 --- a/config/locales/doorkeeper.nn.yml +++ b/config/locales/doorkeeper.nn.yml @@ -127,7 +127,6 @@ nn: bookmarks: Bokmerke conversations: Samtalar crypto: Ende-til-ende-kryptering - favourites: Favorittar filters: Filter follow: Dei du fylgjer, målbind og blokkerer follows: Fylgjer @@ -170,7 +169,6 @@ nn: read:accounts: sjå informasjon om kontoar read:blocks: sjå dine blokkeringar read:bookmarks: sjå bokmerka dine - read:favourites: sjå favorittane dine read:filters: sjå filtera dine read:follows: sjå fylgjarane dine read:lists: sjå listene dine @@ -184,7 +182,6 @@ nn: write:blocks: blokker kontoar og domene write:bookmarks: bokmerk innlegg write:conversations: målbind og slett samtalar - write:favourites: merk innlegg som favoritt write:filters: lag filter write:follows: fylg folk write:lists: lag lister diff --git a/config/locales/doorkeeper.no.yml b/config/locales/doorkeeper.no.yml index c432f6645c..ed0c6da108 100644 --- a/config/locales/doorkeeper.no.yml +++ b/config/locales/doorkeeper.no.yml @@ -127,7 +127,6 @@ bookmarks: Bokmerker conversations: Samtaler crypto: Ende-til-ende-kryptering - favourites: Favoritter filters: Filtre follow: Hvem du følger, demper og blokkerer follows: Følger @@ -170,7 +169,6 @@ read:accounts: se informasjon om kontoer read:blocks: se blokkeringene dine read:bookmarks: se bokmerkene dine - read:favourites: se favorittene dine read:filters: se filtrene dine read:follows: se hvem du følger read:lists: se listene dine @@ -184,7 +182,6 @@ write:blocks: blokkere kontoer og domener write:bookmarks: bokmerke innlegg write:conversations: dempe og slette samtaler - write:favourites: favorittmarker innlegg write:filters: opprette filtre write:follows: følge personer write:lists: opprette lister diff --git a/config/locales/doorkeeper.oc.yml b/config/locales/doorkeeper.oc.yml index 84935d49ba..64bc3a43e2 100644 --- a/config/locales/doorkeeper.oc.yml +++ b/config/locales/doorkeeper.oc.yml @@ -127,7 +127,6 @@ oc: bookmarks: Marcadors conversations: Conversacions crypto: Chiframent del cap a la fin - favourites: Favorits filters: Filtres follow: Seguidors, Silenciats e blocats follows: Abonaments @@ -165,7 +164,6 @@ oc: read:accounts: veire las informacions del compte read:blocks: veire vòstres blocatges read:bookmarks: veire vòstres marcadors - read:favourites: veire vòstres favorits read:filters: veire vòstres filtres read:follows: veire vòstres abonaments read:lists: veire vòstras listas @@ -179,7 +177,6 @@ oc: write:blocks: blocar de comptes e de domenis write:bookmarks: ajustar als marcadors write:conversations: amudir e suprimir las conversacions - write:favourites: metre en favorit write:filters: crear de filtres write:follows: sègre de mond write:lists: crear de listas diff --git a/config/locales/doorkeeper.pl.yml b/config/locales/doorkeeper.pl.yml index 1891ada150..226c0d403c 100644 --- a/config/locales/doorkeeper.pl.yml +++ b/config/locales/doorkeeper.pl.yml @@ -184,7 +184,7 @@ pl: write:blocks: możliwość blokowania domen i użytkowników write:bookmarks: możliwość dodawania wpisów do zakładek write:conversations: wycisz i usuń konwersacje - write:favourites: możliwość dodawnia wpisów do ulubionych + write:favourites: polubianie wpisów write:filters: możliwość tworzenia filtrów write:follows: możliwość obserwowania ludzi write:lists: możliwość tworzenia list diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml index 6b64badf7a..070926e312 100644 --- a/config/locales/doorkeeper.pt-BR.yml +++ b/config/locales/doorkeeper.pt-BR.yml @@ -127,7 +127,6 @@ pt-BR: bookmarks: Salvos conversations: Conversas crypto: Criptografia de ponta a ponta - favourites: Favoritos filters: Filtros follow: Seguidores, Silenciados e Bloqueados follows: Seguidores @@ -170,7 +169,6 @@ pt-BR: read:accounts: ver informações das contas read:blocks: ver seus bloqueados read:bookmarks: ver seus salvos - read:favourites: ver seus favoritos read:filters: ver seus filtros read:follows: ver quem você segue read:lists: ver suas listas @@ -184,7 +182,6 @@ pt-BR: write:blocks: bloquear contas e domínios write:bookmarks: salvar toots write:conversations: silenciar e excluir conversas - write:favourites: favoritar toots write:filters: criar filtros write:follows: seguir pessoas write:lists: criar listas diff --git a/config/locales/doorkeeper.pt-PT.yml b/config/locales/doorkeeper.pt-PT.yml index 2dee34bd9a..31f6e46278 100644 --- a/config/locales/doorkeeper.pt-PT.yml +++ b/config/locales/doorkeeper.pt-PT.yml @@ -184,7 +184,7 @@ pt-PT: write:blocks: bloquear contas e domínios write:bookmarks: estado dos favoritos write:conversations: silenciar e eliminar conversas - write:favourites: estado dos favoritos + write:favourites: assinalar como favoritas write:filters: criar filtros write:follows: seguir pessoas write:lists: criar listas diff --git a/config/locales/doorkeeper.ro.yml b/config/locales/doorkeeper.ro.yml index 59e67aeb24..2315e0f60b 100644 --- a/config/locales/doorkeeper.ro.yml +++ b/config/locales/doorkeeper.ro.yml @@ -126,7 +126,6 @@ ro: bookmarks: Marcaje conversations: Conversații crypto: Criptare în ambele părți - favourites: Favorite filters: Filtre follows: Urmăriri lists: Liste @@ -158,7 +157,6 @@ ro: read:accounts: vede informațiile privind conturile read:blocks: vede blocurile tale read:bookmarks: vede marcajele tale - read:favourites: vede favoritele tale read:filters: vede filtrele tale read:follows: vede urmăririle tale read:lists: vede listele tale @@ -172,7 +170,6 @@ ro: write:blocks: blochează conturile și domeniile write:bookmarks: marchează stările write:conversations: dezactivează și șterge conversațiile - write:favourites: favorizează stările write:filters: creează filtre write:follows: urmărește persoane write:lists: creează liste diff --git a/config/locales/doorkeeper.ru.yml b/config/locales/doorkeeper.ru.yml index d8262dae98..ce8392cb11 100644 --- a/config/locales/doorkeeper.ru.yml +++ b/config/locales/doorkeeper.ru.yml @@ -127,7 +127,7 @@ ru: bookmarks: Закладки conversations: Диалоги crypto: Сквозное шифрование - favourites: Избранное + favourites: Избранные filters: Фильтры follow: Подписки, заглушенные и заблокированные follows: Подписки @@ -184,7 +184,7 @@ ru: write:blocks: блокировать учётные записи и домены write:bookmarks: добавлять посты в закладки write:conversations: игнорировать и удалить разговоры - write:favourites: отмечать посты как избранные + write:favourites: добавить посты в избранное write:filters: создавать фильтры write:follows: подписываться на людей write:lists: создавать списки diff --git a/config/locales/doorkeeper.sc.yml b/config/locales/doorkeeper.sc.yml index 7631d2cc16..1f1d38f3a9 100644 --- a/config/locales/doorkeeper.sc.yml +++ b/config/locales/doorkeeper.sc.yml @@ -124,7 +124,6 @@ sc: read:accounts: bìdere is informatziones in su contu read:blocks: bìdere is blocos tuos read:bookmarks: bìdere is sinnalibros tuos - read:favourites: bìdere is preferidos tuos read:filters: bìdere is filtros tuos read:follows: bìdere is sighiduras tuas read:lists: bìdere is listas tuas @@ -137,7 +136,6 @@ sc: write:accounts: modificare su profilu tuo write:blocks: blocare contos e domìnios write:bookmarks: agiùnghere is istados a is sinnalibros - write:favourites: pone istados in is preferidos write:filters: creare filtros write:follows: sighire persones write:lists: creare listas diff --git a/config/locales/doorkeeper.sco.yml b/config/locales/doorkeeper.sco.yml index 8b6ac83557..70341c3c69 100644 --- a/config/locales/doorkeeper.sco.yml +++ b/config/locales/doorkeeper.sco.yml @@ -126,7 +126,6 @@ sco: bookmarks: Buikmairks conversations: Conversations crypto: En-tae-en encryption - favourites: Favourites filters: Filters follows: Follaes lists: Lists @@ -158,7 +157,6 @@ sco: read:accounts: see accoonts information read:blocks: see yer dingies read:bookmarks: see yer buikmairks - read:favourites: see yer favourites read:filters: see yer filters read:follows: see yer follaes read:lists: see yer lists @@ -172,7 +170,6 @@ sco: write:blocks: dingie accoonts an domains write:bookmarks: buikmairk posts write:conversations: wheesht an delete conversations - write:favourites: favourite posts write:filters: mak filters write:follows: follae fowk write:lists: mak lists diff --git a/config/locales/doorkeeper.si.yml b/config/locales/doorkeeper.si.yml index 3f5fcd5c03..2307f63c0a 100644 --- a/config/locales/doorkeeper.si.yml +++ b/config/locales/doorkeeper.si.yml @@ -126,7 +126,6 @@ si: bookmarks: පිටු සලකුණු conversations: සංවාද crypto: අන්ත සංකේතනය - favourites: ප්රියතම filters: පෙරහන් follows: පහත සඳහන් lists: ලැයිස්තු @@ -158,7 +157,6 @@ si: read:accounts: ගිණුම් තොරතුරු බලන්න read:blocks: ඔබගේ වාරණ බලන්න read:bookmarks: ඔබගේ පිටු සලකුණු බලන්න - read:favourites: ඔබේ ප්රියතම බලන්න read:filters: ඔබගේ පෙරහන් බලන්න read:follows: ඔබගේ පහත සඳහන් බලන්න read:lists: ඔබගේ ලැයිස්තු බලන්න @@ -172,7 +170,6 @@ si: write:blocks: ගිණුම් සහ වසම් අවහිර කරන්න write:bookmarks: පිටු සලකුණු සටහන් write:conversations: සංවාද නිහඬ කිරීම සහ මකා දැමීම - write:favourites: ප්‍රියතම ලිපි write:filters: පෙරහන් කරන්න write:follows: මිනිසුන් අනුගමනය කරන්න write:lists: ලැයිස්තු සාදන්න diff --git a/config/locales/doorkeeper.sk.yml b/config/locales/doorkeeper.sk.yml index ed85ab1c9d..acfd59b3e7 100644 --- a/config/locales/doorkeeper.sk.yml +++ b/config/locales/doorkeeper.sk.yml @@ -159,7 +159,6 @@ sk: read:accounts: prezri si informácie o účte read:blocks: prezri svoje bloky read:bookmarks: pozri svoje záložky - read:favourites: prezri svoje obľúbené read:filters: prezri svoje filtrovanie read:follows: prezri si svoje sledovania read:lists: prezri si svoje zoznamy diff --git a/config/locales/doorkeeper.sq.yml b/config/locales/doorkeeper.sq.yml index afa91bc870..b17b799e42 100644 --- a/config/locales/doorkeeper.sq.yml +++ b/config/locales/doorkeeper.sq.yml @@ -127,7 +127,6 @@ sq: bookmarks: Faqerojtës conversations: Biseda crypto: Fshehtëzim skaj-më-skaj - favourites: Të parapëlqyer filters: Filtra follow: Ndjekje, Heshtime dhe Bllokime follows: Ndjekje @@ -170,7 +169,6 @@ sq: read:accounts: të shohë hollësi llogarish read:blocks: të shohë blloqet tuaja read:bookmarks: të shohë faqerojtësit tuaj - read:favourites: të shohë të parapëlqyerit tuaj read:filters: të shohë filtrat tuaj read:follows: të shohë ndjekësit tuaj read:lists: të shohë listat tuaja @@ -184,7 +182,6 @@ sq: write:blocks: të bllokojë llogari dhe përkatësi write:bookmarks: të faqeruajë gjendje write:conversations: heshtoni dhe fshini biseda - write:favourites: të parapëlqejë gjendje write:filters: të krijojë filtra write:follows: të ndjekë persona write:lists: të krijojë lista diff --git a/config/locales/doorkeeper.sr-Latn.yml b/config/locales/doorkeeper.sr-Latn.yml index 3dca04d0a4..a4eb7bd33e 100644 --- a/config/locales/doorkeeper.sr-Latn.yml +++ b/config/locales/doorkeeper.sr-Latn.yml @@ -127,7 +127,7 @@ sr-Latn: bookmarks: Obeleživači conversations: Razgovori crypto: End-to-end enkripcija - favourites: Omiljeni + favourites: Omiljeno filters: Filteri follow: Praćenja, ignorisanja i blokiranja follows: Praćeni diff --git a/config/locales/doorkeeper.sr.yml b/config/locales/doorkeeper.sr.yml index 00287543f3..a0439d6060 100644 --- a/config/locales/doorkeeper.sr.yml +++ b/config/locales/doorkeeper.sr.yml @@ -127,7 +127,7 @@ sr: bookmarks: Обележивачи conversations: Разговори crypto: End-to-end енкрипција - favourites: Омиљени + favourites: Омиљено filters: Филтери follow: Праћења, игнорисања и блокирања follows: Праћени diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml index b6c4998967..4014397dc3 100644 --- a/config/locales/doorkeeper.sv.yml +++ b/config/locales/doorkeeper.sv.yml @@ -127,7 +127,6 @@ sv: bookmarks: Bokmärken conversations: Konversationer crypto: Ände-till-ände-kryptering - favourites: Favoriter filters: Filter follow: Följare, mjutade och blockerade follows: Följer @@ -170,7 +169,6 @@ sv: read:accounts: se kontoinformation read:blocks: se dina blockeringar read:bookmarks: se dina bokmärken - read:favourites: se dina favoriter read:filters: se dina filter read:follows: se vem du följer read:lists: se dina listor @@ -184,7 +182,6 @@ sv: write:blocks: blockera konton och domäner write:bookmarks: bokmärka inlägg write:conversations: tysta och radera konversationer - write:favourites: favoritmarkera inlägg write:filters: skapa filter write:follows: följa folk write:lists: skapa listor diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml index 46ab470acd..fce8c646e8 100644 --- a/config/locales/doorkeeper.tr.yml +++ b/config/locales/doorkeeper.tr.yml @@ -127,7 +127,7 @@ tr: bookmarks: Yer imleri conversations: Sohbetler crypto: Uçtan uca şifreleme - favourites: Beğeniler + favourites: Favoriler filters: Filtreler follow: Takipler, Sessizler ve Engeller follows: Takip edilenler @@ -170,7 +170,7 @@ tr: read:accounts: hesap bilgilerini görün read:blocks: engellemelerinizi görün read:bookmarks: yer imlerinizi görün - read:favourites: beğenilerinizi görün + read:favourites: favorilerinizi görün read:filters: filtrelerinizi görün read:follows: takip ettiklerinizi görün read:lists: listelerinizi görün @@ -184,7 +184,7 @@ tr: write:blocks: hesapları ve alan adlarını engelleyin write:bookmarks: durumları yer imleyin write:conversations: sessize al ve sohbetleri sil - write:favourites: durumları beğenin + write:favourites: favori gönderiler write:filters: filtreler oluşturun write:follows: insanları takip edin write:lists: listeler oluşturun diff --git a/config/locales/doorkeeper.tt.yml b/config/locales/doorkeeper.tt.yml index 02d733d2a7..876e7138db 100644 --- a/config/locales/doorkeeper.tt.yml +++ b/config/locales/doorkeeper.tt.yml @@ -36,7 +36,6 @@ tt: blocks: Блоклаулар bookmarks: Кыстыргычлар conversations: Әңгәмәләр - favourites: Сайланмалар filters: Сезгечләр lists: Исемлекләр notifications: Искәртүләр diff --git a/config/locales/doorkeeper.uk.yml b/config/locales/doorkeeper.uk.yml index 4e06a3590f..8af404a736 100644 --- a/config/locales/doorkeeper.uk.yml +++ b/config/locales/doorkeeper.uk.yml @@ -127,7 +127,7 @@ uk: bookmarks: Закладки conversations: Бесіди crypto: Наскрізне шифрування - favourites: Вподобане + favourites: Уподобане filters: Фільтри follow: Підписки, ігнорування і блокування follows: Підписки @@ -176,7 +176,7 @@ uk: read:accounts: бачити інформацію про облікові записи read:blocks: бачити Ваші блокування read:bookmarks: бачити ваші закладки - read:favourites: бачити вподобані дописи + read:favourites: бачити вподобані read:filters: бачити Ваші фільтри read:follows: бачити Ваші підписки read:lists: бачити Ваші списки diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml index a3a0f158b0..aecedbe443 100644 --- a/config/locales/doorkeeper.vi.yml +++ b/config/locales/doorkeeper.vi.yml @@ -184,7 +184,7 @@ vi: write:blocks: chặn người và máy chủ write:bookmarks: sửa đổi những thứ bạn lưu write:conversations: ẩn và xóa thảo luận - write:favourites: lượt thích + write:favourites: thích tút write:filters: tạo bộ lọc write:follows: theo dõi ai đó write:lists: tạo danh sách diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml index b9cbdf75b8..36c7fb8127 100644 --- a/config/locales/doorkeeper.zh-CN.yml +++ b/config/locales/doorkeeper.zh-CN.yml @@ -184,7 +184,7 @@ zh-CN: write:blocks: 屏蔽账号和域名 write:bookmarks: 为嘟文添加书签 write:conversations: 静音并删除会话 - write:favourites: 喜欢的嘟文 + write:favourites: 喜欢嘟文 write:filters: 创建过滤器 write:follows: 关注其他人 write:lists: 创建列表 diff --git a/config/locales/doorkeeper.zh-HK.yml b/config/locales/doorkeeper.zh-HK.yml index 6b078d609c..d98dc7d76e 100644 --- a/config/locales/doorkeeper.zh-HK.yml +++ b/config/locales/doorkeeper.zh-HK.yml @@ -127,7 +127,6 @@ zh-HK: bookmarks: 書籤 conversations: 對話 crypto: 端到端加密 - favourites: 最愛 filters: 篩選器 follow: 追蹤、靜音及封鎖 follows: 追蹤 @@ -184,7 +183,6 @@ zh-HK: write:blocks: 封鎖帳號及域名 write:bookmarks: 把文章加入最愛 write:conversations: 靜音及刪除對話 - write:favourites: 喜歡的文章 write:filters: 建立過濾條件 write:follows: 關注其他人 write:lists: 建立清單 diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml index 1b0f7b2ce3..6073096c31 100644 --- a/config/locales/doorkeeper.zh-TW.yml +++ b/config/locales/doorkeeper.zh-TW.yml @@ -170,7 +170,7 @@ zh-TW: read:accounts: 檢視帳號資訊 read:blocks: 檢視您的封鎖列表 read:bookmarks: 檢視您的書籤 - read:favourites: 檢視您收藏的最愛 + read:favourites: 檢視您收藏之最愛嘟文 read:filters: 檢視您的過濾條件 read:follows: 檢視您跟隨的人 read:lists: 檢視您的列表 diff --git a/config/locales/el.yml b/config/locales/el.yml index 43af651772..e6f30aa104 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -758,7 +758,6 @@ el: approved: Απαιτείται έγκριση για εγγραφή none: Δεν μπορεί να εγγραφεί κανείς open: Μπορεί να εγγραφεί ο οποιοσδήποτε - title: Ρυθμίσεις διακομιστή site_uploads: delete: Διαγραφή μεταφορτωμένου αρχείου destroyed_msg: Η μεταφόρτωση ιστότοπου διαγράφηκε επιτυχώς! diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 190fd44261..1df3dc3a92 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -770,7 +770,7 @@ en-GB: approved: Approval required for sign up none: Nobody can sign up open: Anyone can sign up - title: Server Settings + title: Server settings site_uploads: delete: Delete uploaded file destroyed_msg: Site upload successfully deleted! @@ -1277,12 +1277,14 @@ en-GB: bookmarks_html: You are about to replace your bookmarks with up to %{total_items} posts from %{filename}. domain_blocking_html: You are about to replace your domain block list with up to %{total_items} domains from %{filename}. following_html: You are about to follow up to %{total_items} accounts from %{filename} and stop following anyone else. + lists_html: You are about to replace your lists with contents of %{filename}. Up to %{total_items} accounts will be added to new lists. muting_html: You are about to replace your list of muted accounts with up to %{total_items} accounts from %{filename}. preambles: blocking_html: You are about to block up to %{total_items} accounts from %{filename}. bookmarks_html: You are about to add up to %{total_items} posts from %{filename} to your bookmarks. domain_blocking_html: You are about to block up to %{total_items} domains from %{filename}. following_html: You are about to follow up to %{total_items} accounts from %{filename}. + lists_html: You are about to add up to %{total_items} accounts from %{filename} to your lists. New lists will be created if there is no list to add to. muting_html: You are about to mute up to %{total_items} accounts from %{filename}. preface: You can import data that you have exported from another server, such as a list of the people you are following or blocking. recent_imports: Recent imports @@ -1299,6 +1301,7 @@ en-GB: bookmarks: Importing bookmarks domain_blocking: Importing blocked domains following: Importing followed accounts + lists: Importing lists muting: Importing muted accounts type: Import type type_groups: @@ -1309,6 +1312,7 @@ en-GB: bookmarks: Bookmarks domain_blocking: Domain blocking list following: Following list + lists: Lists muting: Muting list upload: Upload invites: diff --git a/config/locales/eo.yml b/config/locales/eo.yml index c5956cbd96..b513bcc009 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -770,7 +770,6 @@ eo: approved: Bezonas aprobi por aliĝi none: Neniu povas aliĝi open: Iu povas aliĝi - title: Agordoj de la servilo site_uploads: delete: Forigi elŝutitan dosieron destroyed_msg: Reteja alŝuto sukcese forigita! diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml index a64d643432..1cf60173ee 100644 --- a/config/locales/es-AR.yml +++ b/config/locales/es-AR.yml @@ -770,7 +770,7 @@ es-AR: approved: Se requiere aprobación para registrarse none: Nadie puede registrarse open: Cualquiera puede registrarse - title: Configuraciones del servidor + title: Configuración del servidor site_uploads: delete: Eliminar archivo subido destroyed_msg: "¡Subida al sitio eliminada exitosamente!" @@ -1277,12 +1277,14 @@ es-AR: bookmarks_html: Estás a punto de reemplazar tus marcadores por hasta %{total_items} mensajes provenientes de %{filename}. domain_blocking_html: Estás a punto de reemplazar tu lista de bloqueos de dominio por hasta %{total_items} dominios provenientes de %{filename}. following_html: Estás a punto de seguir hasta %{total_items} cuentas provenientes de %{filename} y dejar de seguir a cualquier otra cuenta. + lists_html: Estás a punto de reemplazar tus listas con el contenido de %{filename}. Se agregarán hasta %{total_items} cuentas a listas nuevas. muting_html: Estás a punto de reemplazar tu lista de cuentas silenciadas con hasta %{total_items} cuentas provenientes de %{filename}. preambles: blocking_html: Estás a punto de bloquear hasta %{total_items} cuentas provenientes de %{filename}. bookmarks_html: Está a punto de agregar hasta %{total_items} mensajes provenientes de %{filename} a tus marcadores. domain_blocking_html: Estás a punto de bloquear hasta %{total_items} dominios provenientes de %{filename}. following_html: Estás a punto de seguir hasta cuentas%{total_items} provenientes de %{filename}. + lists_html: Estás a punto de agregar hasta %{total_items} cuentas desde %{filename} a tus listas. Se crearán nuevas listas si no hay lista a cual agregar. muting_html: Estás a punto de silenciar hasta %{total_items} cuentas provenientes de %{filename}. preface: Podés importar ciertos datos que exportaste desde otro servidor, como una lista de las cuentas que estás siguiendo o bloqueando. recent_imports: Importaciones recientes @@ -1299,6 +1301,7 @@ es-AR: bookmarks: Importación de marcadores domain_blocking: Importación de dominios bloqueados following: Importación de cuentas seguidas + lists: Importando listas muting: Importación de cuentas silenciadas type: Importar tipo type_groups: @@ -1309,6 +1312,7 @@ es-AR: bookmarks: Marcadores domain_blocking: Lista de dominios bloqueados following: Lista de seguidos + lists: Listas muting: Lista de silenciados upload: Subir invites: diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml index cc94b68843..21079be0be 100644 --- a/config/locales/es-MX.yml +++ b/config/locales/es-MX.yml @@ -770,7 +770,7 @@ es-MX: approved: Se requiere aprobación para registrarse none: Nadie puede registrarse open: Cualquiera puede registrarse - title: Ajustes del Servidor + title: Ajustes del servidor site_uploads: delete: Eliminar archivo subido destroyed_msg: "¡Carga del sitio eliminada con éxito!" diff --git a/config/locales/es.yml b/config/locales/es.yml index 209e41b35a..f782f8fba3 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -146,7 +146,7 @@ es: targeted_reports: Reportes hechos sobre esta cuenta silence: Silenciar silenced: Silenciado - statuses: Estados + statuses: Publicaciones strikes: Amonestaciones previas subscribe: Suscribir suspend: Suspender @@ -195,7 +195,7 @@ es: destroy_email_domain_block: Eliminar Bloqueo de Dominio de Correo Electrónico destroy_instance: Purgar Dominio destroy_ip_block: Eliminar regla IP - destroy_status: Eliminar Estado + destroy_status: Eliminar Publicación destroy_unavailable_domain: Eliminar Dominio No Disponible destroy_user_role: Destruir Rol disable_2fa_user: Deshabilitar 2FA @@ -226,7 +226,7 @@ es: update_custom_emoji: Actualizar Emoji Personalizado update_domain_block: Actualizar el Bloqueo de Dominio update_ip_block: Actualizar regla IP - update_status: Actualizar Estado + update_status: Actualizar Publicación update_user_role: Actualizar Rol actions: approve_appeal_html: "%{name} aprobó la solicitud de moderación de %{target}" @@ -254,7 +254,7 @@ es: destroy_email_domain_block_html: "%{name} desbloqueó el dominio de correo electrónico %{target}" destroy_instance_html: "%{name} purgó el dominio %{target}" destroy_ip_block_html: "%{name} eliminó una regla para la IP %{target}" - destroy_status_html: "%{name} eliminó el estado por %{target}" + destroy_status_html: "%{name} eliminó la publicación de %{target}" destroy_unavailable_domain_html: "%{name} reanudó las entregas al dominio %{target}" destroy_user_role_html: "%{name} eliminó el rol %{target}" disable_2fa_user_html: "%{name} desactivó el requisito de dos factores para el usuario %{target}" @@ -285,7 +285,7 @@ es: update_custom_emoji_html: "%{name} actualizó el emoji %{target}" update_domain_block_html: "%{name} actualizó el bloqueo de dominio para %{target}" update_ip_block_html: "%{name} cambió la regla para la IP %{target}" - update_status_html: "%{name} actualizó el estado de %{target}" + update_status_html: "%{name} actualizó la publicación de %{target}" update_user_role_html: "%{name} cambió el rol %{target}" deleted_account: cuenta eliminada empty: No se encontraron registros. @@ -770,7 +770,7 @@ es: approved: Se requiere aprobación para registrarse none: Nadie puede registrarse open: Cualquiera puede registrarse - title: Ajustes del Servidor + title: Ajustes del servidor site_uploads: delete: Eliminar archivo subido destroyed_msg: "¡Carga del sitio eliminada con éxito!" @@ -790,12 +790,12 @@ es: media: title: Multimedia metadata: Metadatos - no_status_selected: No se cambió ningún estado al no seleccionar ninguno + no_status_selected: No se cambió ninguna publicación al no seleccionar ninguna open: Abrir publicación original_status: Publicación original reblogs: Impulsos status_changed: Publicación cambiada - title: Estado de las cuentas + title: Publicaciones de la cuenta trending: En tendencia visibility: Visibilidad with_media: Con multimedia @@ -980,7 +980,7 @@ es: unsubscribe: Cancelar suscripción view: 'Vista:' view_profile: Ver perfil - view_status: Ver estado + view_status: Ver publicación applications: created: Aplicación creada exitosamente destroyed: Apicación eliminada exitosamente @@ -1364,7 +1364,7 @@ es: title: Cancelar suscripición media_attachments: validations: - images_and_video: No se puede adjuntar un video a un estado que ya contenga imágenes + images_and_video: No se puede adjuntar un video a unapublicación que ya contenga imágenes not_ready: No se pueden adjuntar archivos que no se han terminado de procesar. ¡Inténtalo de nuevo en un momento! too_many: No se pueden adjuntar más de 4 archivos migrations: @@ -1413,8 +1413,8 @@ es: sign_up: subject: "%{name} se registró" favourite: - body: 'Tu estado fue marcado como favorito por %{name}:' - subject: "%{name} marcó como favorito tu estado" + body: 'Tu publicación fue marcada como favorita por %{name}:' + subject: "%{name} marcó como favorita tu publicación" title: Nuevo favorito follow: body: "¡%{name} te está siguiendo!" @@ -1613,7 +1613,7 @@ es: other: 'contenía los hashtags no permitidos: %{tags}' edited_at_html: Editado %{date} errors: - in_reply_not_found: El estado al que intentas responder no existe. + in_reply_not_found: La publicación a la que intentas responder no existe. open_in_web: Abrir en web over_character_limit: Límite de caracteres de %{max} superado pin_errors: diff --git a/config/locales/et.yml b/config/locales/et.yml index 554070c6a3..d4ba300e75 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -770,7 +770,7 @@ et: approved: Kinnitus vajalik konto loomisel none: Keegi ei saa kontoid luua open: Kõik võivad kontoid luua - title: Serveri seadistused + title: Serveri seaded site_uploads: delete: Kustuta üleslaetud fail destroyed_msg: Üleslaetud fail edukalt kustutatud! @@ -1277,12 +1277,14 @@ et: bookmarks_html: Oled asendamas oma järjehoidjaid kuni %{total_items} postitusega kohast %{filename}. domain_blocking_html: Oled asendamas oma domeenide blokeeringute loetelu kuni %{total_items} domeeniga kohast %{filename}. following_html: Oled jälgima hakkamas kuni %{total_items} kontot kohast %{filename} ja lõpetad kõigi teiste jälgimise. + lists_html: Oled asendamas oma loetelusid faili %{filename} sisuga. Uutesse loeteludesse lisatakse kuni %{total_items} kontot. muting_html: Oled asendamas oma vaigistatud kontode loetelu kuni %{total_items} kontoga kohast %{filename}. preambles: blocking_html: Oled blokeerimas kuni %{total_items} kontoga kohast %{filename}. bookmarks_html: Oled lisamas kuni %{total_items} postitust kohast %{filename} to your bookmarks. domain_blocking_html: Oled blokeerimas kuni %{total_items} domeeni kohast %{filename}. following_html: Oled jälgima hakkamas kuni %{total_items} kontot kohast %{filename}. + lists_html: Oled lisamas oma loeteludesse failist %{filename} kuni %{total_items} kontot. Kui pole loetelusi, kuhu lisada, luuakse uued loetelud. muting_html: Oled vaigistamas kuni %{total_items} kontot kohast %{filename}. preface: Saad importida mistahes andmeid, mis on eksporditud teisest serverist. Näiteks nimekirja inimestest, keda jälgid ja keda blokeerid. recent_imports: Viimati imporditud @@ -1299,6 +1301,7 @@ et: bookmarks: Järjehoidjate importimine domain_blocking: Blokeeritud domeenide importimine following: Jälgitavate kontode importimine + lists: Loetelude importimine muting: Vaigistatud kontode importimine type: Importimise tüüp type_groups: @@ -1309,6 +1312,7 @@ et: bookmarks: Järjehoidjad domain_blocking: Domeeniblokeeringute nimekiri following: Jälgimiste nimekiri + lists: Loetelud muting: Vaigistuse nimekiri upload: Lae üles invites: diff --git a/config/locales/eu.yml b/config/locales/eu.yml index f6aeae0326..13563f80a1 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -769,7 +769,7 @@ eu: approved: Izena emateko onarpena behar da none: Ezin du inork izena eman open: Edonork eman dezake izena - title: Zerbitzariaren ezarpenak + title: Zerbitzariko ezarpenak site_uploads: delete: Ezabatu igotako fitxategia destroyed_msg: Guneko igoera ongi ezabatu da! diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 3744fc73ba..9f1c83b4e9 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -667,7 +667,6 @@ fa: approved: ثبت نام نیازمند تأیید مدیران است none: کسی نمی‌تواند ثبت نام کند open: همه می‌توانند ثبت نام کنند - title: تنظیمات کارساز site_uploads: delete: پرونده بارگذاری شده را پاک کنید destroyed_msg: بارگذاری پایگاه با موفقیت حذف شد! diff --git a/config/locales/fi.yml b/config/locales/fi.yml index df513af8ff..67627ec695 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1277,12 +1277,14 @@ fi: bookmarks_html: Olet aikeissa korvata kirjanmerkit kaikkiaan %{total_items} julkaisulla tiedostosta %{filename}. domain_blocking_html: Olet aikeissa korvata verkkotunnusestot kaikkiaan %{total_items} verkkotunnuksella tiedostoon %{filename} perustuen. following_html: Olet aikeissa seurata kaikkiaan %{total_items} tiliä tiedostoon %{filename} perustuen. Aiot lisäksi lopettaa kaikkien muiden seuraamisen. + lists_html: Olet korvaamassa listojasi tiedoston %{filename} sisällöllä. Uusiin listoihin lisätään kaikkiaan %{total_items} tiliä. muting_html: Olet korvaamassa mykistettyjä tilejäsi kaikkiaan %{total_items} tilillä tiedostoon %{filename} perustuen. preambles: blocking_html: Olet estämässä yhteensä %{total_items} tiliä tiedostoon %{filename} perustuen. bookmarks_html: Olet lisäämässä %{total_items} julkaisua tiedostosta %{filename}kirjanmerkkeihisi. domain_blocking_html: Olet estämässä yhteensä %{total_items} verkkotunnusta tiedoston %{filename} nojalla. following_html: Olet aikeissa seurata kaikkiaan %{total_items} tiliä tiedostoon %{filename} perustuen. + lists_html: Olet lisäämässä listoihisi %{total_items} tiliä tiedostosta %{filename}. Uudet listat luodaan, jos sopivaa kohdelistaa ei ole olemassa. muting_html: Olet hiljentämässä yhteensä %{total_items} tiliä tiedostosta %{filename}. preface: Voit tuoda toisesta instanssista viemiäsi tietoja, kuten esimerkiksi seuraamiesi tai estämiesi henkilöiden listan. recent_imports: Viimeksi tuotu @@ -1299,6 +1301,7 @@ fi: bookmarks: Tuodaan kirjanmerkkejä domain_blocking: Tuodaan estettyjä verkkotunnuksia following: Tuodaan seurattuja tilejä + lists: Listojen tuonti muting: Tuodaan hiljennettyjä tilejä type: Tuonnin tyyppi type_groups: @@ -1309,6 +1312,7 @@ fi: bookmarks: Kirjanmerkit domain_blocking: Verkkoalueen estolista following: Seurattujen lista + lists: Listat muting: Mykistettyjen lista upload: Lähetä invites: @@ -1351,7 +1355,6 @@ fi: unsubscribe: action: Kyllä, peru tilaus complete: Tilaus lopetettiin - confirmation_html: Oletko varma, että haluat lopettaa käyttäjän %{type} vastaanottamisen Mastodonista %{domain} sähköpostiisi osoitteessa %{email}? Voit aina tilata sähköposti-ilmoitusasetuksesi uudelleen . emails: notification_emails: favourite: sähköpostit ilmoituksille @@ -1359,8 +1362,6 @@ fi: follow_request: seuraa pyyntöjä sähköpostiin mention: mainitse sähköpostin ilmoitukset reblog: tehosta sähköpostien ilmoituksia - resubscribe_html: Jos olet perunut tilauksen erehdyksellä, voit tilata uudelleen sähköpostin ilmoitusasetuksistasi. - success_html: Et enää saa %{type} Mastodonilta %{domain} sähköpostiisi osoitteeseen %{email}. title: Lopeta tilaus media_attachments: validations: @@ -1778,10 +1779,6 @@ fi: seamless_external_login: Olet kirjautunut ulkoisen palvelun kautta, joten salasana- ja sähköpostiasetukset eivät ole käytettävissä. signed_in_as: 'Kirjautunut tilillä:' verification: - extra_instructions_html: Vihje: Sivuston linkki voi olla näkymätön. Tärkeä osa on rel="me" joka estää personoinnin verkkosivustoilla, joilla on käyttäjän luomaa sisältöä. Voit jopa käyttää linkkiä tag sivun otsikossa sen sijaan a, mutta HTML:n on oltava käytettävissä suorittamatta JavaScriptiä. - here_is_how: Näin voit tehdä sen - hint_html: "Henkilöllisyytesi varmentaminen Mastodonissa on kaikille. Perustuu avoimiin web-standardeihin, nyt ja ikuisesti ilmaiseksi. Kaikki mitä tarvitset on henkilökohtainen sivusto, että ihmiset tunnistavat sinut. Kun linkit tälle sivustolle profiilistasi, tarkistamme, että sivusto linkit takaisin profiiliisi ja näyttää visuaalinen indikaattori sitä." - instructions_html: Kopioi ja liitä alla oleva koodi verkkosivusi HTML:ään. Lisää sitten sivustosi osoite johonkin ylimääräisestä kentästä profiilissasi "Muokkaa profiilia" -välilehdestä ja tallenna muutokset. verification: Vahvistus verified_links: Vahvistetut linkkisi webauthn_credentials: diff --git a/config/locales/fo.yml b/config/locales/fo.yml index 4e1e9d9c7d..d2567feeb7 100644 --- a/config/locales/fo.yml +++ b/config/locales/fo.yml @@ -1277,12 +1277,14 @@ fo: bookmarks_html: Tú ert í ferð við at útskifta tíni bókamerki við upp til %{total_items} postum frá %{filename}. domain_blocking_html: Tú ert í ferð við at útskifta navnaøkisblokeringslistan hjá tær við upp til %{total_items} navnaøkjum frá %{filename}. following_html: Tú ert í ferð við at fylgja upp til %{total_items} kontum frá %{filename} og at gevast at fylgja øðrum. + lists_html: Tú ert í ferð við at skifta listarnar hjá tær út við tað, sum er í %{filename}. Upp til %{total_items} kontur verða lagdar afturat nýggjum listum. muting_html: Tú ert í ferð við at útskifta listan hjá tær við doyvdum kontum við upp til %{total_items} kontum frá %{filename}. preambles: blocking_html: Tú ert í ferð við at blokera upp til %{total_items} kontur frá %{filename}. bookmarks_html: Tú ert í ferð við at leggja upp til %{total_items} postar frá %{filename} afturat tínum bókamerkjum. domain_blocking_html: Tú ert í ferð við at blokera upp til %{total_items} navnaøki frá %{filename}. following_html: Tú ert í ferð við at fylgja upp til %{total_items} kontur frá %{filename}. + lists_html: Tú ert í ferð við at leggja upp til %{total_items} kontur frá %{filename} afturat tínum listum. Nýggir listar verða stovnaðir, um eingin listi er at leggja afturat. muting_html: Tú ert í ferð við at doyva upp til %{total_items} kontur frá %{filename}. preface: Tú kanst innlesa dátur, sum tú hevur útlisið frá einum øðrum ambætara, so sum listar av fólki, sum tú fylgir ella blokerar. recent_imports: Feskar innflytingar @@ -1299,6 +1301,7 @@ fo: bookmarks: Innflyti bókamerki domain_blocking: Innflyti blokeraði navnaøki following: Innflyti fylgdar kontur + lists: Innlesi listar muting: Innflyti doyvdar kontur type: Innflytingarslag type_groups: @@ -1309,6 +1312,7 @@ fo: bookmarks: Bókamerki domain_blocking: Navnaøkisblokeringslisti following: Fylgjaralisti + lists: Listar muting: Doyvingarlisti upload: Legg upp invites: diff --git a/config/locales/fr-QC.yml b/config/locales/fr-QC.yml index 408bc62a3b..7ebb4406ed 100644 --- a/config/locales/fr-QC.yml +++ b/config/locales/fr-QC.yml @@ -387,10 +387,10 @@ fr-QC: confirm: Suspendre permanent_action: Annuler la suspension ne restaure aucune donnée ou relation. preamble_html: Vous êtes sur le point de suspendre %{domain} et ses sous-domaines. - remove_all_data: Cela supprimera de votre serveur tous les contenus, médias et données de profil pour les comptes de votre serveur. + remove_all_data: Cela supprimera de votre serveur tous les contenus, médias et données de profil pour les comptes de ce domaine. stop_communication: Votre serveur cessera de communiquer avec ces serveurs. title: Confirmer le blocage du domaine pour %{domain} - undo_relationships: Cela annulera toute relation de suivi entre les comptes de ces serveurs et le vôtre. + undo_relationships: Cela annulera toute relation de suivi entre les comptes de ces serveurs et du vôtre. created_msg: Le blocage de domaine est désormais activé destroyed_msg: Le blocage de domaine a été désactivé domain: Domaine @@ -741,7 +741,7 @@ fr-QC: preamble: L'image de marque de votre serveur la différencie des autres serveurs du réseau. Ces informations peuvent être affichées dans nombre d'environnements, tels que l'interface web de Mastodon, les applications natives, dans les aperçus de liens sur d'autres sites Web et dans les applications de messagerie, etc. C'est pourquoi il est préférable de garder ces informations claires, courtes et concises. title: Thème captcha_enabled: - desc_html: Ceci se base sur des scripts externes venant de hCaptcha, ce qui peut engendrer des soucis de sécurité et de confidentialité. De plus, cela peut rendre l'inscription beaucoup moins accessible pour certaines personnes (comme les personnes handicapées). Pour ces raisons, veuillez envisager des mesures alternatives telles que l'inscription sur acceptation ou invitation. + desc_html: Ceci se base sur des scripts externes de hCaptcha, ce qui peut engendrer des soucis de sécurité et de confidentialité. De plus, cela peut rendre l'inscription beaucoup moins accessible pour certaines personnes (surtout les personnes handicapées). Pour ces raisons, veuillez envisager des mesures alternatives telles que l'inscription par acceptation ou par invitation. title: Obliger les nouveaux utilisateurs à résoudre un CAPTCHA pour vérifier leur compte content_retention: preamble: Contrôle comment le contenu créé par les utilisateurs est enregistré et stocké dans Mastodon. @@ -993,7 +993,7 @@ fr-QC: apply_for_account: Demander un compte captcha_confirmation: help_html: Si vous ne pouvez pas résoudre le CAPTCHA, vous pouvez nous contacter via %{email} et nous pouvons vous aider. - hint_html: Encore une chose ! Nous avons besoin de confirmer que vous êtes un humain (c'est pour que nous puissions empêcher les spams !). Résolvez le CAPTCHA ci-dessous et cliquez sur "Continuer". + hint_html: Juste une autre chose! Nous avons besoin de confirmer que vous êtes un humain (pour que nous puissions empêcher les spams!). Résolvez le CAPTCHA ci-dessous et cliquez sur "Continuer". title: Vérification de sécurité confirmations: wrong_email_hint: Si cette adresse de courriel est incorrecte, vous pouvez la modifier dans vos paramètres de compte. @@ -1003,7 +1003,7 @@ fr-QC: prefix_invited_by_user: "@%{name} vous invite à rejoindre ce serveur Mastodon !" prefix_sign_up: Inscrivez-vous aujourd’hui sur Mastodon ! suffix: Avec un compte, vous pourrez suivre des gens, publier des statuts et échanger des messages avec les utilisateur·rice·s de n'importe quel serveur Mastodon et bien plus ! - didnt_get_confirmation: Vous n'avez pas reçu de lien de confirmation ? + didnt_get_confirmation: Vous n'avez pas reçu de lien de confirmation? dont_have_your_security_key: Vous n'avez pas votre clé de sécurité? forgot_password: Mot de passe oublié ? invalid_reset_password_token: Le lien de réinitialisation du mot de passe est invalide ou a expiré. Merci de réessayer. @@ -1017,7 +1017,7 @@ fr-QC: or_log_in_with: Ou authentifiez-vous avec privacy_policy_agreement_html: J’ai lu et j’accepte la politique de confidentialité progress: - confirm: Confirmez l'e-mail + confirm: Confirmez l'adresse courriel details: Vos infos review: Notre avis rules: Accepter les règles @@ -1031,7 +1031,7 @@ fr-QC: rules: accept: Accepter back: Retour - invited_by: 'Vous pouvez rejoindre %{domain} grâve à l''invitation de :' + invited_by: 'Vous pouvez rejoindre %{domain} grâve à l''invitation reçue de:' preamble: Celles-ci sont définies et appliqués par les modérateurs de %{domain}. preamble_invited: Avant de continuer, veuillez lire les règles de base définies par les modérateurs de %{domain}. title: Quelques règles de base. @@ -1039,9 +1039,9 @@ fr-QC: security: Sécurité set_new_password: Définir le nouveau mot de passe setup: - email_below_hint_html: Vérifiez votre dossier de spam ou demandez qu’on vous le renvoie. Vous pouvez corriger votre adresse e-mail si elle est incorrecte. - email_settings_hint_html: Cliquez sur le lien que nous vous avons envoyé pour vérifier l’adresse %{email}. Nous vous attendons ici. - link_not_received: Vous n'avez pas reçu de lien ? + email_below_hint_html: Vérifiez votre dossier de spam ou demandez qu’on vous le renvoie. Vous pouvez corriger votre adresse courriel si elle est incorrecte. + email_settings_hint_html: Cliquez sur le lien que nous vous avons envoyé pour vérifier %{email}. Nous vous attendrons ici. + link_not_received: Vous n'avez pas reçu de lien? new_confirmation_instructions_sent: Vous recevrez un nouveau courriel avec votre lien de confirmation dans quelques minutes! title: Vérifiez votre boîte de réception sign_in: @@ -1263,33 +1263,35 @@ fr-QC: incompatible_type: Incompatible avec le type d’import sélectionné invalid_csv_file: 'Fichier CSV non valide. Erreur : %{error}' over_rows_processing_limit: contient plus de %{count} lignes - too_large: Le fichier est trop lourd + too_large: Fichier trop lourd failures: Échecs imported: Importé - mismatched_types_warning: Il semblerait que vous avez sélectionné le mauvais type pour cet import, veuillez vérifier attentivement. + mismatched_types_warning: Il semble que vous avez sélectionné le mauvais type pour cet import, veuillez vérifier à nouveau. modes: merge: Fusionner merge_long: Garder les enregistrements existants et ajouter les nouveaux overwrite: Écraser overwrite_long: Remplacer les enregistrements actuels par les nouveaux overwrite_preambles: - blocking_html: Vous allez remplacer votre liste de blocage par près de %{total_items} comptes tirés de %{filename}. - bookmarks_html: Vous allez remplacer vos signets par près de %{total_items} posts tirés de %{filename}. - domain_blocking_html: Vous allez remplacer votre liste de blocage de domaines par près de %{total_items} domaines tirés de %{filename}. + blocking_html: Vous allez remplacer votre liste de blocages par jusqu'à %{total_items} comptes tirés de %{filename}. + bookmarks_html: Vous allez remplacer vos signets par jusqu'à %{total_items} posts tirés de %{filename}. + domain_blocking_html: Vous allez remplacer votre liste de blocages de domaines par jusqu'à %{total_items} domaines tirés de %{filename}. following_html: Vous allez suivre jusqu’à %{total_items} comptes depuis %{filename} et arrêter de suivre n’importe qui d’autre. - muting_html: Vous allez remplacer votre liste de comptes masqués par près de %{total_items} comptes tirés de %{filename}. + lists_html: Vous allez remplacer vos listes par le contenu de %{filename}. Jusqu'à %{total_items} comptes seront ajoutés à de nouvelles listes. + muting_html: Vous allez remplacer votre liste de comptes masqués par jusqu'à %{total_items} comptes tirés de %{filename}. preambles: - blocking_html: Vous allez bloquer près de %{total_items} comptes tirés de %{filename}. - bookmarks_html: Vous allez ajouter près de %{total_items} messages de %{filename} à vos signets. - domain_blocking_html: Vous allez bloquer près de %{total_items} domaines tirés de %{filename}. - following_html: Vous allez suivre près de %{total_items} comptes tirés de %{filename}. - muting_html: Vous allez masquer près de %{total_items} comptes tirés de %{filename}. + blocking_html: Vous allez bloquer jusqu'à %{total_items} comptes tirés de %{filename}. + bookmarks_html: Vous allez ajouter jusqu'à %{total_items} messages de %{filename} à vos signets. + domain_blocking_html: Vous allez bloquer jusqu'à %{total_items} domaines tirés de %{filename}. + following_html: Vous allez suivre jusqu'à %{total_items} comptes tirés de %{filename}. + lists_html: Vous allez ajouter jusqu'à %{total_items} comptes depuis %{filename} à vos listes. De nouvelles listes seront créées s'il n'y a aucune liste à laquelle les ajouter. + muting_html: Vous allez masquer jusqu'à %{total_items} comptes tirés de %{filename}. preface: Vous pouvez importer certaines données que vous avez exporté d’un autre serveur, comme une liste des personnes que vous suivez ou bloquez sur votre compte. - recent_imports: Récents imports + recent_imports: Importations récentes states: finished: Terminé in_progress: En cours - scheduled: Programmé + scheduled: Planifié unconfirmed: Non confirmé status: Statut success: Vos données ont été importées avec succès et seront traitées en temps et en heure @@ -1299,8 +1301,9 @@ fr-QC: bookmarks: En cours d’importation des signets domain_blocking: En cours d’importation des domaines bloqués following: En cours d’importation des comptes suivis + lists: En cours d’importation des listes muting: En cours d’importation des comptes masqués - type: Type d’import + type: Type d’importation type_groups: constructive: Abonnements et signets destructive: Blocages et masquages @@ -1309,6 +1312,7 @@ fr-QC: bookmarks: Marque-pages domain_blocking: Liste des serveurs bloqués following: Liste d’utilisateur·rice·s suivi·e·s + lists: Listes muting: Liste d’utilisateur·rice·s que vous masquez upload: Importer invites: @@ -1349,19 +1353,19 @@ fr-QC: title: Historique d'authentification mail_subscriptions: unsubscribe: - action: Oui, se désinscrire - complete: Désinscrit - confirmation_html: Êtes-vous sûr de vouloir vous désinscrire des %{type} de la part du Mastodon installé sur %{domain} vers votre adresse %{email}? Vous pouvez toujours vous réabonner à partir de vos paramètres de notification par e-mail. + action: Oui, me désabonner + complete: Désabonné·e + confirmation_html: Voulez-vous vraiment vous désabonner des %{type} de la part de Mastodon installés sur %{domain} vers votre adresse %{email}? Vous pouvez toujours vous réabonner à partir de vos paramètres de notification par courriel. emails: notification_emails: - favourite: e-mails de notifications de signets - follow: e-mails de notifications d’abonnements - follow_request: e-mails de demandes d’abonnements - mention: e-mails de notifications de mentions - reblog: e-mails de notifications de boost - resubscribe_html: Si vous vous êtes désabonné par erreur, vous pouvez vous réinscrire à partir de vos paramètres de notification par e-mail. - success_html: Vous ne serez plus inscrits aux %{type} du Mastodon installé sur %{domain} à votre adresse %{email}. - title: Se désinscrire + favourite: courriels de notifications de favoris + follow: courriels de notifications d’abonnements + follow_request: courriels de demandes d’abonnements + mention: courriels de notifications de mentions + reblog: courriels de notifications de boost + resubscribe_html: Si vous vous êtes désabonné·e par erreur, vous pouvez vous réinscrire à partir de vos paramètres de notification par courriel. + success_html: Vous ne serez plus inscrits aux %{type} de Mastodon installés sur %{domain} à votre adresse %{email}. + title: Se désabonner media_attachments: validations: images_and_video: Impossible de joindre une vidéo à un message contenant déjà des images @@ -1495,7 +1499,7 @@ fr-QC: confirm_follow_selected_followers: Voulez-vous vraiment suivre les abonné⋅e⋅s sélectionné⋅e⋅s ? confirm_remove_selected_followers: Voulez-vous vraiment supprimer les abonné⋅e⋅s sélectionné⋅e⋅s ? confirm_remove_selected_follows: Voulez-vous vraiment supprimer les abonnements sélectionnés ? - dormant: Dormant + dormant: Inactif follow_failure: Impossibilité de suivre certains des comptes sélectionnés. follow_selected_followers: Suivre les abonné·e·s sélectionné·e·s followers: Abonné·e @@ -1596,8 +1600,8 @@ fr-QC: statuses: attached: audio: - one: "%{count} audio" - other: "%{count} audio" + one: "%{count} fichier audio" + other: "%{count} fichiers audio" description: 'Attaché : %{attached}' image: one: "%{count} image" @@ -1778,10 +1782,10 @@ fr-QC: seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles. signed_in_as: 'Connecté·e en tant que :' verification: - extra_instructions_html: Astuce : Le lien sur votre site Web peut être invisible. La partie importante est rel="me" qui évite que soient pris en compte d’autres liens provenant de contenu générés par des utilisateurs tiers. Vous pouvez même utiliser une balise link dans l’en-tête de la page au lieu de a, mais le HTML doit être accessible sans avoir besoin d’exécuter du JavaScript. + extra_instructions_html: Astuce: Le lien sur votre site Web peut être invisible. La partie importante est rel="me" qui évite d’autres liens provenant de contenu générés par des utilisateurs tiers d'être pris en compte. Vous pouvez même utiliser une balise link dans l’en-tête de la page au lieu de a, mais le HTML doit être accessible sans avoir besoin d’exécuter du JavaScript. here_is_how: Voici comment - hint_html: "La vérification de son profil sur Mastodon est accessible à tous. Elle s’appuie sur des standards ouverts du web, gratuits aujourd’hui et pour toujours. Tout ce dont vous avez besoin, c’est d’un site web personnel qui vous est associé dans l’esprit des gens. Lorsque vous ajoutez un lien depuis votre profil, nous vérifierons que le site web renvoie à son tour à votre profil Mastodon et montrerons un indicateur visuel à côté du lien si c’est le cas." - instructions_html: Copiez et collez le code ci-dessous dans le code HTML de votre site web. Ajoutez ensuite l’adresse de votre site dans l’un des champs supplémentaires de votre profil à partir de l‘onglet « Modifier le profil » et enregistrez les modifications. + hint_html: "La vérification de son profil sur Mastodon est accessible à tous. Elle s’appuie sur des standards ouverts du web, gratuits aujourd’hui et pour toujours. Tout ce dont vous avez besoin, c’est d’un site web personnel avec lequel les gens vous reconnaissent. Lorsque vous ajoutez un lien depuis votre profil, nous vérifierons que le site web renvoie à son tour à votre profil Mastodon et montrerons un indicateur visuel à côté du lien si c’est le cas." + instructions_html: Copiez et collez le code ci-dessous dans le code HTML de votre site web. Ajoutez ensuite l’adresse de votre site dans l’un des champs supplémentaires de votre profil à partir de l‘onglet "Modifier le profil" et enregistrez les modifications. verification: Vérification verified_links: Vos liens vérifiés webauthn_credentials: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index bfd1e242d1..7631140d1d 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1277,12 +1277,14 @@ fr: bookmarks_html: Vous allez remplacer vos signets par près de %{total_items} posts tirés de %{filename}. domain_blocking_html: Vous allez remplacer votre liste de blocage de domaines par près de %{total_items} domaines tirés de %{filename}. following_html: Vous allez suivre jusqu’à %{total_items} comptes depuis %{filename} et arrêter de suivre n’importe qui d’autre. + lists_html: Vous allez remplacer vos listes par le contenu de %{filename}. Près de %{total_items} comptes seront ajoutés à de nouvelles listes. muting_html: Vous allez remplacer votre liste de comptes masqués par près de %{total_items} comptes tirés de %{filename}. preambles: blocking_html: Vous allez bloquer près de %{total_items} comptes tirés de %{filename}. bookmarks_html: Vous allez ajouter près de %{total_items} messages de %{filename} à vos signets. domain_blocking_html: Vous allez bloquer près de %{total_items} domaines tirés de %{filename}. following_html: Vous allez suivre près de %{total_items} comptes tirés de %{filename}. + lists_html: Vous allez ajouter près de %{total_items} comptes depuis %{filename} à vos listes. De nouvelles listes seront créées si besoin. muting_html: Vous allez masquer près de %{total_items} comptes tirés de %{filename}. preface: Vous pouvez importer certaines données que vous avez exporté d’un autre serveur, comme une liste des personnes que vous suivez ou bloquez sur votre compte. recent_imports: Récents imports @@ -1299,6 +1301,7 @@ fr: bookmarks: En cours d’importation des signets domain_blocking: En cours d’importation des domaines bloqués following: En cours d’importation des comptes suivis + lists: En cours d’importation des listes muting: En cours d’importation des comptes masqués type: Type d’import type_groups: @@ -1309,6 +1312,7 @@ fr: bookmarks: Marque-pages domain_blocking: Liste des serveurs bloqués following: Liste de comptes suivis + lists: Listes muting: Liste de comptes que vous masquez upload: Importer invites: diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 8ba79c3329..fe25bf5180 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -798,7 +798,6 @@ gd: approved: Tha aontachadh riatanach airson clàradh none: Chan fhaod neach sam bith clàradh open: "’S urrainn do neach sam bith clàradh" - title: Roghainnean an fhrithealaiche site_uploads: delete: Sguab às am faidhle a chaidh a luchdadh suas destroyed_msg: Chaidh an luchdadh suas dhan làrach a sguabadh às! diff --git a/config/locales/gl.yml b/config/locales/gl.yml index b823a9f08b..08de22b1bd 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1277,12 +1277,14 @@ gl: bookmarks_html: Vas substituír os marcadores por %{total_items} publicacións desde %{filename}. domain_blocking_html: Vas substituír a lista de dominios bloqueados por %{total_items} dominios desde %{filename}. following_html: Vas seguir estas %{total_items} contas desde %{filename} e deixar de seguir a todas as outras contas. + lists_html: Vas substituír as túas listas co contido de %{filename}. Vanse engadir %{total_items} contas ás novas listas. muting_html: Vas substituír a lista de contas acaladas por %{total_items} contas desde %{filename}. preambles: blocking_html: Vas bloquear estas %{total_items} contas desde %{filename}. bookmarks_html: Vas engadir %{total_items} publicacións desde %{filename} aos teus marcadores. domain_blocking_html: Vas bloquear estes %{total_items} dominios desde %{filename}. following_html: Vas seguir estas %{total_items} contas desde %{filename}. + lists_html: Vas engadir %{total_items} contas desde %{filename} ás túas listas. Crearánse novas listas se non hai listas ás que engadilas. muting_html: Vas acalar estas %{total_items} contas desde %{filename}. preface: Podes importar os datos que exportaches doutro servidor, tales como a lista de usuarias que estás a seguir ou bloquear. recent_imports: Importacións recentes @@ -1299,6 +1301,7 @@ gl: bookmarks: Importando marcadores domain_blocking: Importando dominios bloqueados following: Importando contas seguidas + lists: Importación de listas muting: Importando contas acaladas type: Tipo de importación type_groups: @@ -1309,6 +1312,7 @@ gl: bookmarks: Marcadores domain_blocking: Lista de bloqueo de dominios following: Lista de seguimento + lists: Listas muting: Lista de usuarias acaladas upload: Subir invites: diff --git a/config/locales/he.yml b/config/locales/he.yml index 9e8e7d8848..b29f2ab26b 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1327,12 +1327,14 @@ he: bookmarks_html: אתם עומדים להחליף את רשימת הסימניות עד כדי %{total_items} הודעות מהקובץ %{filename}. domain_blocking_html: אתם עומדים להחליף את רשימת חסימות השרתים עד כדי %{total_items} שרתים מהקובץ %{filename}. following_html: אתם עומדים לעקוב עד כדי %{total_items} חשבונות מהקובץ %{filename} ובמקביל להפסיק מעקב אחרי כל משתמש אחר. + lists_html: הפעולה הבאה תחליף את רשימותיך בתוכן של %{filename}. עד %{total_items} חשבונות יתווספו לרשימות חדשות. muting_html: אתם עומדים להחליף את רשימת ההשתקות עד כדי %{total_items} חשבונות מהקובץ %{filename}. preambles: blocking_html: אתם עומדים לחסום עד %{total_items} חשבונות מהקובץ %{filename}. bookmarks_html: אתם עומדים להוסיף עד %{total_items} הודעות מהקובץ %{filename} לרשימת הסימניות שלכם. domain_blocking_html: אתם עומדים לחסום עד כדי %{total_items} שרתים מהקובץ %{filename}. following_html: אתם עומדים לעקוב אחרי עד %{total_items} חשבונות מהקובץ %{filename}. + lists_html: הפעולה הבאה תוסיף עד %{total_items} חשבונות מהקובץ %{filename} אל הרשימות שלך. רשימות חדשות יווצרו אם עוד לא קיימת רשימה להוסיף אליה. muting_html: אתם עומדים להשתיק עד %{total_items} חשבונות מהקובץ %{filename}. preface: ניתן ליבא מידע מסויים כגון כל הנעקבים או המשתמשים החסומים לתוך חשבונך על שרת זה, מתוך קבצים שנוצרו על ידי יצוא משרת אחר כגון רשימת הנעקבים והחסומים שלך. recent_imports: ייבואים אחרונים @@ -1349,6 +1351,7 @@ he: bookmarks: מייבא סימניות domain_blocking: מייבא שרתים חסומים following: מייבא חשבונות נעקבים + lists: יבוא רשימות muting: מייבא חשבונות מושתקים type: סוג יבוא type_groups: @@ -1359,6 +1362,7 @@ he: bookmarks: סימניות domain_blocking: רשימת שמות מתחם חסומים following: רשימת נעקבים + lists: רשימות muting: רשימת השתקות upload: יבוא invites: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 4b620896a5..a629508fb9 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -770,7 +770,7 @@ hu: approved: A regisztráció engedélyhez kötött none: Senki sem regisztrálhat open: Bárki regisztrálhat - title: Kiszolgálóbeállítások + title: Kiszolgáló-beállítások site_uploads: delete: Feltöltött fájl törlése destroyed_msg: Sikeresen töröltük a site feltöltését! @@ -1277,12 +1277,14 @@ hu: bookmarks_html: 'Arra készülsz, hogy lecseréld a könyvjelzőket legfeljebb %{total_items} bejegyzésre a következőből: %{filename}.' domain_blocking_html: 'Arra készülsz, hogy lecseréld a domain letiltási listát legfeljebb %{total_items} domainre a következőből: %{filename}.' following_html: 'Arra készülsz, hogy legfeljebb %{total_items} fiókot kövess a következőből: %{filename}, és abbahagyd mindenki más követését.' + lists_html: Arra készülsz, hogy a listákat lecseréld a %{filename} tartalmával. Legfeljebb %{total_items} fiók kerül fel az új listákra. muting_html: 'Arra készülsz, hogy lecseréld a némított fiókok listáját legfeljebb %{total_items} fiókra a következőből: %{filename}.' preambles: blocking_html: 'Arra készülsz, hogy legfeljebb %{total_items} fiókot letilts a következőből: %{filename}.' bookmarks_html: 'Arra készülsz, hogy legfeljebb %{total_items} bejegyzést adj hozzá a könyvjelzőkhöz a következőből: %{filename}.' domain_blocking_html: 'Arra készülsz, hogy legfeljebb %{total_items} domaint letilts a következőből: %{filename}.' following_html: 'Arra készülsz, hogy legfeljebb %{total_items} fiókot kövess a következőből: %{filename}.' + lists_html: Arra készülsz, hogy legfeljebb %{total_items} fiókot hozzáadj a %{filename} fájlból a listákhoz. Új listák jönnek létre, ha nincs hozzáadható lista. muting_html: 'Arra készülsz, hogy legfeljebb %{total_items} fiókot némíts a következőből: %{filename}.' preface: Itt importálhatod egy másik kiszolgálóról lementett adataidat, például követettjeid és letiltott felhasználóid listáját. recent_imports: Legutóbbi importálások @@ -1299,6 +1301,7 @@ hu: bookmarks: Könyvjelzők importálása domain_blocking: Letiltott domainek importálása following: Követett fiókok importálása + lists: Listák importálása muting: Némított fiókok importálása type: Importálás típusa type_groups: @@ -1309,6 +1312,7 @@ hu: bookmarks: Könyvjelzők domain_blocking: Letiltott domainek listája following: Követettjeid listája + lists: Listák muting: Némított felhasználók listája upload: Feltöltés invites: diff --git a/config/locales/hy.yml b/config/locales/hy.yml index b924217af5..fdbba50e97 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -84,6 +84,7 @@ hy: active: Ակտիվ all: Բոլորը pending: Սպասում + silenced: Սահմանափակ suspended: Կասեցուած title: Մոդերացիա moderation_notes: Մոդերացիայի նշումներ @@ -566,6 +567,7 @@ hy: index: delete: Ջնջել empty: Դու ֆիլտրեր չունես։ + expires_on: Լրանում է %{date}-ին title: Ֆիլտրեր new: title: Ավելացնել ֆիլտր @@ -699,6 +701,8 @@ hy: other: Այլ posting_defaults: Կանխադիր կարգաւորումներ public_timelines: Հանրային հոսք + privacy_policy: + title: Գաղտնիութեան քաղաքականութիւն reactions: errors: unrecognized_emoji: ճանաչուած էմոջի չէ diff --git a/config/locales/id.yml b/config/locales/id.yml index 69298c4b13..df8be30af2 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -710,7 +710,6 @@ id: approved: Persetujuan diperlukan untuk mendaftar none: Tidak ada yang dapat mendaftar open: Siapa pun dapat mendaftar - title: Pengaturan Server site_uploads: delete: Hapus berkas yang diunggah destroyed_msg: Situs yang diunggah berhasil dihapus! diff --git a/config/locales/io.yml b/config/locales/io.yml index ce37eda4ee..805ecffe16 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -698,7 +698,6 @@ io: approved: Aprobo bezonesas por registro none: Nulu povas registrar open: Irgu povas registrar - title: Servilopcioni site_uploads: delete: Efacez adchargita failo destroyed_msg: Sitadchargito sucesoze efacesis! diff --git a/config/locales/is.yml b/config/locales/is.yml index 0311296d96..625453c94d 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -1281,12 +1281,14 @@ is: bookmarks_html: Þú er í þann mund að fara að skipta út bókamerkjunum þínum með allt að %{total_items} færslum úr %{filename}. domain_blocking_html: Þú er í þann mund að fara að skipta út listanum þínum yfir útilokuð lén með allt að %{total_items} lénum úr %{filename}. following_html: Þú er í þann mund að fara að fylgjast með allt að %{total_items} aðgöngum úr %{filename} og hætta að fylgjast með öllum öðrum. + lists_html: Þú ert í þann mund að fara að skipta út listunum þínum með efninu úr %{filename}. Allt að %{total_items} aðgöngum verður bætt við nýju listana. muting_html: Þú er í þann mund að fara að skipta út listanum þínum yfir útilokaða aðganga með allt að %{total_items} aðgöngum úr %{filename}. preambles: blocking_html: Þú er í þann mund að fara að útiloka allt að %{total_items} aðganga úr %{filename}. bookmarks_html: Þú er í þann mund að fara að bæta við allt að %{total_items} færslum úr %{filename} við bókamerkin þín. domain_blocking_html: Þú er í þann mund að fara að útiloka allt að %{total_items} lén úr %{filename}. following_html: Þú er í þann mund að fara að fylgjast með allt að %{total_items} aðgöngum úr %{filename}. + lists_html: Þú ert í þann mund að fara að bæta við allt að %{total_items} aðgöngum úr %{filename} við listana þína. Nýir listar verða útbúnir ef ekki finnst neinn listi til að bæta í. muting_html: Þú er í þann mund að fara að þagga allt að %{total_items} aðganga úr %{filename}. preface: Þú getur flutt inn gögn sem þú hefur flutt út frá öðrum vefþjóni, svo sem lista yfir fólk sem þú fylgist með eða útilokar. recent_imports: Nýlega flutt inn @@ -1303,6 +1305,7 @@ is: bookmarks: Flyt inn bókamerki domain_blocking: Flyt inn útilokuð lén following: Flyt inn aðganga sem fylgst er með + lists: Flytja inn lista muting: Flyt inn þaggaða aðganga type: Tegund innflutnings type_groups: @@ -1313,6 +1316,7 @@ is: bookmarks: Bókamerki domain_blocking: Listi yfir útilokanir léna following: Listi yfir þá sem fylgst er með + lists: Listar muting: Listi yfir þagganir upload: Senda inn invites: diff --git a/config/locales/it.yml b/config/locales/it.yml index 22c628e7d4..c678741fdd 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1279,12 +1279,14 @@ it: bookmarks_html: Stai per sostituire i tuoi segnalibri con un massimo di %{total_items} post da %{filename}. domain_blocking_html: Stai per sostituire la tua lista di domini bloccati con un massimo di %{total_items} domini da %{filename}. following_html: Stai per seguire fino a %{total_items} account da %{filename} e smettere di seguire chiunque altro. + lists_html: Stai per sostituire le tue liste con i contenuti di %{filename}. Fino a %{total_items} profili verranno aggiunti a nuove liste. muting_html: Stai per sostituire la tua lista di account silenziati con un massimo di %{total_items} account da %{filename}. preambles: blocking_html: Stai per bloccare fino a %{total_items} account da %{filename}. bookmarks_html: Stai per aggiungere fino a %{total_items} post da %{filename} ai tuoi segnalibri. domain_blocking_html: Stai per bloccare fino a %{total_items} domini da %{filename}. following_html: Stai per seguire fino a %{total_items} account da %{filename}. + lists_html: Stai per aggiungere fino a %{total_items} profili da %{filename} alla tue liste. Le nuove liste saranno create se non c'è una lista a cui aggiungere. muting_html: Stai per silenziare fino a %{total_items} account da %{filename}. preface: Puoi importare alcune informazioni, come le persone che segui o hai bloccato su questo server, da file creati da un'esportazione su un altro server. recent_imports: Importazioni recenti @@ -1301,6 +1303,7 @@ it: bookmarks: Importazione dei segnalibri domain_blocking: Importazione dei domini bloccati following: Importazione degli account seguiti + lists: Importa elenchi muting: Importazione degli account silenziati type: Tipo d'importazione type_groups: @@ -1311,6 +1314,7 @@ it: bookmarks: Segnalibri domain_blocking: Lista dei domini bloccati following: Lista dei seguiti + lists: Elenchi muting: Lista dei silenziati upload: Carica invites: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 5a52dff8bf..38f675470d 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1252,12 +1252,14 @@ ja: bookmarks_html: "%{filename}の%{total_items}件の投稿でブックマークの一覧を置き換えます。" domain_blocking_html: "%{filename}の%{total_items}個のドメインで非表示にしたドメインリストを置き換えます。" following_html: "%{filename}の%{total_items}個のアカウントをフォローします。また、この中に含まれていないアカウントのフォローを解除します。" + lists_html: "作成済みのリストを%{filename}の内容で置き換えます。%{total_items}個のアカウントが新しいリストに追加されます。" muting_html: "%{filename}の%{total_items}個のアカウントでミュートしたアカウントリストを置き換えます。" preambles: blocking_html: "%{filename}の%{total_items}個のアカウントをブロックします。" bookmarks_html: "%{filename}の%{total_items}件の投稿をブックマークに追加します。" domain_blocking_html: "%{filename}の%{total_items}個のドメインを非表示にします。" following_html: "%{filename}の%{total_items}個のアカウントをフォローします。" + lists_html: "%{filename}の%{total_items}個のアカウントをリストに追加します。追加先のリストがない場合は新しく作成されます。" muting_html: "%{filename}の%{total_items}個のアカウントをミュートします。" preface: 他のサーバーでエクスポートされたファイルから、フォロー/ブロックした情報をこのサーバー上のアカウントにインポートできます。 recent_imports: 最近のインポート @@ -1274,6 +1276,7 @@ ja: bookmarks: ブックマークのインポート domain_blocking: ドメイン非表示のインポート following: フォローのインポート + lists: リストのインポート muting: ミュートのインポート type: インポートする項目 type_groups: @@ -1284,6 +1287,7 @@ ja: bookmarks: ブックマーク domain_blocking: 非表示にしたドメインリスト following: フォロー中のアカウントリスト + lists: リスト muting: ミュートしたアカウントリスト upload: アップロード invites: diff --git a/config/locales/kab.yml b/config/locales/kab.yml index 74fd7b3a84..f9884e4e77 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -401,7 +401,6 @@ kab: modes: none: Yiwen·t ur yzmir ad izeddi open: Zemren akk ad jerden - title: Iɣewwaṛen n uqeddac site_uploads: delete: Kkes afaylu yulin statuses: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index f78fa8c0e5..9386ff9013 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -11,7 +11,7 @@ ko: followers: other: 팔로워 following: 팔로잉 - instance_actor_flash: 이 계정은 서버 자신을 나타내기 위한 가상의 계정이며 개인 이용자가 아닙니다. 이 계정은 연합을 위해 사용되며 정지되지 않아야 합니다. + instance_actor_flash: 이 계정은 서버 자신을 나타내기 위한 가상의 계정이며 개인 사용자가 아닙니다. 이 계정은 연합을 위해 사용되며 정지되지 않아야 합니다. last_active: 최근 활동 link_verified_on: "%{date}에 이 링크의 소유가 확인되었습니다" nothing_here: 아무 것도 없습니다! @@ -121,7 +121,7 @@ ko: removed_avatar_msg: 성공적으로 %{username}의 아바타 이미지를 삭제하였습니다 removed_header_msg: 성공적으로 %{username}의 헤더 이미지를 삭제하였습니다 resend_confirmation: - already_confirmed: 이 이용자는 이미 확인하였습니다 + already_confirmed: 이 사용자는 이미 확인되었습니다 send: 확인 링크 다시 보내기 success: 확인 링크를 잘 보냈습니다! reset: 초기화 @@ -129,8 +129,8 @@ ko: resubscribe: 다시 구독 role: 역할 search: 검색 - search_same_email_domain: 같은 이메일 도메인을 가진 다른 이용자 - search_same_ip: 같은 IP의 다른 이용자 + search_same_email_domain: 같은 이메일 도메인을 가진 다른 사용자들 + search_same_ip: 같은 IP의 다른 사용자들 security: 보안 security_measures: only_password: 암호만 @@ -168,11 +168,11 @@ ko: action_logs: action_types: approve_appeal: 이의제기 승인 - approve_user: 이용자 승낙 + approve_user: 사용자 승인 assigned_to_self_report: 신고 맡기 - change_email_user: 이용자의 이메일 변경 + change_email_user: 사용자의 이메일 변경 change_role_user: 사용자 역할 변경 - confirm_user: 이용자 확인 + confirm_user: 사용자 확인 create_account_warning: 경고 생성 create_announcement: 공지사항 생성 create_canonical_email_block: 이메일 차단 생성 @@ -183,7 +183,7 @@ ko: create_ip_block: IP 규칙 만들기 create_unavailable_domain: 사용 불가능한 도메인 생성 create_user_role: 역할 생성 - demote_user: 이용자 강등 + demote_user: 사용자 강등 destroy_announcement: 공지사항 삭제 destroy_canonical_email_block: 이메일 차단 삭제 destroy_custom_emoji: 커스텀 에모지 삭제 @@ -197,15 +197,15 @@ ko: destroy_user_role: 역할 삭제 disable_2fa_user: 2단계 인증 비활성화 disable_custom_emoji: 커스텀 에모지 비활성화 - disable_sign_in_token_auth_user: 이용자에 대한 이메일 토큰 인증 비활성화 - disable_user: 이용자 비활성화 + disable_sign_in_token_auth_user: 사용자에 대한 이메일 토큰 인증 비활성화 + disable_user: 사용자 비활성화 enable_custom_emoji: 커스텀 에모지 활성화 - enable_sign_in_token_auth_user: 이용자에 대한 이메일 토큰 인증 활성화 - enable_user: 이용자 활성화 + enable_sign_in_token_auth_user: 사용자에 대한 이메일 토큰 인증 활성화 + enable_user: 사용자 활성화 memorialize_account: 고인의 계정으로 전환 - promote_user: 이용자 승급 + promote_user: 사용자 승급 reject_appeal: 이의 제기 거절 - reject_user: 이용자 거부 + reject_user: 사용자 거부 remove_avatar_user: 아바타 지우기 reopen_report: 신고 다시 열기 resend_user: 확인 메일 다시 보내기 @@ -229,9 +229,9 @@ ko: approve_appeal_html: "%{name} 님이 %{target}의 중재 결정에 대한 이의 제기를 승인했습니다" approve_user_html: "%{name} 님이 %{target} 님의 가입을 승인했습니다" assigned_to_self_report_html: "%{name} 님이 신고 %{target}을 자신에게 할당했습니다" - change_email_user_html: "%{name} 님이 이용자 %{target} 님의 이메일 주소를 변경했습니다" + change_email_user_html: "%{name} 님이 사용자 %{target} 님의 이메일 주소를 변경했습니다" change_role_user_html: "%{name} 님이 %{target} 님의 역할을 수정했습니다" - confirm_user_html: "%{name} 님이 이용자 %{target} 님의 이메일 주소를 승인했습니다" + confirm_user_html: "%{name} 님이 사용자 %{target} 님의 이메일 주소를 승인했습니다" create_account_warning_html: "%{name} 님이 %{target}에게 경고를 보냈습니다" create_announcement_html: "%{name} 님이 새 공지 %{target}을 만들었습니다" create_canonical_email_block_html: "%{name} 님이 %{target} 해시를 가진 이메일을 차단했습니다" @@ -242,7 +242,7 @@ ko: create_ip_block_html: "%{name} 님이 IP 규칙 %{target}을 만들었습니다" create_unavailable_domain_html: "%{name} 님이 도메인 %{target}에 대한 전달을 중지했습니다" create_user_role_html: "%{name} 님이 %{target} 역할을 생성했습니다" - demote_user_html: "%{name} 님이 이용자 %{target} 님을 강등했습니다" + demote_user_html: "%{name} 님이 사용자 %{target} 님을 강등했습니다" destroy_announcement_html: "%{name} 님이 공지 %{target}을 삭제했습니다" destroy_canonical_email_block_html: "%{name} 님이 %{target} 해시를 가진 이메일을 차단 해제했습니다" destroy_custom_emoji_html: "%{name} 님이 에모지 %{target}를 삭제했습니다" @@ -254,7 +254,7 @@ ko: destroy_status_html: "%{name} 님이 %{target} 님의 게시물을 삭제했습니다" destroy_unavailable_domain_html: "%{name} 님이 도메인 %{target}에 대한 전달을 재개" destroy_user_role_html: "%{name} 님이 %{target} 역할을 삭제했습니다" - disable_2fa_user_html: "%{name} 님이 이용자 %{target} 님의 2단계 인증을 비활성화 했습니다" + disable_2fa_user_html: "%{name} 님이 사용자 %{target} 님의 2단계 인증을 비활성화 했습니다" disable_custom_emoji_html: "%{name} 님이 에모지 %{target}를 비활성화했습니다" disable_sign_in_token_auth_user_html: "%{name} 님이 %{target} 님의 이메일 토큰 인증을 비활성화했습니다" disable_user_html: "%{name} 님이 사용자 %{target}의 로그인을 비활성화했습니다" @@ -262,13 +262,13 @@ ko: enable_sign_in_token_auth_user_html: "%{name} 님이 %{target} 님의 이메일 토큰 인증을 활성화했습니다" enable_user_html: "%{name} 님이 사용자 %{target}의 로그인을 활성화했습니다" memorialize_account_html: "%{name} 님이 %{target}의 계정을 고인의 계정 페이지로 전환했습니다" - promote_user_html: "%{name} 님이 이용자 %{target} 님을 승급 하였습니다." + promote_user_html: "%{name} 님이 사용자 %{target}를 승급시켰습니다" reject_appeal_html: "%{name} 님이 %{target}의 중재 결정에 대한 이의 제기를 거절했습니다" reject_user_html: "%{name} 님이 %{target} 님의 가입을 거부했습니다" remove_avatar_user_html: "%{name} 님이 %{target} 님의 아바타를 지웠습니다" reopen_report_html: "%{name} 님이 신고 %{target}을 다시 열었습니다" resend_user_html: "%{name} 님이 %{target} 님에 대한 확인 메일을 다시 보냈습니다" - reset_password_user_html: "%{name} 님이 이용자 %{target} 님의 암호를 초기화했습니다" + reset_password_user_html: "%{name} 님이 사용자 %{target}의 암호를 초기화했습니다" resolve_report_html: "%{name} 님이 신고 %{target}를 처리됨으로 변경하였습니다" sensitive_account_html: "%{name} 님이 %{target}의 미디어를 민감함으로 표시했습니다" silence_account_html: "%{name} 님이 %{target}의 계정을 제한시켰습니다" @@ -341,7 +341,7 @@ ko: updated_msg: 성공적으로 에모지를 업데이트했습니다! upload: 업로드 dashboard: - active_users: 활성 이용자 + active_users: 활성 사용자 interactions: 상호 작용 media_storage: 미디어 저장소 new_users: 새 사용자 @@ -452,7 +452,7 @@ ko: title: 도메인 차단 불러오기 no_file: 선택된 파일이 없습니다 follow_recommendations: - description_html: "팔로우 추천은 새 사용자들이 관심 가는 콘텐트를 빠르게 찾을 수 있도록 도와줍니다. 이용자가 개인화 된 팔로우 추천이 만들어지기 위한 충분한 상호작용을 하지 않은 경우, 이 계정들이 대신 추천 됩니다. 이들은 해당 언어에 대해 많은 관심을 갖거나 많은 로컬 팔로워를 가지고 있는 계정들을 섞어서 날마다 다시 계산 됩니다." + description_html: "팔로우 추천은 새 사용자들이 관심 가는 콘텐트를 빠르게 찾을 수 있도록 도와줍니다. 사용자가 개인화 된 팔로우 추천이 만들어지기 위한 충분한 상호작용을 하지 않은 경우, 이 계정들이 대신 추천 됩니다. 이들은 해당 언어에 대해 많은 관심을 갖거나 많은 로컬 팔로워를 가지고 있는 계정들을 섞어서 날마다 다시 계산 됩니다." language: 언어 필터 status: 상태 suppress: 팔로우 추천 숨기기 @@ -614,7 +614,7 @@ ko: notes_description_html: 확인하고 다른 중재자나 미래의 자신을 위해 기록을 작성합니다 processed_msg: '신고 #%{id}가 정상적으로 처리되었습니다' quick_actions_description_html: '빠른 조치를 취하거나 아래로 스크롤해서 신고된 콘텐츠를 확인하세요:' - remote_user_placeholder: "%{instance}의 리모트 이용자" + remote_user_placeholder: "%{instance}의 리모트 사용자" reopen: 신고 재검토 report: '신고 #%{id}' reported_account: 신고 대상 계정 @@ -851,7 +851,7 @@ ko: statuses: allow: 게시물 허용 allow_account: 작성자 허용 - description_html: 여기에 여러분의 서버가 알아낸, 이 순간 가장 많은 공유하고 좋아요를 받은 게시물이 있습니다. 새로운 이용자나 돌아오는 이용자들이 팔로우 할 사람을 찾는 데 도움이 될 수 있습니다. 작성자를 승인하고, 작성자가 그들의 계정이 다른 계정에게 탐색되도록 설정하지 않는 한 게시물은 공개적으로 표시되지 않습니다. 또한 각각의 게시물을 별개로 거절할 수도 있습니다. + description_html: 당신의 서버가 알기로 현재 많은 수의 공유와 좋아요가 되고 있는 게시물들입니다. 새로운 사용자나 돌아오는 사용자들이 팔로우 할 사람들을 찾는 데 도움이 될 수 있습니다. 작성자를 승인하고, 작성자가 그들의 계정이 다른 계정에게 탐색되도록 설정하지 않는 한 게시물들은 공개적으로 표시되지 않습니다. 또한 각각의 게시물을 별개로 거절할 수도 있습니다. disallow: 게시물 비허용 disallow_account: 작성자 비허용 no_status_selected: 아무 것도 선택 되지 않아 어떤 유행중인 게시물도 바뀌지 않았습니다 @@ -1254,12 +1254,14 @@ ko: bookmarks_html: 나의 북마크를 %{filename}에서 가져온 %{total_items} 개의 게시물로 덮어 씌우려고 합니다. domain_blocking_html: 나의 도메인 차단 목록을 %{filename}에서 가져온 %{total_items} 개의 도메인으로 덮어 씌우려고 합니다. following_html: "%{filename}에서 가져온 %{total_items} 개의 계정을 팔로우하고 나머지 계정을 팔로우 해제하려고 합니다." + lists_html: 나의 리스트를 %{filename}에서 가져온 %{total_items} 개의 계정으로 덮어 씌우려고 합니다. muting_html: 나의 뮤트한 계정 목록을 %{filename}에서 가져온 %{total_items} 개의 계정으로 덮어 씌우려고 합니다. preambles: blocking_html: "%{filename}에서 가져온 %{total_items}개의 계정을 차단하려고 합니다." bookmarks_html: "%{filename}에서 가져온 %{total_items}개의 게시물을 북마크에 추가하려고 합니다." domain_blocking_html: "%{filename}에서 가져온 %{total_items}개의 도메인을 차단하려고 합니다." following_html: "%{filename}에서 가져온 %{total_items}개의 계정을 팔로우하려고 합니다." + lists_html: "%{filename}에서 가져온 %{total_items}개의 계정을 내 리스트에 추가하려고 합니다. 추가할 리스트가 존재하지 않으면 새로 생성될 것입니다." muting_html: "%{filename}에서 가져온 %{total_items}개의 계정을 뮤트하려고 합니다." preface: 다른 서버에서 내보내기 한 파일에서 팔로우 / 차단 정보를 이 계정으로 불러올 수 있습니다. recent_imports: 최근의 가져오기 @@ -1276,6 +1278,7 @@ ko: bookmarks: 북마크 가져오는 중 domain_blocking: 차단한 도메인 가져오는 중 following: 팔로우한 계정 가져오는 중 + lists: 리스트 가져오기 muting: 뮤트한 계정 가져오는 중 type: 가져오기 유형 type_groups: @@ -1286,6 +1289,7 @@ ko: bookmarks: 북마크 domain_blocking: 도메인 차단 목록 following: 팔로우 중인 계정 목록 + lists: 리스트 muting: 뮤트 중인 계정 목록 upload: 업로드 invites: @@ -1377,8 +1381,8 @@ ko: moderation: title: 중재 move_handler: - carry_blocks_over_text: 이 이용자는 예전에 차단한 %{acct}에서 이주 했습니다. - carry_mutes_over_text: 이 이용자는 예전에 뮤트한 %{acct}에서 이주 했습니다. + carry_blocks_over_text: 이 사용자는 예전에 차단한 %{acct}에서 이주 했습니다. + carry_mutes_over_text: 이 사용자는 예전에 뮤트한 %{acct}에서 이주 했습니다. copy_account_note_text: '이 사용자는 %{acct}로부터 이동하였습니다. 당신의 이전 노트는 이렇습니다:' navigation: toggle_menu: 토글 메뉴 diff --git a/config/locales/ku.yml b/config/locales/ku.yml index bfa9db1d22..d35d0de27e 100644 --- a/config/locales/ku.yml +++ b/config/locales/ku.yml @@ -725,7 +725,6 @@ ku: approved: Ji bo têketinê erêkirin pêwîste none: Kesek nikare tomar bibe open: Herkes dikare tomar bibe - title: Sazkariyên rajekarê site_uploads: delete: Pela barkirî jê bibe destroyed_msg: Barkirina malperê bi serkeftî hate jêbirin! diff --git a/config/locales/lv.yml b/config/locales/lv.yml index b951855595..e184e2171f 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -772,7 +772,6 @@ lv: approved: Reģistrācijai nepieciešams apstiprinājums none: Neviens nevar reģistrēties open: Jebkurš var reģistrēties - title: Servera Iestatījumi site_uploads: delete: Dzēst augšupielādēto failu destroyed_msg: Vietnes augšupielāde ir veiksmīgi izdzēsta! diff --git a/config/locales/ms.yml b/config/locales/ms.yml index e9e6c70cc4..963ee644cd 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -664,7 +664,6 @@ ms: approved: Kelulusan diperlukan untuk pendaftaran none: Tiada siapa boleh mendaftar open: Sesiapapun boleh mendaftar - title: Tetapan Pelayan site_uploads: delete: Hapuskan fail yang dimuat naik destroyed_msg: Muat naik tapak berjaya dihapuskan! diff --git a/config/locales/my.yml b/config/locales/my.yml index 439d1eabea..0d11c30baa 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -1252,12 +1252,14 @@ my: bookmarks_html: သင်သည် %{filename} မှ %{total_items} ပို့စ်များ အထိ သင့် bookmark များကို အစားထိုးပါတော့မည်။ domain_blocking_html: သင်သည် %{filename} မှ %{total_items} ဒိုမိန်းများ ဖြင့် သင်၏ ဒိုမိန်းပိတ်ဆို့စာရင်းကို အစားထိုးပါတော့မည်။ following_html: သင်သည် %{filename} မှ %{total_items} အကောင့်များ အထိ စောင့်ကြည့် ပြီး အခြားမည်သူ့ကိုမျှ စောင့်မကြည့်တော့ပါ ။ + lists_html: သင်သည် %{filename} ၏ အကြောင်းအရာများဖြင့် သင့်စာရင်းများကို အစားထိုး ပါတော့မည်။ %{total_items} အကောင့်များအထိ စာရင်းအသစ်များသို့ ပေါင်းထည့်ပါမည်။ muting_html: သင်သည် %{filename} မှ %{total_items} အကောင့်များ ဖြင့် အသံပိတ်ထားသော သင့်အကောင့်များစာရင်းကို အစားထိုးပါတော့မည်။ preambles: blocking_html: သင်သည် %{filename} မှ %{total_items} အကောင့်များ အထိ ပိတ်ဆို့ပါတော့မည်။ bookmarks_html: သင်သည် %{filename} မှ %{total_items} ပို့စ်များ အထိ သင့် Bookmark များ သို့ ပေါင်းထည့်တော့မည်။ domain_blocking_html: သင်သည် %{filename} မှ %{total_items} ဒိုမိန်းများ အထိ ပိတ်ဆို့ပါတော့မည်။ following_html: သင်သည် %{filename} မှ %{total_items} အကောင့်များ အထိ စောင့်ကြည့် ပါတော့မည်။ + lists_html: သင်သည် %{filename} မှ %{total_items} အကောင့်များ ကို သင့် စာရင်းများ သို့ ပေါင်းထည့်ပါတော့မည်။ ထည့်ရန်စာရင်းမရှိပါက စာရင်းအသစ်များကို ဖန်တီးပါမည်။ muting_html: သင်သည် %{filename} မှ %{total_items} အကောင့်များ အထိ အသံတိတ်ပါတော့မည်။ preface: သင်စောင့်ကြည့်နေသည့်လူများစာရင်း သို့မဟုတ် ပိတ်ပင်ထားသည့်စာရင်းကဲ့သို့သော အခြားဆာဗာတစ်ခုမှ သင်ထုတ်ယူထားသည့်အချက်အလက်များကို ပြန်လည်ထည့်သွင်းနိုင်သည်။ recent_imports: လတ်တလောထည့်သွင်းမှုများ @@ -1274,6 +1276,7 @@ my: bookmarks: Bookmark များ ထည့်သွင်းခြင်း domain_blocking: ပိတ်ထားသောဒိုမိန်းများ ထည့်သွင်းခြင်း following: စောင့်ကြည့်ထားသောအကောင့်များထည့်သွင်းခြင်း + lists: စာရင်းများထည့်ခြင်း muting: အသံတိတ်အကောင့်များထည့်သွင်းခြင်း type: ထည့်သွင်းမှုအမျိုးအစား type_groups: @@ -1284,6 +1287,7 @@ my: bookmarks: Bookmarks domain_blocking: ဒိုမိန်းပိတ်ပင်ထားသည့်စာရင်း following: စောင့်ကြည့်စာရင်း + lists: စာရင်းများ muting: ပိတ်ထားသောစာရင်း upload: တင္ရန် invites: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 5949fcdca3..ff562c97c9 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1277,12 +1277,14 @@ nl: bookmarks_html: Je staat op het punt jouw bladwijzers te vervangen door %{total_items} berichten vanuit %{filename}. domain_blocking_html: Je staat op het punt jouw lijst met geblokkeerde domeinen te vervangen door %{total_items} domeinen vanuit %{filename}. following_html: Je staat op het punt om %{total_items} accounts te volgen vanuit %{filename} en te stoppen met het volgen van alle andere accounts. + lists_html: Je staat op het punt je lijsten te vervangen door inhoud van %{filename}. Tot %{total_items} accounts zullen aan nieuwe lijsten worden toegevoegd. muting_html: Je staat op het punt jouw lijst met genegeerde accounts te vervangen door %{total_items} accounts vanuit %{filename}. preambles: blocking_html: Je staat op het punt om %{total_items} accounts te blokkeren vanuit %{filename}. bookmarks_html: Je staat op het punt om %{total_items} berichten aan je bladwijzers toe te voegen vanuit %{filename}. domain_blocking_html: Je staat op het punt om %{total_items} accounts te negeren vanuit %{filename}. following_html: Je staat op het punt om %{total_items} accounts te volgen vanuit %{filename}. + lists_html: Je staat op het punt om tot %{total_items} accounts van %{filename} toe te voegen aan je lijsten. Nieuwe lijsten worden aangemaakt als er geen lijst is om aan toe te voegen. muting_html: Je staat op het punt om %{total_items} accounts te negeren vanuit %{filename}. preface: Je kunt bepaalde gegevens, zoals de mensen die jij volgt of hebt geblokkeerd, naar jouw account op deze server importeren. Je moet deze gegevens wel eerst op de oorspronkelijke server exporteren. recent_imports: Recent geïmporteerd @@ -1299,6 +1301,7 @@ nl: bookmarks: Bladwijzers importeren domain_blocking: Geblokkeerde domeinen importeren following: Gevolgde accounts importeren + lists: Lijsten importeren muting: Genegeerde accounts importeren type: Importtype type_groups: @@ -1309,6 +1312,7 @@ nl: bookmarks: Bladwijzers domain_blocking: Geblokkeerde domeinen following: Gevolgde accounts + lists: Lijsten muting: Genegeerde accounts upload: Uploaden invites: diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 393b48037c..78292744b0 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -762,7 +762,6 @@ nn: approved: Godkjenning kreves for påmelding none: Ingen kan melda seg inn open: Kven som helst kan melda seg inn - title: Serverinnstillinger site_uploads: delete: Slett opplasta fil destroyed_msg: Vellukka sletting av sideopplasting! diff --git a/config/locales/no.yml b/config/locales/no.yml index cc6b4b2aa8..04b5bce728 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -734,7 +734,6 @@ approved: Godkjenning kreves for påmelding none: Ingen kan melde seg inn open: Hvem som helst kan melde seg inn - title: Serverinnstillinger site_uploads: delete: Slett den opplastede filen destroyed_msg: Vellykket sletting av sideopplasting! diff --git a/config/locales/oc.yml b/config/locales/oc.yml index e531a91f42..5dcbb0c57b 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -395,7 +395,6 @@ oc: approved: Validacion necessària per s’inscriure none: Degun pòt pas se marcar open: Tot lo monde se pòt marcar - title: Paramètres del servidor site_uploads: delete: Suprimir lo fichièr enviat statuses: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index dd35e06f47..4af8885138 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1327,12 +1327,14 @@ pl: bookmarks_html: Zamierzasz zastąpić swoje zakładki maksymalnie %{total_items} wpisami z %{filename}. domain_blocking_html: Zamierzasz zastąpić swoją listę bloków domen maksymalnie %{total_items} domenami z %{filename}. following_html: Zamierzasz zaobserwować maksymalnie %{total_items} kont z %{filename} i przestać obserwować kogokolwiek innego. + lists_html: Zamierzasz zastąpić swoje listy maksymalnie %{total_items} kontami z %{filename}. muting_html: Zamierzasz zastąpić swoją wyciszonych maksymalnie %{total_items} kontami z %{filename}. preambles: blocking_html: Zamierzasz zablokować maksymalnie %{total_items} kont z %{filename}. bookmarks_html: Zamierzasz dodać maksymalnie %{total_items} wpisów do twoich zakładek z %{filename}. domain_blocking_html: Zamierzasz zablokować maksymalnie %{total_items} domen z %{filename}. following_html: Zamierzasz zaobserwować maksymalnie %{total_items} kont z %{filename}. + lists_html: Zamierzasz dodać maksymalnie %{total_items} kont do twoich list z %{filename}. Jeżeli nie ma list, nowe zostaną utworzone. muting_html: Zamierzasz wyciszyć maksymalnie %{total_items} kont z %{filename}. preface: Możesz zaimportować pewne dane (np. lista kont, które obserwujesz lub blokujesz) do swojego konta na tym serwerze, korzystając z danych wyeksportowanych z innego serwera. recent_imports: Ostatnie importy @@ -1349,6 +1351,7 @@ pl: bookmarks: Importowanie zakładek domain_blocking: Importowanie zablokowanych domen following: Importowanie obserwowanych kont + lists: Importowanie list muting: Importowanie wyciszonych kont type: Typ importu type_groups: @@ -1359,6 +1362,7 @@ pl: bookmarks: Zakładki domain_blocking: Lista zablokowanych domen following: Lista obserwowanych + lists: Listy muting: Lista wyciszonych upload: Załaduj invites: diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 8195d42758..d9594a1506 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -770,7 +770,6 @@ pt-BR: approved: Aprovação necessária para criar conta none: Ninguém pode criar conta open: Qualquer um pode criar conta - title: Configurações do Servidor site_uploads: delete: Excluir arquivo enviado destroyed_msg: Upload do site excluído com sucesso! diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index eedc115a8f..4b1b7a1b76 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -770,7 +770,7 @@ pt-PT: approved: Registo sujeito a aprovação none: Ninguém se pode registar open: Qualquer pessoa se pode registar - title: Definições do Servidor + title: Definições do servidor site_uploads: delete: Eliminar arquivo carregado destroyed_msg: Envio de sítio na teia correctamente eliminado! diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 98112f6ee9..d90a93e3ca 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -798,7 +798,7 @@ ru: approved: Для регистрации требуется подтверждение none: Никто не может регистрироваться open: Все могут регистрироваться - title: Настройки Сервера + title: Настройки сервера site_uploads: delete: Удалить загруженный файл destroyed_msg: Файл успешно удалён. @@ -1067,6 +1067,7 @@ ru: rules: accept: Принять back: Назад + invited_by: 'Вы можете присоединиться к %{domain} благодаря приглашению полученному от:' preamble: Они устанавливаются и применяются модераторами %{domain}. title: Несколько основных правил. security: Безопасность @@ -1319,12 +1320,14 @@ ru: bookmarks_html: Вы собираетесь заменить свои закладки на %{total_items} постов из %{filename}. domain_blocking_html: Вы собираетесь заменить ваш список блокировки доменов на %{total_items} доменов из %{filename}. following_html: Вы собираетесь следить за %{total_items} аккаунтами из %{filename} и прекратить следить за всеми остальными. + lists_html: Вы собираетесь заменить ваши списки содержимым %{filename}. До %{total_items} аккаунты будут добавлены в новые списки. muting_html: Вы собираетесь заменить список отключенных аккаунтов на %{total_items} аккаунтов из %{filename}. preambles: blocking_html: Вы собираетесь заблокировать до %{total_items} аккаунтов из %{filename}. bookmarks_html: Вы собираетесь добавить до %{total_items} постов из %{filename} в свои закладки. domain_blocking_html: Вы собираетесь блокировать до %{total_items} доменов от %{filename}. following_html: Вы собираетесь следовать за %{total_items} аккаунтами из %{filename}. + lists_html: Вы собираетесь добавить до %{total_items} аккаунтов от %{filename} к вашим спискам. Новые списки будут созданы, если нет списка для добавления. muting_html: Вы собираетесь отключить до %{total_items} аккаунтов из %{filename}. preface: Вы можете загрузить некоторые данные, например, списки людей, на которых Вы подписаны или которых блокируете, в Вашу учётную запись на этом узле из файлов, экспортированных с другого узла. recent_imports: Недавно импортированное @@ -1341,6 +1344,7 @@ ru: bookmarks: Импорт закладок domain_blocking: Импорт заблокированных доменов following: Импорт последующих аккаунтов + lists: Импортировать список muting: Импорт отключенных аккаунтов type: Тип импорта type_groups: @@ -1351,6 +1355,7 @@ ru: bookmarks: Закладки domain_blocking: Список доменных блокировок following: Подписки + lists: Списки muting: Список глушения upload: Загрузить invites: diff --git a/config/locales/sco.yml b/config/locales/sco.yml index b53f715d69..37c8b0b435 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -718,7 +718,6 @@ sco: approved: Approval needit fir sign up none: Naebody kin sign up open: Oniebody kin sign up - title: Server Settins site_uploads: delete: Delete uploadit file destroyed_msg: Site upload successfully deletit! diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index d99750faab..4e8972cb96 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -4,8 +4,8 @@ da: hints: account: display_name: Dit fulde navn eller dit sjove navn. - fields: Din hjemmeside, udtaler, alder, hvad du ønsker. - note: 'Du kan @nævne andre personer eller #hashtags.' + fields: Din hjemmeside, dine pronominer, din alder, eller hvad du har lyst til. + note: 'Du kan @omtale andre personer eller #hashtags.' account_alias: acct: Angiv brugernavn@domain for den konto, hvorfra du vil flytte account_migration: @@ -285,7 +285,7 @@ da: favourite: Nogen favoritmarkerede dit indlæg follow: Nogen begyndte at følge dig follow_request: Nogen anmodede om at følge dig - mention: Nogen nævnte dig + mention: Nogen omtalte dig pending_account: Ny konto kræver gennemgang reblog: Nogen boostede dit indlæg report: Ny anmeldelse indsendt diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 150c07bcf5..012989244d 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -11,17 +11,17 @@ de: account_migration: acct: Gib profilname@domain des Kontos an, zu dem du umziehen möchtest account_warning_preset: - text: Du kannst Beitragssyntax verwenden, wie z. B. URLs, Hashtags und Erwähnungen + text: Du kannst Beitragssyntax verwenden, wie z. B. URLs, Hashtags und Erwähnungen title: Optional. Für Empfänger*in nicht sichtbar admin_account_action: - include_statuses: Die Person sieht, welche Beiträge die Moderationsmaßnahme oder Warnung verursacht haben + include_statuses: Die Person wird sehen, welche Inhalte dich zu dieser Maßnahme veranlasst haben send_email_notification: Benutzer*in wird eine Erklärung erhalten, was mit dem Konto geschehen ist text_html: Optional. Du kannst Beitragssyntax verwenden. Du kannst Warnvorlagen hinzufügen, um Zeit zu sparen type_html: Wähle aus, wie mit %{acct} vorgegangen werden soll types: disable: Benutzer*in daran hindern, das Konto verwenden zu können, aber die Inhalte nicht löschen oder ausblenden. none: Dem Konto eine Verwarnung zusenden, ohne dabei eine andere Aktion vorzunehmen. - sensitive: Erzwingen, dass alle Medienanhänge dieses Profils mit einer Inhaltswarnung versehen werden. + sensitive: Erzwingen, dass alle Medieninhalte dieses Profils mit einer Inhaltswarnung versehen werden. silence: Verhindert, dass dieses Profil öffentlich sichtbare Beiträge verfassen kann, und verbirgt alle Beiträge und Benachrichtigungen vor Personen, die diesem Profil nicht folgen. Alle Meldungen zu diesem Konto werden geschlossen. suspend: Verhindert jegliche Interaktion von oder zu diesem Konto und löscht dessen Inhalt. Dies kann innerhalb von 30 Tagen rückgängig gemacht werden. Alle Meldungen zu diesem Konto werden geschlossen. warning_preset_id: Optional. Du kannst immer noch eigenen Text an das Ende der Vorlage hinzufügen @@ -37,7 +37,7 @@ de: autofollow: Personen, die sich über deine Einladung registrieren, folgen automatisch deinem Profil avatar: PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert bot: Signalisiert, dass dieses Konto hauptsächlich automatisierte Aktionen durchführt und möglicherweise nicht persönlich betreut wird - context: In welchem Bereich soll der Filter aktiv sein? + context: Orte, an denen der Filter aktiv sein soll current_password: Gib aus Sicherheitsgründen bitte das Passwort des aktuellen Kontos ein current_username: Um das zu bestätigen, gib den Profilnamen des aktuellen Kontos ein digest: Wenn du eine längere Zeit inaktiv bist oder du in deiner Abwesenheit eine Direktnachricht erhalten hast @@ -46,14 +46,14 @@ de: header: PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert inbox_url: Kopiere die URL von der Startseite des gewünschten Relays irreversible: Bereinigte Beiträge verschwinden unwiderruflich für dich, auch dann, wenn dieser Filter zu einem späteren wieder entfernt wird - locale: Die Sprache des Webinterface, der E-Mails und Push-Benachrichtigungen + locale: Die Sprache der Bedienoberfläche, E-Mails und Push-Benachrichtigungen locked: Wer dir folgen möchte, muss um deine Erlaubnis bitten password: Verwende mindestens 8 Zeichen phrase: Wird unabhängig von der Groß- und Kleinschreibung im Text oder der Inhaltswarnung eines Beitrags abgeglichen scopes: Welche Schnittstellen der Applikation erlaubt sind. Wenn du einen Top-Level-Scope auswählst, dann musst du nicht jeden einzelnen darunter auswählen. setting_aggregate_reblogs: Keine geteilten Beiträge anzeigen, die bereits kürzlich geteilt wurden (wirkt sich nur auf zukünftige geteilte Beiträge aus) - setting_always_send_emails: Normalerweise werden Benachrichtigungen nicht per E-Mail verschickt, wenn du gerade auf Mastodon aktiv bist - setting_default_sensitive: Medien, die mit einer Inhaltswarnung versehen wurden, werden erst nach einem zusätzlichen Klick angezeigt + setting_always_send_emails: Normalerweise werden Benachrichtigungen nicht per E-Mail versendet, wenn du gerade auf Mastodon aktiv bist + setting_default_sensitive: Medien, die mit einer Inhaltswarnung versehen worden sind, werden – je nach Einstellung – erst nach einem zusätzlichen Klick angezeigt setting_display_media_default: Medien mit Inhaltswarnung ausblenden setting_display_media_hide_all: Medien immer ausblenden setting_display_media_show_all: Medien mit Inhaltswarnung immer anzeigen @@ -84,9 +84,9 @@ de: content_cache_retention_period: Sowohl alle Beiträge als auch geteilte Beiträge von anderen Servern werden nach der angegebenen Anzahl von Tagen gelöscht. Alle zugehörigen Lesezeichen, Favoriten und geteilte Beiträge werden ebenfalls verloren gehen. Dies kann nicht mehr rückgängig gemacht werden. custom_css: Du kannst benutzerdefinierte Stile auf die Web-Version von Mastodon anwenden. mascot: Überschreibt die Abbildung in der erweiterten Weboberfläche. - media_cache_retention_period: Von anderen Instanzen übertragene Mediendateien werden nach der angegebenen Anzahl an Tagen – sofern das Feld eine positive Zahl enthält – aus dem Cache gelöscht und bei Bedarf erneut heruntergeladen. - peers_api_enabled: Eine Liste von Domainnamen, die diesem Server im Fediverse begegnet sind. Hier werden keine Angaben darüber gemacht, ob du mit einem bestimmten Server föderierst, sondern nur, dass dein Server davon weiß. Dies wird von Diensten verwendet, die Statistiken über Föderation im allgemeinen Sinne sammeln. - profile_directory: Das Profilverzeichnis zeigt alle Benutzer*innen an, die sich dafür entschieden haben, entdeckt zu werden. + media_cache_retention_period: Von anderen Servern übertragene Mediendateien werden nach der angegebenen Anzahl an Tagen – sofern das Feld eine positive Zahl enthält – aus dem Cache gelöscht und bei Bedarf erneut heruntergeladen. + peers_api_enabled: Eine Liste von Domains, die diesem Server im Fediverse begegnet sind. Hierbei werden keine Angaben darüber gemacht, ob du mit einem bestimmten Server föderierst, sondern nur, dass dein Server davon weiß. Dies wird von Diensten verwendet, die allgemein Statistiken übers Ferdiverse sammeln. + profile_directory: Dieses Verzeichnis zeigt alle Profile an, die sich dafür entschieden haben, entdeckt zu werden. require_invite_text: Wenn Registrierungen eine manuelle Genehmigung erfordern, dann werden Nutzer einen Grund für ihre Registrierung angeben müssen site_contact_email: Wie man dich bei rechtlichen oder Support-Anfragen erreichen kann. site_contact_username: Wie man dich auf Mastodon erreichen kann. @@ -94,13 +94,13 @@ de: site_short_description: Eine kurze Beschreibung zur eindeutigen Identifizierung des Servers. Wer betreibt ihn, für wen ist er bestimmt? site_terms: Verwende eine eigene Datenschutzerklärung oder lasse das Feld leer, um die allgemeine Vorlage zu verwenden. Kann mit der Markdown-Syntax formatiert werden. site_title: Wie Personen neben dem Domainnamen auf deinen Server verweisen können. - status_page_url: URL einer Seite, auf der der Serverstatus während eines Ausfalls angezeigt wird + status_page_url: Link zu einer Internetseite, auf der der Serverstatus während eines Ausfalls angezeigt wird theme: Das Design, das abgemeldete Besucher und neue Benutzer sehen. thumbnail: Ein Bild ungefähr im 2:1-Format, das neben den Server-Informationen angezeigt wird. - timeline_preview: Besucher*innen und ausgeloggte Benutzer*innen können die neuesten öffentlichen Beiträge dieses Servers aufrufen. + timeline_preview: Nicht angemeldete Personen können die neuesten öffentlichen Beiträge dieses Servers aufrufen. trendable_by_default: Manuelles Überprüfen angesagter Inhalte überspringen. Einzelne Elemente können später noch aus den Trends entfernt werden. trends: Trends zeigen, welche Beiträge, Hashtags und Nachrichten auf deinem Server immer beliebter werden. - trends_as_landing_page: Zeigt Trendinhalte abgemeldeter Benutzer und Besucher anstelle einer Beschreibung dieses Servers an. Erfordert, dass Trends aktiviert sind. + trends_as_landing_page: Dies zeigt nicht angemeldeten Personen Trendinhalte anstelle einer Beschreibung des Servers an. Erfordert, dass Trends aktiviert sind. form_challenge: current_password: Du betrittst einen sicheren Bereich imports: @@ -117,12 +117,12 @@ de: sign_up_requires_approval: Neue Registrierungen müssen genehmigt werden severity: Wähle aus, was mit Anfragen von dieser IP-Adresse geschehen soll rule: - text: Führe eine Regel oder Bedingung für Benutzer*innen auf diesem Server ein. Bleib dabei kurz und knapp + text: Führe eine Regel oder Auflage für Profile auf diesem Server ein. Bleib dabei kurz und knapp sessions: - otp: 'Gib den Zwei-Faktor-Code von deinem Smartphone ein oder benutze einen deiner Wiederherstellungscodes:' + otp: 'Gib den Zwei-Faktor-Code von deinem Smartphone ein oder verwende einen deiner Wiederherstellungscodes:' webauthn: Wenn es sich um einen USB-Schlüssel handelt, vergewissere dich, dass du ihn einsteckst und – falls erforderlich – antippst. tag: - name: Du kannst zum Beispiel nur die Groß- und Kleinschreibung der Buchstaben ändern, um es lesbarer zu machen + name: Du kannst nur die Groß- und Kleinschreibung der Buchstaben ändern, um es z. B. lesbarer zu machen user: chosen_languages: Wenn du hier eine oder mehrere Sprachen auswählst, werden ausschließlich Beiträge in diesen Sprachen in deinen öffentlichen Timelines angezeigt role: Die Rolle legt fest, welche Berechtigungen das Konto hat @@ -135,7 +135,7 @@ de: webhook: events: Zu sendende Ereignisse auswählen template: Erstelle deine eigenen JSON-Nutzdaten mit Hilfe von Variablen-Interpolation. Leer lassen für Standard-JSON. - url: Wohin Ereignisse geschickt werden + url: Wohin Ereignisse gesendet werden labels: account: fields: @@ -151,7 +151,7 @@ de: admin_account_action: include_statuses: Gemeldete Beiträge der E-Mail beifügen send_email_notification: Benachrichtigung per E-Mail - text: Benutzerdefinierte Verwarnung + text: Individuelle Verwarnung type: Aktion types: disable: Einfrieren @@ -159,7 +159,7 @@ de: sensitive: Inhaltswarnung silence: Stummschalten suspend: Sperre - warning_preset_id: Warnungsvorlage verwenden + warning_preset_id: Warnvorlage verwenden announcement: all_day: Ganztägiges Ereignis ends_at: Ende der Ankündigung @@ -171,14 +171,14 @@ de: defaults: autofollow: Meinem Profil automatisch folgen avatar: Profilbild - bot: Dieses Konto ist automatisiert + bot: Dieses Profil ist automatisiert chosen_languages: Sprachen einschränken confirm_new_password: Neues Passwort bestätigen confirm_password: Passwort bestätigen context: Nach Bereichen filtern current_password: Derzeitiges Passwort data: Daten - discoverable: Dieses Konto anderen empfehlen + discoverable: Anderen dieses Konto empfehlen display_name: Anzeigename email: E-Mail-Adresse expires_in: Läuft ab @@ -202,7 +202,7 @@ de: setting_boost_modal: Bestätigungsdialog beim Teilen eines Beitrags anzeigen setting_default_language: Beitragssprache setting_default_privacy: Beitragssichtbarkeit - setting_default_sensitive: Eigene Medien immer mit einer Inhaltswarnung versehen + setting_default_sensitive: Medien immer mit einer Inhaltswarnung versehen setting_delete_modal: Bestätigungsdialog beim Löschen eines Beitrags anzeigen setting_disable_swiping: Wischgesten deaktivieren setting_display_media: Medien-Anzeige @@ -243,8 +243,8 @@ de: content_cache_retention_period: Aufbewahrungsfrist für Inhalte im Cache custom_css: Eigenes CSS mascot: Benutzerdefiniertes Maskottchen (Legacy) - media_cache_retention_period: Aufbewahrungsfrist für den Medien-Cache - peers_api_enabled: Über die API die bekanntgewordenen Fediverse-Server veröffentlichen + media_cache_retention_period: Aufbewahrungsfrist für Medien im Cache + peers_api_enabled: Die entdeckten Server im Fediverse über die API veröffentlichen profile_directory: Profilverzeichnis aktivieren registrations_mode: Wer darf ein neues Konto registrieren? require_invite_text: Begründung für Beitritt verlangen @@ -256,7 +256,7 @@ de: site_short_description: Serverbeschreibung site_terms: Datenschutzerklärung site_title: Servername - status_page_url: URL der Statusseite + status_page_url: Statusseite (URL) theme: Standard-Design thumbnail: Vorschaubild des Servers timeline_preview: Nicht-authentifizierten Zugriff auf die öffentliche Timeline gestatten @@ -264,8 +264,8 @@ de: trends: Trends aktivieren trends_as_landing_page: Trends als Landingpage verwenden interactions: - must_be_follower: Benachrichtigungen von Profilen verbergen, die mir nicht folgen - must_be_following: Benachrichtigungen von Profilen verbergen, denen ich nicht folge + must_be_follower: Benachrichtigungen von Profilen unterdrücken, die mir nicht folgen + must_be_following: Benachrichtigungen von Profilen unterdrücken, denen ich nicht folge must_be_following_dm: Direktnachrichten von Profilen, denen ich nicht folge, ablehnen invite: comment: Kommentar @@ -280,7 +280,7 @@ de: sign_up_requires_approval: Registrierungen begrenzen severity: Regel notification_emails: - appeal: wenn jemand einer Moderationsentscheidung widerspricht + appeal: Jemand hat Einspruch gegen eine Moderationsentscheidung erhoben digest: Zusammenfassung senden favourite: wenn jemand meinen Beitrag favorisiert follow: wenn mir jemand Neues gefolgt ist @@ -288,8 +288,8 @@ de: mention: wenn mich jemand erwähnt pending_account: wenn ein neues Konto überprüft werden muss reblog: wenn jemand meinen Beitrag teilt - report: wenn eine neue Meldung vorliegt - trending_tag: wenn ein neuer Trend überprüft werden soll + report: Neue Meldung wurde eingereicht + trending_tag: Neuer Trend erfordert eine Überprüfung rule: text: Regel tag: diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index e314bb4557..75f83b17cc 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -58,10 +58,10 @@ es: setting_display_media_hide_all: Siempre ocultar todo el contenido multimedia setting_display_media_show_all: Mostrar siempre contenido multimedia marcado como sensible setting_hide_network: A quién sigues y quién te sigue no será mostrado en tu perfil - setting_noindex: Afecta a tu perfil público y páginas de estado + setting_noindex: Afecta a tu perfil público y a tus publicaciones setting_show_application: La aplicación que utiliza usted para publicar publicaciones se mostrará en la vista detallada de sus publicaciones setting_use_blurhash: Los gradientes se basan en los colores de las imágenes ocultas pero haciendo borrosos los detalles - setting_use_pending_items: Ocultar nuevos estados detrás de un clic en lugar de desplazar automáticamente el feed + setting_use_pending_items: Ocultar nuevas publicaciones detrás de un clic en lugar de desplazar automáticamente el feed username: Puedes usar letras, números y guiones bajos whole_word: Cuando la palabra clave o frase es solo alfanumérica, solo será aplicado si concuerda con toda la palabra domain_allow: diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml index 65cafb7d19..142ed483f6 100644 --- a/config/locales/simple_form.et.yml +++ b/config/locales/simple_form.et.yml @@ -134,7 +134,6 @@ et: position: Kõrgem roll otsustab teatud olukordades konfliktide lahendamise. Teatud toiminguid saab teha ainult madalama prioriteediga rollidega webhook: events: Saadetavate sündmuste valik - template: Cruthaich an JSON payload agad fhèin le eadar-phòlachadh chaochladairean. Fàg seo bàn airson JSON bunaiteach fhaighinn. url: Kuhu sündmused saadetakse labels: account: @@ -308,7 +307,6 @@ et: position: Positsioon webhook: events: Lubatud sündmused - template: Gjedhe ngarkese url: Lõpp-punkti URL 'no': Ei not_recommended: Pole soovitatav diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml index e89583eadc..a3a45ebea7 100644 --- a/config/locales/simple_form.fi.yml +++ b/config/locales/simple_form.fi.yml @@ -134,7 +134,6 @@ fi: position: Korkeampi rooli ratkaisee konfliktit tietyissä tilanteissa. Tiettyjä toimintoja voidaan suorittaa vain rooleille, joiden prioriteetti on pienempi webhook: events: Valitse lähetettävät tapahtumat - template: Luo oma JSON hyötykuorma käyttäen muuttujan interpolointia. Jätä tyhjäksi oletuksena JSON. url: Mihin tapahtumat lähetetään labels: account: @@ -200,7 +199,7 @@ fi: setting_always_send_emails: Lähetä aina sähköposti-ilmoituksia setting_auto_play_gif: Toista GIF-animaatiot automaattisesti setting_boost_modal: Kysy vahvistus ennen tehostusta - setting_default_language: Julkaisujen kieli + setting_default_language: Viestien kieli setting_default_privacy: Viestin näkyvyys setting_default_sensitive: Merkitse media aina arkaluontoiseksi setting_delete_modal: Kysy vahvistusta ennen viestin poistamista @@ -308,7 +307,6 @@ fi: position: Prioriteetti webhook: events: Tapahtumat käytössä - template: Maksun malli url: Päätepisteen URL 'no': Ei not_recommended: Ei suositella diff --git a/config/locales/simple_form.fr-QC.yml b/config/locales/simple_form.fr-QC.yml index 010e534045..ba81508365 100644 --- a/config/locales/simple_form.fr-QC.yml +++ b/config/locales/simple_form.fr-QC.yml @@ -3,7 +3,7 @@ fr-QC: simple_form: hints: account: - display_name: Votre nom complet ou votre nom rigolo. + display_name: Votre nom complet ou votre nom cool. fields: Votre page d'accueil, pronoms, âge, tout ce que vous voulez. note: 'Vous pouvez @mentionner d’autres personnes ou des #hashtags.' account_alias: @@ -134,7 +134,7 @@ fr-QC: position: Dans certaines situations, un rôle supérieur peut trancher la résolution d'un conflit. Mais certaines opérations ne peuvent être effectuées que sur des rôles ayant une priorité inférieure webhook: events: Sélectionnez les événements à envoyer - template: Écrivez votre propre bloc JSON avec la possibilité d’utiliser de l’interpolation de variables. Laissez vider pour utiliser le bloc JSON par défaut. + template: Écrivez votre propre bloc JSON avec la possibilité d’utiliser de l’interpolation de variables. Laissez vide pour le bloc JSON par défaut. url: Là où les événements seront envoyés labels: account: @@ -308,7 +308,7 @@ fr-QC: position: Priorité webhook: events: Événements activés - template: Modèle de payload + template: Modèle de charge utile url: URL du point de terminaison 'no': Non not_recommended: Non recommandé diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml index c16a0a74f0..084c16863a 100644 --- a/config/locales/simple_form.hy.yml +++ b/config/locales/simple_form.hy.yml @@ -165,6 +165,8 @@ hy: with_dns_records: Ներառել MX գրառում կամ դոմէյնի IP featured_tag: name: Պիտակ + form_admin_settings: + site_terms: Գաղտնիութեան քաղաքականութիւն interactions: must_be_follower: Արգելափակել ծանուցումները ոչ հետեւորդներից must_be_following: Արգելափակել ծանուցումները մարդկանցից, որոնց չես հետեւում diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index 0caecbb992..4c51117a13 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -81,7 +81,7 @@ ko: backups_retention_period: 생성된 사용자 아카이브를 며칠동안 저장할 지. bootstrap_timeline_accounts: 이 계정들은 팔로우 추천 목록 상단에 고정됩니다. closed_registrations_message: 새 가입을 차단했을 때 표시됩니다 - content_cache_retention_period: 다른 서버의 게시물과 부스트들은 지정한 일수가 지나면 삭제될 것입니다. 몇몇 게시물들은 복구가 불가능할 것입니다. 관련된 북마크, 좋아요, 부스트 또한 읽어버릴 것이며 취소도 할 수 없습니다. + content_cache_retention_period: 다른 서버의 게시물과 부스트들은 지정한 일수가 지나면 삭제될 것입니다. 몇몇 게시물들은 복구가 불가능할 것입니다. 관련된 북마크, 좋아요, 부스트 또한 잃어버릴 것이며 취소도 할 수 없습니다. custom_css: 사용자 지정 스타일을 웹 버전의 마스토돈에 지정할 수 있습니다. mascot: 고급 웹 인터페이스의 그림을 대체합니다. media_cache_retention_period: 양수로 설정된 경우 다운로드된 미디어 파일들은 지정된 일수가 지나면 삭제될 것이고 필요할 때 다시 다운로드 될 것입니다. diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml index 64acdb09ac..fa0f50d840 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -3,9 +3,9 @@ pl: simple_form: hints: account: - display_name: Twoje imię lub imię zabawne. - fields: Twoja strona główna, rzeczy, wiek, cokolwiek chcesz. - note: 'Możesz @wymienić innych ludzi lub #hashtags.' + display_name: Twoje imię lub pseudonim. + fields: Co ci się tylko podoba – twoja strona domowa, zaimki, wiek… + note: 'Możesz @wspomnieć użytkowników albo #hasztagi.' account_alias: acct: Określ nazwę@domenę konta z którego chcesz się przenieść account_migration: @@ -134,7 +134,7 @@ pl: position: Wyższa rola decyduje o rozwiązywaniu konfliktów w pewnych sytuacjach. Niektóre działania mogą być wykonywane tylko na rolach z niższym priorytetem webhook: events: Wybierz zdarzenia do wysłania - template: Stwórz własny ładunek JSON za pomocą zmiennej interpolacji. Pozostaw puste dla domyślnego JSON. + template: Poskładaj zawartość JSON, podstawiając zmienne. Użyjemy domyślnej wartości, jeżeli pole zostawisz pustym. url: Dokąd będą wysłane zdarzenia labels: account: @@ -294,7 +294,7 @@ pl: text: Zasada tag: listable: Pozwól, aby ten hashtag pojawiał się w wynikach wyszukiwania i katalogu profilów - name: Hashtag + name: Hasztag trendable: Pozwól na wyświetlanie tego hashtagu w „Na czasie” usable: Pozwól na umieszczanie tego hashtagu we wpisach user: @@ -308,7 +308,7 @@ pl: position: Priorytet webhook: events: Włączone zdarzenia - template: Szablon obciążenia + template: Szablon zawartości url: Endpoint URL 'no': Nie not_recommended: Niezalecane diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml index a848a4b11c..6451a9c93a 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -2,12 +2,16 @@ ru: simple_form: hints: + account: + display_name: Ваше полное имя или псевдоним. + fields: Ваша домашняя страница, местоимения, возраст - все, что угодно. + note: 'Вы можете @упоминать других людей или #хэштеги.' account_alias: acct: Укажите имя_пользователя@домен учётной записи, с которой вы собираетесь мигрировать account_migration: acct: Укажите имя_пользователя@домен учётной записи, на которую вы собираетесь мигрировать account_warning_preset: - text: Вы можете использовать всё, что в обычных постах — ссылки, хэштеги, упоминания и т.д. + text: Можно использовать синтаксис сообщений, например URL, хэштеги и упоминания title: Необязательно. Не видно получателю admin_account_action: include_statuses: Пользователь будет видеть к каким постами применялись модераторские действия и выносились предупреждения @@ -130,6 +134,7 @@ ru: position: Повышение роли разрешают конфликты интересов в некоторых ситуациях. Некоторые действия могут выполняться только на ролях с более низким приоритетом webhook: events: Выберите события для отправки + template: Составьте собственную полезную нагрузку JSON с использованием интерполяции переменных. Оставьте поле пустым для стандартного JSON. url: Куда события будут отправляться labels: account: @@ -294,6 +299,7 @@ ru: usable: Разрешить использовать этот хэштег в постах user: role: Роль + time_zone: Часовой пояс user_role: color: Цвет значка highlighted: Отображать роль в качестве значка в профилях пользователей @@ -302,6 +308,7 @@ ru: position: Приоритет webhook: events: Включенные события + template: Шаблон полезной нагрузки url: Endpoint URL 'no': Нет not_recommended: Не рекомендуется diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml index 180835c37c..d765e2ed06 100644 --- a/config/locales/simple_form.sl.yml +++ b/config/locales/simple_form.sl.yml @@ -3,6 +3,7 @@ sl: simple_form: hints: account: + display_name: Vaše polno ime ali lažno ime. fields: Vaša domača stran, starost, kar koli. note: 'Druge osebe lahko @omenite ali #ključnite.' account_alias: diff --git a/config/locales/sk.yml b/config/locales/sk.yml index a98a97d1c5..0cf03d7e34 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -575,7 +575,6 @@ sk: approved: Pre registráciu je nutné povolenie none: Nikto sa nemôže registrovať open: Ktokoľvek sa môže zaregistrovať - title: Nastavenia servera site_uploads: delete: Vymaž nahratý súbor destroyed_msg: Nahratie bolo zo stránky úspešne vymazané! @@ -959,7 +958,7 @@ sk: favourite: body: 'Tvoj príspevok bol uložený medzi obľúbené užívateľa %{name}:' subject: "%{name} si obľúbil/a tvoj príspevok" - title: Nové obľúbené + title: Novo obľúbené follow: body: "%{name} ťa teraz následuje!" subject: "%{name} ťa teraz nasleduje" diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 8295425540..057abc2b82 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -791,7 +791,6 @@ sl: approved: Potrebna je odobritev za prijavo none: Nihče se ne more prijaviti open: Vsakdo se lahko prijavi - title: Nastavitve strežnika site_uploads: delete: Izbriši naloženo datoteko destroyed_msg: Prenos na strežnik uspešno izbrisan! @@ -1325,13 +1324,18 @@ sl: bookmarks: Uvažanje zaznamkov domain_blocking: Uvažanje blokiranih domen following: Uvažanje sledenih računov + lists: Uvažanje seznamov muting: Uvažanje utišanih računov type: Vrsta uvoza + type_groups: + constructive: Sledenje in zaznamki + destructive: Blokiranja in utišanja types: blocking: Seznam blokiranih bookmarks: Zaznamki domain_blocking: Seznam blokiranih domen following: Seznam uporabnikov, katerim sledite + lists: Seznami muting: Seznam utišanih upload: Pošlji invites: @@ -1374,6 +1378,8 @@ sl: title: Zgodovina overjanja mail_subscriptions: unsubscribe: + action: Da, odjavi me + complete: Odjavljeni title: Odjavi od naročnine media_attachments: validations: diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 11b9a7f4c8..4e27e218ed 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1,7 +1,7 @@ --- sq: about: - about_mastodon_html: 'تۆڕی کۆمەڵایەتی داهاتوو: هیچ ڕیکلامێک، هیچ چاودێرییەکی کۆمپانیا، دیزاینی ئەخلاقی و لامەرکەزی! خاوەنی داتاکانت بە لە ماستۆدۆن!' + about_mastodon_html: 'Rrjeti shoqëror i së ardhmes: Pa reklama, pa survejim nga korporata, konceptim etik dhe decentralizim! Jini zot i të dhënave tuaja, me Mastodon-in!' contact_missing: I parregulluar contact_unavailable: N/A hosted_on: Mastodon i strehuar në %{domain} @@ -475,7 +475,6 @@ sq: one: Përpjekje e dështuar në %{count} ditë. other: Përpjekje e dështuar në %{count} ditë të ndryshme. no_failures_recorded: S’ka dështime të regjistruara. - title: Disponueshmëria warning: Përpjekja e fundit për t’u lidhur me këtë shërbyes ka qenë e pasuksesshme back_to_all: Krejt back_to_limited: E kufizuar @@ -667,7 +666,6 @@ sq: other: "%{count} përdorues" categories: administration: Administrim - devops: DevOps invites: Ftesa moderation: Moderim special: Special @@ -718,7 +716,6 @@ sq: view_audit_log_description: U lejon përdoruesve të shohin një historik veprimesh administrative te shërbyesi view_dashboard: Shihni Pultin view_dashboard_description: U lejon përdoruesve të hyjnë te pulti dhe shohin shifra të ndryshme matjesh - view_devops: DevOps view_devops_description: U lejon përdoruesve të hyjnë në pultet Sidekiq dhe pgHero title: Role rules: @@ -741,7 +738,6 @@ sq: preamble: Elementët e markës të shërbyesit tuaj e dallojnë atë nga shërbyes të tjerë në rrjet. Këto hollësi mund të shfaqen në një larmi mjedisesh, bie fjala, në ndërfaqen web të Mastodon-it, aplikacione për platforma të ndryshme, në paraparje lidhjesh në sajte të tjerë dhe brenda aplikacionesh për shkëmbim mesazhesh, e me radhë. Për këtë arsyes, më e mira është që këto hollësi të jenë të qarta, të shkurtra dhe të kursyera. title: Elementë marke captcha_enabled: - desc_html: Гэта функцыянальнасць залежыць ад знешніх скрыптоў hCaptcha, што можа быць праблемай бяспекі і прыватнасці. Акрамя таго, гэта можа зрабіць працэс рэгістрацыі значна менш даступным для некаторых людзей, асабліва інвалідаў. Па гэтых прычынах, калі ласка, разгледзьце альтэрнатыўныя меры, такія як рэгістрацыя на аснове зацвярджэння або запрашэння. title: Kërko prej përdoruesve të rinj të zgjidhin një CAPTCHA, si ripohim të llogarisë të tyre content_retention: preamble: Kontrolloni se si depozitohen në Mastodon lënda e prodhuar nga përdoruesit. @@ -770,7 +766,6 @@ sq: approved: Për regjistrim, lypset miratimi none: S’mund të regjistrohet ndokush open: Mund të regjistrohet gjithkush - title: Rregullime Shërbyesi site_uploads: delete: Fshi kartelën e ngarkuar destroyed_msg: Ngarkimi në sajt u fshi me sukses! @@ -852,7 +847,6 @@ sq: other: Ndarë me të tjerë nga %{count} vetë gjatë javës së kaluar title: Lidhje në modë usage_comparison: Ndarë %{today} herë sot, kundrejt %{yesterday} dje - not_allowed_to_trend: غير مسموح ظهوره في المتداولة only_allowed: Lejuar vetëm pending_review: Në pritje të shqyrtimit preview_card_providers: @@ -890,7 +884,6 @@ sq: peaked_on_and_decaying: Kulmoi më %{date}, tani në rënie title: Hashtag-ë në modë trendable: Mund të shfaqet nën të modës - trending_rank: 'U trendu #%{rank}' usable: Mund të përdoret usage_comparison: Përdorur %{today} herë sot, krahasuar me %{yesterday} dje used_by_over_week: @@ -952,7 +945,6 @@ sq: title: Postime në modë new_trending_tags: no_approved_tags: Aktualisht s’ka hashtag-ë në modë të miratuar. - requirements: 'Qualquer um desses candidatos poderia ultrapassar a hashtag de tendência aprovada #%{rank} , que é atualmente #%{lowest_tag_name} com uma pontuação de %{lowest_tag_score}.' title: Hashtag-ë në modë subject: Gjëra të reja në modë për shqyrtim te %{instance} aliases: @@ -1352,13 +1344,6 @@ sq: action: Po, shpajtomëni complete: U shpajtuat confirmation_html: Jeni i sigurt se doni të shpajtoheni prej marrjes së %{type} për Mastodon në %{domain} te email-i juaj në %{email}? Mundeni përherë të ripajtoheni, që prej rregullimeve tuaja për njoftime me email. - emails: - notification_emails: - favourite: notificaciones de me gusta por correo - follow: notificaciones de seguidores por correo - follow_request: notificaciones de peticiones de seguimiento por correo - mention: notificaciones de menciones por correo - reblog: notificaciones de impulsos por correo resubscribe_html: Nëse u shpajtuat gabimisht, mund të ripajtoheni që nga rregullimet tuaja për njoftime me email. success_html: S’do të merrni më %{type} për Mastodon në %{domain} te email juaj %{email}. title: Shpajtohuni diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index f34692b579..0de22a2f90 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -1302,12 +1302,14 @@ sr-Latn: bookmarks_html: Upravo ćete zameniti svoje obeleživače sa do %{total_items} objava iz %{filename}. domain_blocking_html: Upravo ćete zameniti svoju listu blokiranih domena sa do %{total_items} domena iz %{filename}. following_html: Upravo ćete pratiti do %{total_items} naloga iz %{filename} and i prestati sa praćenjem bilo koga drugog. + lists_html: Spremate se da zamenite svoje liste sadržajem od %{filename}. Do %{total_items} naloga će biti dodato na nove liste. muting_html: Upravo ćete zameniti svoju listu ignorisanih naloga sa do %{total_items} naloga iz %{filename}. preambles: blocking_html: Upravo ćete blokirati do %{total_items} naloga iz %{filename}. bookmarks_html: Upravo ćete dodati do %{total_items} objava iz %{filename} u vaše obeleživače. domain_blocking_html: Upravo ćete blokirati do %{total_items} domena iz %{filename}. following_html: Upravo ćete pratiti do %{total_items} naloga iz %{filename}. + lists_html: Spremate se da dodate do %{total_items} naloga od %{filename} na svoje liste. Nove liste će biti kreirane ako ne postoji lista za dodavanje. muting_html: Upravo ćete ignorisati do %{total_items} naloga iz %{filename}. preface: Možete uvesti podatke koje ste izvezli sa druge instance, kao što su liste ljudi koje ste pratili ili blokirali. recent_imports: Nedavni uvozi @@ -1324,6 +1326,7 @@ sr-Latn: bookmarks: Uvoz obeleživača domain_blocking: Uvoz blokiranih domena following: Uvoz praćenih naloga + lists: Uvoz lista muting: Uvoz ignorisanih naloga type: Tip uvoza type_groups: @@ -1334,6 +1337,7 @@ sr-Latn: bookmarks: Obeleživači domain_blocking: Lista blokiranih domena following: Lista pratilaca + lists: Liste muting: Lista ućutkanih upload: Otpremi invites: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index bd216aff42..5806b4696d 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1302,12 +1302,14 @@ sr: bookmarks_html: Управо ћете заменити своје обележиваче са до %{total_items} објава из %{filename}. domain_blocking_html: Управо ћете заменити своју листу блокираних домена са до %{total_items} домена из %{filename}. following_html: Управо ћете пратити до %{total_items} налога из %{filename} and и престати са праћењем било кога другог. + lists_html: Спремате се да замените своје листе садржајем од %{filename}. До %{total_items} налога ће бити додато на нове листе. muting_html: Управо ћете заменити своју листу игнорисаних налога са до %{total_items} налога из %{filename}. preambles: blocking_html: Управо ћете блокирати до %{total_items} налога из %{filename}. bookmarks_html: Управо ћете додати до %{total_items} објава из %{filename} у ваше обележиваче. domain_blocking_html: Управо ћете блокирати до %{total_items} домена из %{filename}. following_html: Управо ћете пратити до %{total_items} налога из %{filename}. + lists_html: Спремате се да додате до %{total_items} налога од %{filename} на своје листе. Нове листе ће бити креиране ако не постоји листа за додавање. muting_html: Управо ћете игнорисати до %{total_items} налога из %{filename}. preface: Можете увести податке које сте извезли са друге инстанце, као што су листе људи које сте пратили или блокирали. recent_imports: Недавни увози @@ -1324,6 +1326,7 @@ sr: bookmarks: Увоз обележивача domain_blocking: Увоз блокираних домена following: Увоз праћених налога + lists: Увоз листа muting: Увоз игнорисаних налога type: Тип увоза type_groups: @@ -1334,6 +1337,7 @@ sr: bookmarks: Обележивачи domain_blocking: Листа блокираних домена following: Листа пратилаца + lists: Листе muting: Листа ућутканих upload: Отпреми invites: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index c8c1e4868f..81ef482f51 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -1019,6 +1019,7 @@ sv: back: Tillbaka preamble: Dessa bestäms och upprätthålls av moderatorerna för %{domain}. title: Några grundregler. + title_invited: Du har blivit inbjuden. security: Säkerhet set_new_password: Skriv in nytt lösenord setup: @@ -1261,6 +1262,7 @@ sv: bookmarks: Bokmärken domain_blocking: Domänblockeringslista following: Lista av följare + lists: Listor muting: Lista av nertystade upload: Ladda upp invites: diff --git a/config/locales/th.yml b/config/locales/th.yml index 9a034126ad..0d55abbe54 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1252,12 +1252,14 @@ th: bookmarks_html: คุณกำลังจะ แทนที่ที่คั่นหน้าของคุณ ด้วยมากถึง %{total_items} โพสต์ จาก %{filename} domain_blocking_html: คุณกำลังจะ แทนที่รายการการปิดกั้นโดเมนของคุณ ด้วยมากถึง %{total_items} โดเมน จาก %{filename} following_html: คุณกำลังจะ ติดตาม มากถึง %{total_items} บัญชี จาก %{filename} และ หยุดการติดตามคนอื่นใด + lists_html: คุณกำลังจะ แทนที่รายการของคุณ ด้วยเนื้อหาของ %{filename} จะเพิ่มมากถึง %{total_items} บัญชี ไปยังรายการใหม่ muting_html: คุณกำลังจะ แทนที่รายการบัญชีที่ซ่อนอยู่ของคุณ ด้วยมากถึง %{total_items} บัญชี จาก %{filename} preambles: blocking_html: คุณกำลังจะ ปิดกั้น มากถึง %{total_items} บัญชี จาก %{filename} bookmarks_html: คุณกำลังจะเพิ่มมากถึง %{total_items} โพสต์ จาก %{filename} ไปยัง ที่คั่นหน้า ของคุณ domain_blocking_html: คุณกำลังจะ ปิดกั้น มากถึง %{total_items} โดเมน จาก %{filename} following_html: คุณกำลังจะ ติดตาม มากถึง %{total_items} บัญชี จาก %{filename} + lists_html: คุณกำลังจะเพิ่มมากถึง %{total_items} บัญชี จาก %{filename} ไปยัง รายการ ของคุณ จะสร้างรายการใหม่หากไม่มีรายการที่จะเพิ่มไปยัง muting_html: คุณกำลังจะ ซ่อน มากถึง %{total_items} บัญชี จาก %{filename} preface: คุณสามารถนำเข้าข้อมูลที่คุณได้ส่งออกจากเซิร์ฟเวอร์อื่น เช่น รายการผู้คนที่คุณกำลังติดตามหรือกำลังปิดกั้น recent_imports: การนำเข้าล่าสุด @@ -1274,6 +1276,7 @@ th: bookmarks: กำลังนำเข้าที่คั่นหน้า domain_blocking: กำลังนำเข้าโดเมนที่ปิดกั้นอยู่ following: กำลังนำเข้าบัญชีที่ติดตาม + lists: กำลังนำเข้ารายการ muting: กำลังนำเข้าบัญชีที่ซ่อนอยู่ type: ชนิดการนำเข้า type_groups: @@ -1284,6 +1287,7 @@ th: bookmarks: ที่คั่นหน้า domain_blocking: รายการการปิดกั้นโดเมน following: รายการติดตาม + lists: รายการ muting: รายการซ่อน upload: อัปโหลด invites: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index e16ba9abbc..3b60a4cd58 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -770,7 +770,7 @@ tr: approved: Kayıt için onay gerekli none: Hiç kimse kayıt olamaz open: Herkes kaydolabilir - title: Sunucu Ayarları + title: Sunucu ayarları site_uploads: delete: Yüklenen dosyayı sil destroyed_msg: Site yüklemesi başarıyla silindi! @@ -1277,12 +1277,14 @@ tr: bookmarks_html: "Yerimlerinizi, %{filename} dosyasından, %{total_items} gönderiyle değiştirmek üzeresiniz." domain_blocking_html: "Alan adı engel listenizi, %{filename} dosyasından, %{total_items} alan adıyla değiştirmek üzeresiniz." following_html: "%{filename} dosyasından %{total_items} hesabı takip etmeye başlamak ve diğer herkesi takipten çıkmak üzeresiniz." + lists_html: Listelerinizi %{filename} içeriğiyle değiştirmek üzeresiniz. Yeni listelere en fazla %{total_items} hesap eklenecek. muting_html: "Sessize alınmış hesaplar listenizi, %{filename} dosyasından, %{total_items} hesapla değiştirmek üzeresiniz." preambles: blocking_html: "%{filename} dosyasından %{total_items} hesabı engellemek üzeresiniz." bookmarks_html: "%{filename} dosyasından %{total_items} gönderiyi yerimlerinize eklemek üzeresiniz." domain_blocking_html: "%{filename} dosyasından %{total_items} alan adını engellemek üzeresiniz." following_html: "%{filename} dosyasından %{total_items} hesabı takip etmek üzeresiniz." + lists_html: "Listelerinize %{filename} dosyasından en fazla %{total_items} hesap eklemek üzeresiniz. Eklenecek bir liste olmaması durumunda yeni listeler oluşturulacaktır." muting_html: "%{filename} dosyasından %{total_items} hesabı sessize almak üzeresiniz." preface: Diğer sunucudan alarak oluşturduğunuz dosyalar sayesinde, bu sunucudaki hesabınıza takipçilerinizi aktarabilir veya istemediğiniz kişileri otomatik olarak engelleyebilirsiniz. recent_imports: Son içe aktarmalar @@ -1299,6 +1301,7 @@ tr: bookmarks: Yer işaretleri içe aktarılıyor domain_blocking: Engellenmiş alan adları içe aktarılıyor following: Takip edilen hesaplar içe aktarılıyor + lists: Listeleri içe aktarma muting: Sessize alınmış hesaplar içe aktarılıyor type: İçe aktarma türü type_groups: @@ -1309,6 +1312,7 @@ tr: bookmarks: Yer imleri domain_blocking: Alan adı engelleme listesi following: Takip edilenler listesi + lists: Listeler muting: Susturulanlar listesi upload: Yükle invites: diff --git a/config/locales/tt.yml b/config/locales/tt.yml index 9fe46315bd..7999de2ff6 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -260,7 +260,6 @@ tt: trends: Мөһим вакыйгалар domain_blocks: disabled: Һичкемгә - title: Сервер көйләүләре site_uploads: destroyed_msg: Сайтны йөкләү уңышлы бетерелде! statuses: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 280b423cb0..d3d92f9f79 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1327,12 +1327,14 @@ uk: bookmarks_html: Ви збираєтеся замінити ваші закладки з %{total_items} дописами з %{filename}. domain_blocking_html: Ви збираєтеся замінити ваш список блокування доменів з %{total_items} доменами з %{filename}. following_html: Ви збираєтеся слідкувати за %{total_items} обліковими записами з %{filename} і перестати слідкувати за всіма іншими. + lists_html: Ви збираєтеся замінити ваші списки вмістом з %{filename}. До нових списків буде додано до %{total_items} облікових записів. muting_html: Ви збираєтеся замінити ваш список ігнорованих облікових записів з %{total_items} обліковими записами з %{filename}. preambles: blocking_html: Ви збираєтеся заблокувати %{total_items} облікових записів з %{filename}. bookmarks_html: Ви збираєтеся додати %{total_items} дописів з %{filename} до ваших закладок. domain_blocking_html: Ви збираєтеся заблокувати %{total_items} доменів з %{filename}. following_html: Ви збираєтеся слідкувати за %{total_items} обліковими записами з %{filename}. + lists_html: Ви збираєтеся додати до %{total_items} облікових записів з %{filename} до ваших списків. Нові списки будуть створені, якщо немає списку для додавання. muting_html: Ви збираєтеся ігнорувати %{total_items} облікових записів з %{filename}. preface: Ви можете імпортувати дані, які ви експортували з іншого сервера, наприклад, список людей, яких ви відстежуєте або блокуєте. recent_imports: Останні імпорти @@ -1349,6 +1351,7 @@ uk: bookmarks: Імпортування закладок domain_blocking: Імпортування заблокованих доменів following: Імпортування відстежуваних облікових записів + lists: Імпортування списків muting: Імпортування ігнорованих облікових записів type: Тип імпорту type_groups: @@ -1359,6 +1362,7 @@ uk: bookmarks: Закладки domain_blocking: Список заблокованих сайтів following: Підписки + lists: Списки muting: Список глушення upload: Завантажити invites: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 5ee9761745..a95f5f764b 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1252,12 +1252,14 @@ vi: bookmarks_html: Bạn sắp thay thế lượt lưu với %{total_items} tút từ %{filename}. domain_blocking_html: Bạn sắp thay thế danh sách máy chủ chặn với %{total_items} máy chủ từ %{filename}. following_html: Bạn sắp theo dõi với %{total_items} người từ %{filename} và ngừng theo dõi bất kỳ ai. + lists_html: Bạn sắp thay thế các danh sách bằng nội dung từ %{filename}. Hơn %{total_items} tài khoản sẽ được thêm vào những danh sách mới. muting_html: Bạn sắp thay thế danh sách ẩn với %{total_items} người từ %{filename}. preambles: blocking_html: Bạn sắp chặn tới %{total_items} người từ %{filename}. bookmarks_html: Bạn sắp thêm vào %{total_items} tút từ %{filename} vào lượt lưu. domain_blocking_html: Bạn sắp chặn tới %{total_items} máy chủ từ %{filename}. following_html: Bạn sắp theo dõi tới %{total_items} người từ %{filename}. + lists_html: Bạn sắp thêm %{total_items} tài khoản từ %{filename} vào danh sách của bạn. Những danh sách mới sẽ được tạo nếu bạn chưa có danh sách nào. muting_html: Bạn sắp ẩn lên tới %{total_items} người từ %{filename}. preface: Bạn có thể nhập dữ liệu mà bạn đã xuất từ một máy chủ khác, chẳng hạn như danh sách những người bạn đang theo dõi hoặc chặn. recent_imports: Đã nhập gần đây @@ -1274,6 +1276,7 @@ vi: bookmarks: Đang nhập lượt lưu domain_blocking: Đang nhập máy chủ đã chặn following: Đang nhập người theo dõi + lists: Nhập danh sách muting: Đang nhập người đã ẩn type: Kiểu nhập type_groups: @@ -1284,6 +1287,7 @@ vi: bookmarks: Tút đã lưu domain_blocking: Danh sách máy chủ đã chặn following: Danh sách người theo dõi + lists: Danh sách muting: Danh sách người đã ẩn upload: Tải lên invites: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index a6b77fc667..0ba154d628 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -769,7 +769,7 @@ zh-CN: remove_from_report: 从报告中移除 report: 举报 deleted: 已删除 - favourites: 收藏夹 + favourites: 喜欢 history: 版本历史记录 in_reply_to: 回复给 language: 语言 @@ -1249,15 +1249,17 @@ zh-CN: overwrite_long: 将当前记录替换为新记录 overwrite_preambles: blocking_html: 您即将使用来自 %{filename} 的最多 %{total_items} 个账户替换您的屏蔽列表。 - bookmarks_html: 您即将使用来自 %{filename} 的 %{total_items} 篇贴文替换您的书签。 + bookmarks_html: 您即将使用来自 %{filename} 的 %{total_items} 篇嘟文替换您的书签。 domain_blocking_html: 您即将使用来自 %{filename} 的最多 %{total_items} 个域名替换您的域名屏蔽列表。 following_html: 您即将从 %{filename} 关注 %{total_items} 个账户，并停止关注其他任何人。 + lists_html: 你即将用 %{filename} 的内容替换你的列表。新列表中将添加 %{total_items} 个账户。 muting_html: 您即将使用来自 %{filename} 的最多 %{total_items} 个账户替换您已隐藏的账户列表。 preambles: blocking_html: 您即将从 %{filename} 中封锁多达 %{total_items} 个账户。 - bookmarks_html: 您即将把来自 %{filename} 的 %{total_items} 篇贴文添加到您的书签中。 + bookmarks_html: 您即将把来自 %{filename} 的 %{total_items} 篇嘟文添加到您的书签中。 domain_blocking_html: 您即将从 %{filename} 中屏蔽 %{total_items} 个域名。 following_html: 您即将从 %{filename} 关注最多 %{total_items} 个账户。 + lists_html: 你即将从 %{filename} 中添加最多 %{total_items} 个账户到你的列表中。如果没有可用列表，将创建新的列表。 muting_html: 您即将从 %{filename} 中隐藏 %{total_items} 个账户。 preface: 你可以在此导入你在其他实例导出的数据，比如你所关注或屏蔽的用户列表。 recent_imports: 最近导入 @@ -1274,6 +1276,7 @@ zh-CN: bookmarks: 正在导入书签 domain_blocking: 正在导入被屏蔽的域名 following: 正在导入关注的账户 + lists: 导入列表 muting: 正在导入隐藏的账户 type: 导入类型 type_groups: @@ -1284,6 +1287,7 @@ zh-CN: bookmarks: 书签 domain_blocking: 域名屏蔽列表 following: 关注列表 + lists: 列表 muting: 隐藏列表 upload: 上传 invites: @@ -1328,7 +1332,7 @@ zh-CN: confirmation_html: 您确定要取消订阅来自 %{domain} 上的 Mastodon 的 %{type} 到您的邮箱 %{email} 吗？您可以随时在电子邮件通知设置重新订阅。 emails: notification_emails: - favourite: 嘟文被喜欢邮件通知 + favourite: 嘟文被点赞邮件通知 follow: 账户被关注邮件通知 follow_request: 关注请求邮件通知 mention: 账户被提及邮件通知 @@ -1629,7 +1633,7 @@ zh-CN: keep_polls_hint: 不会删除你的任何投票 keep_self_bookmark: 保存被你加入书签的嘟文 keep_self_bookmark_hint: 如果你已将自己的嘟文添加书签，就不会删除这些嘟文 - keep_self_fav: 保留你喜欢的嘟文 + keep_self_fav: 保留你点赞的嘟文 keep_self_fav_hint: 如果你喜欢了自己的嘟文，则不会删除这些嘟文 min_age: '1209600': 2周 @@ -1641,8 +1645,8 @@ zh-CN: '63113904': 两年 '7889238': 3个月 min_age_label: 过期阈值 - min_favs: 保留如下嘟文：喜欢数超过 - min_favs_hint: 喜欢数超过该阈值的的嘟文都不会被删除。如果留空，则无论嘟文获得多少喜欢，都将被删除。 + min_favs: 保留如下嘟文：点赞数超过 + min_favs_hint: 点赞数超过该阈值的的嘟文都不会被删除。如果留空，则无论嘟文获得多少点赞，都将被删除。 min_reblogs: 保留如下嘟文：转嘟数超过 min_reblogs_hint: 转嘟数超过该阈值的的嘟文不会被删除。如果留空，则无论嘟文获得多少转嘟，都将被删除。 stream_entries: diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index 23de5f830b..25a9897545 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -742,7 +742,6 @@ zh-HK: approved: 註冊需要核准 none: 沒有人可註冊 open: 任何人皆能註冊 - title: 伺服器設定 site_uploads: delete: 刪除上傳的檔案 destroyed_msg: 成功刪除站台的上傳項目！ diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 833fba11fb..80addbf49d 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1256,12 +1256,14 @@ zh-TW: bookmarks_html: 您將要自 %{filename} 中之 %{total_items} 個嘟文 以 取代您的書籤。 domain_blocking_html: 您將要自 %{filename} 中之 %{total_items} 個網域 以 取代您的封鎖網域列表。 following_html: 您將要 跟隨 自 %{filename} 中之 %{total_items} 個帳號 並且 取消跟隨其他所有人。 + lists_html: 您將以 %{filename} 之內容取代您的列表。這將會新增 %{total_items} 個帳號至新列表。 muting_html: 您將要自 %{filename} 中之 %{total_items} 個帳號 以 取代您的靜音帳號列表。 preambles: blocking_html: 您將要 封鎖 自 %{filename} 中之 %{total_items} 個帳號。 bookmarks_html: 您將要自 %{filename} 中之 %{total_items} 個嘟文 以 加入至您的書籤。 domain_blocking_html: 您將要 封鎖 自 %{filename} 中之 %{total_items} 個網域。 following_html: 您將要 跟隨 自 %{filename} 中之 %{total_items} 個帳號。 + lists_html: 您將自 %{filename} 新增 %{total_items} 個帳號至您的列表。若不存在列表用以新增帳號，則會建立新列表。 muting_html: 您將要 靜音 自 %{filename} 中之 %{total_items} 個帳號。 preface: 您可以在此匯入您在其他伺服器所匯出的資料檔，包括跟隨的使用者、封鎖的使用者名單。 recent_imports: 最近匯入的 @@ -1278,6 +1280,7 @@ zh-TW: bookmarks: 正在匯入書籤 domain_blocking: 正在匯入已封鎖網域 following: 正在匯入已封鎖帳號 + lists: 匯入列表 muting: 正在匯入已靜音帳號 type: 匯入類型 type_groups: @@ -1288,6 +1291,7 @@ zh-TW: bookmarks: 書籤 domain_blocking: 網域封鎖列表 following: 您跟隨的使用者列表 + lists: 列表 muting: 您靜音的使用者名單 upload: 上傳 invites: From b06763dc1115ce0c7a4c73021b0c2144a78fe66a Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 26 Jul 2023 09:39:53 -0400 Subject: [PATCH 121/557] Remove the `sr` locale override .rb files (#25927) --- .rubocop_todo.yml | 9 --------- config/locales/sr-Latn.rb | 5 ----- config/locales/sr.rb | 5 ----- 3 files changed, 19 deletions(-) delete mode 100644 config/locales/sr-Latn.rb delete mode 100644 config/locales/sr.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 71e8623ec5..42e7e4e89d 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -144,13 +144,6 @@ Metrics/CyclomaticComplexity: Metrics/PerceivedComplexity: Max: 27 -# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms. -# CheckDefinitionPathHierarchyRoots: lib, spec, test, src -# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS -Naming/FileName: - Exclude: - - 'config/locales/sr-Latn.rb' - # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns. # SupportedStyles: snake_case, normalcase, non_integer # AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64 @@ -833,8 +826,6 @@ Style/RedundantConstantBase: Exclude: - 'config/environments/production.rb' - 'config/initializers/sidekiq.rb' - - 'config/locales/sr-Latn.rb' - - 'config/locales/sr.rb' # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: SafeForConstants. diff --git a/config/locales/sr-Latn.rb b/config/locales/sr-Latn.rb deleted file mode 100644 index b7a403a8e1..0000000000 --- a/config/locales/sr-Latn.rb +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -require 'rails_i18n/common_pluralizations/romanian' - -::RailsI18n::Pluralization::Romanian.with_locale(:'sr-Latn') diff --git a/config/locales/sr.rb b/config/locales/sr.rb deleted file mode 100644 index 0605de3348..0000000000 --- a/config/locales/sr.rb +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -require 'rails_i18n/common_pluralizations/romanian' - -::RailsI18n::Pluralization::Romanian.with_locale(:sr) From f48d345de1093a878fbf8543fe1d6ac1deb95392 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 27 Jul 2023 08:27:21 -0400 Subject: [PATCH 122/557] Use correct naming on controller concern specs (#26197) --- .rubocop.yml | 6 ------ .../controllers/concerns/account_controller_concern_spec.rb | 4 ++-- spec/controllers/concerns/export_controller_concern_spec.rb | 4 ++-- spec/controllers/concerns/localized_spec.rb | 4 ++-- spec/controllers/concerns/rate_limit_headers_spec.rb | 4 ++-- spec/controllers/concerns/signature_verification_spec.rb | 4 ++-- spec/controllers/concerns/user_tracking_concern_spec.rb | 4 ++-- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 597dfcb9e0..9ebb0219bf 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -131,12 +131,6 @@ RSpec/FilePath: Exclude: - 'spec/config/initializers/rack_attack_spec.rb' # namespaces usually have separate folder - 'spec/lib/sanitize_config_spec.rb' # namespaces usually have separate folder - - 'spec/controllers/concerns/account_controller_concern_spec.rb' # Concerns describe ApplicationController and don't fit naming - - 'spec/controllers/concerns/export_controller_concern_spec.rb' - - 'spec/controllers/concerns/localized_spec.rb' - - 'spec/controllers/concerns/rate_limit_headers_spec.rb' - - 'spec/controllers/concerns/signature_verification_spec.rb' - - 'spec/controllers/concerns/user_tracking_concern_spec.rb' # Reason: # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecnamedsubject diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb index 57fc6f9653..d080475c32 100644 --- a/spec/controllers/concerns/account_controller_concern_spec.rb +++ b/spec/controllers/concerns/account_controller_concern_spec.rb @@ -2,8 +2,8 @@ require 'rails_helper' -describe ApplicationController do - controller do +describe AccountControllerConcern do + controller(ApplicationController) do include AccountControllerConcern def success diff --git a/spec/controllers/concerns/export_controller_concern_spec.rb b/spec/controllers/concerns/export_controller_concern_spec.rb index b380246e7e..e253aa5206 100644 --- a/spec/controllers/concerns/export_controller_concern_spec.rb +++ b/spec/controllers/concerns/export_controller_concern_spec.rb @@ -2,8 +2,8 @@ require 'rails_helper' -describe ApplicationController do - controller do +describe ExportControllerConcern do + controller(ApplicationController) do include ExportControllerConcern def index diff --git a/spec/controllers/concerns/localized_spec.rb b/spec/controllers/concerns/localized_spec.rb index caac94ea95..ce31e786f0 100644 --- a/spec/controllers/concerns/localized_spec.rb +++ b/spec/controllers/concerns/localized_spec.rb @@ -2,8 +2,8 @@ require 'rails_helper' -describe ApplicationController do - controller do +describe Localized do + controller(ApplicationController) do include Localized def success diff --git a/spec/controllers/concerns/rate_limit_headers_spec.rb b/spec/controllers/concerns/rate_limit_headers_spec.rb index 7e1f92546d..1cdf741f4d 100644 --- a/spec/controllers/concerns/rate_limit_headers_spec.rb +++ b/spec/controllers/concerns/rate_limit_headers_spec.rb @@ -2,8 +2,8 @@ require 'rails_helper' -describe ApplicationController do - controller do +describe RateLimitHeaders do + controller(ApplicationController) do include RateLimitHeaders def show diff --git a/spec/controllers/concerns/signature_verification_spec.rb b/spec/controllers/concerns/signature_verification_spec.rb index e6b7f18498..650cd21eaf 100644 --- a/spec/controllers/concerns/signature_verification_spec.rb +++ b/spec/controllers/concerns/signature_verification_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe ApplicationController do +describe SignatureVerification do let(:wrapped_actor_class) do Class.new do attr_reader :wrapped_account @@ -15,7 +15,7 @@ describe ApplicationController do end end - controller do + controller(ApplicationController) do include SignatureVerification before_action :require_actor_signature!, only: [:signature_required] diff --git a/spec/controllers/concerns/user_tracking_concern_spec.rb b/spec/controllers/concerns/user_tracking_concern_spec.rb index 8e272468b6..dd0b3c042a 100644 --- a/spec/controllers/concerns/user_tracking_concern_spec.rb +++ b/spec/controllers/concerns/user_tracking_concern_spec.rb @@ -2,8 +2,8 @@ require 'rails_helper' -describe ApplicationController do - controller do +describe UserTrackingConcern do + controller(ApplicationController) do include UserTrackingConcern def show From 812a84ff5fbaefebb84081be9a837ee7b9624bb3 Mon Sep 17 00:00:00 2001 From: Daniel M Brasil Date: Thu, 27 Jul 2023 09:58:20 -0300 Subject: [PATCH 123/557] Migrate to request specs in `/api/v2/filters` (#25721) --- .rubocop_todo.yml | 1 - .../api/v2/filters_controller_spec.rb | 123 --------- spec/requests/api/v2/filters/filters_spec.rb | 248 ++++++++++++++++++ 3 files changed, 248 insertions(+), 124 deletions(-) delete mode 100644 spec/controllers/api/v2/filters_controller_spec.rb create mode 100644 spec/requests/api/v2/filters/filters_spec.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 42e7e4e89d..472bb06229 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -272,7 +272,6 @@ RSpec/LetSetup: - 'spec/controllers/api/v2/admin/accounts_controller_spec.rb' - 'spec/controllers/api/v2/filters/keywords_controller_spec.rb' - 'spec/controllers/api/v2/filters/statuses_controller_spec.rb' - - 'spec/controllers/api/v2/filters_controller_spec.rb' - 'spec/controllers/auth/confirmations_controller_spec.rb' - 'spec/controllers/auth/passwords_controller_spec.rb' - 'spec/controllers/auth/sessions_controller_spec.rb' diff --git a/spec/controllers/api/v2/filters_controller_spec.rb b/spec/controllers/api/v2/filters_controller_spec.rb deleted file mode 100644 index 722037eeb2..0000000000 --- a/spec/controllers/api/v2/filters_controller_spec.rb +++ /dev/null @@ -1,123 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Api::V2::FiltersController do - render_views - - let(:user) { Fabricate(:user) } - let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) } - - before do - allow(controller).to receive(:doorkeeper_token) { token } - end - - describe 'GET #index' do - let(:scopes) { 'read:filters' } - let!(:filter) { Fabricate(:custom_filter, account: user.account) } - - it 'returns http success' do - get :index - expect(response).to have_http_status(200) - end - end - - describe 'POST #create' do - let(:scopes) { 'write:filters' } - - before do - post :create, params: { title: 'magic', context: %w(home), filter_action: 'hide', keywords_attributes: [keyword: 'magic'] } - end - - it 'returns http success' do - expect(response).to have_http_status(200) - end - - it 'returns a filter with keywords' do - json = body_as_json - expect(json[:title]).to eq 'magic' - expect(json[:filter_action]).to eq 'hide' - expect(json[:context]).to eq ['home'] - expect(json[:keywords].map { |keyword| keyword.slice(:keyword, :whole_word) }).to eq [{ keyword: 'magic', whole_word: true }] - end - - it 'creates a filter' do - filter = user.account.custom_filters.first - expect(filter).to_not be_nil - expect(filter.keywords.pluck(:keyword)).to eq ['magic'] - expect(filter.context).to eq %w(home) - expect(filter.irreversible?).to be true - expect(filter.expires_at).to be_nil - end - end - - describe 'GET #show' do - let(:scopes) { 'read:filters' } - let(:filter) { Fabricate(:custom_filter, account: user.account) } - - it 'returns http success' do - get :show, params: { id: filter.id } - expect(response).to have_http_status(200) - end - end - - describe 'PUT #update' do - let(:scopes) { 'write:filters' } - let!(:filter) { Fabricate(:custom_filter, account: user.account) } - let!(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) } - - context 'when updating filter parameters' do - before do - put :update, params: { id: filter.id, title: 'updated', context: %w(home public) } - end - - it 'returns http success' do - expect(response).to have_http_status(200) - end - - it 'updates the filter title' do - expect(filter.reload.title).to eq 'updated' - end - - it 'updates the filter context' do - expect(filter.reload.context).to eq %w(home public) - end - end - - context 'when updating keywords in bulk' do - before do - allow(redis).to receive_messages(publish: nil) - put :update, params: { id: filter.id, keywords_attributes: [{ id: keyword.id, keyword: 'updated' }] } - end - - it 'returns http success' do - expect(response).to have_http_status(200) - end - - it 'updates the keyword' do - expect(keyword.reload.keyword).to eq 'updated' - end - - it 'sends exactly one filters_changed event' do - expect(redis).to have_received(:publish).with("timeline:#{user.account.id}", Oj.dump(event: :filters_changed)).once - end - end - end - - describe 'DELETE #destroy' do - let(:scopes) { 'write:filters' } - let(:filter) { Fabricate(:custom_filter, account: user.account) } - - before do - delete :destroy, params: { id: filter.id } - end - - it 'returns http success' do - expect(response).to have_http_status(200) - end - - it 'removes the filter' do - expect { filter.reload }.to raise_error ActiveRecord::RecordNotFound - end - end -end diff --git a/spec/requests/api/v2/filters/filters_spec.rb b/spec/requests/api/v2/filters/filters_spec.rb new file mode 100644 index 0000000000..2ee24d8095 --- /dev/null +++ b/spec/requests/api/v2/filters/filters_spec.rb @@ -0,0 +1,248 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe 'Filters' do + let(:user) { Fabricate(:user) } + let(:scopes) { 'read:filters write:filters' } + let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) } + let(:headers) { { 'Authorization' => "Bearer #{token.token}" } } + + shared_examples 'unauthorized for invalid token' do + let(:headers) { { 'Authorization' => '' } } + + it 'returns http unauthorized' do + subject + + expect(response).to have_http_status(401) + end + end + + describe 'GET /api/v2/filters' do + subject do + get '/api/v2/filters', headers: headers + end + + let!(:filters) { Fabricate.times(3, :custom_filter, account: user.account) } + + it_behaves_like 'forbidden for wrong scope', 'write write:filters' + it_behaves_like 'unauthorized for invalid token' + + it 'returns the existing filters successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(body_as_json.pluck(:id)).to match_array(filters.map { |filter| filter.id.to_s }) + end + end + + describe 'POST /api/v2/filters' do + subject do + post '/api/v2/filters', params: params, headers: headers + end + + let(:params) { {} } + + it_behaves_like 'forbidden for wrong scope', 'read read:filters' + it_behaves_like 'unauthorized for invalid token' + + context 'with valid params' do + let(:params) { { title: 'magic', context: %w(home), filter_action: 'hide', keywords_attributes: [keyword: 'magic'] } } + + it 'returns http success' do + subject + + expect(response).to have_http_status(200) + end + + it 'returns a filter with keywords', :aggregate_failures do + subject + + json = body_as_json + + expect(json[:title]).to eq 'magic' + expect(json[:filter_action]).to eq 'hide' + expect(json[:context]).to eq ['home'] + expect(json[:keywords].map { |keyword| keyword.slice(:keyword, :whole_word) }).to eq [{ keyword: 'magic', whole_word: true }] + end + + it 'creates a filter', :aggregate_failures do + subject + + filter = user.account.custom_filters.first + + expect(filter).to be_present + expect(filter.keywords.pluck(:keyword)).to eq ['magic'] + expect(filter.context).to eq %w(home) + expect(filter.irreversible?).to be true + expect(filter.expires_at).to be_nil + end + end + + context 'when the required title param is missing' do + let(:params) { { context: %w(home), filter_action: 'hide', keywords_attributes: [keyword: 'magic'] } } + + it 'returns http unprocessable entity' do + subject + + expect(response).to have_http_status(422) + end + end + + context 'when the required context param is missing' do + let(:params) { { title: 'magic', filter_action: 'hide', keywords_attributes: [keyword: 'magic'] } } + + it 'returns http unprocessable entity' do + subject + + expect(response).to have_http_status(422) + end + end + + context 'when the given context value is invalid' do + let(:params) { { title: 'magic', context: %w(shaolin), filter_action: 'hide', keywords_attributes: [keyword: 'magic'] } } + + it 'returns http unprocessable entity' do + subject + + expect(response).to have_http_status(422) + end + end + end + + describe 'GET /api/v2/filters/:id' do + subject do + get "/api/v2/filters/#{filter.id}", headers: headers + end + + let(:filter) { Fabricate(:custom_filter, account: user.account) } + + it_behaves_like 'forbidden for wrong scope', 'write write:filters' + it_behaves_like 'unauthorized for invalid token' + + it 'returns the filter successfully', :aggregate_failures do + subject + + expect(response).to have_http_status(200) + expect(body_as_json[:id]).to eq(filter.id.to_s) + end + + context 'when the filter belongs to someone else' do + let(:filter) { Fabricate(:custom_filter) } + + it 'returns http not found' do + subject + + expect(response).to have_http_status(404) + end + end + end + + describe 'PUT /api/v2/filters/:id' do + subject do + put "/api/v2/filters/#{filter.id}", params: params, headers: headers + end + + let!(:filter) { Fabricate(:custom_filter, account: user.account) } + let!(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) } + let(:params) { {} } + + it_behaves_like 'forbidden for wrong scope', 'read read:filters' + it_behaves_like 'unauthorized for invalid token' + + context 'when updating filter parameters' do + context 'with valid params' do + let(:params) { { title: 'updated', context: %w(home public) } } + + it 'updates the filter successfully', :aggregate_failures do + subject + + filter.reload + + expect(response).to have_http_status(200) + expect(filter.title).to eq 'updated' + expect(filter.reload.context).to eq %w(home public) + end + end + + context 'with invalid params' do + let(:params) { { title: 'updated', context: %w(word) } } + + it 'returns http unprocessable entity' do + subject + + expect(response).to have_http_status(422) + end + end + end + + context 'when updating keywords in bulk' do + let(:params) { { keywords_attributes: [{ id: keyword.id, keyword: 'updated' }] } } + + before do + allow(redis).to receive_messages(publish: nil) + end + + it 'returns http success' do + subject + + expect(response).to have_http_status(200) + end + + it 'updates the keyword' do + subject + + expect(keyword.reload.keyword).to eq 'updated' + end + + it 'sends exactly one filters_changed event' do + subject + + expect(redis).to have_received(:publish).with("timeline:#{user.account.id}", Oj.dump(event: :filters_changed)).once + end + end + + context 'when the filter belongs to someone else' do + let(:filter) { Fabricate(:custom_filter) } + + it 'returns http not found' do + subject + + expect(response).to have_http_status(404) + end + end + end + + describe 'DELETE /api/v2/filters/:id' do + subject do + delete "/api/v2/filters/#{filter.id}", headers: headers + end + + let(:filter) { Fabricate(:custom_filter, account: user.account) } + + it_behaves_like 'forbidden for wrong scope', 'read read:filters' + it_behaves_like 'unauthorized for invalid token' + + it 'returns http success' do + subject + + expect(response).to have_http_status(200) + end + + it 'removes the filter' do + subject + + expect { filter.reload }.to raise_error ActiveRecord::RecordNotFound + end + + context 'when the filter belongs to someone else' do + let(:filter) { Fabricate(:custom_filter) } + + it 'returns http not found' do + subject + + expect(response).to have_http_status(404) + end + end + end +end From 1814990a3d117555153321216fa593e4d9e84de3 Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 27 Jul 2023 15:12:10 +0200 Subject: [PATCH 124/557] Fix wrong filters sometimes applying in streaming (#26159) --- streaming/index.js | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/streaming/index.js b/streaming/index.js index aabd2f8559..067a2d1675 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -626,7 +626,7 @@ const startServer = async () => { const listener = message => { const { event, payload, queued_at } = message; - const transmit = () => { + const transmit = (payload) => { const now = new Date().getTime(); const delta = now - queued_at; const encodedPayload = typeof payload === 'object' ? JSON.stringify(payload) : payload; @@ -638,22 +638,21 @@ const startServer = async () => { // Only messages that may require filtering are statuses, since notifications // are already personalized and deletes do not matter if (!needsFiltering || event !== 'update') { - transmit(); + transmit(payload); return; } - const unpackedPayload = payload; - const targetAccountIds = [unpackedPayload.account.id].concat(unpackedPayload.mentions.map(item => item.id)); - const accountDomain = unpackedPayload.account.acct.split('@')[1]; + const targetAccountIds = [payload.account.id].concat(payload.mentions.map(item => item.id)); + const accountDomain = payload.account.acct.split('@')[1]; - if (Array.isArray(req.chosenLanguages) && unpackedPayload.language !== null && req.chosenLanguages.indexOf(unpackedPayload.language) === -1) { - log.silly(req.requestId, `Message ${unpackedPayload.id} filtered by language (${unpackedPayload.language})`); + if (Array.isArray(req.chosenLanguages) && payload.language !== null && req.chosenLanguages.indexOf(payload.language) === -1) { + log.silly(req.requestId, `Message ${payload.id} filtered by language (${payload.language})`); return; } // When the account is not logged in, it is not necessary to confirm the block or mute if (!req.accountId) { - transmit(); + transmit(payload); return; } @@ -672,14 +671,14 @@ const startServer = async () => { SELECT 1 FROM mutes WHERE account_id = $1 - AND target_account_id IN (${placeholders(targetAccountIds, 2)})`, [req.accountId, unpackedPayload.account.id].concat(targetAccountIds)), + AND target_account_id IN (${placeholders(targetAccountIds, 2)})`, [req.accountId, payload.account.id].concat(targetAccountIds)), ]; if (accountDomain) { queries.push(client.query('SELECT 1 FROM account_domain_blocks WHERE account_id = $1 AND domain = $2', [req.accountId, accountDomain])); } - if (!unpackedPayload.filtered && !req.cachedFilters) { + if (!payload.filtered && !req.cachedFilters) { queries.push(client.query('SELECT filter.id AS id, filter.phrase AS title, filter.context AS context, filter.expires_at AS expires_at, filter.action AS filter_action, keyword.keyword AS keyword, keyword.whole_word AS whole_word FROM custom_filter_keywords keyword JOIN custom_filters filter ON keyword.custom_filter_id = filter.id WHERE filter.account_id = $1 AND (filter.expires_at IS NULL OR filter.expires_at > NOW())', [req.accountId])); } @@ -690,7 +689,7 @@ const startServer = async () => { return; } - if (!unpackedPayload.filtered && !req.cachedFilters) { + if (!payload.filtered && !req.cachedFilters) { const filterRows = values[accountDomain ? 2 : 1].rows; req.cachedFilters = filterRows.reduce((cache, row) => { @@ -733,27 +732,30 @@ const startServer = async () => { } // Check filters - if (req.cachedFilters && !unpackedPayload.filtered) { - const status = unpackedPayload; + if (req.cachedFilters && !payload.filtered) { + const mutatedPayload = { ...payload }; + const status = payload; const searchContent = ([status.spoiler_text || '', status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(//g, '\n').replace(/<\/p>

/g, '\n\n'); const searchIndex = JSDOM.fragment(searchContent).textContent; const now = new Date(); - payload.filtered = []; + mutatedPayload.filtered = []; Object.values(req.cachedFilters).forEach((cachedFilter) => { if ((cachedFilter.expires_at === null || cachedFilter.expires_at > now)) { const keyword_matches = searchIndex.match(cachedFilter.regexp); if (keyword_matches) { - payload.filtered.push({ + mutatedPayload.filtered.push({ filter: cachedFilter.repr, keyword_matches, }); } } }); - } - transmit(); + transmit(mutatedPayload); + } else { + transmit(payload); + } }).catch(err => { log.error(err); done(); From ddaf200c78a05f5bae0ff913a18ea88e5478e9c7 Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Thu, 27 Jul 2023 15:38:18 +0200 Subject: [PATCH 125/557] Refactor streaming's filtering logic & improve documentation (#26213) --- streaming/index.js | 162 ++++++++++++++++++++++++++++++--------------- 1 file changed, 110 insertions(+), 52 deletions(-) diff --git a/streaming/index.js b/streaming/index.js index 067a2d1675..3adf37c191 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -622,29 +622,39 @@ const startServer = async () => { log.verbose(req.requestId, `Starting stream from ${ids.join(', ')} for ${accountId}`); - // Currently message is of type string, soon it'll be Record + const transmit = (event, payload) => { + // TODO: Replace "string"-based delete payloads with object payloads: + const encodedPayload = typeof payload === 'object' ? JSON.stringify(payload) : payload; + + log.silly(req.requestId, `Transmitting for ${accountId}: ${event} ${encodedPayload}`); + output(event, encodedPayload); + }; + + // The listener used to process each message off the redis subscription, + // message here is an object with an `event` and `payload` property. Some + // events also include a queued_at value, but this is being removed shortly. const listener = message => { - const { event, payload, queued_at } = message; + const { event, payload } = message; - const transmit = (payload) => { - const now = new Date().getTime(); - const delta = now - queued_at; - const encodedPayload = typeof payload === 'object' ? JSON.stringify(payload) : payload; - - log.silly(req.requestId, `Transmitting for ${accountId}: ${event} ${encodedPayload} Delay: ${delta}ms`); - output(event, encodedPayload); - }; - - // Only messages that may require filtering are statuses, since notifications - // are already personalized and deletes do not matter - if (!needsFiltering || event !== 'update') { - transmit(payload); + // Streaming only needs to apply filtering to some channels and only to + // some events. This is because majority of the filtering happens on the + // Ruby on Rails side when producing the event for streaming. + // + // The only events that require filtering from the streaming server are + // `update` and `status.update`, all other events are transmitted to the + // client as soon as they're received (pass-through). + // + // The channels that need filtering are determined in the function + // `channelNameToIds` defined below: + if (!needsFiltering || (event !== 'update' && event !== 'status.update')) { + transmit(event, payload); return; } - const targetAccountIds = [payload.account.id].concat(payload.mentions.map(item => item.id)); - const accountDomain = payload.account.acct.split('@')[1]; + // The rest of the logic from here on in this function is to handle + // filtering of statuses: + // Filter based on language: if (Array.isArray(req.chosenLanguages) && payload.language !== null && req.chosenLanguages.indexOf(payload.language) === -1) { log.silly(req.requestId, `Message ${payload.id} filtered by language (${payload.language})`); return; @@ -652,11 +662,16 @@ const startServer = async () => { // When the account is not logged in, it is not necessary to confirm the block or mute if (!req.accountId) { - transmit(payload); + transmit(event, payload); return; } - pgPool.connect((err, client, done) => { + // Filter based on domain blocks, blocks, mutes, or custom filters: + const targetAccountIds = [payload.account.id].concat(payload.mentions.map(item => item.id)); + const accountDomain = payload.account.acct.split('@')[1]; + + // TODO: Move this logic out of the message handling loop + pgPool.connect((err, client, releasePgConnection) => { if (err) { log.error(err); return; @@ -683,28 +698,45 @@ const startServer = async () => { } Promise.all(queries).then(values => { - done(); + releasePgConnection(); + // Handling blocks & mutes and domain blocks: If one of those applies, + // then we don't transmit the payload of the event to the client if (values[0].rows.length > 0 || (accountDomain && values[1].rows.length > 0)) { return; } - if (!payload.filtered && !req.cachedFilters) { + // If the payload already contains the `filtered` property, it means + // that filtering has been applied on the ruby on rails side, as + // such, we don't need to construct or apply the filters in streaming: + if (Object.prototype.hasOwnProperty.call(payload, "filtered")) { + transmit(event, payload); + return; + } + + // Handling for constructing the custom filters and caching them on the request + // TODO: Move this logic out of the message handling lifecycle + if (!req.cachedFilters) { const filterRows = values[accountDomain ? 2 : 1].rows; - req.cachedFilters = filterRows.reduce((cache, row) => { - if (cache[row.id]) { - cache[row.id].keywords.push([row.keyword, row.whole_word]); + req.cachedFilters = filterRows.reduce((cache, filter) => { + if (cache[filter.id]) { + cache[filter.id].keywords.push([filter.keyword, filter.whole_word]); } else { - cache[row.id] = { - keywords: [[row.keyword, row.whole_word]], - expires_at: row.expires_at, - repr: { - id: row.id, - title: row.title, - context: row.context, - expires_at: row.expires_at, - filter_action: ['warn', 'hide'][row.filter_action], + cache[filter.id] = { + keywords: [[filter.keyword, filter.whole_word]], + expires_at: filter.expires_at, + filter: { + id: filter.id, + title: filter.title, + context: filter.context, + expires_at: filter.expires_at, + // filter.filter_action is the value from the + // custom_filters.action database column, it is an integer + // representing a value in an enum defined by Ruby on Rails: + // + // enum { warn: 0, hide: 1 } + filter_action: ['warn', 'hide'][filter.filter_action], }, }; } @@ -712,6 +744,10 @@ const startServer = async () => { return cache; }, {}); + // Construct the regular expressions for the custom filters: This + // needs to be done in a separate loop as the database returns one + // filterRow per keyword, so we need all the keywords before + // constructing the regular expression Object.keys(req.cachedFilters).forEach((key) => { req.cachedFilters[key].regexp = new RegExp(req.cachedFilters[key].keywords.map(([keyword, whole_word]) => { let expr = keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); @@ -731,34 +767,56 @@ const startServer = async () => { }); } - // Check filters - if (req.cachedFilters && !payload.filtered) { - const mutatedPayload = { ...payload }; + // Apply cachedFilters against the payload, constructing a + // `filter_results` array of FilterResult entities + if (req.cachedFilters) { const status = payload; - const searchContent = ([status.spoiler_text || '', status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(//g, '\n').replace(/<\/p>

/g, '\n\n'); - const searchIndex = JSDOM.fragment(searchContent).textContent; + // TODO: Calculate searchableContent in Ruby on Rails: + const searchableContent = ([status.spoiler_text || '', status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(//g, '\n').replace(/<\/p>

/g, '\n\n'); + const searchableTextContent = JSDOM.fragment(searchableContent).textContent; const now = new Date(); - mutatedPayload.filtered = []; - Object.values(req.cachedFilters).forEach((cachedFilter) => { - if ((cachedFilter.expires_at === null || cachedFilter.expires_at > now)) { - const keyword_matches = searchIndex.match(cachedFilter.regexp); - if (keyword_matches) { - mutatedPayload.filtered.push({ - filter: cachedFilter.repr, - keyword_matches, - }); - } + const filter_results = Object.values(req.cachedFilters).reduce((results, cachedFilter) => { + // Check the filter hasn't expired before applying: + if (cachedFilter.expires_at !== null && cachedFilter.expires_at < now) { + return; } - }); - transmit(mutatedPayload); + // Just in-case JSDOM fails to find textContent in searchableContent + if (!searchableTextContent) { + return; + } + + const keyword_matches = searchableTextContent.match(cachedFilter.regexp); + if (keyword_matches) { + // results is an Array of FilterResult; status_matches is always + // null as we only are only applying the keyword-based custom + // filters, not the status-based custom filters. + // https://docs.joinmastodon.org/entities/FilterResult/ + results.push({ + filter: cachedFilter.filter, + keyword_matches, + status_matches: null + }); + } + }, []); + + // Send the payload + the FilterResults as the `filtered` property + // to the streaming connection. To reach this code, the `event` must + // have been either `update` or `status.update`, meaning the + // `payload` is a Status entity, which has a `filtered` property: + // + // filtered: https://docs.joinmastodon.org/entities/Status/#filtered + transmit(event, { + ...payload, + filtered: filter_results + }); } else { - transmit(payload); + transmit(event, payload); } }).catch(err => { + releasePgConnection(); log.error(err); - done(); }); }); }; From 1e4ccc655acb0ac746656bed891d44b3a986384b Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 27 Jul 2023 16:05:24 +0200 Subject: [PATCH 126/557] Add role badges to the WebUI (#25649) --- .../features/account/components/header.jsx | 35 +++++++++++++++---- app/javascript/styles/mastodon/accounts.scss | 35 +++++++++++++------ .../styles/mastodon/components.scss | 14 +++++--- .../custom_emojis/_custom_emoji.html.haml | 2 +- app/views/custom_css/show.css.erb | 2 -- .../authorized_applications/index.html.haml | 2 +- 6 files changed, 65 insertions(+), 25 deletions(-) diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx index aea7317577..51206c03bf 100644 --- a/app/javascript/mastodon/features/account/components/header.jsx +++ b/app/javascript/mastodon/features/account/components/header.jsx @@ -370,16 +370,33 @@ class Header extends ImmutablePureComponent { const acct = isLocal && domain ? `${account.get('acct')}@${domain}` : account.get('acct'); const isIndexable = !account.get('noindex'); - let badge; + const badges = []; if (account.get('bot')) { - badge = (

); + badges.push( +
+ { ' ' } + +
+ ); } else if (account.get('group')) { - badge = (
); - } else { - badge = null; + badges.push( +
+ { ' ' } + +
+ ); } + account.get('roles', []).forEach((role) => { + badges.push( +
+ { ' ' } + {role.get('name')} ({domain}) +
+ ); + }); + return (
{!(suspended || hidden || account.get('moved')) && account.getIn(['relationship', 'requested_by']) && } @@ -414,13 +431,19 @@ class Header extends ImmutablePureComponent {

- {badge} + @{acct} {lockedIcon}

+ {badges.length > 0 && ( +
+ {badges} +
+ )} + {!(suspended || hidden) && (
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss index b50306deda..babfbbbad0 100644 --- a/app/javascript/styles/mastodon/accounts.scss +++ b/app/javascript/styles/mastodon/accounts.scss @@ -188,30 +188,43 @@ } .account-role, +.information-badge, .simple_form .recommended, .simple_form .not_recommended { display: inline-block; padding: 4px 6px; cursor: default; - border-radius: 3px; + border-radius: 4px; font-size: 12px; line-height: 12px; font-weight: 500; - color: var(--user-role-accent, $ui-secondary-color); - background-color: var(--user-role-background, rgba($ui-secondary-color, 0.1)); - border: 1px solid var(--user-role-border, rgba($ui-secondary-color, 0.5)); + color: $ui-secondary-color; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} - &.moderator { +.information-badge, +.simple_form .recommended, +.simple_form .not_recommended { + background-color: rgba($ui-secondary-color, 0.1); + border: 1px solid rgba($ui-secondary-color, 0.5); +} + +.account-role { + border: 1px solid $highlight-text-color; + + .fa { + color: var(--user-role-accent, $highlight-text-color); + } +} + +.information-badge { + &.superapp { color: $success-green; background-color: rgba($success-green, 0.1); border-color: rgba($success-green, 0.5); } - - &.admin { - color: lighten($error-red, 12%); - background-color: rgba(lighten($error-red, 12%), 0.1); - border-color: rgba(lighten($error-red, 12%), 0.5); - } } .simple_form .not_recommended { diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 2d1d4aa47c..4c9a2cfdd0 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -7331,6 +7331,16 @@ noscript { } } + &__badges { + display: flex; + flex-wrap: wrap; + gap: 8px; + + .account-role { + line-height: unset; + } + } + &__tabs { display: flex; align-items: flex-start; @@ -7369,10 +7379,6 @@ noscript { margin-top: 16px; margin-bottom: 16px; - .account-role { - vertical-align: top; - } - .emojione { width: 22px; height: 22px; diff --git a/app/views/admin/custom_emojis/_custom_emoji.html.haml b/app/views/admin/custom_emojis/_custom_emoji.html.haml index 8d34d38e58..c6789d4f89 100644 --- a/app/views/admin/custom_emojis/_custom_emoji.html.haml +++ b/app/views/admin/custom_emojis/_custom_emoji.html.haml @@ -9,7 +9,7 @@ %samp= ":#{custom_emoji.shortcode}:" - if custom_emoji.local? - %span.account-role.bot= custom_emoji.category&.name || t('admin.custom_emojis.uncategorized') + %span.information-badge= custom_emoji.category&.name || t('admin.custom_emojis.uncategorized') .batch-table__row__content__extra - if custom_emoji.local? diff --git a/app/views/custom_css/show.css.erb b/app/views/custom_css/show.css.erb index bcbe819621..9cd38fb371 100644 --- a/app/views/custom_css/show.css.erb +++ b/app/views/custom_css/show.css.erb @@ -5,8 +5,6 @@ <%- UserRole.where(highlighted: true).select { |role| role.color.present? }.each do |role| %> .user-role-<%= role.id %> { --user-role-accent: <%= role.color %>; - --user-role-background: <%= role.color + '19' %>; - --user-role-border: <%= role.color + '80' %>; } <%- end %> diff --git a/app/views/oauth/authorized_applications/index.html.haml b/app/views/oauth/authorized_applications/index.html.haml index 689f051029..40b09d87f1 100644 --- a/app/views/oauth/authorized_applications/index.html.haml +++ b/app/views/oauth/authorized_applications/index.html.haml @@ -14,7 +14,7 @@ %strong.announcements-list__item__title = application.name - if application.superapp? - %span.account-role.moderator= t('doorkeeper.authorized_applications.index.superapp') + %span.information-badge.superapp= t('doorkeeper.authorized_applications.index.superapp') .announcements-list__item__action-bar .announcements-list__item__meta From b4e739ff0f64c601973762ac986c0e63092d2d7e Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 27 Jul 2023 16:11:17 +0200 Subject: [PATCH 127/557] Change interaction modal in web UI (#26075) Co-authored-by: Eugen Rochko --- app/chewy/instances_index.rb | 12 + .../api/v1/instances/peers_controller.rb | 2 +- .../api/v1/peers/search_controller.rb | 45 +++ .../authorize_interactions_controller.rb | 21 +- .../remote_interaction_helper_controller.rb | 43 +++ .../well_known/webfinger_controller.rb | 1 + .../mastodon/containers/status_container.jsx | 2 +- .../containers/header_container.jsx | 2 +- .../features/compose/components/search.jsx | 4 - .../features/interaction_modal/index.jsx | 300 ++++++++++++++---- .../picture_in_picture/components/footer.jsx | 6 +- .../mastodon/features/status/index.jsx | 6 +- app/javascript/mastodon/locales/en.json | 8 +- .../packs/remote_interaction_helper.ts | 172 ++++++++++ .../styles/mastodon/components.scss | 115 ++++--- app/javascript/styles/mastodon/variables.scss | 2 + app/javascript/types/resources.ts | 1 + app/lib/importer/instances_index_importer.rb | 26 ++ app/lib/webfinger_resource.rb | 9 + app/models/instance.rb | 1 + app/serializers/rest/account_serializer.rb | 6 +- app/serializers/webfinger_serializer.rb | 1 + .../_post_follow_actions.html.haml | 4 - .../authorize_interactions/error.html.haml | 3 - .../authorize_interactions/show.html.haml | 24 -- .../authorize_interactions/success.html.haml | 13 - app/views/layouts/helper_frame.html.haml | 8 + .../remote_interaction_helper/index.html.haml | 4 + .../scheduler/instance_refresh_scheduler.rb | 1 + config/locales/an.yml | 12 - config/locales/ar.yml | 12 - config/locales/ast.yml | 9 - config/locales/be.yml | 12 - config/locales/bg.yml | 12 - config/locales/br.yml | 5 - config/locales/ca.yml | 12 - config/locales/ckb.yml | 12 - config/locales/co.yml | 12 - config/locales/cs.yml | 12 - config/locales/cy.yml | 12 - config/locales/da.yml | 12 - config/locales/de.yml | 12 - config/locales/el.yml | 12 - config/locales/en-GB.yml | 12 - config/locales/en.yml | 12 - config/locales/eo.yml | 12 - config/locales/es-AR.yml | 12 - config/locales/es-MX.yml | 12 - config/locales/es.yml | 12 - config/locales/et.yml | 12 - config/locales/eu.yml | 12 - config/locales/fa.yml | 12 - config/locales/fi.yml | 12 - config/locales/fo.yml | 12 - config/locales/fr-QC.yml | 12 - config/locales/fr.yml | 12 - config/locales/fy.yml | 12 - config/locales/ga.yml | 5 - config/locales/gd.yml | 12 - config/locales/gl.yml | 12 - config/locales/he.yml | 12 - config/locales/hr.yml | 4 - config/locales/hu.yml | 12 - config/locales/hy.yml | 11 - config/locales/id.yml | 12 - config/locales/io.yml | 12 - config/locales/is.yml | 12 - config/locales/it.yml | 12 - config/locales/ja.yml | 12 - config/locales/ka.yml | 11 - config/locales/kab.yml | 8 - config/locales/kk.yml | 11 - config/locales/ko.yml | 12 - config/locales/ku.yml | 12 - config/locales/lt.yml | 11 - config/locales/lv.yml | 12 - config/locales/ml.yml | 10 - config/locales/ms.yml | 8 - config/locales/my.yml | 12 - config/locales/nl.yml | 12 - config/locales/nn.yml | 12 - config/locales/no.yml | 12 - config/locales/oc.yml | 11 - config/locales/pl.yml | 12 - config/locales/pt-BR.yml | 12 - config/locales/pt-PT.yml | 12 - config/locales/ro.yml | 12 - config/locales/ru.yml | 12 - config/locales/sc.yml | 12 - config/locales/sco.yml | 12 - config/locales/si.yml | 12 - config/locales/sk.yml | 11 - config/locales/sl.yml | 12 - config/locales/sq.yml | 12 - config/locales/sr-Latn.yml | 12 - config/locales/sr.yml | 12 - config/locales/sv.yml | 12 - config/locales/ta.yml | 2 - config/locales/th.yml | 12 - config/locales/tr.yml | 12 - config/locales/tt.yml | 6 - config/locales/uk.yml | 12 - config/locales/vi.yml | 12 - config/locales/zgh.yml | 3 - config/locales/zh-CN.yml | 12 - config/locales/zh-HK.yml | 12 - config/locales/zh-TW.yml | 12 - config/routes.rb | 5 +- config/routes/api.rb | 4 + lib/mastodon/cli/search.rb | 1 + .../authorize_interactions_controller_spec.rb | 51 +-- 111 files changed, 682 insertions(+), 1091 deletions(-) create mode 100644 app/chewy/instances_index.rb create mode 100644 app/controllers/api/v1/peers/search_controller.rb create mode 100644 app/controllers/remote_interaction_helper_controller.rb create mode 100644 app/javascript/packs/remote_interaction_helper.ts create mode 100644 app/lib/importer/instances_index_importer.rb delete mode 100644 app/views/authorize_interactions/_post_follow_actions.html.haml delete mode 100644 app/views/authorize_interactions/error.html.haml delete mode 100644 app/views/authorize_interactions/show.html.haml delete mode 100644 app/views/authorize_interactions/success.html.haml create mode 100644 app/views/layouts/helper_frame.html.haml create mode 100644 app/views/remote_interaction_helper/index.html.haml diff --git a/app/chewy/instances_index.rb b/app/chewy/instances_index.rb new file mode 100644 index 0000000000..2bce4043c9 --- /dev/null +++ b/app/chewy/instances_index.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class InstancesIndex < Chewy::Index + settings index: { refresh_interval: '30s' } + + index_scope ::Instance.searchable + + root date_detection: false do + field :domain, type: 'text', index_prefixes: { min_chars: 1 } + field :accounts_count, type: 'long' + end +end diff --git a/app/controllers/api/v1/instances/peers_controller.rb b/app/controllers/api/v1/instances/peers_controller.rb index 70281362a8..23096650e6 100644 --- a/app/controllers/api/v1/instances/peers_controller.rb +++ b/app/controllers/api/v1/instances/peers_controller.rb @@ -15,7 +15,7 @@ class Api::V1::Instances::PeersController < Api::BaseController def index cache_even_if_authenticated! - render_with_cache(expires_in: 1.day) { Instance.where.not(domain: DomainBlock.select(:domain)).pluck(:domain) } + render_with_cache(expires_in: 1.day) { Instance.searchable.pluck(:domain) } end private diff --git a/app/controllers/api/v1/peers/search_controller.rb b/app/controllers/api/v1/peers/search_controller.rb new file mode 100644 index 0000000000..50a342cde3 --- /dev/null +++ b/app/controllers/api/v1/peers/search_controller.rb @@ -0,0 +1,45 @@ +# frozen_string_literal: true + +class Api::V1::Peers::SearchController < Api::BaseController + before_action :require_enabled_api! + before_action :set_domains + + skip_before_action :require_authenticated_user!, unless: :whitelist_mode? + skip_around_action :set_locale + + vary_by '' + + def index + cache_even_if_authenticated! + render json: @domains + end + + private + + def require_enabled_api! + head 404 unless Setting.peers_api_enabled && !whitelist_mode? + end + + def set_domains + return if params[:q].blank? + + if Chewy.enabled? + @domains = InstancesIndex.query(function_score: { + query: { + prefix: { + domain: params[:q], + }, + }, + + field_value_factor: { + field: 'accounts_count', + modifier: 'log2p', + }, + }).limit(10).pluck(:domain) + else + domain = params[:q].strip + domain = TagManager.instance.normalize_domain(domain) + @domains = Instance.searchable.where(Instance.arel_table[:domain].matches("#{Instance.sanitize_sql_like(domain)}%", false, true)).limit(10).pluck(:domain) + end + end +end diff --git a/app/controllers/authorize_interactions_controller.rb b/app/controllers/authorize_interactions_controller.rb index bf28d18423..99eed018b0 100644 --- a/app/controllers/authorize_interactions_controller.rb +++ b/app/controllers/authorize_interactions_controller.rb @@ -3,32 +3,19 @@ class AuthorizeInteractionsController < ApplicationController include Authorization - layout 'modal' - before_action :authenticate_user! - before_action :set_body_classes before_action :set_resource def show if @resource.is_a?(Account) - render :show + redirect_to web_url("@#{@resource.pretty_acct}") elsif @resource.is_a?(Status) redirect_to web_url("@#{@resource.account.pretty_acct}/#{@resource.id}") else - render :error + not_found end end - def create - if @resource.is_a?(Account) && FollowService.new.call(current_account, @resource, with_rate_limit: true) - render :success - else - render :error - end - rescue ActiveRecord::RecordNotFound - render :error - end - private def set_resource @@ -61,8 +48,4 @@ class AuthorizeInteractionsController < ApplicationController def uri_param params[:uri] || params.fetch(:acct, '').delete_prefix('acct:') end - - def set_body_classes - @body_classes = 'modal-layout' - end end diff --git a/app/controllers/remote_interaction_helper_controller.rb b/app/controllers/remote_interaction_helper_controller.rb new file mode 100644 index 0000000000..90c853f47b --- /dev/null +++ b/app/controllers/remote_interaction_helper_controller.rb @@ -0,0 +1,43 @@ +# frozen_string_literal: true + +class RemoteInteractionHelperController < ApplicationController + vary_by '' + + skip_before_action :require_functional! + skip_around_action :set_locale + skip_before_action :update_user_sign_in + + content_security_policy do |p| + # We inherit the normal `script-src` + + # Set every directive that does not have a fallback + p.default_src :none + p.form_action :none + p.base_uri :none + + # Disable every directive with a fallback to cut on response size + p.base_uri false + p.font_src false + p.img_src false + p.style_src false + p.media_src false + p.frame_src false + p.manifest_src false + p.connect_src false + p.child_src false + p.worker_src false + + # Widen the directives that we do need + p.frame_ancestors :self + p.connect_src :https + end + + def index + expires_in(5.minutes, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.day) + + response.headers['X-Frame-Options'] = 'SAMEORIGIN' + response.headers['Referrer-Policy'] = 'no-referrer' + + render layout: 'helper_frame' + end +end diff --git a/app/controllers/well_known/webfinger_controller.rb b/app/controllers/well_known/webfinger_controller.rb index 0d897e8e24..4748940f7c 100644 --- a/app/controllers/well_known/webfinger_controller.rb +++ b/app/controllers/well_known/webfinger_controller.rb @@ -19,6 +19,7 @@ module WellKnown def set_account username = username_from_resource + @account = begin if username == Rails.configuration.x.local_domain Account.representative diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx index 536765e137..7a7cd9880f 100644 --- a/app/javascript/mastodon/containers/status_container.jsx +++ b/app/javascript/mastodon/containers/status_container.jsx @@ -278,7 +278,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({ modalProps: { type, accountId: status.getIn(['account', 'id']), - url: status.get('url'), + url: status.get('uri'), }, })); }, diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx index 2b3a66c55e..df5427c307 100644 --- a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx +++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx @@ -83,7 +83,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ modalProps: { type: 'follow', accountId: account.get('id'), - url: account.get('url'), + url: account.get('uri'), }, })); }, diff --git a/app/javascript/mastodon/features/compose/components/search.jsx b/app/javascript/mastodon/features/compose/components/search.jsx index 7badb0774f..682f8d3c8c 100644 --- a/app/javascript/mastodon/features/compose/components/search.jsx +++ b/app/javascript/mastodon/features/compose/components/search.jsx @@ -139,10 +139,6 @@ class Search extends PureComponent { this.setState({ expanded: false, selectedOption: -1 }); }; - findTarget = () => { - return this.searchForm; - }; - handleHashtagClick = () => { const { router } = this.context; const { value, onClickSearchResult } = this.props; diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx index 4722c130e7..6e17ab0194 100644 --- a/app/javascript/mastodon/features/interaction_modal/index.jsx +++ b/app/javascript/mastodon/features/interaction_modal/index.jsx @@ -1,95 +1,296 @@ import PropTypes from 'prop-types'; -import { PureComponent } from 'react'; +import React from 'react'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage, defineMessages, injectIntl } from 'react-intl'; import classNames from 'classnames'; import { connect } from 'react-redux'; +import { throttle, escapeRegExp } from 'lodash'; + import { openModal, closeModal } from 'mastodon/actions/modal'; +import api from 'mastodon/api'; +import Button from 'mastodon/components/button'; import { Icon } from 'mastodon/components/icon'; import { registrationsOpen } from 'mastodon/initial_state'; +const messages = defineMessages({ + loginPrompt: { id: 'interaction_modal.login.prompt', defaultMessage: 'Domain of your home server, e.g. mastodon.social' }, +}); + const mapStateToProps = (state, { accountId }) => ({ displayNameHtml: state.getIn(['accounts', accountId, 'display_name_html']), - signupUrl: state.getIn(['server', 'server', 'registrations', 'url'], null) || '/auth/sign_up', }); const mapDispatchToProps = (dispatch) => ({ onSignupClick() { - dispatch(closeModal({ - modalType: undefined, - ignoreFocus: false, - })); - dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' })); + dispatch(closeModal()); + dispatch(openModal('CLOSED_REGISTRATIONS')); }, }); -class Copypaste extends PureComponent { +const PERSISTENCE_KEY = 'mastodon_home'; + +const isValidDomain = value => { + const url = new URL('https:///path'); + url.hostname = value; + return url.hostname === value; +}; + +const valueToDomain = value => { + // If the user starts typing an URL + if (/^https?:\/\//.test(value)) { + try { + const url = new URL(value); + + // Consider that if there is a path, the URL is more meaningful than a bare domain + if (url.pathname.length > 1) { + return ''; + } + + return url.host; + } catch { + return undefined; + } + // If the user writes their full handle including username + } else if (value.includes('@')) { + if (value.replace(/^@/, '').split('@').length > 2) { + return undefined; + } + return ''; + } + + return value; +}; + +const addInputToOptions = (value, options) => { + value = value.trim(); + + if (value.includes('.') && isValidDomain(value)) { + return [value].concat(options.filter((x) => x !== value)); + } + + return options; +}; + +class LoginForm extends React.PureComponent { static propTypes = { - value: PropTypes.string, + resourceUrl: PropTypes.string, + intl: PropTypes.object.isRequired, }; state = { - copied: false, + value: localStorage ? (localStorage.getItem(PERSISTENCE_KEY) || '') : '', + expanded: false, + selectedOption: -1, + isLoading: false, + isSubmitting: false, + error: false, + options: [], + networkOptions: [], }; setRef = c => { this.input = c; }; - handleInputClick = () => { - this.setState({ copied: false }); - this.input.focus(); - this.input.select(); - this.input.setSelectionRange(0, this.input.value.length); + handleChange = ({ target }) => { + this.setState(state => ({ value: target.value, isLoading: true, error: false, options: addInputToOptions(target.value, state.networkOptions) }), () => this._loadOptions()); }; - handleButtonClick = () => { - const { value } = this.props; - navigator.clipboard.writeText(value); - this.input.blur(); - this.setState({ copied: true }); - this.timeout = setTimeout(() => this.setState({ copied: false }), 700); + handleMessage = (event) => { + const { resourceUrl } = this.props; + + if (event.origin !== window.origin || event.source !== this.iframeRef.contentWindow) { + return; + } + + if (event.data?.type === 'fetchInteractionURL-failure') { + this.setState({ isSubmitting: false, error: true }); + } else if (event.data?.type === 'fetchInteractionURL-success') { + if (/^https?:\/\//.test(event.data.template)) { + if (localStorage) { + localStorage.setItem(PERSISTENCE_KEY, event.data.uri_or_domain); + } + + window.location.href = event.data.template.replace('{uri}', encodeURIComponent(resourceUrl)); + } else { + this.setState({ isSubmitting: false, error: true }); + } + } }; - componentWillUnmount () { - if (this.timeout) clearTimeout(this.timeout); + componentDidMount () { + window.addEventListener('message', this.handleMessage); } + componentWillUnmount () { + window.removeEventListener('message', this.handleMessage); + } + + handleSubmit = () => { + const { value } = this.state; + + this.setState({ isSubmitting: true }); + + this.iframeRef.contentWindow.postMessage({ + type: 'fetchInteractionURL', + uri_or_domain: value.trim(), + }, window.origin); + }; + + setIFrameRef = (iframe) => { + this.iframeRef = iframe; + } + + handleFocus = () => { + this.setState({ expanded: true }); + }; + + handleBlur = () => { + this.setState({ expanded: false }); + }; + + handleKeyDown = (e) => { + const { options, selectedOption } = this.state; + + switch(e.key) { + case 'ArrowDown': + e.preventDefault(); + + if (options.length > 0) { + this.setState({ selectedOption: Math.min(selectedOption + 1, options.length - 1) }); + } + + break; + case 'ArrowUp': + e.preventDefault(); + + if (options.length > 0) { + this.setState({ selectedOption: Math.max(selectedOption - 1, -1) }); + } + + break; + case 'Enter': + e.preventDefault(); + + if (selectedOption === -1) { + this.handleSubmit(); + } else if (options.length > 0) { + this.setState({ value: options[selectedOption], error: false }, () => this.handleSubmit()); + } + + break; + } + }; + + handleOptionClick = e => { + const index = Number(e.currentTarget.getAttribute('data-index')); + const option = this.state.options[index]; + + e.preventDefault(); + this.setState({ selectedOption: index, value: option, error: false }, () => this.handleSubmit()); + }; + + _loadOptions = throttle(() => { + const { value } = this.state; + + const domain = valueToDomain(value.trim()); + + if (typeof domain === 'undefined') { + this.setState({ options: [], networkOptions: [], isLoading: false, error: true }); + return; + } + + if (domain.length === 0) { + this.setState({ options: [], networkOptions: [], isLoading: false }); + return; + } + + api().get('/api/v1/peers/search', { params: { q: domain } }).then(({ data }) => { + if (!data) { + data = []; + } + + this.setState((state) => ({ networkOptions: data, options: addInputToOptions(state.value, data), isLoading: false })); + }).catch(() => { + this.setState({ isLoading: false }); + }); + }, 200, { leading: true, trailing: true }); + render () { - const { value } = this.props; - const { copied } = this.state; + const { intl } = this.props; + const { value, expanded, options, selectedOption, error, isSubmitting } = this.state; + const domain = (valueToDomain(value) || '').trim(); + const domainRegExp = new RegExp(`(${escapeRegExp(domain)})`, 'gi'); + const hasPopOut = domain.length > 0 && options.length > 0; return ( -
- + +