diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
index 892f59f941f929..2e7123cd7ed77c 100644
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@@ -15,6 +15,7 @@ on:
- '**/*.rb'
- '.github/workflows/test-migrations.yml'
- 'lib/tasks/tests.rake'
+ - 'lib/tasks/db.rake'
pull_request:
paths:
@@ -93,6 +94,11 @@ jobs:
bin/rails db:drop
bin/rails db:create
SKIP_POST_DEPLOYMENT_MIGRATIONS=true bin/rails tests:migrations:prepare_database
+
+ # Migrate up to v4.2.0 breakpoint
+ bin/rails db:migrate VERSION=20230907150100
+
+ # Migrate the rest
SKIP_POST_DEPLOYMENT_MIGRATIONS=true bin/rails db:migrate
bin/rails db:migrate
bin/rails tests:migrations:check_database
diff --git a/Gemfile.lock b/Gemfile.lock
index a81428e9d1d9ac..8cbceae21439c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -94,7 +94,7 @@ GEM
ast (2.4.2)
attr_required (1.0.2)
aws-eventstream (1.3.0)
- aws-partitions (1.1015.0)
+ aws-partitions (1.1017.0)
aws-sdk-core (3.214.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
@@ -103,7 +103,7 @@ GEM
aws-sdk-kms (1.96.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
- aws-sdk-s3 (1.175.0)
+ aws-sdk-s3 (1.176.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
@@ -128,7 +128,7 @@ GEM
msgpack (~> 1.2)
brakeman (6.2.2)
racc
- browser (6.1.0)
+ browser (6.2.0)
brpoplpush-redis_script (0.1.3)
concurrent-ruby (~> 1.0, >= 1.0.5)
redis (>= 1.0, < 6)
@@ -466,7 +466,7 @@ GEM
opentelemetry-api (1.4.0)
opentelemetry-common (0.21.0)
opentelemetry-api (~> 1.0)
- opentelemetry-exporter-otlp (0.29.0)
+ opentelemetry-exporter-otlp (0.29.1)
google-protobuf (>= 3.18)
googleapis-common-protos-types (~> 1.3)
opentelemetry-api (~> 1.1)
@@ -490,8 +490,9 @@ GEM
opentelemetry-instrumentation-active_job (0.7.8)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
- opentelemetry-instrumentation-active_model_serializers (0.20.2)
+ opentelemetry-instrumentation-active_model_serializers (0.20.3)
opentelemetry-api (~> 1.0)
+ opentelemetry-instrumentation-active_support (>= 0.6.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-active_record (0.8.1)
opentelemetry-api (~> 1.0)
@@ -545,7 +546,7 @@ GEM
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-registry (0.3.1)
opentelemetry-api (~> 1.1)
- opentelemetry-sdk (1.5.0)
+ opentelemetry-sdk (1.6.0)
opentelemetry-api (~> 1.1)
opentelemetry-common (~> 0.20)
opentelemetry-registry (~> 0.2)
diff --git a/app/controllers/api/v1/trends/tags_controller.rb b/app/controllers/api/v1/trends/tags_controller.rb
index b15dd50131dc96..10a34423446d1a 100644
--- a/app/controllers/api/v1/trends/tags_controller.rb
+++ b/app/controllers/api/v1/trends/tags_controller.rb
@@ -27,7 +27,9 @@ def set_tags
end
def tags_from_trends
- Trends.tags.query.allowed
+ scope = Trends.tags.query.allowed.in_locale(content_locale)
+ scope = scope.filtered_for(current_account) if user_signed_in?
+ scope
end
def next_path
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 0669b7f405c991..141d20f16decb4 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -101,8 +101,9 @@
"annual_report.summary.highlighted_post.possessive": "на {name}",
"annual_report.summary.most_used_app.most_used_app": "най-употребявано приложение",
"annual_report.summary.most_used_hashtag.most_used_hashtag": "най-употребяван хаштаг",
+ "annual_report.summary.most_used_hashtag.none": "Няма",
"annual_report.summary.new_posts.new_posts": "нови публикации",
- "annual_report.summary.percentile.text": "Това ви слага най-отгоресред потребителите на Mastodon.",
+ "annual_report.summary.percentile.text": "Това ви слага най-отгоресред потребителите на {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Няма да кажем на Бърни Сандърс.",
"annual_report.summary.thanks": "Благодарим, че сте част от Mastodon!",
"attachments_list.unprocessed": "(необработено)",
@@ -204,6 +205,9 @@
"confirmations.edit.confirm": "Редактиране",
"confirmations.edit.message": "Редактирането сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?",
"confirmations.edit.title": "Презаписвате ли публикацията?",
+ "confirmations.follow_to_list.confirm": "Последване и добавяне в списък",
+ "confirmations.follow_to_list.message": "Трябва да последвате {name}, за да добавите лицето към списък.",
+ "confirmations.follow_to_list.title": "Последвате ли потребителя?",
"confirmations.logout.confirm": "Излизане",
"confirmations.logout.message": "Наистина ли искате да излезете?",
"confirmations.logout.title": "Излизате ли от системата?",
@@ -394,6 +398,7 @@
"home.pending_critical_update.title": "Налично критично обновяване на сигурността!",
"home.show_announcements": "Показване на оповестяванията",
"ignore_notifications_modal.disclaimer": "Mastodon не може да осведоми потребители, че сте пренебрегнали известията им. Пренебрегването на известията няма да спре самите съобщения да не бъдат изпращани.",
+ "ignore_notifications_modal.filter_instead": "Вместо това филтриране",
"ignore_notifications_modal.filter_to_act_users": "Вие все още ще може да приемате, отхвърляте или докладвате потребители",
"ignore_notifications_modal.filter_to_avoid_confusion": "Прецеждането помага за избягване на възможно объркване",
"ignore_notifications_modal.filter_to_review_separately": "Може да разгледате отделно филтрираните известия",
@@ -491,7 +496,7 @@
"lists.replies_policy.list": "Членуващите в списъка",
"lists.replies_policy.none": "Никого",
"lists.save": "Запазване",
- "lists.search_placeholder": "Търсене сред, които сте последвали",
+ "lists.search": "Търсене",
"lists.show_replies_to": "Включва отговори от членуващи в списъка до",
"load_pending": "{count, plural, one {# нов елемент} other {# нови елемента}}",
"loading_indicator.label": "Зареждане…",
@@ -634,6 +639,7 @@
"notifications.policy.drop": "Пренебрегване",
"notifications.policy.drop_hint": "Изпращане в празнотата, за да не се видим никога пак",
"notifications.policy.filter": "Филтър",
+ "notifications.policy.filter_hint": "Изпращане до филтрираните входящи за известия",
"notifications.policy.filter_limited_accounts_hint": "Ограничено от модераторите на сървъра",
"notifications.policy.filter_limited_accounts_title": "Модерирани акаунти",
"notifications.policy.filter_new_accounts.hint": "Сътворено през {days, plural, one {последния ден} other {последните # дена}}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 022d5800bbb63a..b6344c45e84fe6 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "l'etiqueta més utilitzada",
"annual_report.summary.most_used_hashtag.none": "Cap",
"annual_report.summary.new_posts.new_posts": "publicacions noves",
- "annual_report.summary.percentile.text": "Que us posa en elmés alt dels usuaris de Mastodon.",
+ "annual_report.summary.percentile.text": "Que us posa alcapdamunt dels usuaris de {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "No li ho direm al Bernie.",
"annual_report.summary.thanks": "Gràcies per formar part de Mastodon!",
"attachments_list.unprocessed": "(sense processar)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Edita",
"confirmations.edit.message": "Editant ara sobreescriuràs el missatge que estàs editant. Segur que vols continuar?",
"confirmations.edit.title": "Sobreescriure la publicació?",
+ "confirmations.follow_to_list.confirm": "Seguir i afegir a una llista",
+ "confirmations.follow_to_list.message": "Cal seguir {name} per a afegir-lo a una llista.",
+ "confirmations.follow_to_list.title": "Seguir l'usuari?",
"confirmations.logout.confirm": "Tanca la sessió",
"confirmations.logout.message": "Segur que vols tancar la sessió?",
"confirmations.logout.title": "Tancar la sessió?",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "Membres de la llista",
"lists.replies_policy.none": "Ningú",
"lists.save": "Desa",
- "lists.search_placeholder": "Cerca persones que seguiu",
+ "lists.search": "Cerca",
"lists.show_replies_to": "Inclou respostes de membres de la llista a",
"load_pending": "{count, plural, one {# element nou} other {# elements nous}}",
"loading_indicator.label": "Es carrega…",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 99dc11a88a2894..a533230acdb27f 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -103,7 +103,6 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "hashnod a ddefnyddiwyd fwyaf",
"annual_report.summary.most_used_hashtag.none": "Dim",
"annual_report.summary.new_posts.new_posts": "postiadau newydd",
- "annual_report.summary.percentile.text": "Rydych chi yn y mwyaf o ddefnyddwyr Mastodon.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Ni fyddwn yn dweud wrth Bernie.",
"annual_report.summary.thanks": "Diolch am fod yn rhan o Mastodon!",
"attachments_list.unprocessed": "(heb eu prosesu)",
@@ -487,7 +486,6 @@
"lists.replies_policy.list": "Aelodau'r rhestr",
"lists.replies_policy.none": "Neb",
"lists.save": "Cadw",
- "lists.search_placeholder": "Chwiliwch am bobl rydych chi'n eu dilyn",
"lists.show_replies_to": "Cynhwyswch atebion gan aelodau'r rhestr i",
"load_pending": "{count, plural, one {# eitem newydd} other {# eitem newydd}}",
"loading_indicator.label": "Yn llwytho…",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index e4e610ee1da369..adf7c8386a7dde 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "mest benyttede hashtag",
"annual_report.summary.most_used_hashtag.none": "Intet",
"annual_report.summary.new_posts.new_posts": "nye indlæg",
- "annual_report.summary.percentile.text": "Det betyder, at man er i topaf Mastodon-brugere.",
+ "annual_report.summary.percentile.text": "Det betyder, at man er i topaf {domain}-brugere.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Vi fortæller det ikke til Bernie.",
"annual_report.summary.thanks": "Tak for at være en del af Mastodon!",
"attachments_list.unprocessed": "(ubehandlet)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Redigér",
"confirmations.edit.message": "Redigeres nu, overskrive den besked, der forfattes pt. Fortsæt alligevel?",
"confirmations.edit.title": "Overskriv indlæg?",
+ "confirmations.follow_to_list.confirm": "Følg og føj til liste",
+ "confirmations.follow_to_list.message": "Man skal følge {name} for at føje vedkommende til en liste.",
+ "confirmations.follow_to_list.title": "Følg bruger?",
"confirmations.logout.confirm": "Log ud",
"confirmations.logout.message": "Er du sikker på, at du vil logge ud?",
"confirmations.logout.title": "Log ud?",
@@ -244,7 +247,7 @@
"domain_block_modal.block_account_instead": "Blokér i stedet @{name}",
"domain_block_modal.they_can_interact_with_old_posts": "Folk fra denne server kan interagere med de gamle indlæg.",
"domain_block_modal.they_cant_follow": "Ingen fra denne server kan følge dig.",
- "domain_block_modal.they_wont_know": "Vedkommende ser ikke den aktive blokering.",
+ "domain_block_modal.they_wont_know": "De ser ikke den aktive blokering.",
"domain_block_modal.title": "Blokér domæne?",
"domain_block_modal.you_will_lose_num_followers": "Man vil miste {followersCount, plural, one {{followersCountDisplay} følger} other {{followersCountDisplay} følgere}} og {followingCount, plural, one {{followingCountDisplay} person, man følger} other {{followingCountDisplay} personer, man følger}}.",
"domain_block_modal.you_will_lose_relationships": "Alle følgere og personer som følges på denne server mistes.",
@@ -492,7 +495,7 @@
"lists.replies_policy.list": "Listemedlemmer",
"lists.replies_policy.none": "Ingen",
"lists.save": "Gem",
- "lists.search_placeholder": "Søg efter folk, man følger",
+ "lists.search": "Søg",
"lists.show_replies_to": "Medtag svar fra listemedlemmer til",
"load_pending": "{count, plural, one {# nyt emne} other {# nye emner}}",
"loading_indicator.label": "Indlæser…",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index cf46a14680dd49..52f297f6044ec6 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "am häufigsten verwendeter Hashtag",
"annual_report.summary.most_used_hashtag.none": "Keiner",
"annual_report.summary.new_posts.new_posts": "neue Beiträge",
- "annual_report.summary.percentile.text": "Damit gehörst du zu den oberstender Mastodon-Nutzer*innen.",
+ "annual_report.summary.percentile.text": "Damit gehörst du zu den oberstender Nutzer*innen auf {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Wir werden Bernie nichts verraten.",
"annual_report.summary.thanks": "Danke, dass du Teil von Mastodon bist!",
"attachments_list.unprocessed": "(ausstehend)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Bearbeiten",
"confirmations.edit.message": "Das Bearbeiten überschreibt die Nachricht, die du gerade verfasst. Möchtest du wirklich fortfahren?",
"confirmations.edit.title": "Beitrag überschreiben?",
+ "confirmations.follow_to_list.confirm": "Folgen und zur Liste hinzufügen",
+ "confirmations.follow_to_list.message": "Du musst {name} folgen, um das Profil zu einer Liste hinzufügen zu können.",
+ "confirmations.follow_to_list.title": "Profil folgen?",
"confirmations.logout.confirm": "Abmelden",
"confirmations.logout.message": "Möchtest du dich wirklich abmelden?",
"confirmations.logout.title": "Abmelden?",
@@ -220,7 +223,7 @@
"confirmations.unfollow.title": "Profil entfolgen?",
"content_warning.hide": "Beitrag ausblenden",
"content_warning.show": "Trotzdem anzeigen",
- "content_warning.show_more": "Mehr anzeigen",
+ "content_warning.show_more": "Beitrag anzeigen",
"conversation.delete": "Unterhaltung löschen",
"conversation.mark_as_read": "Als gelesen markieren",
"conversation.open": "Unterhaltung anzeigen",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "Mitglieder der Liste",
"lists.replies_policy.none": "Niemanden",
"lists.save": "Speichern",
- "lists.search_placeholder": "Nach Profilen suchen, denen du folgst",
+ "lists.search": "Suchen",
"lists.show_replies_to": "Antworten von Listenmitgliedern einbeziehen an …",
"load_pending": "{count, plural, one {# neuer Beitrag} other {# neue Beiträge}}",
"loading_indicator.label": "Wird geladen …",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 000c0e7650c5b1..dcd6357493fa69 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "πιο χρησιμοποιημένη ετικέτα",
"annual_report.summary.most_used_hashtag.none": "Κανένα",
"annual_report.summary.new_posts.new_posts": "νέες αναρτήσεις",
- "annual_report.summary.percentile.text": "Αυτό σε βάζει στην κορυφή του των χρηστών του Mastodon.",
+ "annual_report.summary.percentile.text": "Αυτό σε βάζει στο των κορυφαίων χρηστών του {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Δεν θα το πούμε στον Bernie.",
"annual_report.summary.thanks": "Ευχαριστούμε που συμμετέχεις στο Mastodon!",
"attachments_list.unprocessed": "(μη επεξεργασμένο)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Επεξεργασία",
"confirmations.edit.message": "Αν το επεξεργαστείς τώρα θα αντικατασταθεί το μήνυμα που συνθέτεις. Είσαι σίγουρος ότι θέλεις να συνεχίσεις;",
"confirmations.edit.title": "Αντικατάσταση ανάρτησης;",
+ "confirmations.follow_to_list.confirm": "Ακολούθησε και πρόσθεσε στη λίστα",
+ "confirmations.follow_to_list.message": "Πρέπει να ακολουθήσεις τον χρήστη {name} για να τον προσθέσεις σε μια λίστα.",
+ "confirmations.follow_to_list.title": "Ακολούθηση χρήστη;",
"confirmations.logout.confirm": "Αποσύνδεση",
"confirmations.logout.message": "Σίγουρα θέλεις να αποσυνδεθείς;",
"confirmations.logout.title": "Αποσύνδεση;",
@@ -238,6 +241,8 @@
"dismissable_banner.dismiss": "Παράβλεψη",
"dismissable_banner.explore_links": "Αυτές οι ιστορίες ειδήσεων μοιράζονται περισσότερο στο fediverse σήμερα. Νεότερες ιστορίες ειδήσεων που δημοσιεύτηκαν από πιο διαφορετικά άτομα κατατάσσονται υψηλότερα.",
"dismissable_banner.explore_statuses": "Αυτές οι αναρτήσεις από όλο το fediverse κερδίζουν την προσοχή σήμερα. Νεότερες αναρτήσεις με περισσότερες ενισχύσεις και αγαπημένα κατατάσσονται υψηλότερα.",
+ "dismissable_banner.explore_tags": "Αυτές οι ετικέτες κερδίζουν την προσοχή στο fediverse σήμερα. Οι ετικέτες που χρησιμοποιούνται από περισσότερα διαφορετικά άτομα είναι υψηλότερα.",
+ "dismissable_banner.public_timeline": "Αυτές είναι οι πιο πρόσφατες δημόσιες αναρτήσεις από άτομα στο fediverse που ακολουθούν άτομα από το {domain}.",
"domain_block_modal.block": "Αποκλεισμός διακομιστή",
"domain_block_modal.block_account_instead": "Αποκλεισμός @{name} αντ' αυτού",
"domain_block_modal.they_can_interact_with_old_posts": "Άτομα από αυτόν τον διακομιστή μπορούν να αλληλεπιδράσουν με τις παλιές αναρτήσεις σου.",
@@ -361,6 +366,7 @@
"footer.status": "Κατάσταση",
"generic.saved": "Αποθηκεύτηκε",
"getting_started.heading": "Ας ξεκινήσουμε",
+ "hashtag.admin_moderation": "Άνοιγμα διεπαφής συντονισμού για το #{name}",
"hashtag.column_header.tag_mode.all": "και {additional}",
"hashtag.column_header.tag_mode.any": "ή {additional}",
"hashtag.column_header.tag_mode.none": "χωρίς {additional}",
@@ -466,11 +472,32 @@
"link_preview.author": "Από {name}",
"link_preview.more_from_author": "Περισσότερα από {name}",
"link_preview.shares": "{count, plural, one {{counter} ανάρτηση} other {{counter} αναρτήσεις}}",
+ "lists.add_member": "Προσθήκη",
+ "lists.add_to_list": "Προσθήκη στη λίστα",
+ "lists.add_to_lists": "Προσθήκη {name} σε λίστες",
+ "lists.create": "Δημιουργία",
+ "lists.create_a_list_to_organize": "Δημιούργησε μια νέα λίστα για να οργανώσεις την αρχική σου ροή",
+ "lists.create_list": "Δημιουργία λίστας",
"lists.delete": "Διαγραφή λίστας",
+ "lists.done": "Έγινε",
"lists.edit": "Επεξεργασία λίστας",
+ "lists.exclusive": "Απόκρυψη μελών από την Αρχική",
+ "lists.exclusive_hint": "Αν κάποιος είναι σε αυτή τη λίστα, απόκρυψέ τον στην Αρχική σου για να αποφύγεις να βλέπεις τις αναρτήσεις του δύο φορές.",
+ "lists.find_users_to_add": "Εύρεση χρηστών για προσθήκη",
+ "lists.list_members": "Λίστα μελών",
+ "lists.list_members_count": "{count, plural, one {# μέλος} other {# μέλη}}",
+ "lists.list_name": "Όνομα λίστας",
+ "lists.new_list_name": "Νέο όνομα λίστας",
+ "lists.no_lists_yet": "Δεν υπάρχουν λίστες ακόμα.",
+ "lists.no_members_yet": "Κανένα μέλος ακόμα.",
+ "lists.no_results_found": "Δεν βρέθηκαν αποτελέσματα.",
+ "lists.remove_member": "Αφαίρεση",
"lists.replies_policy.followed": "Οποιοσδήποτε χρήστης που ακολουθείς",
"lists.replies_policy.list": "Μέλη της λίστας",
"lists.replies_policy.none": "Κανένας",
+ "lists.save": "Αποθήκευση",
+ "lists.search": "Αναζήτηση",
+ "lists.show_replies_to": "Συμπερίληψη απαντήσεων από τα μέλη της λίστας σε",
"load_pending": "{count, plural, one {# νέο στοιχείο} other {# νέα στοιχεία}}",
"loading_indicator.label": "Φόρτωση…",
"media_gallery.hide": "Απόκρυψη",
@@ -627,7 +654,11 @@
"notifications_permission_banner.enable": "Ενεργοποίηση ειδοποιήσεων επιφάνειας εργασίας",
"notifications_permission_banner.how_to_control": "Για να λαμβάνεις ειδοποιήσεις όταν το Mastodon δεν είναι ανοιχτό, ενεργοποίησε τις ειδοποιήσεις επιφάνειας εργασίας. Μπορείς να ελέγξεις με ακρίβεια ποιοι τύποι αλληλεπιδράσεων δημιουργούν ειδοποιήσεις επιφάνειας εργασίας μέσω του κουμπιού {icon} μόλις ενεργοποιηθούν.",
"notifications_permission_banner.title": "Μη χάσεις στιγμή",
+ "onboarding.follows.back": "Πίσω",
+ "onboarding.follows.done": "Έγινε",
"onboarding.follows.empty": "Δυστυχώς, δεν μπορούν να εμφανιστούν αποτελέσματα αυτή τη στιγμή. Μπορείς να προσπαθήσεις να χρησιμοποιήσεις την αναζήτηση ή να περιηγηθείς στη σελίδα εξερεύνησης για να βρεις άτομα να ακολουθήσεις ή να δοκιμάσεις ξανά αργότερα.",
+ "onboarding.follows.search": "Αναζήτηση",
+ "onboarding.follows.title": "Ακολούθησε άτομα για να ξεκινήσεις",
"onboarding.profile.discoverable": "Κάνε το προφίλ μου ανακαλύψιμο",
"onboarding.profile.discoverable_hint": "Όταν επιλέγεις την δυνατότητα ανακάλυψης στο Mastodon, οι αναρτήσεις σου μπορεί να εμφανιστούν στα αποτελέσματα αναζήτησης και τις τάσεις, και το προφίλ σου μπορεί να προτείνεται σε άτομα με παρόμοια ενδιαφέροντα με εσένα.",
"onboarding.profile.display_name": "Εμφανιζόμενο όνομα",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index d7346d82e0bfff..8f00fe5b205e0c 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -103,7 +103,6 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "most used hashtag",
"annual_report.summary.most_used_hashtag.none": "None",
"annual_report.summary.new_posts.new_posts": "new posts",
- "annual_report.summary.percentile.text": "That puts you in the topof Mastodon users.",
"annual_report.summary.percentile.we_wont_tell_bernie": "We won't tell Bernie.",
"annual_report.summary.thanks": "Thanks for being part of Mastodon!",
"attachments_list.unprocessed": "(unprocessed)",
@@ -487,7 +486,6 @@
"lists.replies_policy.list": "Members of the list",
"lists.replies_policy.none": "No one",
"lists.save": "Save",
- "lists.search_placeholder": "Search people you follow",
"lists.show_replies_to": "Include replies from list members to",
"load_pending": "{count, plural, one {# new item} other {# new items}}",
"loading_indicator.label": "Loading…",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index d23783b214a89b..17ca70548eaebb 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -87,6 +87,7 @@
"alert.unexpected.title": "Aj!",
"alt_text_badge.title": "Alt-teksto",
"announcement.announcement": "Anonco",
+ "annual_report.summary.archetype.pollster": "La balotenketisto",
"annual_report.summary.archetype.replier": "La plej societema",
"annual_report.summary.followers.followers": "sekvantoj",
"annual_report.summary.highlighted_post.by_favourites": "plej ŝatata afiŝo",
@@ -198,6 +199,9 @@
"confirmations.edit.confirm": "Redakti",
"confirmations.edit.message": "Redakti nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?",
"confirmations.edit.title": "Ĉu superskribi afiŝon?",
+ "confirmations.follow_to_list.confirm": "Sekvi kaj aldoni al listo",
+ "confirmations.follow_to_list.message": "Vi devas sekvi {name} por aldoni ilin al listo.",
+ "confirmations.follow_to_list.title": "Ĉu sekvi uzanton?",
"confirmations.logout.confirm": "Elsaluti",
"confirmations.logout.message": "Ĉu vi certas, ke vi volas elsaluti?",
"confirmations.logout.title": "Ĉu elsaluti?",
@@ -483,7 +487,7 @@
"lists.replies_policy.list": "Membroj de la listo",
"lists.replies_policy.none": "Neniu",
"lists.save": "Konservi",
- "lists.search_placeholder": "Serĉi homojn, kiujn vi sekvas",
+ "lists.search": "Ŝerci",
"load_pending": "{count,plural, one {# nova elemento} other {# novaj elementoj}}",
"loading_indicator.label": "Ŝargado…",
"media_gallery.hide": "Kaŝi",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 38a776700a7657..d8c97028e4d522 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "la etiqueta más usada",
"annual_report.summary.most_used_hashtag.none": "Ninguna",
"annual_report.summary.new_posts.new_posts": "nuevos mensajes",
- "annual_report.summary.percentile.text": "Eso te pone en la cimade los usuarios de Mastodon.",
+ "annual_report.summary.percentile.text": "Eso te coloca en el topde usuarios de {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "No se lo diremos a Bernie.",
"annual_report.summary.thanks": "¡Gracias por ser parte de Mastodon!",
"attachments_list.unprocessed": "[sin procesar]",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Editar",
"confirmations.edit.message": "Editar ahora sobreescribirá el mensaje que estás redactando actualmente. ¿Estás seguro que querés seguir?",
"confirmations.edit.title": "¿Sobrescribir mensaje?",
+ "confirmations.follow_to_list.confirm": "Seguir y añadir a la lista",
+ "confirmations.follow_to_list.message": "Necesitas seguir a {name} para agregarlo a una lista.",
+ "confirmations.follow_to_list.title": "¿Seguir usuario?",
"confirmations.logout.confirm": "Cerrar sesión",
"confirmations.logout.message": "¿Estás seguro que querés cerrar la sesión?",
"confirmations.logout.title": "¿Cerrar sesión?",
@@ -238,7 +241,7 @@
"dismissable_banner.dismiss": "Descartar",
"dismissable_banner.explore_links": "Estas noticias son las más compartidas hoy en el fediverso. Las noticias más recientes publicadas por más personas diferentes se clasifican mejor.",
"dismissable_banner.explore_statuses": "Estas publicaciones del fediverso están ganando popularidad hoy. Las publicaciones más recientes, con más impulsos y favoritos, se clasifican mejor.",
- "dismissable_banner.explore_tags": "Estas etiquetas están ganando popularidad hoy en el fediverso. Las etiquetas que son utilizados por más personas diferentes se puntúan más alto.",
+ "dismissable_banner.explore_tags": "Estas etiquetas están ganando popularidad hoy en el fediverso. Las etiquetas que son utilizadas por más personas diferentes se puntúan más alto.",
"dismissable_banner.public_timeline": "Estas son las publicaciones más recientes de las personas del fediverso a las que sigue la gente de {domain}.",
"domain_block_modal.block": "Bloquear servidor",
"domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "Miembros de la lista",
"lists.replies_policy.none": "Nadie",
"lists.save": "Guardar",
- "lists.search_placeholder": "Buscar gente a la que sigues",
+ "lists.search": "Buscar",
"lists.show_replies_to": "Incluir las respuestas de los miembros de la lista a",
"load_pending": "{count, plural, one {# elemento nuevo} other {# elementos nuevos}}",
"loading_indicator.label": "Cargando…",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index d32586db0b593a..a433db023d16eb 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "etiqueta más utilizada",
"annual_report.summary.most_used_hashtag.none": "Ninguna",
"annual_report.summary.new_posts.new_posts": "nuevas publicaciones",
- "annual_report.summary.percentile.text": "Eso te sitúa en el topde usuarios de Mastodon.",
+ "annual_report.summary.percentile.text": "Eso te sitúa en el topde usuarios de {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "No se lo diremos a Bernie.",
"annual_report.summary.thanks": "¡Gracias por ser parte de Mastodon!",
"attachments_list.unprocessed": "(sin procesar)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Editar",
"confirmations.edit.message": "Editar sobrescribirá el mensaje que estás escribiendo. ¿Estás seguro de que deseas continuar?",
"confirmations.edit.title": "¿Sobreescribir publicación?",
+ "confirmations.follow_to_list.confirm": "Seguir y agregar a la lista",
+ "confirmations.follow_to_list.message": "Tienes que seguir a {name} para añadirlo a una lista.",
+ "confirmations.follow_to_list.title": "¿Seguir a usuario?",
"confirmations.logout.confirm": "Cerrar sesión",
"confirmations.logout.message": "¿Estás seguro de que quieres cerrar la sesión?",
"confirmations.logout.title": "¿Deseas cerrar sesión?",
@@ -238,7 +241,7 @@
"dismissable_banner.dismiss": "Descartar",
"dismissable_banner.explore_links": "Estas noticias son las más compartidas hoy en el fediverso. Las noticias más recientes publicadas por más personas diferentes se clasifican mejor.",
"dismissable_banner.explore_statuses": "Estas publicaciones del fediverso están ganando popularidad hoy. Las publicaciones más recientes, con más impulsos y favoritos, se clasifican mejor.",
- "dismissable_banner.explore_tags": "Estas etiquetas están ganando popularidad hoy en el fediverso. Las etiquetas que son utilizados por más personas diferentes se puntúan más alto.",
+ "dismissable_banner.explore_tags": "Estas etiquetas están ganando popularidad en el fediverso hoy en día. Las etiquetas que son utilizadas por más personas diferentes se clasifican mejor.",
"dismissable_banner.public_timeline": "Estas son las publicaciones más recientes de las personas del fediverso a las que sigue la gente de {domain}.",
"domain_block_modal.block": "Bloquear servidor",
"domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "Miembros de la lista",
"lists.replies_policy.none": "Nadie",
"lists.save": "Guardar",
- "lists.search_placeholder": "Buscar personas a las que sigues",
+ "lists.search": "Buscar",
"lists.show_replies_to": "Incluir respuestas de miembros de la lista a",
"load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
"loading_indicator.label": "Cargando…",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index cb076540f6e197..37a88c979b7a24 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "etiqueta más usada",
"annual_report.summary.most_used_hashtag.none": "Ninguna",
"annual_report.summary.new_posts.new_posts": "nuevas publicaciones",
- "annual_report.summary.percentile.text": "Eso te pone en el topde usuarios de Mastodon.",
+ "annual_report.summary.percentile.text": "Eso te coloca en el topde usuarios de {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "No se lo diremos a Bernie.",
"annual_report.summary.thanks": "¡Gracias por ser parte de Mastodon!",
"attachments_list.unprocessed": "(sin procesar)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Editar",
"confirmations.edit.message": "Editar ahora reemplazará el mensaje que estás escribiendo. ¿Seguro que quieres proceder?",
"confirmations.edit.title": "¿Sobrescribir publicación?",
+ "confirmations.follow_to_list.confirm": "Seguir y añadir a la lista",
+ "confirmations.follow_to_list.message": "Necesitas seguir a {name} para agregarlo a una lista.",
+ "confirmations.follow_to_list.title": "¿Seguir usuario?",
"confirmations.logout.confirm": "Cerrar sesión",
"confirmations.logout.message": "¿Seguro que quieres cerrar la sesión?",
"confirmations.logout.title": "¿Cerrar sesión?",
@@ -238,7 +241,7 @@
"dismissable_banner.dismiss": "Descartar",
"dismissable_banner.explore_links": "Estas noticias son las más compartidas hoy en el fediverso. Las noticias más recientes publicadas por más personas diferentes se clasifican mejor.",
"dismissable_banner.explore_statuses": "Estas publicaciones del fediverso están ganando popularidad hoy. Las publicaciones más recientes, con más impulsos y favoritos, se clasifican mejor.",
- "dismissable_banner.explore_tags": "Estas etiquetas están ganando popularidad hoy en el fediverso. Las etiquetas que son utilizados por más personas diferentes se puntúan más alto.",
+ "dismissable_banner.explore_tags": "Estas etiquetas están ganando popularidad hoy en el fediverso. Las etiquetas que son utilizadas por más personas diferentes se puntúan más alto.",
"dismissable_banner.public_timeline": "Estas son las publicaciones más recientes de las personas del fediverso a las que sigue la gente de {domain}.",
"domain_block_modal.block": "Bloquear servidor",
"domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "Miembros de la lista",
"lists.replies_policy.none": "Nadie",
"lists.save": "Guardar",
- "lists.search_placeholder": "Buscar gente a la que sigues",
+ "lists.search": "Buscar",
"lists.show_replies_to": "Incluir las respuestas de los miembros de la lista a",
"load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
"loading_indicator.label": "Cargando…",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 3260baf4ce4453..a9c36101b9b2a8 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -103,7 +103,6 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "enim kasutatud silt",
"annual_report.summary.most_used_hashtag.none": "Pole",
"annual_report.summary.new_posts.new_posts": "uus postitus",
- "annual_report.summary.percentile.text": "See paigutab su top Mastodoni kasutajatest.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Vägev.",
"annual_report.summary.thanks": "Tänud olemast osa Mastodonist!",
"attachments_list.unprocessed": "(töötlemata)",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 351ad59f1d8c51..348f544c3a6e03 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -180,6 +180,9 @@
"confirmations.edit.confirm": "Editatu",
"confirmations.edit.message": "Orain editatzen baduzu, une honetan idazten ari zaren mezua gainidatziko da. Ziur jarraitu nahi duzula?",
"confirmations.edit.title": "Gainidatzi bidalketa?",
+ "confirmations.follow_to_list.confirm": "Jarraitu eta zerrendan sartu",
+ "confirmations.follow_to_list.message": "{name} jarraitu behar duzu zerrenda batean sartzeko.",
+ "confirmations.follow_to_list.title": "Erabiltzailea jarraitu?",
"confirmations.logout.confirm": "Amaitu saioa",
"confirmations.logout.message": "Ziur saioa amaitu nahi duzula?",
"confirmations.logout.title": "Itxi saioa?",
@@ -436,6 +439,7 @@
"lists.replies_policy.followed": "Jarraitutako edozein erabiltzaile",
"lists.replies_policy.list": "Zerrendako kideak",
"lists.replies_policy.none": "Bat ere ez",
+ "lists.search": "Bilatu",
"load_pending": "{count, plural, one {elementu berri #} other {# elementu berri}}",
"loading_indicator.label": "Kargatzen…",
"media_gallery.hide": "Ezkutatu",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 5ddc672f5686dc..d3c9849e834887 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "käytetyin aihetunniste",
"annual_report.summary.most_used_hashtag.none": "Ei mitään",
"annual_report.summary.new_posts.new_posts": "uutta julkaisua",
- "annual_report.summary.percentile.text": "Olet osa huippujoukkoa, johon kuuluuMastodon-käyttäjistä.",
+ "annual_report.summary.percentile.text": "Olet osa huippujoukkoa, johon kuuluu{domain}-käyttäjistä.",
"annual_report.summary.thanks": "Kiitos, että olet osa Mastodonia!",
"attachments_list.unprocessed": "(käsittelemätön)",
"audio.hide": "Piilota ääni",
@@ -204,6 +204,9 @@
"confirmations.edit.confirm": "Muokkaa",
"confirmations.edit.message": "Jos muokkaat viestiä nyt, se korvaa parhaillaan työstämäsi viestin. Haluatko varmasti jatkaa?",
"confirmations.edit.title": "Korvataanko julkaisu?",
+ "confirmations.follow_to_list.confirm": "Seuraa ja lisää listaan",
+ "confirmations.follow_to_list.message": "Sinun on seurattava käyttäjää {name}, jotta voit lisätä hänet listaan.",
+ "confirmations.follow_to_list.title": "Seurataanko käyttäjää?",
"confirmations.logout.confirm": "Kirjaudu ulos",
"confirmations.logout.message": "Haluatko varmasti kirjautua ulos?",
"confirmations.logout.title": "Kirjaudutaanko ulos?",
@@ -492,7 +495,7 @@
"lists.replies_policy.list": "Listan jäsenille",
"lists.replies_policy.none": "Ei kellekään",
"lists.save": "Tallenna",
- "lists.search_placeholder": "Hae käyttäjiä seurattavaksi",
+ "lists.search": "Haku",
"lists.show_replies_to": "Sisällytä listan jäsenten vastaukset kohteeseen",
"load_pending": "{count, plural, one {# uusi kohde} other {# uutta kohdetta}}",
"loading_indicator.label": "Ladataan…",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index d53d5a98ec711f..aa2e78afe824c0 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "mest brúkta frámerki",
"annual_report.summary.most_used_hashtag.none": "Einki",
"annual_report.summary.new_posts.new_posts": "nýggir postar",
- "annual_report.summary.percentile.text": "Tað fær teg í toppav Mastodon brúkarum.",
+ "annual_report.summary.percentile.text": "Tað fær teg í toppav {domain} brúkarum.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Vit fara ikki at fortelja Bernie tað.",
"annual_report.summary.thanks": "Takk fyri at tú er partur av Mastodon!",
"attachments_list.unprocessed": "(óviðgjørt)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Rætta",
"confirmations.edit.message": "Rættingar, sum verða gjørdar nú, skriva yvir boðini, sum tú ert í holt við. Ert tú vís/ur í, at tú vilt halda fram?",
"confirmations.edit.title": "Skriva omaná post?",
+ "confirmations.follow_to_list.confirm": "Fylg og legg afturat lista",
+ "confirmations.follow_to_list.message": "Tú mást fylgja {name} fyri at leggja tey afturat einum lista.",
+ "confirmations.follow_to_list.title": "Fylg brúkara?",
"confirmations.logout.confirm": "Rita út",
"confirmations.logout.message": "Ert tú vís/ur í, at tú vilt útrita teg?",
"confirmations.logout.title": "Rita út?",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "Listalimunum",
"lists.replies_policy.none": "Eingin",
"lists.save": "Goym",
- "lists.search_placeholder": "Leita eftir fólki, sum tú fylgir",
+ "lists.search": "Leita",
"lists.show_replies_to": "Írokna svar frá limum á listanum til",
"load_pending": "{count, plural, one {# nýtt evni} other {# nýggj evni}}",
"loading_indicator.label": "Innlesur…",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 6c9933ca38ef46..7c87a36e543edb 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -100,7 +100,6 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "hashtag le plus utilisé",
"annual_report.summary.most_used_hashtag.none": "Aucun",
"annual_report.summary.new_posts.new_posts": "nouveaux posts",
- "annual_report.summary.percentile.text": "Cela vous place dans le topdes utilisateurs de Mastodon.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Nous ne le dirons pas à Bernie.",
"annual_report.summary.thanks": "Merci de faire partie de Mastodon!",
"attachments_list.unprocessed": "(non traité)",
@@ -483,7 +482,6 @@
"lists.replies_policy.list": "Membres de la liste",
"lists.replies_policy.none": "Personne",
"lists.save": "Enregistrer",
- "lists.search_placeholder": "Rechercher parmi les gens que vous suivez",
"load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}",
"loading_indicator.label": "Chargement…",
"media_gallery.hide": "Masquer",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index d986f135023798..ea7850ab607af9 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -100,7 +100,6 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "hashtag le plus utilisé",
"annual_report.summary.most_used_hashtag.none": "Aucun",
"annual_report.summary.new_posts.new_posts": "nouveaux posts",
- "annual_report.summary.percentile.text": "Cela vous place dans le topdes utilisateurs de Mastodon.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Nous ne le dirons pas à Bernie.",
"annual_report.summary.thanks": "Merci de faire partie de Mastodon!",
"attachments_list.unprocessed": "(non traité)",
@@ -483,7 +482,6 @@
"lists.replies_policy.list": "Membres de la liste",
"lists.replies_policy.none": "Personne",
"lists.save": "Enregistrer",
- "lists.search_placeholder": "Rechercher parmi les gens que vous suivez",
"load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}",
"loading_indicator.label": "Chargement…",
"media_gallery.hide": "Masquer",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 979490ca49eb01..50b0c7d4371c92 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -103,7 +103,6 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "hashtag is mó a úsáidtear",
"annual_report.summary.most_used_hashtag.none": "Dada",
"annual_report.summary.new_posts.new_posts": "postanna nua",
- "annual_report.summary.percentile.text": "Cuireann sé sin i mbarr úsáideoirí Mastodon.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Ní inseoidh muid do Bernie.",
"annual_report.summary.thanks": "Go raibh maith agat as a bheith mar chuid de Mastodon!",
"attachments_list.unprocessed": "(neamhphróiseáilte)",
@@ -493,7 +492,6 @@
"lists.replies_policy.list": "Baill an liosta",
"lists.replies_policy.none": "Duine ar bith",
"lists.save": "Sábháil",
- "lists.search_placeholder": "Cuardaigh daoine a leanann tú",
"lists.show_replies_to": "Cuir san áireamh freagraí ó bhaill an liosta go",
"load_pending": "{count, plural, one {# mír nua} two {# mír nua} few {# mír nua} many {# mír nua} other {# mír nua}}",
"loading_indicator.label": "Á lódáil…",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 1da6bdcddecaf1..a90a9b197d3f4d 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -103,7 +103,6 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "an taga hais a chaidh a cleachdadh as trice",
"annual_report.summary.most_used_hashtag.none": "Chan eil gin",
"annual_report.summary.new_posts.new_posts": "postaichean ùra",
- "annual_report.summary.percentile.text": "Tha thu am measg brod nandhen luchd-cleachdaidh Mhastodon.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Ainmeil ’nad latha ’s ’nad linn.",
"annual_report.summary.thanks": "Mòran taing airson conaltradh air Mastodon.",
"attachments_list.unprocessed": "(gun phròiseasadh)",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 1435969a8ef428..cac6147fdb45c8 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "o cancelo mais utilizado",
"annual_report.summary.most_used_hashtag.none": "Nada",
"annual_report.summary.new_posts.new_posts": "novas publicacións",
- "annual_report.summary.percentile.text": "Sitúante no top das usuarias de Mastodon.",
+ "annual_report.summary.percentile.text": "Sitúante no top das usuarias de {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Moito tes que contarnos!",
"annual_report.summary.thanks": "Grazas por ser parte de Mastodon!",
"attachments_list.unprocessed": "(sen procesar)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Editar",
"confirmations.edit.message": "Ao editar sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
"confirmations.edit.title": "Editar a publicación?",
+ "confirmations.follow_to_list.confirm": "Seguir e engadir á lista",
+ "confirmations.follow_to_list.message": "Tes que seguir a {name} para poder engadila a unha lista.",
+ "confirmations.follow_to_list.title": "Seguir á usuaria?",
"confirmations.logout.confirm": "Pechar sesión",
"confirmations.logout.message": "Desexas pechar a sesión?",
"confirmations.logout.title": "Pechar sesión?",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "Membros da lista",
"lists.replies_policy.none": "Ninguén",
"lists.save": "Gardar",
- "lists.search_placeholder": "Buscar persoas que segues",
+ "lists.search": "Buscar",
"lists.show_replies_to": "Incluír respostas dos membros das listas a",
"load_pending": "{count, plural, one {# novo elemento} other {# novos elementos}}",
"loading_indicator.label": "Estase a cargar…",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 8d689404e19322..a9bd632ec1b799 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "התג בשימוש הרב ביותר",
"annual_report.summary.most_used_hashtag.none": "אף אחד",
"annual_report.summary.new_posts.new_posts": "הודעות חדשות",
- "annual_report.summary.percentile.text": "ממקם אותך באחוזון של משמשי מסטודון.",
+ "annual_report.summary.percentile.text": "ממקם אותך באחוזון של משמשי {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "לא נגלה לברני.",
"annual_report.summary.thanks": "תודה על היותך חלק ממסטודון!",
"attachments_list.unprocessed": "(לא מעובד)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "עריכה",
"confirmations.edit.message": "עריכה תדרוס את ההודעה שכבר התחלת לכתוב. האם להמשיך?",
"confirmations.edit.title": "לבצע החלפת תוכן?",
+ "confirmations.follow_to_list.confirm": "עקיבה והוספה לרשימה",
+ "confirmations.follow_to_list.message": "כדי להכניס את {name} לרשימה, ראשית יש לעקוב אחריהם.",
+ "confirmations.follow_to_list.title": "לעקוב אחר המשתמש.ת?",
"confirmations.logout.confirm": "התנתקות",
"confirmations.logout.message": "האם אתם בטוחים שאתם רוצים להתנתק?",
"confirmations.logout.title": "להתנתק?",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "משתמשים שברשימה",
"lists.replies_policy.none": "אף אחד",
"lists.save": "שמירה",
- "lists.search_placeholder": "חיפוש אנשים שאני עוקב\\ת אחריהם",
+ "lists.search": "חיפוש",
"lists.show_replies_to": "לכלול תשובות מחברי הרשימה אל",
"load_pending": "{count, plural, one {# פריט חדש} other {# פריטים חדשים}}",
"loading_indicator.label": "בטעינה…",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 3696b7ce957164..25f37c82a19799 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "legtöbbet használt hashtag",
"annual_report.summary.most_used_hashtag.none": "Nincs",
"annual_report.summary.new_posts.new_posts": "új bejegyzés",
- "annual_report.summary.percentile.text": "Ezzel acsúcs Mastodon felhasználó között vagy.",
+ "annual_report.summary.percentile.text": "Ezzel a csúcs{domain} felhasználó között vagy.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Nem mondjuk el Bernie-nek.",
"annual_report.summary.thanks": "Kösz, hogy a Mastodon része vagy!",
"attachments_list.unprocessed": "(feldolgozatlan)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Szerkesztés",
"confirmations.edit.message": "Ha most szerkeszted, ez felülírja a most szerkesztés alatt álló üzenetet. Mégis ezt szeretnéd?",
"confirmations.edit.title": "Felülírod a bejegyzést?",
+ "confirmations.follow_to_list.confirm": "Követés, és hozzáadás a listához",
+ "confirmations.follow_to_list.message": "Követned kell {name} felhasználót, hogy hozzáadhasd a listához.",
+ "confirmations.follow_to_list.title": "Felhasználó követése?",
"confirmations.logout.confirm": "Kijelentkezés",
"confirmations.logout.message": "Biztos, hogy kijelentkezel?",
"confirmations.logout.title": "Kijelentkezel?",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "A lista tagjai",
"lists.replies_policy.none": "Senki",
"lists.save": "Mentés",
- "lists.search_placeholder": "Keresés a követett személyek között",
+ "lists.search": "Keresés",
"lists.show_replies_to": "Listatagok válaszainak hozzávétele",
"load_pending": "{count, plural, one {# új elem} other {# új elem}}",
"loading_indicator.label": "Betöltés…",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 1de5247f2232df..35f04614229d65 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -103,7 +103,6 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "hashtag le plus usate",
"annual_report.summary.most_used_hashtag.none": "Necun",
"annual_report.summary.new_posts.new_posts": "nove messages",
- "annual_report.summary.percentile.text": "Isto te pone in le primedel usatores de Mastodon.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Tu es un primo inter pares.",
"annual_report.summary.thanks": "Gratias pro facer parte de Mastodon!",
"attachments_list.unprocessed": "(non processate)",
@@ -474,7 +473,6 @@
"lists.replies_policy.followed": "Qualcunque usator sequite",
"lists.replies_policy.list": "Membros del lista",
"lists.replies_policy.none": "Nemo",
- "lists.search_placeholder": "Cerca personas que tu seque",
"load_pending": "{count, plural, one {# nove entrata} other {# nove entratas}}",
"loading_indicator.label": "Cargante…",
"media_gallery.hide": "Celar",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index a2d94aa1e9e241..3f0ef723e9b279 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "mest notaða myllumerki",
"annual_report.summary.most_used_hashtag.none": "Ekkert",
"annual_report.summary.new_posts.new_posts": "nýjar færslur",
- "annual_report.summary.percentile.text": "Það setur þig á meðal efstunotenda Mastodon.",
+ "annual_report.summary.percentile.text": "Þetta setur þig á meðalof {domain} virkustu notendanna.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Við förum ekkert að raupa um þetta.",
"annual_report.summary.thanks": "Takk fyrir að vera hluti af Mastodon-samfélaginu!",
"attachments_list.unprocessed": "(óunnið)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Breyta",
"confirmations.edit.message": "Ef þú breytir núna verður skrifað yfir skilaboðin sem þú ert að semja núna. Ertu viss um að þú viljir halda áfram?",
"confirmations.edit.title": "Skrifa yfir færslu?",
+ "confirmations.follow_to_list.confirm": "Fylgjast með og bæta á lista",
+ "confirmations.follow_to_list.message": "Þú þarft að fylgjast með {name} til að bæta viðkomandi á lista.",
+ "confirmations.follow_to_list.title": "Fylgjast með notanda?",
"confirmations.logout.confirm": "Skrá út",
"confirmations.logout.message": "Ertu viss um að þú viljir skrá þig út?",
"confirmations.logout.title": "Skrá út?",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "Meðlima listans",
"lists.replies_policy.none": "Engra",
"lists.save": "Vista",
- "lists.search_placeholder": "Leitaðu að fólki sem þú fylgist með",
+ "lists.search": "Leita",
"lists.show_replies_to": "Hafa með svör frá meðlimum lista til",
"load_pending": "{count, plural, one {# nýtt atriði} other {# ný atriði}}",
"loading_indicator.label": "Hleð inn…",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index f97103d8b416f0..5b4ad995651d9f 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "l'hashtag più usato",
"annual_report.summary.most_used_hashtag.none": "Nessuno",
"annual_report.summary.new_posts.new_posts": "nuovi post",
- "annual_report.summary.percentile.text": "Questo ti colloca tra ildei migliori utenti Mastodon.",
+ "annual_report.summary.percentile.text": "Ciò ti colloca in cimaagli utenti di {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Non lo diremo a Bernie.",
"annual_report.summary.thanks": "Grazie per far parte di Mastodon!",
"attachments_list.unprocessed": "(non elaborato)",
@@ -129,6 +129,7 @@
"bundle_column_error.routing.body": "Impossibile trovare la pagina richiesta. Sei sicuro che l'URL nella barra degli indirizzi sia corretto?",
"bundle_column_error.routing.title": "404",
"bundle_modal_error.close": "Chiudi",
+ "bundle_modal_error.message": "Si è verificato un errore durante il caricamento di questa schermata.",
"bundle_modal_error.retry": "Riprova",
"closed_registrations.other_server_instructions": "Poiché Mastodon è decentralizzato, puoi creare un profilo su un altro server, pur continuando a interagire con questo.",
"closed_registrations_modal.description": "Correntemente, è impossibile creare un profilo su {domain}, ma sei pregato di tenere presente che non necessiti di un profilo specificamente su {domain} per utilizzare Mastodon.",
@@ -204,6 +205,9 @@
"confirmations.edit.confirm": "Modifica",
"confirmations.edit.message": "Modificare ora sovrascriverà il messaggio che stai correntemente componendo. Sei sicuro di voler procedere?",
"confirmations.edit.title": "Sovrascrivere il post?",
+ "confirmations.follow_to_list.confirm": "Segui e aggiungi alla lista",
+ "confirmations.follow_to_list.message": "Devi seguire {name} per aggiungerli a una lista.",
+ "confirmations.follow_to_list.title": "Seguire l'utente?",
"confirmations.logout.confirm": "Disconnettiti",
"confirmations.logout.message": "Sei sicuro di volerti disconnettere?",
"confirmations.logout.title": "Uscire?",
@@ -235,6 +239,10 @@
"disabled_account_banner.text": "Il tuo profilo {disabledAccount} è correntemente disabilitato.",
"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 le più condivise sul fediverso, oggi. Le notizie più recenti pubblicate da più persone differenti sono classificate più in alto.",
+ "dismissable_banner.explore_statuses": "Questi post provenienti da tutto il fediverso stanno guadagnando terreno oggi. I post più recenti con più condivisioni e gradimenti sono classificati più in alto.",
+ "dismissable_banner.explore_tags": "Questi hashtag stanno guadagnando terreno nel fediverso, oggi. Gli hashtag che vengono usati da più persone differenti sono classificati più in alto.",
+ "dismissable_banner.public_timeline": "Questi sono i post pubblici più recenti pubblicati dalle persone sul fediverso che sono seguite dagli utenti su {domain}.",
"domain_block_modal.block": "Blocca il server",
"domain_block_modal.block_account_instead": "Blocca invece @{name}",
"domain_block_modal.they_can_interact_with_old_posts": "Le persone da questo server possono interagire con i tuoi vecchi post.",
@@ -358,6 +366,7 @@
"footer.status": "Stato",
"generic.saved": "Salvato",
"getting_started.heading": "Per iniziare",
+ "hashtag.admin_moderation": "Apri l'interfaccia di moderazione per #{name}",
"hashtag.column_header.tag_mode.all": "e {additional}",
"hashtag.column_header.tag_mode.any": "o {additional}",
"hashtag.column_header.tag_mode.none": "senza {additional}",
@@ -487,7 +496,7 @@
"lists.replies_policy.list": "Membri dell'elenco",
"lists.replies_policy.none": "Nessuno",
"lists.save": "Salva",
- "lists.search_placeholder": "Cerca le persone che segui",
+ "lists.search": "Cerca",
"lists.show_replies_to": "Includi le risposte dei membri della lista a",
"load_pending": "{count, plural, one {# nuovo oggetto} other {# nuovi oggetti}}",
"loading_indicator.label": "Caricamento…",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 6cd0a0c42040ab..dadd976fb80ac8 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -114,7 +114,6 @@
"annual_report.summary.most_used_app.most_used_app": "最も使用されているアプリ",
"annual_report.summary.most_used_hashtag.most_used_hashtag": "最も使用されたハッシュタグ",
"annual_report.summary.new_posts.new_posts": "新しい投稿",
- "annual_report.summary.percentile.text": "それにより、あなたは上位に位置しています。Mastodonユーザーの中で。",
"annual_report.summary.percentile.we_wont_tell_bernie": "バー二ーには秘密にしておくよ。",
"annual_report.summary.thanks": "Mastodonの一員になってくれてありがとう！",
"antennas.accounts": "{count} のアカウント",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index c8e72173579305..87c2b38ec67064 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -103,8 +103,8 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "가장 많이 사용한 해시태그",
"annual_report.summary.most_used_hashtag.none": "없음",
"annual_report.summary.new_posts.new_posts": "새 게시물",
- "annual_report.summary.percentile.text": "마스토돈 사용자의 상위입니다.",
- "annual_report.summary.percentile.we_wont_tell_bernie": "엄마한테 말 안 할게요.",
+ "annual_report.summary.percentile.text": "{domain} 사용자의 상위입니다.",
+ "annual_report.summary.percentile.we_wont_tell_bernie": "종부세는 안 걷을게요",
"annual_report.summary.thanks": "마스토돈과 함께 해주셔서 감사합니다!",
"attachments_list.unprocessed": "(처리 안 됨)",
"audio.hide": "소리 숨기기",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "수정",
"confirmations.edit.message": "지금 편집하면 작성 중인 메시지를 덮어씁니다. 진행이 확실한가요?",
"confirmations.edit.title": "게시물을 덮어쓸까요?",
+ "confirmations.follow_to_list.confirm": "팔로우하고 리스트에 추가",
+ "confirmations.follow_to_list.message": "리스트에 추가하려면 {name} 님을 팔로우해야 합니다.",
+ "confirmations.follow_to_list.title": "팔로우할까요?",
"confirmations.logout.confirm": "로그아웃",
"confirmations.logout.message": "정말로 로그아웃 하시겠습니까?",
"confirmations.logout.title": "로그아웃 할까요?",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "리스트의 구성원",
"lists.replies_policy.none": "모두 제외",
"lists.save": "저장",
- "lists.search_placeholder": "팔로우 중인 사람 찾기",
+ "lists.search": "검색",
"lists.show_replies_to": "리스트 구성원의 답글또한 포함하기",
"load_pending": "{count, plural, other {#}} 개의 새 항목",
"loading_indicator.label": "불러오는 중...",
@@ -721,7 +724,7 @@
"report.category.title_status": "게시물",
"report.close": "완료",
"report.comment.title": "우리가 더 알아야 할 내용이 있나요?",
- "report.forward": "{target}에 포워드 됨",
+ "report.forward": "{target}에 전달",
"report.forward_hint": "이 계정은 다른 서버에 있습니다. 익명화 된 사본을 해당 서버에도 전송할까요?",
"report.mute": "침묵",
"report.mute_explanation": "당신은 해당 계정의 게시물을 보지 않게 됩니다. 해당 계정은 여전히 당신을 팔로우 하거나 당신의 게시물을 볼 수 있으며 해당 계정은 자신이 뮤트 되었는지 알지 못합니다.",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 36dea2773445fb..c6a9658f1c96db 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "labiausiai naudotas saitažodis",
"annual_report.summary.most_used_hashtag.none": "Nieko",
"annual_report.summary.new_posts.new_posts": "nauji įrašai",
- "annual_report.summary.percentile.text": "Tai reiškia, kad esate tarppopuliariausių „Mastodon“ naudotojų.",
+ "annual_report.summary.percentile.text": "Tai reiškia, kad esate tarppopuliariausių {domain} naudotojų.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Mes nesakysime Bernie.",
"annual_report.summary.thanks": "Dėkojame, kad esate „Mastodon“ dalis!",
"attachments_list.unprocessed": "(neapdorotas)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Redaguoti",
"confirmations.edit.message": "Redaguojant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
"confirmations.edit.title": "Perrašyti įrašą?",
+ "confirmations.follow_to_list.confirm": "Sekti ir pridėti prie sąrašo",
+ "confirmations.follow_to_list.message": "Kad pridėtumėte juos į sąrašą, turite sekti {name}.",
+ "confirmations.follow_to_list.title": "Sekti naudotoją?",
"confirmations.logout.confirm": "Atsijungti",
"confirmations.logout.message": "Ar tikrai nori atsijungti?",
"confirmations.logout.title": "Atsijungti?",
@@ -489,7 +492,7 @@
"lists.replies_policy.list": "Sąrašo nariams",
"lists.replies_policy.none": "Nei vienam",
"lists.save": "Išsaugoti",
- "lists.search_placeholder": "Ieškokite asmenų, kuriuos sekate",
+ "lists.search": "Ieškoti",
"lists.show_replies_to": "Įtraukti atsakymus iš sąrašo narių į",
"load_pending": "{count, plural, one {# naujas elementas} few {# nauji elementai} many {# naujo elemento} other {# naujų elementų}}",
"loading_indicator.label": "Kraunama…",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index cc441e138c199d..bb6e3610e851cc 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -86,14 +86,21 @@
"alert.unexpected.message": "Radās negaidīta kļūda.",
"alert.unexpected.title": "Ups!",
"announcement.announcement": "Paziņojums",
+ "annual_report.summary.archetype.replier": "Sabiedriskais tauriņš",
"annual_report.summary.followers.followers": "sekotāji",
"annual_report.summary.followers.total": "pavisam {count}",
"annual_report.summary.here_it_is": "Šeit ir {year}. gada pārskats:",
+ "annual_report.summary.highlighted_post.by_favourites": "izlasēs visvairāk ievietotais ieraksts",
+ "annual_report.summary.highlighted_post.by_reblogs": "vispastiprinātākais ieraksts",
+ "annual_report.summary.highlighted_post.by_replies": "ieraksts ar vislielāko atbilžu skaitu",
"annual_report.summary.highlighted_post.possessive": "{name}",
"annual_report.summary.most_used_app.most_used_app": "visizmantotākā lietotne",
"annual_report.summary.most_used_hashtag.most_used_hashtag": "visizmantotākais tēmturis",
"annual_report.summary.most_used_hashtag.none": "Nav",
"annual_report.summary.new_posts.new_posts": "jauni ieraksti",
+ "annual_report.summary.percentile.text": "Tas ievieto Tevi virsējosno {domain} lietotājiem.",
+ "annual_report.summary.percentile.we_wont_tell_bernie": "Mēs neteiksim Bērnijam.",
+ "annual_report.summary.thanks": "Paldies, ka esi daļa no Mastodon!",
"attachments_list.unprocessed": "(neapstrādāti)",
"audio.hide": "Slēpt audio",
"block_modal.remote_users_caveat": "Mēs vaicāsim serverim {domain} ņemt vērā Tavu lēmumu. Tomēr atbilstība nav nodrošināta, jo atsevišķi serveri var apstrādāt bloķēšanu citādi. Publiski ieraksti joprojām var būt redzami lietotājiem, kuri nav pieteikušies.",
@@ -125,13 +132,16 @@
"column.blocks": "Bloķētie lietotāji",
"column.bookmarks": "Grāmatzīmes",
"column.community": "Vietējā laika līnija",
+ "column.create_list": "Izveidot sarakstu",
"column.direct": "Privātas pieminēšanas",
"column.directory": "Pārlūkot profilus",
"column.domain_blocks": "Bloķētie domēni",
+ "column.edit_list": "Labot sarakstu",
"column.favourites": "Iecienītie",
"column.firehose": "Tiešraides plūsmas",
"column.follow_requests": "Sekošanas pieprasījumi",
"column.home": "Sākums",
+ "column.list_members": "Pārvaldīt saraksta dalībniekus",
"column.lists": "Saraksti",
"column.mutes": "Apklusinātie lietotāji",
"column.notifications": "Paziņojumi",
@@ -144,13 +154,14 @@
"column_header.pin": "Piespraust",
"column_header.show_settings": "Rādīt iestatījumus",
"column_header.unpin": "Atspraust",
+ "column_search.cancel": "Atcelt",
"column_subheading.settings": "Iestatījumi",
"community.column_settings.local_only": "Tikai vietējie",
"community.column_settings.media_only": "Tikai multivide",
"community.column_settings.remote_only": "Tikai attālinātie",
"compose.language.change": "Mainīt valodu",
"compose.language.search": "Meklēt valodas...",
- "compose.published.body": "Ieraksts publicēta.",
+ "compose.published.body": "Ieraksts izveidots.",
"compose.published.open": "Atvērt",
"compose.saved.body": "Ziņa saglabāta.",
"compose_form.direct_message_warning_learn_more": "Uzzināt vairāk",
@@ -162,10 +173,11 @@
"compose_form.poll.duration": "Aptaujas ilgums",
"compose_form.poll.multiple": "Vairākas izvēles iespējas",
"compose_form.poll.option_placeholder": "Izvēle {number}",
+ "compose_form.poll.single": "Viena izvēle",
"compose_form.poll.switch_to_multiple": "Mainīt aptaujas veidu, lai atļautu vairākas izvēles",
"compose_form.poll.switch_to_single": "Mainīt aptaujas veidu, lai atļautu vienu izvēli",
"compose_form.poll.type": "Stils",
- "compose_form.publish": "Iesūtīt",
+ "compose_form.publish": "Nosūtīt",
"compose_form.publish_form": "Jauns ieraksts",
"compose_form.reply": "Atbildēt",
"compose_form.save_changes": "Atjaunināt",
@@ -185,6 +197,9 @@
"confirmations.edit.confirm": "Labot",
"confirmations.edit.message": "Labošana pārrakstīs ziņojumu, kas šobrīd tiek sastādīts. Vai tiešām turpināt?",
"confirmations.edit.title": "Pārrakstīt ierakstu?",
+ "confirmations.follow_to_list.confirm": "Sekot un pievienot sarakstam",
+ "confirmations.follow_to_list.message": "Ir jāseko {name}, lai pievienotu sarakstam.",
+ "confirmations.follow_to_list.title": "Sekot lietotājam?",
"confirmations.logout.confirm": "Iziet",
"confirmations.logout.message": "Vai tiešām vēlies izrakstīties?",
"confirmations.logout.title": "Atteikties?",
@@ -404,7 +419,7 @@
"lists.replies_policy.followed": "Jebkuram sekotajam lietotājam",
"lists.replies_policy.list": "Saraksta dalībniekiem",
"lists.replies_policy.none": "Nevienam",
- "load_pending": "{count, plural, one {# jauna lieta} other {# jaunas lietas}}",
+ "load_pending": "{count, plural, zero{# jaunu vienumu} one {# jauns vienums} other {# jauni vienumi}}",
"loading_indicator.label": "Ielādē…",
"media_gallery.hide": "Paslēpt",
"moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo Tu pārcēlies uz kontu {movedToAccount}.",
@@ -639,6 +654,7 @@
"status.bookmark": "Grāmatzīme",
"status.cancel_reblog_private": "Nepastiprināt",
"status.cannot_reblog": "Šo ziņu nevar izcelt",
+ "status.continued_thread": "Turpināts pavediens",
"status.copy": "Ievietot ieraksta saiti starpliktuvē",
"status.delete": "Dzēst",
"status.detailed_status": "Detalizēts sarunas skats",
diff --git a/app/javascript/mastodon/locales/nan.json b/app/javascript/mastodon/locales/nan.json
index 0967ef424bce67..0a3dc2c06b2156 100644
--- a/app/javascript/mastodon/locales/nan.json
+++ b/app/javascript/mastodon/locales/nan.json
@@ -1 +1,29 @@
-{}
+{
+ "about.blocks": "Siū 管制 ê 服侍器",
+ "about.contact": "聯絡lâng：",
+ "about.disclaimer": "Mastodon是自由、開放原始碼ê軟體，mā是Mastodon gGmbH ê商標。",
+ "about.domain_blocks.no_reason_available": "原因bē-tàng用",
+ "about.domain_blocks.preamble": "Mastodon一般ē允准lí看別ê fediverse 服侍器來ê聯絡人kap hām用者交流。Tsiah ê 是本服侍器建立ê例外。",
+ "about.domain_blocks.silenced.explanation": "Lí一般buē-tàng tuì tsit ê服侍器看用戶ê紹介kap內容，除非lí明白tshiau-tshuē á是跟tuè伊。",
+ "about.domain_blocks.silenced.title": "有限制",
+ "about.domain_blocks.suspended.explanation": "Uì tsit ê服侍器來ê資料lóng bē處理、儲存á是交換，無可能kap tsit ê服侍器ê用者互動á是溝通。.",
+ "about.domain_blocks.suspended.title": "權限中止",
+ "about.not_available": "Tsit ê資訊bē-tàng tī tsit ê服侍器使用。",
+ "about.powered_by": "由 {mastodon} 提供ê非中心化社群媒體",
+ "about.rules": "服侍器ê規則",
+ "account.account_note_header": "個人ê註解",
+ "account.add_or_remove_from_list": "加添kàu列單á是uì列單thâi掉",
+ "account.badges.bot": "機器lâng",
+ "account.badges.group": "群組",
+ "account.block": "封鎖 @{name}",
+ "account.block_domain": "封鎖網域 {domain}",
+ "account.block_short": "封鎖",
+ "account.blocked": "Hőng封鎖",
+ "account.cancel_follow_request": "取消跟tuè",
+ "account.follow_back": "Tuè tńg去",
+ "annual_report.summary.percentile.text": "Tse 予lí變做 {domain} ê用戶ê ",
+ "block_modal.show_less": "看khah少",
+ "compose.language.change": "換語言",
+ "confirmations.follow_to_list.confirm": "跟tuè，加入kàu列單",
+ "search_popout.language_code": "ISO語言代碼"
+}
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 6b19e0105e793a..2384ef6ce3887d 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "meest gebruikte hashtag",
"annual_report.summary.most_used_hashtag.none": "Geen",
"annual_report.summary.new_posts.new_posts": "nieuwe berichten",
- "annual_report.summary.percentile.text": "Dat zet je in de topvan Mastodon-gebruikers.",
+ "annual_report.summary.percentile.text": "Hiermee behoor je tot de top van {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "We zullen Bernie niets vertellen.",
"annual_report.summary.thanks": "Bedankt dat je deel uitmaakt van Mastodon!",
"attachments_list.unprocessed": "(niet verwerkt)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Bewerken",
"confirmations.edit.message": "Door nu te reageren overschrijf je het bericht dat je op dit moment aan het schrijven bent. Weet je zeker dat je verder wil gaan?",
"confirmations.edit.title": "Bericht overschrijven?",
+ "confirmations.follow_to_list.confirm": "Volgen en toevoegen aan de lijst",
+ "confirmations.follow_to_list.message": "Je moet {name} volgen om ze toe te voegen aan een lijst.",
+ "confirmations.follow_to_list.title": "Gebruiker volgen?",
"confirmations.logout.confirm": "Uitloggen",
"confirmations.logout.message": "Weet je zeker dat je wilt uitloggen?",
"confirmations.logout.title": "Uitloggen?",
@@ -236,7 +239,7 @@
"disabled_account_banner.text": "Jouw account {disabledAccount} is momenteel uitgeschakeld.",
"dismissable_banner.community_timeline": "Dit zijn de meest recente openbare berichten van accounts op {domain}. Je kunt onder 'instellingen > voorkeuren > overig' kiezen welke talen je wilt zien.",
"dismissable_banner.dismiss": "Sluiten",
- "dismissable_banner.explore_links": "Deze nieuwsberichten worden vandaag de dag het meest gedeeld op de fediverse. Nieuwere verhalen die door meer verschillende mensen zijn gepost, worden hoger gerangschikt.",
+ "dismissable_banner.explore_links": "Deze nieuwsartikelen worden vandaag de dag het meest gedeeld op de fediverse. Nieuwere artikelen die door meer verschillende mensen zijn geplaatst, worden hoger gerangschikt.",
"dismissable_banner.explore_statuses": "Deze berichten uit de hele fediverse winnen vandaag aan populariteit. Nieuwere berichten met meer boosts en favorieten worden hoger gerangschikt.",
"dismissable_banner.explore_tags": "Deze hashtags winnen tegenwoordig aan populariteit op de fediverse. Hashtags die door meer verschillende mensen worden gebruikt, worden hoger gerangschikt.",
"dismissable_banner.public_timeline": "Dit zijn de meest recente openbare berichten van mensen op de fediverse die mensen op {domain} volgen.",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "Leden van de lijst",
"lists.replies_policy.none": "Niemand",
"lists.save": "Opslaan",
- "lists.search_placeholder": "Zoek mensen die je volgt",
+ "lists.search": "Zoeken",
"lists.show_replies_to": "Voeg antwoorden van lijstleden toe aan",
"load_pending": "{count, plural, one {# nieuw item} other {# nieuwe items}}",
"loading_indicator.label": "Laden…",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 99b65333454e4f..2c06f9068ae16e 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "mest brukte emneknagg",
"annual_report.summary.most_used_hashtag.none": "Ingen",
"annual_report.summary.new_posts.new_posts": "nye innlegg",
- "annual_report.summary.percentile.text": "Du er av deiivrigaste Mastodon-brukarane.",
+ "annual_report.summary.percentile.text": "Du er av deiivrigaste brukarane på {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Ikkje eit ord til pressa.",
"annual_report.summary.thanks": "Takk for at du er med i Mastodon!",
"attachments_list.unprocessed": "(ubehandla)",
@@ -129,6 +129,7 @@
"bundle_column_error.routing.body": "Den etterspurde sida vart ikkje funnen. Er du sikker på at URL-adressa er rett?",
"bundle_column_error.routing.title": "404",
"bundle_modal_error.close": "Lat att",
+ "bundle_modal_error.message": "Noko gjekk gale då denne sida vart lasta.",
"bundle_modal_error.retry": "Prøv igjen",
"closed_registrations.other_server_instructions": "Sidan Mastodon er desentralisert kan du lage ein brukar på ein anna tenar og framleis interagere med denne.",
"closed_registrations_modal.description": "Det er ikkje mogleg å opprette ein konto på {domain} nett no, men hugs at du ikkje treng ein konto på akkurat {domain} for å nytte Mastodon.",
@@ -139,13 +140,16 @@
"column.blocks": "Blokkerte brukarar",
"column.bookmarks": "Bokmerke",
"column.community": "Lokal tidsline",
+ "column.create_list": "Lag liste",
"column.direct": "Private omtaler",
"column.directory": "Sjå gjennom profilar",
"column.domain_blocks": "Blokkerte domene",
+ "column.edit_list": "Rediger liste",
"column.favourites": "Favorittar",
"column.firehose": "Tidslinjer",
"column.follow_requests": "Fylgjeførespurnadar",
"column.home": "Heim",
+ "column.list_members": "Administrer medlemer på lista",
"column.lists": "Lister",
"column.mutes": "Målbundne brukarar",
"column.notifications": "Varsel",
@@ -158,6 +162,7 @@
"column_header.pin": "Fest",
"column_header.show_settings": "Vis innstillingar",
"column_header.unpin": "Løys",
+ "column_search.cancel": "Avbryt",
"column_subheading.settings": "Innstillingar",
"community.column_settings.local_only": "Berre lokalt",
"community.column_settings.media_only": "Berre media",
@@ -200,6 +205,9 @@
"confirmations.edit.confirm": "Rediger",
"confirmations.edit.message": "Å redigera no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?",
"confirmations.edit.title": "Overskriv innlegget?",
+ "confirmations.follow_to_list.confirm": "Fylg og legg til lista",
+ "confirmations.follow_to_list.message": "Du må fylgja {name} for å leggja dei til ei liste.",
+ "confirmations.follow_to_list.title": "Vil du fylgja brukaren?",
"confirmations.logout.confirm": "Logg ut",
"confirmations.logout.message": "Er du sikker på at du vil logga ut?",
"confirmations.logout.title": "Logg ut?",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index dc482af4cd6512..165b1b56372d0d 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -486,7 +486,6 @@
"lists.replies_policy.list": "Członkowie listy",
"lists.replies_policy.none": "Nikt",
"lists.save": "Zapisz",
- "lists.search_placeholder": "Szukaj wśród osób, które obserwujesz",
"lists.show_replies_to": "Pokaż odpowiedzi od członków listy do",
"load_pending": "{count, plural, one {# nowa pozycja} other {nowe pozycje}}",
"loading_indicator.label": "Ładowanie…",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 27d8b9a5a0310f..25387fc41c18f0 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -103,7 +103,6 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "hashtag mais usada",
"annual_report.summary.most_used_hashtag.none": "Nenhuma",
"annual_report.summary.new_posts.new_posts": "novas publicações",
- "annual_report.summary.percentile.text": "Isso o coloca no topodos usuários de Mastodon.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Não contaremos à Bernie.",
"annual_report.summary.thanks": "Obrigada por fazer parte do Mastodon!",
"attachments_list.unprocessed": "(não processado)",
@@ -205,6 +204,9 @@
"confirmations.edit.confirm": "Editar",
"confirmations.edit.message": "Editar agora irá substituir a mensagem que está sendo criando. Tem certeza de que deseja continuar?",
"confirmations.edit.title": "Sobrescrever o post?",
+ "confirmations.follow_to_list.confirm": "Seguir e adicionar à lista",
+ "confirmations.follow_to_list.message": "Você precisa seguir {name} para adicioná-lo à lista.",
+ "confirmations.follow_to_list.title": "Seguir usuário?",
"confirmations.logout.confirm": "Sair",
"confirmations.logout.message": "Você tem certeza de que deseja sair?",
"confirmations.logout.title": "Sair da sessão?",
@@ -493,7 +495,7 @@
"lists.replies_policy.list": "Membros da lista",
"lists.replies_policy.none": "Ninguém",
"lists.save": "Salvar",
- "lists.search_placeholder": "Buscar pessoas que você segue",
+ "lists.search": "Buscar",
"lists.show_replies_to": "Incluir respostas de membros da lista para",
"load_pending": "{count, plural, one {# novo item} other {# novos items}}",
"loading_indicator.label": "Carregando…",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 81b5525da223df..898c156d132b19 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -96,26 +96,26 @@
"annual_report.summary.followers.total": "{count} за всё время",
"annual_report.summary.here_it_is": "Вот ваши итоги {year} года:",
"annual_report.summary.highlighted_post.by_favourites": "пост с наибольшим количеством звёздочек",
- "annual_report.summary.highlighted_post.by_reblogs": "пост с наибольшим количеством продвижений",
+ "annual_report.summary.highlighted_post.by_reblogs": "самый популярный пост",
"annual_report.summary.highlighted_post.by_replies": "пост с наибольшим количеством ответов",
"annual_report.summary.highlighted_post.possessive": "{name}",
"annual_report.summary.most_used_app.most_used_app": "наиболее часто используемое приложение",
"annual_report.summary.most_used_hashtag.most_used_hashtag": "наиболее часто используемый хэштег",
"annual_report.summary.most_used_hashtag.none": "Нет",
"annual_report.summary.new_posts.new_posts": "новых постов",
- "annual_report.summary.percentile.text": "Всё это помещает вас в топпользователей Mastodon.",
+ "annual_report.summary.percentile.text": "Всё это помещает вас в топпользователей {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Роскомнадзор об этом не узнает.",
"annual_report.summary.thanks": "Спасибо за то, что были вместе с Mastodon!",
"attachments_list.unprocessed": "(не обработан)",
"audio.hide": "Скрыть аудио",
- "block_modal.remote_users_caveat": "Мы попросим сервер {domain} уважать ваше решение. Однако, соблюдение требований не гарантировано, поскольку некоторые серверы могут работать с блокировками по-разному. Публичные записи по-прежнему могут быть видны неавторизованным пользователям.",
+ "block_modal.remote_users_caveat": "Мы попросим сервер {domain} уважать ваше решение, однако соблюдение им блокировки не гарантировано, поскольку некоторые серверы могут по-разному обрабатывать запросы. Публичные посты по-прежнему могут быть видны неавторизованным пользователям.",
"block_modal.show_less": "Показать меньше",
"block_modal.show_more": "Показать больше",
- "block_modal.they_cant_mention": "Он не может упоминать или подписываться на вас.",
- "block_modal.they_cant_see_posts": "Он не может видеть ваши сообщения, и вы не увидите его.",
- "block_modal.they_will_know": "Он может видеть, что он заблокирован.",
+ "block_modal.they_cant_mention": "Он не сможет упоминать вас или подписаться на вас.",
+ "block_modal.they_cant_see_posts": "Он не сможет видеть ваши посты, а вы не будете видеть его посты.",
+ "block_modal.they_will_know": "Он будет знать, что вы его блокируете.",
"block_modal.title": "Заблокировать пользователя?",
- "block_modal.you_wont_see_mentions": "Вы не увидите записи, которые упоминают его.",
+ "block_modal.you_wont_see_mentions": "Вы не увидите посты, которые его упоминают.",
"boost_modal.combo": "{combo}, чтобы пропустить это в следующий раз",
"boost_modal.reblog": "Продвинуть пост?",
"boost_modal.undo_reblog": "Убрать продвижение?",
@@ -149,7 +149,7 @@
"column.firehose": "Живая лента",
"column.follow_requests": "Запросы на подписку",
"column.home": "Главная",
- "column.list_members": "Управление участниками списка",
+ "column.list_members": "Управление пользователями в списке",
"column.lists": "Списки",
"column.mutes": "Игнорируемые пользователи",
"column.notifications": "Уведомления",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Редактировать",
"confirmations.edit.message": "При редактировании, текст набираемого поста будет очищен. Продолжить?",
"confirmations.edit.title": "Переписать сообщение?",
+ "confirmations.follow_to_list.confirm": "Подписаться, а затем добавить в список",
+ "confirmations.follow_to_list.message": "Чтобы добавить пользователя {name} в список, вы должны быть на него подписаны.",
+ "confirmations.follow_to_list.title": "Подписаться?",
"confirmations.logout.confirm": "Выйти",
"confirmations.logout.message": "Вы уверены, что хотите выйти?",
"confirmations.logout.title": "Выйти?",
@@ -241,27 +244,27 @@
"dismissable_banner.explore_tags": "Эти хэштеги привлекают людей на этом и других серверах децентрализованной сети прямо сейчас.",
"dismissable_banner.public_timeline": "Это самые новые публичные посты от тех пользователей этого и других серверов децентрализованной сети, на которых подписываются пользователи {domain}.",
"domain_block_modal.block": "Заблокировать сервер",
- "domain_block_modal.block_account_instead": "Заблокировать @{name} вместо",
- "domain_block_modal.they_can_interact_with_old_posts": "Люди с этого сервера могут взаимодействовать с вашими старыми записями.",
- "domain_block_modal.they_cant_follow": "Никто из этого сервера не может подписываться на вас.",
- "domain_block_modal.they_wont_know": "Он не будет знать, что его заблокировали.",
+ "domain_block_modal.block_account_instead": "Заблокировать только @{name}",
+ "domain_block_modal.they_can_interact_with_old_posts": "Пользователи с этого сервера смогут взаимодействовать с вашими старыми постами.",
+ "domain_block_modal.they_cant_follow": "Пользователи с этого сервера не смогут подписаться на вас.",
+ "domain_block_modal.they_wont_know": "Пользователи с этого сервера не будут знать, что вы их блокируете.",
"domain_block_modal.title": "Заблокировать домен?",
- "domain_block_modal.you_will_lose_num_followers": "Вы потеряете {followersCount, plural, one {{followersCountDisplay} подписчика} other {{followersCountDisplay} подписчиков}} и {followingCount, plural, one {{followingCountDisplay} подписку} other {{followingCountDisplay} подписок}}.",
- "domain_block_modal.you_will_lose_relationships": "Вы потеряете всех подписчиков и людей, на которых вы подписаны, на этом сервере.",
- "domain_block_modal.you_wont_see_posts": "Вы не будете видеть записи или уведомления от пользователей на этом сервере.",
- "domain_pill.activitypub_lets_connect": "Это позволяет вам общаться и взаимодействовать с людьми не только на Mastodon, но и в различных социальных приложениях.",
- "domain_pill.activitypub_like_language": "ActivityPub как язык Mastodon говорит с другими социальными сетями.",
+ "domain_block_modal.you_will_lose_num_followers": "Вы потеряете {followersCount, plural, one {{followersCountDisplay} подписчика} few {{followersCountDisplay} подписчика} other {{followersCountDisplay} подписчиков}} и {followingCount, plural, one {{followingCountDisplay} подписку} few {{followingCountDisplay} подписки} other {{followingCountDisplay} подписок}}.",
+ "domain_block_modal.you_will_lose_relationships": "Вы потеряете все подписки и всех подписчиков с этого сервера.",
+ "domain_block_modal.you_wont_see_posts": "Вы не будете видеть посты или уведомления от пользователей с этого сервера.",
+ "domain_pill.activitypub_lets_connect": "Благодаря ему вы можете связываться и взаимодействовать не только с пользователями Mastodon, но и с пользователями других платформ.",
+ "domain_pill.activitypub_like_language": "ActivityPub это язык, на котором Mastodon говорит с другими социальными сетями.",
"domain_pill.server": "Сервер",
- "domain_pill.their_handle": "Его бейдж:",
- "domain_pill.their_server": "Цифровой дом, где находятся все записи.",
- "domain_pill.their_username": "Уникальный идентификатор на сервере. Возможно найти пользователей с одним и тем же именем пользователя на разных серверах.",
+ "domain_pill.their_handle": "Адрес пользователя:",
+ "domain_pill.their_server": "Цифровой дом пользователя, где находятся все его посты.",
+ "domain_pill.their_username": "Уникальный идентификатор пользователя на его сервере. На разных серверах могут встречаться люди с тем же именем пользователя.",
"domain_pill.username": "Имя пользователя",
- "domain_pill.whats_in_a_handle": "Что такое бейдж?",
- "domain_pill.who_they_are": "Поскольку бейджи говорят о том, кто и где находится, вы можете взаимодействовать с людьми в социальной сети .",
- "domain_pill.who_you_are": "Поскольку ваш бейдж говорит о том, кто вы и где находитесь, люди могут взаимодействовать с вами через социальную сеть .",
- "domain_pill.your_handle": "Ваш бейдж:",
- "domain_pill.your_server": "Сервер, где живут все ваши посты. Этот не нравится? Поменяй сервер в любое время вместе со своими подписчиками.",
- "domain_pill.your_username": "Ваш уникальный идентификатор на этом сервере. Вы можете найти пользователей с одним именем пользователя на разных серверах.",
+ "domain_pill.whats_in_a_handle": "Что это значит?",
+ "domain_pill.who_they_are": "Поскольку адрес позволяет однозначно определить, кто и где находится, вы можете взаимодействовать с пользователями социальной сети .",
+ "domain_pill.who_you_are": "Поскольку ваш адрес позволяет однозначно определить, кто вы и где находитесь, пользователи социальной сети могут взаимодействовать с вами.",
+ "domain_pill.your_handle": "Ваш адрес:",
+ "domain_pill.your_server": "Ваш цифровой дом, где находятся все ваши посты. Если вам не нравится этот сервер, вы можете в любое время перенести свою учётную запись на другой сервер, не теряя подписчиков.",
+ "domain_pill.your_username": "Ваш уникальный идентификатор на этом сервере. На разных серверах могут встречаться люди с тем же именем пользователя.",
"embed.instructions": "Встройте этот пост на свой сайт, скопировав следующий код:",
"embed.preview": "Так это будет выглядеть:",
"emoji_button.activity": "Занятия",
@@ -481,33 +484,33 @@
"lists.exclusive": "Не показывать участников в домашней ленте",
"lists.exclusive_hint": "Если кто-то есть в этом списке, скрыть его в домашней ленте, чтобы не видеть его посты дважды.",
"lists.find_users_to_add": "Найти пользователей для добавления",
- "lists.list_members": "Участники списка",
- "lists.list_members_count": "{count, plural, one {# участник} few {# участника} other {# участников}}",
+ "lists.list_members": "Пользователи в списке",
+ "lists.list_members_count": "{count, plural, one {# пользователь} few {# пользователя} other {# пользователей}}",
"lists.list_name": "Название списка",
"lists.new_list_name": "Новое имя списка",
"lists.no_lists_yet": "Пока нет списков.",
- "lists.no_members_yet": "Пока нет участников.",
+ "lists.no_members_yet": "Пока нет пользователей в списке.",
"lists.no_results_found": "Не найдено.",
"lists.remove_member": "Удалить",
- "lists.replies_policy.followed": "Пользователи, на которых вы подписаны",
- "lists.replies_policy.list": "Пользователи в списке",
+ "lists.replies_policy.followed": "Все пользователи, на которых вы подписаны",
+ "lists.replies_policy.list": "Другие пользователи в списке",
"lists.replies_policy.none": "Никого",
"lists.save": "Сохранить",
- "lists.search_placeholder": "Искать среди подписок",
- "lists.show_replies_to": "Показывать ответы участников списка на посты",
+ "lists.search": "Поиск",
+ "lists.show_replies_to": "Показывать ответы пользователей в списке на посты",
"load_pending": "{count, plural, one {# новый элемент} few {# новых элемента} other {# новых элементов}}",
"loading_indicator.label": "Загрузка…",
"media_gallery.hide": "Скрыть",
"moved_to_account_banner.text": "Ваша учетная запись {disabledAccount} в настоящее время заморожена, потому что вы переехали на {movedToAccount}.",
"mute_modal.hide_from_notifications": "Скрыть из уведомлений",
- "mute_modal.hide_options": "Скрыть параметры",
- "mute_modal.indefinite": "Пока я не разблокирую их",
+ "mute_modal.hide_options": "Скрыть опции",
+ "mute_modal.indefinite": "Бессрочно",
"mute_modal.show_options": "Показать опции",
- "mute_modal.they_can_mention_and_follow": "Они могут упоминать и следить за вами, но вы не будете их видеть.",
- "mute_modal.they_wont_know": "Они не будут знать, что их заглушили.",
- "mute_modal.title": "Заглушить пользователя?",
- "mute_modal.you_wont_see_mentions": "Вы не увидите постов, которые их упоминают.",
- "mute_modal.you_wont_see_posts": "Они по-прежнему смогут видеть ваши посты, но вы не сможете видеть их посты.",
+ "mute_modal.they_can_mention_and_follow": "Он сможет упоминать вас и подписаться на вас, но вы этого не увидите.",
+ "mute_modal.they_wont_know": "Он не будет знать, что вы его игнорируете.",
+ "mute_modal.title": "Игнорировать пользователя?",
+ "mute_modal.you_wont_see_mentions": "Вы не увидите посты, которые его упоминают.",
+ "mute_modal.you_wont_see_posts": "Он по-прежнему сможет видеть ваши посты, но вы не будете видеть его посты.",
"navigation_bar.about": "О проекте",
"navigation_bar.administration": "Администрирование",
"navigation_bar.advanced_interface": "Открыть в многоколоночном интерфейсе",
@@ -808,11 +811,11 @@
"status.edit": "Изменить",
"status.edited": "Дата последнего изменения: {date}",
"status.edited_x_times": "{count, plural, one {{count} изменение} many {{count} изменений} other {{count} изменения}}",
- "status.embed": "Получить код для встраивания",
+ "status.embed": "Встроить на свой сайт",
"status.favourite": "Добавить в избранное",
"status.favourites": "{count, plural, other {в избранном}}",
"status.filter": "Фильтровать этот пост",
- "status.history.created": "{name} создал {date}",
+ "status.history.created": "{name} создал(а) {date}",
"status.history.edited": "{name} отредактировал(а) {date}",
"status.load_more": "Загрузить остальное",
"status.media.open": "Нажмите, чтобы открыть.",
@@ -829,7 +832,7 @@
"status.reblog": "Продвинуть",
"status.reblog_private": "Продвинуть для своей аудитории",
"status.reblogged_by": "{name} продвинул(а)",
- "status.reblogs": "{count, plural, one {boost} few {boosts} many {boosts} other {boosts}}",
+ "status.reblogs": "{count, plural, one {продвижение} few {продвижения} other {продвижений}}",
"status.reblogs.empty": "Никто ещё не продвинул этот пост. Как только кто-то это сделает, они появятся здесь.",
"status.redraft": "Создать заново",
"status.remove_bookmark": "Убрать из закладок",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index df7ff350b6fc62..84f4d4dda24ff6 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -448,7 +448,6 @@
"lists.replies_policy.list": "Članom seznama",
"lists.replies_policy.none": "Nikomur",
"lists.save": "Shrani",
- "lists.search_placeholder": "Iščite ljudi, katerim sledite",
"load_pending": "{count, plural, one {# nov element} two {# nova elementa} few {# novi elementi} other {# novih elementov}}",
"loading_indicator.label": "Nalaganje …",
"media_gallery.hide": "Skrij",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 6de39e6e99f4f2..b13f1af3a70bee 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -98,7 +98,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "hashtag-u më i përdorur",
"annual_report.summary.most_used_hashtag.none": "Asnjë",
"annual_report.summary.new_posts.new_posts": "postime të reja",
- "annual_report.summary.percentile.text": "Kjo ju vë në kryetë përdoruesve të Mastodon-it.",
+ "annual_report.summary.percentile.text": "Kjo ju vendos te kryesues të përdoruesve të {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Nuk do t’ia themi Bernit.",
"annual_report.summary.thanks": "Faleminderit që jeni pjesë e Mastodon-it!",
"attachments_list.unprocessed": "(e papërpunuar)",
@@ -200,6 +200,9 @@
"confirmations.edit.confirm": "Përpunojeni",
"confirmations.edit.message": "Përpunimi tani do të sjellë mbishkrim të mesazhit që po hartoni aktualisht. Jeni i sigurt se doni të vazhdohet?",
"confirmations.edit.title": "Të mbishkruhet postimi?",
+ "confirmations.follow_to_list.confirm": "Ndiqe dhe shtoje te listë",
+ "confirmations.follow_to_list.message": "Lypset të jeni duke e ndjekur {name}, që të shtohte te një listë.",
+ "confirmations.follow_to_list.title": "Të ndiqet përdoruesi?",
"confirmations.logout.confirm": "Dilni",
"confirmations.logout.message": "Jeni i sigurt se doni të dilet?",
"confirmations.logout.title": "Të dilet?",
@@ -488,7 +491,7 @@
"lists.replies_policy.list": "Anëtarë të listës",
"lists.replies_policy.none": "Askush",
"lists.save": "Ruaje",
- "lists.search_placeholder": "Kërkoni persona që ndiqni",
+ "lists.search": "Kërko",
"lists.show_replies_to": "Përfshi përgjigje nga anëtarë liste te",
"load_pending": "{count, plural,one {# objekt i ri }other {# objekte të rinj }}",
"loading_indicator.label": "Po ngarkohet…",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 5c04140e4494fd..805f75c078a3b3 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -103,7 +103,6 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "mest använda hashtag",
"annual_report.summary.most_used_hashtag.none": "Inga",
"annual_report.summary.new_posts.new_posts": "nya inlägg",
- "annual_report.summary.percentile.text": "Det placerar dig i toppav Mastodon-användare.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Vi berättar inte för Bernie.",
"annual_report.summary.thanks": "Tack för att du är en del av Mastodon!",
"attachments_list.unprocessed": "(obehandlad)",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 609caa1126408c..e0f55f562b6b70 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -481,7 +481,6 @@
"lists.replies_policy.list": "สมาชิกของรายการ",
"lists.replies_policy.none": "ไม่มีใคร",
"lists.save": "บันทึก",
- "lists.search_placeholder": "ค้นหาผู้คนที่คุณติดตาม",
"lists.show_replies_to": "รวมการตอบกลับจากสมาชิกของรายการถึง",
"load_pending": "{count, plural, other {# รายการใหม่}}",
"loading_indicator.label": "กำลังโหลด…",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index a10d2028863d85..bdd91a56af9df4 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -289,7 +289,6 @@
"lists.replies_policy.followed": "jan kute ale",
"lists.replies_policy.list": "jan pi kulupu ni taso",
"lists.replies_policy.none": "jan ala",
- "lists.search_placeholder": "o alasa lon kulupu jan ni: sina kute e ona",
"load_pending": "{count, plural, other {ijo sin #}}",
"loading_indicator.label": "ni li kama…",
"mute_modal.title": "sina wile ala wile kute e jan ni?",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 1cf5a3db1e36c1..ae5285838ac981 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "en çok kullanılan etiket",
"annual_report.summary.most_used_hashtag.none": "Yok",
"annual_report.summary.new_posts.new_posts": "yeni gönderiler",
- "annual_report.summary.percentile.text": "Mastodon kullanıcılarınınüst dilimindesiniz.",
+ "annual_report.summary.percentile.text": "{domain} kullanıcılarınınüst dilimindesiniz",
"annual_report.summary.percentile.we_wont_tell_bernie": "Bernie'ye söylemeyiz.",
"annual_report.summary.thanks": "Mastodon'un bir parçası olduğunuz için teşekkürler!",
"attachments_list.unprocessed": "(işlenmemiş)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Düzenle",
"confirmations.edit.message": "Şimdi düzenlersen şu an oluşturduğun iletinin üzerine yazılır. Devam etmek istediğine emin misin?",
"confirmations.edit.title": "Gönderinin üzerine yaz?",
+ "confirmations.follow_to_list.confirm": "Takip et ve yapılacaklar listesine ekle",
+ "confirmations.follow_to_list.message": "Bir listeye eklemek için {name} kişisini takip etmeniz gerekiyor.",
+ "confirmations.follow_to_list.title": "Kullanıcıyı takip et?",
"confirmations.logout.confirm": "Oturumu kapat",
"confirmations.logout.message": "Oturumu kapatmak istediğinden emin misin?",
"confirmations.logout.title": "Oturumu kapat?",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "Listenin üyeleri",
"lists.replies_policy.none": "Hiç kimse",
"lists.save": "Kaydet",
- "lists.search_placeholder": "Takip ettiğiniz kişilerde arama yapın",
+ "lists.search": "Ara",
"lists.show_replies_to": "Liste üyelerinin yanıtlarını içer",
"load_pending": "{count, plural, one {# yeni öğe} other {# yeni öğe}}",
"loading_indicator.label": "Yükleniyor…",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index d68eddc5f6d5d1..b96230d3e46995 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -103,7 +103,6 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "найчастіший хештег",
"annual_report.summary.most_used_hashtag.none": "Немає",
"annual_report.summary.new_posts.new_posts": "нові дописи",
- "annual_report.summary.percentile.text": "Це виводить вас в топ користувачів Mastodon.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Ми не скажемо Bernie.",
"annual_report.summary.thanks": "Дякуємо, що ви є частиною Mastodon!",
"attachments_list.unprocessed": "(не оброблено)",
@@ -204,6 +203,9 @@
"confirmations.edit.confirm": "Змінити",
"confirmations.edit.message": "Редагування перезапише повідомлення, яке ви зараз пишете. Ви впевнені, що хочете продовжити?",
"confirmations.edit.title": "Перезаписати допис?",
+ "confirmations.follow_to_list.confirm": "Підписатися і додати до списку",
+ "confirmations.follow_to_list.message": "Ви повинні слідувати за {name}, щоб додати до списку.",
+ "confirmations.follow_to_list.title": "Підписатися на користувача?",
"confirmations.logout.confirm": "Вийти",
"confirmations.logout.message": "Ви впевнені, що хочете вийти?",
"confirmations.logout.title": "Вийти?",
@@ -469,6 +471,7 @@
"lists.replies_policy.followed": "Будь-який відстежуваний користувач",
"lists.replies_policy.list": "Учасники списку",
"lists.replies_policy.none": "Ніхто",
+ "lists.search": "Пошук",
"load_pending": "{count, plural, one {# новий елемент} other {# нових елементів}}",
"loading_indicator.label": "Завантаження…",
"media_gallery.hide": "Сховати",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 0c17953022b861..316eae0aa6b40f 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "hashtag dùng nhiều nhất",
"annual_report.summary.most_used_hashtag.none": "Không có",
"annual_report.summary.new_posts.new_posts": "tút mới",
- "annual_report.summary.percentile.text": "Bạn nằm trong topthành viên Mastodon.",
+ "annual_report.summary.percentile.text": "Bạn thuộc topthành viên của {domain}.",
"annual_report.summary.percentile.we_wont_tell_bernie": "Chúng tôi sẽ không kể cho Bernie.",
"annual_report.summary.thanks": "Cảm ơn đã trở thành một phần của Mastodon!",
"attachments_list.unprocessed": "(chưa xử lí)",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "Sửa",
"confirmations.edit.message": "Nội dung tút cũ sẽ bị ghi đè, bạn có tiếp tục?",
"confirmations.edit.title": "Ghi đè lên tút cũ",
+ "confirmations.follow_to_list.confirm": "Theo dõi và thêm vào danh sách",
+ "confirmations.follow_to_list.message": "Bạn cần theo dõi {name} trước khi thêm họ vào danh sách.",
+ "confirmations.follow_to_list.title": "Theo dõi người này?",
"confirmations.logout.confirm": "Đăng xuất",
"confirmations.logout.message": "Bạn có chắc muốn thoát?",
"confirmations.logout.title": "Đăng xuất",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "Người trong danh sách",
"lists.replies_policy.none": "Không ai",
"lists.save": "Lưu",
- "lists.search_placeholder": "Tìm những người mà bạn quan tâm",
+ "lists.search": "Tìm kiếm",
"lists.show_replies_to": "Bao gồm lượt trả lời từ thành viên danh sách",
"load_pending": "{count, plural, one {# tút mới} other {# tút mới}}",
"loading_indicator.label": "Đang tải…",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 937aebeaa9ca4a..0634b3a4982b68 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -78,8 +78,8 @@
"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.instance_followers": "本站用户即将丢失的关注者",
+ "admin.impact_report.instance_follows": "对方站点用户即将丢失的关注者",
"admin.impact_report.title": "影响摘要",
"alert.rate_limited.message": "请在 {retry_time, time, medium} 后重试。",
"alert.rate_limited.title": "频率受限",
@@ -103,12 +103,12 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "最常用的话题",
"annual_report.summary.most_used_hashtag.none": "无",
"annual_report.summary.new_posts.new_posts": "新嘟嘟",
- "annual_report.summary.percentile.text": "这使你跻身 Mastodon 用户的前",
- "annual_report.summary.percentile.we_wont_tell_bernie": "我们打死也不会告诉扣税国王的。",
+ "annual_report.summary.percentile.text": "这使你跻身 {domain} 用户的前",
+ "annual_report.summary.percentile.we_wont_tell_bernie": " ",
"annual_report.summary.thanks": "谢谢你这一年和 Mastodon 上的大家一起嘟嘟！",
"attachments_list.unprocessed": "(未处理)",
"audio.hide": "隐藏音频",
- "block_modal.remote_users_caveat": "我们将要求服务器 {domain} 尊重你的决定。然而，我们无法保证对方一定遵从，因为某些服务器可能会以不同的方案处理屏蔽操作。公开嘟文仍然可能对未登录的用户可见。",
+ "block_modal.remote_users_caveat": "我们将要求站点 {domain} 尊重你的决定。然而，我们无法保证对方一定遵从，因为某些站点可能会以不同的方案处理屏蔽操作。公开嘟文仍然可能对未登录用户可见。",
"block_modal.show_less": "隐藏",
"block_modal.show_more": "显示更多",
"block_modal.they_cant_mention": "他们不能提及或关注你。",
@@ -174,7 +174,7 @@
"compose.saved.body": "嘟文已保存。",
"compose_form.direct_message_warning_learn_more": "详细了解",
"compose_form.encryption_warning": "Mastodon 上的嘟文未经端到端加密。请勿在 Mastodon 上分享敏感信息。",
- "compose_form.hashtag_warning": "这条嘟文被设置为“不公开”，因此它不会出现在任何话题标签的列表下。只有公开的嘟文才能通过话题标签进行搜索。",
+ "compose_form.hashtag_warning": "这条嘟文被设置为“不公开”，因此它不会出现在任何话题的列表下。只有公开的嘟文才能通过话题进行搜索。",
"compose_form.lock_disclaimer": "你的账户没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。",
"compose_form.lock_disclaimer.lock": "锁嘟",
"compose_form.placeholder": "想写什么？",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "编辑",
"confirmations.edit.message": "编辑此消息将会覆盖当前正在撰写的信息。仍要继续吗？",
"confirmations.edit.title": "是否重写嘟文？",
+ "confirmations.follow_to_list.confirm": "关注并添加到列表",
+ "confirmations.follow_to_list.message": "你需要先关注 {name}，才能将其添加到列表。",
+ "confirmations.follow_to_list.title": "是否关注用户？",
"confirmations.logout.confirm": "退出登录",
"confirmations.logout.message": "确定要退出登录吗？",
"confirmations.logout.title": "是否退出登录？",
@@ -242,13 +245,13 @@
"dismissable_banner.public_timeline": "以下是联邦宇宙中 {domain} 上的用户关注的人发布的最新公开嘟文。",
"domain_block_modal.block": "屏蔽服务器",
"domain_block_modal.block_account_instead": "改为屏蔽 @{name}",
- "domain_block_modal.they_can_interact_with_old_posts": "来自该服务器的人可以与你之前的嘟文交互。",
- "domain_block_modal.they_cant_follow": "此服务器上没有人可以关注你。",
+ "domain_block_modal.they_can_interact_with_old_posts": "该站点的用户可以与你之前的嘟文交互。",
+ "domain_block_modal.they_cant_follow": "该站点上将没有人可以关注你。",
"domain_block_modal.they_wont_know": "对方不会知道自己被屏蔽。",
"domain_block_modal.title": "是否屏蔽该域名？",
"domain_block_modal.you_will_lose_num_followers": "你将失去 {followersCount, plural, other {{followersCountDisplay} 名关注者}}和 {followingCount, plural, other {{followingCountDisplay} 名关注}}。",
- "domain_block_modal.you_will_lose_relationships": "你将失去在此实例上的所有关注和关注者。",
- "domain_block_modal.you_wont_see_posts": "你将不会看到此服务器上用户的嘟文或通知。",
+ "domain_block_modal.you_will_lose_relationships": "你将丢失该站点上的所有关注与关注者。",
+ "domain_block_modal.you_wont_see_posts": "你将不会看到该站点用户的嘟文或通知。",
"domain_pill.activitypub_lets_connect": "它可以让你与不同社交应用上的人交流互动，而不仅限于 Mastodon。",
"domain_pill.activitypub_like_language": "ActivityPub 好比 Mastodon 与其它社交网络交流时使用的语言。",
"domain_pill.server": "服务器",
@@ -292,8 +295,8 @@
"empty_column.favourited_statuses": "你没有喜欢过任何嘟文。喜欢过的嘟文会显示在这里。",
"empty_column.favourites": "没有人喜欢过这条嘟文。如果有人喜欢了，就会显示在这里。",
"empty_column.follow_requests": "你还没有收到任何关注请求。当你收到一个关注请求时，它会出现在这里。",
- "empty_column.followed_tags": "你还没有关注任何话题标签。 当你关注后，它们会出现在这里。",
- "empty_column.hashtag": "这个话题标签下暂时没有内容。",
+ "empty_column.followed_tags": "你还没有关注任何话题。 当你关注后，它们会出现在这里。",
+ "empty_column.hashtag": "该话题下暂无内容。",
"empty_column.home": "你的主页时间线还没有内容！快去关注更多人吧。",
"empty_column.list": "列表中还没有任何内容。当列表成员发布新嘟文时，它们将出现在这里。",
"empty_column.mutes": "你没有隐藏任何用户。",
@@ -311,7 +314,7 @@
"explore.title": "探索",
"explore.trending_links": "新闻",
"explore.trending_statuses": "嘟文",
- "explore.trending_tags": "话题标签",
+ "explore.trending_tags": "话题",
"filter_modal.added.context_mismatch_explanation": "这条过滤规则不适用于你当前访问此嘟文的场景。要在此场景下过滤嘟文，你必须编辑此过滤规则。",
"filter_modal.added.context_mismatch_title": "场景不匹配！",
"filter_modal.added.expired_explanation": "此过滤规则类别已过期，你需要修改到期日期才能应用。",
@@ -352,7 +355,7 @@
"follow_suggestions.similar_to_recently_followed_longer": "与你近期关注的用户相似",
"follow_suggestions.view_all": "查看全部",
"follow_suggestions.who_to_follow": "推荐关注",
- "followed_tags": "已关注话题标签",
+ "followed_tags": "已关注话题",
"footer.about": "关于",
"footer.directory": "用户列表",
"footer.get_app": "获取应用",
@@ -368,7 +371,7 @@
"hashtag.column_header.tag_mode.any": "或是 {additional}",
"hashtag.column_header.tag_mode.none": "而不用 {additional}",
"hashtag.column_settings.select.no_options_message": "未找到建议",
- "hashtag.column_settings.select.placeholder": "输入话题标签…",
+ "hashtag.column_settings.select.placeholder": "输入话题…",
"hashtag.column_settings.tag_mode.all": "全部",
"hashtag.column_settings.tag_mode.any": "任一",
"hashtag.column_settings.tag_mode.none": "无一",
@@ -376,8 +379,8 @@
"hashtag.counter_by_accounts": "{count, plural,other {{counter} 人讨论}}",
"hashtag.counter_by_uses": "{count, plural, other {{counter} 条嘟文}}",
"hashtag.counter_by_uses_today": "今日 {count, plural, other {{counter} 条嘟文}}",
- "hashtag.follow": "关注话题标签",
- "hashtag.unfollow": "取消关注话题标签",
+ "hashtag.follow": "关注话题",
+ "hashtag.unfollow": "取消关注话题",
"hashtags.and_other": "… 和另外 {count, plural, other {# 个话题}}",
"hints.profiles.followers_may_be_missing": "该账户的关注者列表可能没有完全显示。",
"hints.profiles.follows_may_be_missing": "该账户的关注列表可能没有完全显示。",
@@ -411,7 +414,7 @@
"interaction_modal.description.reply": "只需一个 Mastodon 账号，即可回复此嘟文。",
"interaction_modal.description.vote": "只需一个 Mastodon 账号，即可参与此投票。",
"interaction_modal.login.action": "转到主页",
- "interaction_modal.login.prompt": "你所入驻的服务器域名，如：mastodon.social",
+ "interaction_modal.login.prompt": "你所入驻的站点域名，如：mastodon.social",
"interaction_modal.no_account_yet": "还没加入 Mastodon？",
"interaction_modal.on_another_server": "在另一服务器",
"interaction_modal.on_this_server": "在此服务器",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "列表成员",
"lists.replies_policy.none": "不显示",
"lists.save": "保存",
- "lists.search_placeholder": "搜索你关注的人",
+ "lists.search": "搜索",
"lists.show_replies_to": "列表成员回复的显示范围",
"load_pending": "{count} 项",
"loading_indicator.label": "加载中…",
@@ -522,7 +525,7 @@
"navigation_bar.favourites": "喜欢",
"navigation_bar.filters": "忽略的关键词",
"navigation_bar.follow_requests": "关注请求",
- "navigation_bar.followed_tags": "关注的话题标签",
+ "navigation_bar.followed_tags": "关注的话题",
"navigation_bar.follows_and_followers": "关注与关注者",
"navigation_bar.lists": "列表",
"navigation_bar.logout": "退出登录",
@@ -661,7 +664,7 @@
"onboarding.profile.display_name": "昵称",
"onboarding.profile.display_name_hint": "你的全名或昵称…",
"onboarding.profile.note": "简介",
- "onboarding.profile.note_hint": "你可以提及 @其他人 或使用 #话题标签…",
+ "onboarding.profile.note_hint": "你可以提及 @其他人 或使用 #话题…",
"onboarding.profile.save_and_continue": "保存并继续",
"onboarding.profile.title": "设置个人资料",
"onboarding.profile.upload_avatar": "上传头像",
@@ -686,7 +689,7 @@
"privacy.private.short": "关注者",
"privacy.public.long": "所有 Mastodon 内外的人",
"privacy.public.short": "公开",
- "privacy.unlisted.additional": "此模式的行为与“公开”类似，只是嘟文不会出现在实时动态、话题标签、探索或 Mastodon 搜索页面中，即使您已全局开启了对应的发现设置。",
+ "privacy.unlisted.additional": "此模式的行为与“公开”类似，只是嘟文不会出现在实时动态、话题、探索或 Mastodon 搜索页面中，即使您已全局开启了对应的发现设置。",
"privacy.unlisted.long": "减少算法影响",
"privacy.unlisted.short": "悄悄公开",
"privacy_policy.last_updated": "最近更新于 {date}",
@@ -763,7 +766,7 @@
"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.go_to_hashtag": "打开话题 {x}",
"search.quick_action.open_url": "在 Mastodon 中打开此链接",
"search.quick_action.status_search": "包含 {x} 的嘟文",
"search.search_or_paste": "搜索或输入网址",
@@ -777,7 +780,7 @@
"search_popout.user": "用户",
"search_results.accounts": "用户",
"search_results.all": "全部",
- "search_results.hashtags": "话题标签",
+ "search_results.hashtags": "话题",
"search_results.nothing_found": "无法找到符合这些搜索词的任何内容",
"search_results.see_all": "查看全部",
"search_results.statuses": "嘟文",
@@ -785,7 +788,7 @@
"server_banner.about_active_users": "过去 30 天内使用此服务器的人(月活跃用户)",
"server_banner.active_users": "活跃用户",
"server_banner.administered_by": "本站管理员：",
- "server_banner.is_one_of_many": "{domain} 是可用于参与联邦宇宙的众多独立 Mastodon 服务器之一。",
+ "server_banner.is_one_of_many": "{domain} 是可用于参与联邦宇宙的众多独立 Mastodon 站点之一。",
"server_banner.server_stats": "服务器统计数据：",
"sign_in_banner.create_account": "创建账户",
"sign_in_banner.follow_anyone": "关注联邦宇宙中的任何人，并按时间顺序查看所有内容。没有算法、广告或诱导链接。",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 0c831e5499dad0..c8e394cb8a8384 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -103,7 +103,7 @@
"annual_report.summary.most_used_hashtag.most_used_hashtag": "最常使用的主題標籤",
"annual_report.summary.most_used_hashtag.none": "無最常用之主題標籤",
"annual_report.summary.new_posts.new_posts": "新嘟文",
- "annual_report.summary.percentile.text": "這讓您成為前Mastodon 的使用者。",
+ "annual_report.summary.percentile.text": "這讓您成為前{domain} 的使用者。",
"annual_report.summary.percentile.we_wont_tell_bernie": "我們不會告訴 Bernie。",
"annual_report.summary.thanks": "感謝您成為 Mastodon 的一份子！",
"attachments_list.unprocessed": "（未經處理）",
@@ -205,6 +205,9 @@
"confirmations.edit.confirm": "編輯",
"confirmations.edit.message": "編輯嘟文將覆蓋掉您目前正在撰寫之嘟文內容。您是否仍要繼續？",
"confirmations.edit.title": "是否覆寫該嘟文？",
+ "confirmations.follow_to_list.confirm": "跟隨並加入至列表",
+ "confirmations.follow_to_list.message": "您必須先跟隨 {name} 以將其加入至列表。",
+ "confirmations.follow_to_list.title": "是否跟隨該使用者？",
"confirmations.logout.confirm": "登出",
"confirmations.logout.message": "您確定要登出嗎？",
"confirmations.logout.title": "您確定要登出嗎？",
@@ -493,7 +496,7 @@
"lists.replies_policy.list": "列表成員",
"lists.replies_policy.none": "沒有人",
"lists.save": "儲存",
- "lists.search_placeholder": "搜尋您跟隨的人",
+ "lists.search": "搜尋",
"lists.show_replies_to": "包含來自列表成員的回覆到",
"load_pending": "{count, plural, other {# 個新項目}}",
"loading_indicator.label": "正在載入...",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 302b5f31105b18..4566ce5e4d35e4 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -8196,6 +8196,7 @@ noscript {
p {
margin-bottom: 20px;
+ unicode-bidi: plaintext;
&:last-child {
margin-bottom: 0;
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 82b25d4649433f..38cf5fe831dc51 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -134,7 +134,7 @@ def history
end
def authors
- @authors ||= [PreviewCard::Author.new(self)]
+ @authors ||= Array(serialized_authors)
end
class Author < ActiveModelSerializers::Model
@@ -169,6 +169,13 @@ def image_styles(file)
private
+ def serialized_authors
+ if author_name? || author_url?
+ PreviewCard::Author
+ .new(self)
+ end
+ end
+
def extract_dimensions
file = image.queued_for_write[:original]
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 6af7a98c6df64b..12ff32f00a1703 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -7,10 +7,8 @@
# id :bigint(8) not null, primary key
# var :string not null
# value :text
-# thing_type :string
# created_at :datetime
# updated_at :datetime
-# thing_id :bigint(8)
#
# This file is derived from a fork of the `rails-settings-cached` gem available at
@@ -46,10 +44,10 @@ class Setting < ApplicationRecord
after_commit :rewrite_cache, on: %i(create update)
after_commit :expire_cache, on: %i(destroy)
- # Settings are server-wide settings only, but they were previously
- # used for users too. This can be dropped later with a database
- # migration dropping any scoped setting.
- default_scope { where(thing_type: nil, thing_id: nil) }
+ self.ignored_columns += %w(
+ thing_id
+ thing_type
+ )
class << self
# get or set a variable with the variable as the called method
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 397acaf25a1228..58ad8963965af4 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -33,6 +33,7 @@ class Tag < ApplicationRecord
has_many :followers, through: :passive_relationships, source: :account
has_one :antenna_tag, dependent: :destroy, inverse_of: :tag
+ has_one :trend, class_name: 'TagTrend', inverse_of: :tag, dependent: :destroy
HASHTAG_SEPARATORS = "_\u00B7\u30FB\u200c"
HASHTAG_FIRST_SEQUENCE_CHUNK_ONE = "[[:word:]_][[:word:]#{HASHTAG_SEPARATORS}]*[[:alpha:]#{HASHTAG_SEPARATORS}]"
diff --git a/app/models/tag_trend.rb b/app/models/tag_trend.rb
new file mode 100644
index 00000000000000..47e8489603cb9e
--- /dev/null
+++ b/app/models/tag_trend.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: tag_trends
+#
+# id :bigint(8) not null, primary key
+# allowed :boolean default(FALSE), not null
+# language :string default(""), not null
+# rank :integer default(0), not null
+# score :float default(0.0), not null
+# tag_id :bigint(8) not null
+#
+class TagTrend < ApplicationRecord
+ include RankedTrend
+
+ belongs_to :tag
+
+ scope :allowed, -> { where(allowed: true) }
+ scope :not_allowed, -> { where(allowed: false) }
+end
diff --git a/app/models/trends/base.rb b/app/models/trends/base.rb
index a189f11f233235..1e7749e4b17949 100644
--- a/app/models/trends/base.rb
+++ b/app/models/trends/base.rb
@@ -34,19 +34,7 @@ def request_review
end
def query
- Trends::Query.new(key_prefix, klass)
- end
-
- def score(id, locale: nil)
- redis.zscore([key_prefix, 'all', locale].compact.join(':'), id) || 0
- end
-
- def rank(id, locale: nil)
- redis.zrevrank([key_prefix, 'allowed', locale].compact.join(':'), id)
- end
-
- def currently_trending_ids(allowed, limit)
- redis.zrevrange(allowed ? "#{key_prefix}:allowed" : "#{key_prefix}:all", 0, limit.positive? ? limit - 1 : limit).map(&:to_i)
+ Trends::Query.new(klass)
end
protected
@@ -64,42 +52,9 @@ def record_used_id(id, at_time = Time.now.utc)
redis.expire(used_key(at_time), 1.day.seconds)
end
- def score_at_rank(rank)
- redis.zrevrange("#{key_prefix}:allowed", 0, rank, with_scores: true).last&.last || 0
- end
-
- def replace_items(suffix, items)
- tmp_prefix = "#{key_prefix}:tmp:#{SecureRandom.alphanumeric(6)}#{suffix}"
- allowed_items = filter_for_allowed_items(items)
-
- redis.pipelined do |pipeline|
- items.each { |item| pipeline.zadd("#{tmp_prefix}:all", item[:score], item[:item].id) }
- allowed_items.each { |item| pipeline.zadd("#{tmp_prefix}:allowed", item[:score], item[:item].id) }
-
- rename_set(pipeline, "#{tmp_prefix}:all", "#{key_prefix}:all#{suffix}", items)
- rename_set(pipeline, "#{tmp_prefix}:allowed", "#{key_prefix}:allowed#{suffix}", allowed_items)
- end
- end
-
- def filter_for_allowed_items(items)
- raise NotImplementedError
- end
-
private
def used_key(at_time)
"#{key_prefix}:used:#{at_time.beginning_of_day.to_i}"
end
-
- def rename_set(pipeline, from_key, to_key, set_items)
- if set_items.empty?
- pipeline.del(to_key)
- else
- pipeline.rename(from_key, to_key)
- end
- end
-
- def skip_review?
- Setting.trendable_by_default
- end
end
diff --git a/app/models/trends/links.rb b/app/models/trends/links.rb
index 9d721d25f818ce..0f3ead43f88e0d 100644
--- a/app/models/trends/links.rb
+++ b/app/models/trends/links.rb
@@ -14,15 +14,6 @@ class Trends::Links < Trends::Base
}
class Query < Trends::Query
- def filtered_for!(account)
- @account = account
- self
- end
-
- def filtered_for(account)
- clone.filtered_for!(account)
- end
-
def to_arel
scope = PreviewCard.joins(:trend).reorder(score: :desc)
scope = scope.reorder(language_order_clause.desc, score: :desc) if preferred_languages.present?
@@ -37,14 +28,6 @@ def to_arel
def language_order_clause
Arel::Nodes::Case.new.when(PreviewCardTrend.arel_table[:language].in(preferred_languages)).then(1).else(0)
end
-
- def preferred_languages
- if @account&.chosen_languages.present?
- @account.chosen_languages
- else
- @locale
- end
- end
end
def register(status, at_time = Time.now.utc)
diff --git a/app/models/trends/query.rb b/app/models/trends/query.rb
index c4edbba6b8e442..590e81f4fdaeff 100644
--- a/app/models/trends/query.rb
+++ b/app/models/trends/query.rb
@@ -1,19 +1,18 @@
# frozen_string_literal: true
class Trends::Query
- include Redisable
include Enumerable
- attr_reader :prefix, :klass, :loaded
+ attr_reader :klass, :loaded
alias loaded? loaded
- def initialize(prefix, klass)
- @prefix = prefix
+ def initialize(_prefix, klass)
@klass = klass
@records = []
@loaded = false
@allowed = false
+ @account = nil
@limit = nil
@offset = nil
end
@@ -27,6 +26,15 @@ def allowed
clone.allowed!
end
+ def filtered_for!(account)
+ @account = account
+ self
+ end
+
+ def filtered_for(account)
+ clone.filtered_for!(account)
+ end
+
def in_locale!(value)
@locale = value
self
@@ -68,22 +76,11 @@ def to_ary
alias to_a to_ary
def to_arel
- if ids_for_key.empty?
- klass.none
- else
- scope = klass.joins(sanitized_join_sql).reorder('x.ordering')
- scope = scope.offset(@offset) if @offset.present?
- scope = scope.limit(@limit) if @limit.present?
- scope
- end
+ raise NotImplementedError
end
private
- def key
- [@prefix, @allowed ? 'allowed' : 'all', @locale].compact.join(':')
- end
-
def load
unless loaded?
@records = perform_queries
@@ -93,29 +90,15 @@ def load
self
end
- def ids_for_key
- @ids_for_key ||= redis.zrevrange(key, 0, -1).map(&:to_i)
- end
-
- def sanitized_join_sql
- ActiveRecord::Base.sanitize_sql_array(join_sql_array)
- end
-
- def join_sql_array
- [join_sql_query, ids_for_key]
- end
-
- def join_sql_query
- <<~SQL.squish
- JOIN unnest(array[?]) WITH ordinality AS x (id, ordering) ON #{klass.table_name}.id = x.id
- SQL
- end
-
def perform_queries
- apply_scopes(to_arel).to_a
+ to_arel.to_a
end
- def apply_scopes(scope)
- scope
+ def preferred_languages
+ if @account&.chosen_languages.present?
+ @account.chosen_languages
+ else
+ @locale
+ end
end
end
diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index be2398620de5b3..4a770c82683e42 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -13,15 +13,6 @@ class Trends::Statuses < Trends::Base
}
class Query < Trends::Query
- def filtered_for!(account)
- @account = account
- self
- end
-
- def filtered_for(account)
- clone.filtered_for!(account)
- end
-
def to_arel
scope = Status.joins(:trend).reorder(score: :desc)
scope = scope.reorder(language_order_clause.desc, score: :desc) if preferred_languages.present?
@@ -37,14 +28,6 @@ def to_arel
def language_order_clause
Arel::Nodes::Case.new.when(StatusTrend.arel_table[:language].in(preferred_languages)).then(1).else(0)
end
-
- def preferred_languages
- if @account&.chosen_languages.present?
- @account.chosen_languages
- else
- @locale
- end
- end
end
def register(status, at_time = Time.now.utc)
diff --git a/app/models/trends/tag_filter.rb b/app/models/trends/tag_filter.rb
index d6f88a9486e710..02d558ac254615 100644
--- a/app/models/trends/tag_filter.rb
+++ b/app/models/trends/tag_filter.rb
@@ -6,6 +6,8 @@ class Trends::TagFilter
status
).freeze
+ IGNORED_PARAMS = %w(page).freeze
+
attr_reader :params
def initialize(params)
@@ -13,14 +15,10 @@ def initialize(params)
end
def results
- scope = if params[:status] == 'pending_review'
- Tag.unscoped.order(id: :desc)
- else
- trending_scope
- end
+ scope = initial_scope
params.each do |key, value|
- next if key.to_s == 'page'
+ next if IGNORED_PARAMS.include?(key.to_s)
scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
end
@@ -30,19 +28,24 @@ def results
private
+ def initial_scope
+ Tag.select(Tag.arel_table[Arel.star])
+ .joins(:trend)
+ .eager_load(:trend)
+ .reorder(score: :desc)
+ end
+
def scope_for(key, value)
case key.to_s
when 'status'
status_scope(value)
+ when 'trending'
+ trending_scope(value)
else
- raise "Unknown filter: #{key}"
+ raise Mastodon::InvalidParameterError, "Unknown filter: #{key}"
end
end
- def trending_scope
- Trends.tags.query.to_arel
- end
-
def status_scope(value)
case value.to_s
when 'approved'
@@ -52,7 +55,16 @@ def status_scope(value)
when 'pending_review'
Tag.pending_review
else
- raise "Unknown status: #{value}"
+ raise Mastodon::InvalidParameterError, "Unknown status: #{value}"
+ end
+ end
+
+ def trending_scope(value)
+ case value
+ when 'allowed'
+ TagTrend.allowed
+ else
+ TagTrend.all
end
end
end
diff --git a/app/models/trends/tags.rb b/app/models/trends/tags.rb
index 5b00fca7ec994a..00ca5366e62b77 100644
--- a/app/models/trends/tags.rb
+++ b/app/models/trends/tags.rb
@@ -3,6 +3,8 @@
class Trends::Tags < Trends::Base
PREFIX = 'trending_tags'
+ BATCH_SIZE = 100
+
self.default_options = {
threshold: 5,
review_threshold: 3,
@@ -11,6 +13,22 @@ class Trends::Tags < Trends::Base
decay_threshold: 1,
}
+ class Query < Trends::Query
+ def to_arel
+ scope = Tag.joins(:trend).reorder(language_order_clause.desc, score: :desc)
+ scope = scope.merge(TagTrend.allowed) if @allowed
+ scope = scope.offset(@offset) if @offset.present?
+ scope = scope.limit(@limit) if @limit.present?
+ scope
+ end
+
+ private
+
+ def language_order_clause
+ Arel::Nodes::Case.new.when(TagTrend.arel_table[:language].in(preferred_languages)).then(1).else(0)
+ end
+ end
+
def register(status, at_time = Time.now.utc)
return unless !status.reblog? && %i(public public_unlisted login).include?(status.visibility.to_sym) && !status.account.silenced?
return if !status.account.local? && DomainBlock.block_trends?(status.account.domain)
@@ -25,19 +43,39 @@ def add(tag, account_id, at_time = Time.now.utc)
record_used_id(tag.id, at_time)
end
+ def query
+ Query.new(key_prefix, klass)
+ end
+
def refresh(at_time = Time.now.utc)
- tags = Tag.where(id: (recently_used_ids(at_time) + currently_trending_ids(false, -1)).uniq)
- calculate_scores(tags, at_time)
+ # First, recalculate scores for tags that were trending previously. We split the queries
+ # to avoid having to load all of the IDs into Ruby just to send them back into Postgres
+ Tag.where(id: TagTrend.select(:tag_id)).find_in_batches(batch_size: BATCH_SIZE) do |tags|
+ calculate_scores(tags, at_time)
+ end
+
+ # Then, calculate scores for tags that were used today. There are potentially some
+ # duplicate items here that we might process one more time, but that should be fine
+ Tag.where(id: recently_used_ids(at_time)).find_in_batches(batch_size: BATCH_SIZE) do |tags|
+ calculate_scores(tags, at_time)
+ end
+
+ # Now that all trends have up-to-date scores, and all the ones below the threshold have
+ # been removed, we can recalculate their positions
+ TagTrend.recalculate_ordered_rank
end
def request_review
- tags = Tag.where(id: currently_trending_ids(false, -1))
+ score_at_threshold = TagTrend.allowed.by_rank.ranked_below(options[:review_threshold]).first&.score || 0
+ tag_trends = TagTrend.not_allowed.includes(:tag)
- tags.filter_map do |tag|
- next unless would_be_trending?(tag.id) && !tag.trendable? && tag.requires_review_notification?
+ tag_trends.filter_map do |trend|
+ tag = trend.tag
- tag.touch(:requested_review_at)
- tag
+ if trend.score > score_at_threshold && !tag.trendable? && tag.requires_review_notification?
+ tag.touch(:requested_review_at)
+ tag
+ end
end
end
@@ -54,9 +92,7 @@ def klass
private
def calculate_scores(tags, at_time)
- items = []
-
- tags.each do |tag|
+ items = tags.map do |tag|
expected = tag.history.get(at_time - 1.day).accounts.to_f
expected = 1.0 if expected.zero?
observed = tag.history.get(at_time).accounts.to_f
@@ -80,19 +116,13 @@ def calculate_scores(tags, at_time)
decaying_score = max_score * (0.5**((at_time.to_f - max_time.to_f) / options[:max_score_halflife].to_f))
- next unless decaying_score >= options[:decay_threshold]
-
- items << { score: decaying_score, item: tag }
+ [decaying_score, tag]
end
- replace_items('', items)
- end
-
- def filter_for_allowed_items(items)
- items.select { |item| item[:item].trendable? }
- end
+ to_insert = items.filter { |(score, _)| score >= options[:decay_threshold] }
+ to_delete = items.filter { |(score, _)| score < options[:decay_threshold] }
- def would_be_trending?(id)
- score(id) > score_at_rank(options[:review_threshold] - 1)
+ TagTrend.upsert_all(to_insert.map { |(score, tag)| { tag_id: tag.id, score: score, language: '', allowed: tag.trendable? || false } }, unique_by: %w(tag_id language)) if to_insert.any?
+ TagTrend.where(tag_id: to_delete.map { |(_, tag)| tag.id }).delete_all if to_delete.any?
end
end
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index 81d393ff57bb81..37eb2ae1e19420 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -81,12 +81,13 @@ def configuration
},
media_attachments: {
- supported_mime_types: MediaAttachment.supported_mime_types,
- image_size_limit: MediaAttachment::IMAGE_LIMIT,
+ description_limit: MediaAttachment::MAX_DESCRIPTION_LENGTH,
image_matrix_limit: Attachmentable::MAX_MATRIX_LIMIT,
- video_size_limit: MediaAttachment::VIDEO_LIMIT,
+ image_size_limit: MediaAttachment::IMAGE_LIMIT,
+ supported_mime_types: MediaAttachment.supported_mime_types,
video_frame_rate_limit: MediaAttachment::MAX_VIDEO_FRAME_RATE,
video_matrix_limit: MediaAttachment::MAX_VIDEO_MATRIX_LIMIT,
+ video_size_limit: MediaAttachment::VIDEO_LIMIT,
},
polls: {
diff --git a/app/views/admin/trends/tags/_tag.html.haml b/app/views/admin/trends/tags/_tag.html.haml
index b1e714a912410f..e0f9f39e4748ba 100644
--- a/app/views/admin/trends/tags/_tag.html.haml
+++ b/app/views/admin/trends/tags/_tag.html.haml
@@ -11,9 +11,9 @@
= link_to tag_path(tag), target: '_blank', rel: 'noopener noreferrer' do
= t('admin.trends.tags.used_by_over_week', count: tag.history.reduce(0) { |sum, day| sum + day.accounts })
- - if tag.trendable? && (rank = Trends.tags.rank(tag.id))
+ - if tag.trendable?
·
- %abbr{ title: t('admin.trends.tags.current_score', score: Trends.tags.score(tag.id)) }= t('admin.trends.tags.trending_rank', rank: rank + 1)
+ %abbr{ title: t('admin.trends.tags.current_score', score: tag.trend.score) }= t('admin.trends.tags.trending_rank', rank: tag.trend.rank + 1)
- if tag.decaying?
·
diff --git a/app/views/admin_mailer/_new_trending_tags.text.erb b/app/views/admin_mailer/_new_trending_tags.text.erb
index f738caaf3db4b4..c9bd1bc7172ca3 100644
--- a/app/views/admin_mailer/_new_trending_tags.text.erb
+++ b/app/views/admin_mailer/_new_trending_tags.text.erb
@@ -2,7 +2,7 @@
<% new_trending_tags.each do |tag| %>
- #<%= tag.display_name %>
- <%= raw t('admin.trends.tags.usage_comparison', today: tag.history.get(Time.now.utc).accounts, yesterday: tag.history.get(Time.now.utc - 1.day).accounts) %> · <%= t('admin.trends.tags.current_score', score: Trends.tags.score(tag.id).round(2)) %>
+ <%= raw t('admin.trends.tags.usage_comparison', today: tag.history.get(Time.now.utc).accounts, yesterday: tag.history.get(Time.now.utc - 1.day).accounts) %> · <%= t('admin.trends.tags.current_score', score: tag.trend.score.round(2)) %>
<% end %>
<%= raw t('application_mailer.view')%> <%= admin_trends_tags_url(status: 'pending_review') %>
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index a778b9421208c4..afa1d622433e2b 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -62,6 +62,7 @@
as: :text,
hint: false,
label: false,
+ input_html: { maxlength: UserInviteRequest::TEXT_SIZE_LIMIT },
required: Setting.require_invite_text,
wrapper: :with_block_label
diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml
index 355a0c3f2e9825..4d3a3318ee82ba 100644
--- a/app/views/tags/show.html.haml
+++ b/app/views/tags/show.html.haml
@@ -1,4 +1,6 @@
- content_for :header_tags do
+ %link{ rel: :alternate, type: 'application/rss+xml', href: tag_url(@tag) }/
+ %link{ rel: :alternate, type: 'application/activity+json', href: tag_url(@tag) }/
%meta{ name: 'robots', content: 'noindex, noai, noimageai' }/
%meta{ name: 'CCBot', content: 'nofollow' }
= render partial: 'shared/og'
diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
index f7551283320dce..03544e2e98e53f 100644
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -19,6 +19,7 @@ def clean_unconfirmed_accounts!
User.unconfirmed.where(confirmation_sent_at: ..UNCONFIRMED_ACCOUNTS_MAX_AGE_DAYS.days.ago).find_in_batches do |batch|
# We have to do it separately because of missing database constraints
AccountModerationNote.where(target_account_id: batch.map(&:account_id)).delete_all
+ WebauthnCredential.where(user_id: batch.map(&:id)).delete_all
Account.where(id: batch.map(&:account_id)).delete_all
User.where(id: batch.map(&:id)).delete_all
end
diff --git a/config/locales/activerecord.el.yml b/config/locales/activerecord.el.yml
index a47622161674da..2b1210e3373d2b 100644
--- a/config/locales/activerecord.el.yml
+++ b/config/locales/activerecord.el.yml
@@ -39,6 +39,11 @@ el:
attributes:
data:
malformed: δεν είναι έγκυρα
+ list_account:
+ attributes:
+ account_id:
+ taken: είναι ήδη στη λίστα
+ must_be_following: πρέπει να είναι ένας λογαριασμός που ακολουθείς
status:
attributes:
reblog:
diff --git a/config/locales/activerecord.it.yml b/config/locales/activerecord.it.yml
index 3d5be6c258a297..3e8897577ada4a 100644
--- a/config/locales/activerecord.it.yml
+++ b/config/locales/activerecord.it.yml
@@ -39,6 +39,11 @@ it:
attributes:
data:
malformed: è malformato
+ list_account:
+ attributes:
+ account_id:
+ taken: è già nella lista
+ must_be_following: deve essere un account seguito
status:
attributes:
reblog:
diff --git a/config/locales/an.yml b/config/locales/an.yml
index f941651438dc59..49033dc48efa59 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -1322,7 +1322,6 @@ an:
scheduled_statuses:
over_daily_limit: Ha superau lo limite de %{limit} publicacions programadas pa ixe día
over_total_limit: Ha superau lo limite de %{limit} publicacions programadas
- too_soon: La calendata programada ha d'estar en o futuro
sessions:
activity: Zaguera actividat
browser: Navegador
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 832f60795f7be9..a3f66759524867 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1644,7 +1644,6 @@ ar:
scheduled_statuses:
over_daily_limit: لقد تجاوزتَ حد الـ %{limit} منشورات مُبَرمَجة مسموح بها اليوم
over_total_limit: لقد بلغت حد الـ %{limit} مِن المنشورات المبرمَجة
- too_soon: يجب أن يكون تاريخ البرمجة في المستقبَل
self_destruct:
lead_html: للأسف، سيتم إغلاق %{domain} بشكل دائم. إذا كان لديك حساب هناك، لن تكون قادرًا على الاستمرار في استخدامه، غير أنه يمكنك طلب نسخة احتياطية لبياناتك.
title: سيُغلق هذا الخادم أبوابه
diff --git a/config/locales/be.yml b/config/locales/be.yml
index c97547b8b9664d..7ce89d99354a2d 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1647,7 +1647,6 @@ be:
scheduled_statuses:
over_daily_limit: Вы перавысілі ліміт ў %{limit} запланаваных на сёння допісаў
over_total_limit: Вы перавысілі ліміт ў %{limit} запланаваных допісаў
- too_soon: Запланаваная дата мусіць быць у будучыні
self_destruct:
lead_html: На жаль, дамен %{domain} зачыняецца назаўсёды. Калі ў вас быў уліковы запіс, вы не зможаце працягваць выкарыстоўваць яго, але вы ўсё яшчэ можаце запытаць рэзервовае капіраванне вашых даных.
title: Гэты сервер зачыняецца
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 7ff595b41a23f9..bfb9cc3b00d12e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -185,7 +185,9 @@ bg:
create_custom_emoji: Създаване на персонализирано емоджи
create_domain_allow: Създаване на позволение за домейна
create_domain_block: Създаване на блокиране за домейна
+ create_email_domain_block: Създаване на блокиране на имейл домейн
create_ip_block: Създаване на правило за IP
+ create_relay: Създаване на пренасочване
create_unavailable_domain: Създаване на недостъпен домейн
create_user_role: Създаване на роля
demote_user: Понижаване на потребител
@@ -200,6 +202,7 @@ bg:
destroy_user_role: Унищожаване на роля
disable_2fa_user: Изкл. на 2факт.удостов.
disable_custom_emoji: Деактивиране на персонализирано емоджи
+ disable_sign_in_token_auth_user: Изключване на удостоверяването с код по имейл за потребител
disable_user: Изключване на потребител
enable_custom_emoji: Включване на персонализирано емоджи
enable_user: Активиране на потребител
@@ -1621,7 +1624,7 @@ bg:
scheduled_statuses:
over_daily_limit: Завишили сте ограничението от %{limit} планирани публикации за днес
over_total_limit: Завишили сте ограничението от %{limit} планирани публикации
- too_soon: Заплануваната дата трябва да е в бъдеще
+ too_soon: датата трябва да е в бъдеще
self_destruct:
lead_html: За жалост, %{domain} е трайно затворен. Ако сте имали там акаунт, то няма да може да продължите да го употребявате, но още може да заявите резервно копие на данните си.
title: Този сървър се затваря
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 28caa1d1fc9290..07fcd8632ccd8b 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1638,7 +1638,7 @@ ca:
scheduled_statuses:
over_daily_limit: Has superat el límit de %{limit} tuts programats per a avui
over_total_limit: Has superat el límit de %{limit} tuts programats
- too_soon: La data programada ha de ser futura
+ too_soon: la data ha de ser al futur
self_destruct:
lead_html: Lamentablement, %{domain} tanca de forma definitiva. Si hi teníeu un compte, no el podreu continuar utilitzant, però podeu demanar una còpia de les vostres dades.
title: Aquest servidor tancarà
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index cfee624e368471..0f2a5ed3647fb6 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -863,7 +863,6 @@ ckb:
scheduled_statuses:
over_daily_limit: ئێوە لە سنووری ڕیپێدراوی %{limit} توتی ئەو رۆژە،خۆرتر ڕۆیشتوویت
over_total_limit: تۆ سنووری خشتەکراوی %{limit} ت بەزاندووە
- too_soon: پێویستە بەرواری خشتەکراو لە داهاتوودا بێت
sessions:
activity: دوایین چالاکی
browser: وێبگەڕ
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 39d9e9157e6951..2e45ab92632aff 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -843,7 +843,6 @@ co:
scheduled_statuses:
over_daily_limit: Avete trapassatu a limita di %{limit} statuti pianificati per stu ghjornu
over_total_limit: Avete trapassatu a limita di %{limit} statuti pianificati
- too_soon: A data deve esse indè u futuru
sessions:
activity: Ultima attività
browser: Navigatore
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 19a63722247d29..502e2fe0d8eaa8 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1591,7 +1591,6 @@ cs:
scheduled_statuses:
over_daily_limit: Pro dnešek jste překročili limit %{limit} naplánovaných příspěvků
over_total_limit: Překročili jste limit %{limit} naplánovaných příspěvků
- too_soon: Plánované datum musí být v budoucnosti
self_destruct:
lead_html: "%{domain} bohužel končí nadobro. Pokud jste tam měli účet, nebudete jej moci dále používat, ale stále si můžete vyžádat zálohu vašich dat."
title: Tento server končí
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 3d376bc4b82426..2f2ae75e5d5a70 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1828,7 +1828,6 @@ cy:
scheduled_statuses:
over_daily_limit: Rydych wedi mynd dros y terfyn o %{limit} postiad a drefnwyd ar gyfer heddiw
over_total_limit: Rydych wedi mynd dros y terfyn o %{limit} postiad a drefnwyd
- too_soon: Rhaid i'r dyddiad a drefnwyd fod yn y dyfodol
self_destruct:
lead_html: Yn anffodus mae %{domain} yn cau'n barhaol. Os oedd gennych gyfrif yno, ni fydd modd i chi barhau i'w ddefnyddio, ond mae dal modd gofyn i gael copi wrth gefn o'ch data.
title: Mae'r gweinydd hwn yn cau
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 3a82278b933de9..916dc931f9fb4f 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1676,7 +1676,7 @@ da:
scheduled_statuses:
over_daily_limit: Den daglige grænse på %{limit} planlagte indlæg er nået
over_total_limit: Grænsen på %{limit} planlagte indlæg er nået
- too_soon: Den planlagte dato skal være i fremtiden
+ too_soon: dato skal være i fremtiden
self_destruct:
lead_html: Desværre lukker %{domain} permanent. Har man en konto dér, vil fortsat brug heraf ikke være mulig. Man kan dog stadig anmode om en sikkerhedskopi af sine data.
title: Denne server er under nedlukning
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0faee920b4fb87..76b3c1f7658f3e 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1676,7 +1676,7 @@ de:
scheduled_statuses:
over_daily_limit: Du hast das Limit von %{limit} geplanten Beiträgen für heute erreicht
over_total_limit: Du hast das Limit für geplante Beiträge, das %{limit} beträgt, erreicht
- too_soon: Das geplante Datum muss in der Zukunft liegen
+ too_soon: Datum muss in der Zukunft liegen
self_destruct:
lead_html: Bedauerlicherweise wird %{domain} den Betrieb für immer einstellen. Wenn du dort ein Konto angelegt hast, wirst du es nicht weiter verwenden können. Du kannst allerdings eine Sicherung deiner Daten anfordern.
title: Dieser Server wird den Betrieb einstellen
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index 7d44a6a6b92528..38f88943bf7da8 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -139,7 +139,7 @@ fi:
profile: Mastodon-profiilisi
push: Puskuilmoitukset
reports: Raportit
- search: Hae
+ search: Haku
statuses: Julkaisut
layouts:
admin:
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 50705932e68d4e..bccb26d5bf77a3 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -152,17 +152,17 @@ zh-CN:
admin:read: 读取服务器上的所有数据
admin:read:accounts: 读取所有账号的敏感信息
admin:read:canonical_email_blocks: 读取所有已屏蔽邮箱的敏感信息
- admin:read:domain_allows: 读取所有域的敏感信息
- admin:read:domain_blocks: 读取所有域块的敏感信息
- admin:read:email_domain_blocks: 读取所有已屏蔽邮箱域名的敏感信息
+ admin:read:domain_allows: 读取敏感信息 - 站点允许列表
+ admin:read:domain_blocks: 读取敏感信息 - 站点屏蔽列表
+ admin:read:email_domain_blocks: 读取敏感信息 - 邮箱域名屏蔽列表
admin:read:ip_blocks: 读取所有IP块的敏感信息
admin:read:reports: 读取所有举报和被举报账号的敏感信息
admin:write: 修改服务器上的所有数据
admin:write:accounts: 对账号执行管理操作
admin:write:canonical_email_blocks: 对已屏蔽邮箱执行管理操作
- admin:write:domain_allows: 在域上执行管理操作
- admin:write:domain_blocks: 在域块上执行管理操作
- admin:write:email_domain_blocks: 对已屏蔽邮箱域名执行管理操作
+ admin:write:domain_allows: 修改站点允许列表
+ admin:write:domain_blocks: 修改站点屏蔽列表
+ admin:write:email_domain_blocks: 修改邮箱域名屏蔽列表
admin:write:ip_blocks: 针对 IP 段执行管理操作
admin:write:reports: 对举报执行管理操作
crypto: 使用端到端加密
@@ -184,7 +184,7 @@ zh-CN:
read:statuses: 查看所有嘟文
write: 修改你的账号数据
write:accounts: 修改你的个人资料
- write:blocks: 屏蔽账号和域名
+ write:blocks: 屏蔽账户与站点
write:bookmarks: 收藏嘟文
write:conversations: 静音并删除会话
write:favourites: 喜欢嘟文
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 98ef5f18b70710..dd534d6b0bb968 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -187,6 +187,7 @@ el:
create_domain_block: Δημιουργία Αποκλεισμού Τομέα
create_email_domain_block: Δημιουργία Αποκλεισμού Τομέα Email
create_ip_block: Δημιουργία κανόνα IP
+ create_relay: Δημιουργία Relay
create_unavailable_domain: Δημιουργία Μη Διαθέσιμου Τομέα
create_user_role: Δημιουργία Ρόλου
demote_user: Υποβιβασμός Χρήστη
@@ -198,14 +199,17 @@ el:
destroy_email_domain_block: Διαγραφή Αποκλεισμού Τομέα Email
destroy_instance: Εκκαθάριση Τομέα
destroy_ip_block: Διαγραφή κανόνα IP
+ destroy_relay: Διαγραφή Relay
destroy_status: Διαγραφή Ανάρτησης
destroy_unavailable_domain: Διαγραφή Μη Διαθέσιμου Τομέα
destroy_user_role: Καταστροφή Ρόλου
disable_2fa_user: Απενεργοποίηση 2FA
disable_custom_emoji: Απενεργοποίηση Προσαρμοσμένων Emoji
+ disable_relay: Απενεργοποίηση Relay
disable_sign_in_token_auth_user: Απενεργοποίηση Ελέγχου Ταυτότητας Διακριτικού Email για Χρήστη
disable_user: Απενεργοποίηση Χρήστη
enable_custom_emoji: Ενεργοποίηση Προσαρμοσμένων Emoji
+ enable_relay: Ενεργοποίηση Relay
enable_sign_in_token_auth_user: Ενεργοποίηση Ελέγχου Ταυτότητας Διακριτικού Email για Χρήστη
enable_user: Ενεργοποίηση Χρήστη
memorialize_account: Μετατροπή Λογαριασμού σε Εις Μνήμην
@@ -247,22 +251,30 @@ el:
create_domain_block_html: Ο/Η %{name} απέκλεισε τον τομέα %{target}
create_email_domain_block_html: Ο χρήστης %{name} απέκλεισε τον τομέα email %{target}
create_ip_block_html: Ο/Η %{name} δημιούργησε κανόνα για την IP %{target}
+ create_relay_html: Ο χρήστης %{name} δημιούργησε ένα relay %{target}
create_unavailable_domain_html: Ο/Η %{name} σταμάτησε να τροφοδοτεί τον τομέα %{target}
create_user_role_html: Ο/Η %{name} δημιούργησε ρόλο %{target}
demote_user_html: Ο/Η %{name} υποβίβασε τον χρήστη %{target}
destroy_announcement_html: Ο/Η %{name} διέγραψε την ανακοίνωση %{target}
+ destroy_canonical_email_block_html: Ο χρήστης %{name} έκανε άρση αποκλεισμού email με το hash %{target}
destroy_custom_emoji_html: Ο/Η %{name} διέγραψε το emoji %{target}
destroy_domain_allow_html: Ο/Η %{name} αφαίρεσε τον τομέα %{target} από τη λίστα εγκρίσεων
destroy_domain_block_html: Ο/Η %{name} επέτρεψε τον τομέα %{target}
+ destroy_email_domain_block_html: Ο χρήστης %{name} έκανε άρση αποκλεισμού του τομέα email %{target}
destroy_instance_html: Ο/Η %{name} εκκαθάρισε τον τομέα %{target}
destroy_ip_block_html: Ο/Η %{name} διέγραψε τον κανόνα για την IP %{target}
+ destroy_relay_html: Ο χρήστης %{name} διέγραψε το relay %{target}
destroy_status_html: Ο/Η %{name} αφαίρεσε την ανάρτηση του/της %{target}
destroy_unavailable_domain_html: Ο/Η %{name} ξανάρχισε να τροφοδοτεί το domain %{target}
destroy_user_role_html: Ο/Η %{name} διέγραψε τον ρόλο του %{target}
disable_2fa_user_html: Ο/Η %{name} απενεργοποίησε την απαίτηση για ταυτοποίηση δύο παραγόντων για τον χρήστη %{target}
disable_custom_emoji_html: Ο/Η %{name} απενεργοποίησε το emoji %{target}
+ disable_relay_html: Ο χρήστης %{name} απενεργοποίησε το relay %{target}
+ disable_sign_in_token_auth_user_html: Ο χρήστης %{name} απενεργοποίησε την ταυτοποίηση χαρακτηριστικού μέσω e-mail για %{target}
disable_user_html: Ο/Η %{name} απενεργοποίησε τη σύνδεση για τον χρήστη %{target}
enable_custom_emoji_html: Ο/Η %{name} ενεργοποίησε το emoji %{target}
+ enable_relay_html: Ο χρήστης %{name} ενεργοποίησε το relay %{target}
+ enable_sign_in_token_auth_user_html: Ο χρήστης %{name} ενεργοποίησε την πιστοποίηση αναγνωριστικού email του %{target}
enable_user_html: Ο/Η %{name} ενεργοποίησε τη σύνδεση για τον χρήστη %{target}
memorialize_account_html: O/H %{name} μετέτρεψε τον λογαριασμό του %{target} σε σελίδα εις μνήμην
promote_user_html: Ο/Η %{name} προβίβασε το χρήστη %{target}
@@ -270,6 +282,7 @@ el:
reject_user_html: ο/η %{name} απέρριψε την εγγραφή από %{target}
remove_avatar_user_html: ο/η %{name} αφαίρεσε το άβαταρ του/της %{target}
reopen_report_html: Ο/Η %{name} ξανάνοιξε την αναφορά %{target}
+ resend_user_html: Ο χρήστης %{name} έστειλε ξανά email επιβεβαίωσης για τον χρήστη %{target}
reset_password_user_html: Ο/Η %{name} επανέφερε το συνθηματικό του χρήστη %{target}
resolve_report_html: Ο/Η %{name} επέλυσε την αναφορά %{target}
sensitive_account_html: Ο/Η %{name} επισήμανε τα πολυμέσα του/της %{target} ως ευαίσθητα
@@ -430,6 +443,7 @@ el:
attempts_over_week:
one: "%{count} προσπάθεια την τελευταία εβδομάδα"
other: "%{count} προσπάθειες εγγραφής την τελευταία εβδομάδα"
+ created_msg: Επιτυχής αποκλεισμός τομέα email
delete: Διαγραφή
dns:
types:
@@ -438,8 +452,12 @@ el:
new:
create: Προσθήκη τομέα
resolve: Επίλυση τομέα
+ title: Αποκλεισμός νέου τομέα email
+ no_email_domain_block_selected: Δεν άλλαξαν οι αποκλεισμοί τομέα email καθώς δεν επιλέχθηκε κανένας
not_permitted: Δεν επιτρέπεται
+ resolved_dns_records_hint_html: Το όνομα τομέα επιλύεται στους ακόλουθους τομείς MX, οι οποίοι είναι τελικά υπεύθυνοι για την αποδοχή των email. Αποκλείοντας έναν τομέα MX θα αποκλείει τις εγγραφές από οποιαδήποτε διεύθυνση email που χρησιμοποιεί τον ίδιο τομέα MX, ακόμη και αν το ορατό όνομα τομέα είναι διαφορετικό. Προσέξτε να μην αποκλείσετε τους μεγάλους παρόχους ηλεκτρονικού ταχυδρομείου.
resolved_through_html: Επιλύθηκε μέσω %{domain}
+ title: Αποκλεισμένοι τομείς email
export_domain_allows:
new:
title: Εισαγωγή επιτρεπόμενων τομέων
@@ -593,7 +611,9 @@ el:
resolve_description_html: Δεν θα ληφθούν μέτρα κατά του αναφερόμενου λογαριασμού, δεν θα καταγραφεί κανένα παράπτωμα, και η αναφορά θα κλείσει.
silence_description_html: Ο λογαριασμός θα είναι ορατός μόνο σε εκείνους που ήδη τον ακολουθούν ή τον αναζητούν χειροκίνητα, περιορίζοντας κατά πολύ την εμβέλειά του. Η ενέργεια αυτή είναι αναστρέψιμη. Κλείνει όλες τις αναφορές εναντίον αυτού του λογαριασμού.
suspend_description_html: Ο λογαριασμός και όλο το περιεχόμενό του θα είναι απρόσιτα και τελικά θα διαγραφούν και η αλληλεπίδραση με αυτόν θα είναι αδύνατη. Αναστρέψιμη εντός 30 ημερών. Κλείνει όλες τις αναφορές εναντίον αυτού του λογαριασμού.
+ actions_description_html: Αποφάσισε ποια μέτρα θα ληφθούν για την επίλυση αυτής της αναφοράς. Εάν προβείς σε τιμωρητική ενέργεια κατά του αναφερόμενου λογαριασμού, θα αποσταλεί ειδοποίηση μέσω ηλεκτρονικού ταχυδρομείου σε αυτόν, εκτός όταν η κατηγορία Spam είναι επιλεγμένη.
actions_description_remote_html: Αποφάσισε ποια μέτρα θα ληφθούν για την επίλυση αυτής της αναφοράς. Αυτό θα επηρεάσει μόνο το πώς ο δικός σας διακομιστής επικοινωνεί με αυτόν τον απομακρυσμένο λογαριασμό και χειρίζεται το περιεχόμενό του.
+ actions_no_posts: Αυτή η αναφορά δεν έχει συσχετισμένες αναρτήσεις για διαγραφή
add_to_report: Πρόσθεσε περισσότερα στην αναφορά
already_suspended_badges:
local: Ήδη σε αναστολή σε αυτόν τον διακομιστή
@@ -657,6 +677,7 @@ el:
delete_data_html: Διάγραψε το προφίλ και το περιεχόμενο του @%{acct} σε 30 ημέρες από τώρα εκτός αν, εν τω μεταξύ, ανακληθεί η αναστολή
preview_preamble_html: 'Ο @%{acct} θα λάβει μια προειδοποίηση με τα ακόλουθο περιεχόμενο:'
record_strike_html: Κατάγραψε ένα παράπτωμα εναντίον του @%{acct} για να σε βοηθήσει να αποφασίσεις σε μελλοντικές παραβιάσεις από αυτόν τον λογαριασμό
+ send_email_html: Στείλε στον λογαριασμό @%{acct} ένα προειδοποιητικό email
warning_placeholder: Προαιρετικές επιπλέον εξηγήσεις για αυτή την ενέργεια από την ομάδα συντονισμού.
target_origin: Προέλευση του αναφερόμενου λογαριασμού
title: Αναφορές
@@ -696,6 +717,7 @@ el:
manage_appeals: Διαχείριση Εφέσεων
manage_appeals_description: Επιτρέπει στους χρήστες να εξετάζουν τις εφέσεις κατά των ενεργειών της ομάδας συντονισμού
manage_blocks: Διαχείριση Αποκλεισμών
+ manage_blocks_description: Επιτρέπει στους χρήστες να αποκλείουν παρόχους email και διευθύνσεις IP
manage_custom_emojis: Διαχείριση Προσαρμοσμένων Emojis
manage_custom_emojis_description: Επιτρέπει στους χρήστες να διαχειρίζονται προσαρμοσμένα emojis στον διακομιστή
manage_federation: Διαχείριση Συναλλαγών
@@ -713,6 +735,7 @@ el:
manage_taxonomies: Διαχείριση Ταξινομιών
manage_taxonomies_description: Επιτρέπει στους χρήστες να εξετάζουν το δημοφιλές περιεχόμενο και να ενημερώνουν τις ρυθμίσεις ετικέτας
manage_user_access: Διαχείριση Πρόσβασης Χρήστη
+ manage_user_access_description: Επιτρέπει στους χρήστες να απενεργοποιούν την ταυτοποίηση δύο παραγόντων άλλων χρηστών, να αλλάξουν τη διεύθυνση ηλεκτρονικού ταχυδρομείου τους και να επαναφέρουν τον κωδικό πρόσβασής τους
manage_users: Διαχείριση Χρηστών
manage_users_description: Επιτρέπει στους χρήστες να βλέπουν τις λεπτομέρειες άλλων χρηστών και να εκτελούν ενέργειες συντονισμού εναντίον τους
manage_webhooks: Διαχείριση Webhooks
@@ -787,6 +810,7 @@ el:
destroyed_msg: Η μεταφόρτωση ιστότοπου διαγράφηκε επιτυχώς!
software_updates:
critical_update: Κρίσιμο - παρακαλώ ενημέρωσε γρήγορα
+ description: Συνιστάται να διατηρείς την εγκατάσταση του Mastodon ενημερωμένη για να επωφεληθείς από τις πιο πρόσφατες διορθώσεις και δυνατότητες. Επιπλέον, μερικές φορές είναι κρίσιμο να ενημερώσεις το Mastodon εγκαίρως για να αποφύγεις προβλήματα ασφαλείας. Για αυτούς τους λόγους, το Mastodon ελέγχει για ενημερώσεις κάθε 30 λεπτά και θα σε ειδοποιεί σύμφωνα με τις προτιμήσεις ειδοποίησης μέσω email.
documentation_link: Μάθε περισσότερα
release_notes: Σημειώσεις έκδοσης
title: Διαθέσιμες ενημερώσεις
@@ -802,8 +826,10 @@ el:
back_to_account: Επιστροφή στη σελίδα λογαριασμού
back_to_report: Πίσω στη σελίδα αναφοράς
batch:
+ add_to_report: 'Προσθήκη στην αναφορά #%{id}'
remove_from_report: Αφαίρεση από την αναφορά
report: Αναφορά
+ contents: Περιεχόμενα
deleted: Διαγεγραμμένα
favourites: Αγαπημένα
history: Ιστορικό εκδόσεων
@@ -812,12 +838,17 @@ el:
media:
title: Πολυμέσα
metadata: Μεταδεδομένα
+ no_history: Αυτή η ανάρτηση δεν έχει επεξεργαστεί
no_status_selected: Καμία δημοσίευση δεν άλλαξε αφού καμία δεν ήταν επιλεγμένη
open: Άνοιγμα ανάρτησης
original_status: Αρχική ανάρτηση
reblogs: Αναδημοσιεύσεις
+ replied_to_html: Απάντησε στον χρήστη %{acct_link}
status_changed: Η ανάρτηση άλλαξε
+ status_title: Ανάρτηση από @%{name}
+ title: Αναρτήσεις λογαριασμού - @%{name}
trending: Τάσεις
+ view_publicly: Προβολή δημόσια
visibility: Ορατότητα
with_media: Με πολυμέσα
strikes:
@@ -859,6 +890,9 @@ el:
message_html: Δεν έχεις ορίσει κανέναν κανόνα διακομιστή.
sidekiq_process_check:
message_html: Καμία διεργασία Sidekiq δεν εκτελείται για την ουρά %{value}. Παρακαλώ έλεγξε τη διαμόρφωση του Sidekiq
+ software_version_check:
+ action: Δες τις διαθέσιμες ενημερώσεις
+ message_html: Μια ενημέρωση Mastodon είναι διαθέσιμη.
software_version_critical_check:
action: Δες τις διαθέσιμες ενημερώσεις
message_html: Μια κρίσιμη ενημέρωση του Mastodon είναι διαθέσιμη, παρακαλώ ενήμερωσε το συντομότερο δυνατόν.
@@ -885,6 +919,7 @@ el:
name: Όνομα
newest: Νεότερη όλων
oldest: Παλαιότερη όλων
+ open: Προβολή Δημόσια
reset: Επαναφορά
review: Κατάσταση αξιολόγησης
search: Αναζήτηση
@@ -894,10 +929,16 @@ el:
trends:
allow: Επιτρέπεται
approved: Εγκρίθηκε
+ confirm_allow: Σίγουρα θες να επιτρέψεις τις επιλεγμένες ετικέτες;
+ confirm_disallow: Σίγουρα θες να απορρίψεις τις επιλεγμένες ετικέτες;
disallow: Να μην επιτρέπεται
links:
allow: Να επιτρέπεται σύνδεσμος
allow_provider: Να επιτρέπεται ο εκδότης
+ confirm_allow: Σίγουρα θες να επιτρέψεις τουςεπιλεγμένους συνδέσμους;
+ confirm_allow_provider: Σίγουρα θες να επιτρέψεις τους επιλεγμένους παρόχους;
+ confirm_disallow: Σίγουρα θες να απορρίψεις τους επιλεγμένους συνδέσμους;
+ confirm_disallow_provider: Σίγουρα θες να απορρίψεις τους επιλεγμένους παρόχους;
description_html: Αυτοί οι σύνδεσμοι μοιράζονται αρκετά από λογαριασμούς των οποίων τις δημοσιεύσεις, βλέπει ο διακομιστής σας. Μπορεί να βοηθήσει τους χρήστες σας να μάθουν τί συμβαίνει στον κόσμο. Οι σύνδεσμοι δεν εμφανίζονται δημόσια μέχρι να εγκρίνετε τον εκδότη. Μπορείς επίσης να επιτρέψεις ή να απορρίψεις μεμονωμένους συνδέσμους.
disallow: Να μην επιτρέπεται ο σύνδεσμος
disallow_provider: Να μην επιτρέπεται ο εκδότης
@@ -1556,7 +1597,6 @@ el:
scheduled_statuses:
over_daily_limit: Έχεις υπερβεί το όριο των %{limit} προγραμματισμένων αναρτήσεων για εκείνη τη μέρα
over_total_limit: Έχεις υπερβεί το όριο των %{limit} προγραμματισμένων αναρτήσεων
- too_soon: Η προγραμματισμένη ημερομηνία πρέπει να είναι στο μέλλον
self_destruct:
lead_html: Δυστυχώς, το %{domain} κλείνει οριστικά. Αν είχατε λογαριασμό εκεί, δεν θα μπορείτε να συνεχίσετε τη χρήση του, αλλά μπορείτε ακόμα να ζητήσετε ένα αντίγραφο ασφαλείας των δεδομένων σας.
title: Αυτός ο διακομιστής κλείνει οριστικά
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 9d535e3226c418..b08ce82368ec42 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1676,7 +1676,6 @@ en-GB:
scheduled_statuses:
over_daily_limit: You have exceeded the limit of %{limit} scheduled posts for today
over_total_limit: You have exceeded the limit of %{limit} scheduled posts
- too_soon: The scheduled date must be in the future
self_destruct:
lead_html: Unfortunately, %{domain} is permanently closing down. If you had an account there, you will not be able to continue using it, but you can still request a backup of your data.
title: This server is closing down
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 40d1cb83457a98..43db925d49de63 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2010,7 +2010,7 @@ en:
scheduled_statuses:
over_daily_limit: You have exceeded the limit of %{limit} scheduled posts for today
over_total_limit: You have exceeded the limit of %{limit} scheduled posts
- too_soon: The scheduled date must be in the future
+ too_soon: date must be in the future
self_destruct:
lead_html: Unfortunately, %{domain} is permanently closing down. If you had an account there, you will not be able to continue using it, but you can still request a backup of your data.
title: This server is closing down
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index ad1396e4e8f1d4..70278460eee91e 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1584,7 +1584,6 @@ eo:
scheduled_statuses:
over_daily_limit: Vi transpasis la limigon al %{limit} samtage planitaj mesaĝoj
over_total_limit: Vi transpasis la limigon al %{limit} planitaj mesaĝoj
- too_soon: La planita dato devas esti en la estonteco
self_destruct:
lead_html: Bedaŭrinde, %{domain} konstante fermiĝas. Se vi havis konton tie, vi ne povos daŭrigi uzi ĝin, sed vi ankoraŭ povas peti sekurkopion de viaj datumoj.
title: Ĉi tiu servilo fermiĝas
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 170c16f0946b6e..5ea429f5cb21be 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1676,7 +1676,7 @@ es-AR:
scheduled_statuses:
over_daily_limit: Superaste el límite de %{limit} mensajes programados para ese día
over_total_limit: Superaste el límite de %{limit} mensajes programados
- too_soon: La fecha programada debe estar en el futuro
+ too_soon: la fecha debe ser en el futuro
self_destruct:
lead_html: Desafortunadamente, %{domain} va a cerrar permanentemente. Si tenías una cuenta ahí, no podrás continuar usándola, pero aún podés solicitar una copia de tus datos.
title: Este servidor está cerrando
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 25a7be89159111..d9288cfb0bcb30 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1390,36 +1390,36 @@ es-MX:
one: Estás a punto de reemplazar tus marcadores por %{count} publicación proveniente de %{filename}.
other: Estás a punto de reemplazar tus marcadores por hasta %{count} publicaciones provenientes de %{filename}.
domain_blocking_html:
- one: Estás a punto de reemplazar tu lista de bloqueos de dominio por %{count} dominio proveniente de %{filename}.
- other: Estás a punto de reemplazar tu lista de bloqueos de dominio por hasta %{count} dominios provenientes de %{filename}.
+ one: Estás a punto de reemplazar tu lista de dominios bloqueados con %{count} dominio de %{filename}.
+ other: Estás a punto de reemplazar tu lista de dominios bloqueados con hasta %{count} dominios de %{filename}.
following_html:
- one: Estás a punto de seguir a %{count} cuenta proveniente de %{filename} y dejar de seguir a cualquier otra cuenta.
- other: Estás a punto de seguir hasta %{count} cuentas provenientes de %{filename} y dejar de seguir a cualquier otra cuenta.
+ one: Estás a punto de seguir a %{count} cuenta de %{filename} y dejar de seguir a cualquier otra.
+ other: Estás a punto de seguir hasta %{count} cuentas de %{filename} y dejar de seguir cualquier otra cuenta.
lists_html:
- one: Estás a punto de reemplazar tus listas con el contenido de %{filename}. Se añadirá %{count} cuenta a una nueva lista.
- other: Estás a punto de reemplazar tus listas con el contenido de %{filename}. Se añadirán %{count} cuentas a nuevas listas.
+ one: Estás a punto de reemplazar tus listas con contenidos de %{filename}. Hasta %{count} cuenta será agregada a nuevas listas.
+ other: Estás a punto de reemplazar tus listas con contenidos de %{filename}. Hasta %{count} cuentas serán agregadas a nuevas listas.
muting_html:
- one: Estás a punto de reemplazar tu lista de cuentas silenciadas con %{count} cuenta proveninete de %{filename}.
- other: Estás a punto de reemplazar tu lista de cuentas silenciadas con hasta %{count} cuentas provenientes de %{filename}.
+ one: Estás a punto de reemplazar tu lista de cuentas silenciadas con %{count} cuenta de %{filename}.
+ other: Estás a punto de reemplazar tu lista de cuentas silenciadas con hasta %{count} cuentas de %{filename}.
preambles:
blocking_html:
- one: Estás a punto de bloquear a %{count} cuenta proveninete de %{filename}.
- other: Estás a punto de bloquear hasta %{count} cuentas provenientes de %{filename}.
+ one: Estás a punto de bloquear a %{count} cuenta de %{filename}.
+ other: Estás a punto de bloquear hasta %{count} cuentas de %{filename}.
bookmarks_html:
- one: Está a punto de añadir %{count} publicación proveniente de %{filename} a tus marcadores.
- other: Está a punto de añadir hasta %{count} publicaciones provenientes de %{filename} a tus marcadores.
+ one: Estás a punto de agregar %{count} publicación de %{filename} a tus marcadores.
+ other: Estás a punto de agregar %{count} publicaciones de %{filename} a tus marcadores.
domain_blocking_html:
- one: Estás a punto de bloquear%{count} dominio proveniente de %{filename}.
- other: Estás a punto de bloquear hasta %{count} dominios provenientes de %{filename}.
+ one: Estás a punto de bloquear%{count} dominio de %{filename}.
+ other: Estás a punto de bloquear hasta %{count} dominios de %{filename}.
following_html:
- one: Estás a punto de seguir a %{count} cuenta proveniente de %{filename}.
- other: Estás a punto de seguir hasta %{count} cuentas provenientes de %{filename}.
+ one: Estás a punto de seguir a %{count} cuenta de %{filename}.
+ other: Estás a punto de seguir hasta %{count} cuentas de %{filename}.
lists_html:
- one: Estás a punto de añadir %{count} cuenta desde %{filename} a tus listas. Se creará una nueva listas si no hay listas donde añadirla.
- other: Estás a punto de añadir %{count} cuentas desde %{filename} a tus listas. Se crearán nuevas listas si no hay listas donde añadirlas.
+ one: Estás a punto de agregar %{count} cuenta de %{filename} a tus listas. Se crearán nuevas listas si no hay ninguna lista a la que agregar.
+ other: Estás a punto de agregar %{count} cuentas de %{filename} a tus listas. Se crearán nuevas listas si no hay ninguna lista a la que agregar.
muting_html:
- one: Estás a punto de silenciar a %{count} cuenta proveniente de %{filename}.
- other: Estás a punto de silenciar hasta %{count} cuentas provenientes de %{filename}.
+ one: Estás a punto de silenciar a %{count} cuenta de %{filename}.
+ other: Estás a punto de silenciar hasta %{count} cuentas de %{filename}.
preface: Puedes importar ciertos datos, como todas las personas que estás siguiendo o bloqueando en tu cuenta en esta instancia, desde archivos exportados de otra instancia.
recent_imports: Importaciones recientes
states:
@@ -1676,7 +1676,7 @@ es-MX:
scheduled_statuses:
over_daily_limit: Has superado el límite de %{limit} publicaciones programadas para ese día
over_total_limit: Has superado el límite de %{limit} publicaciones programadas
- too_soon: La fecha programada debe estar en el futuro
+ too_soon: la fecha debe ser en el futuro
self_destruct:
lead_html: Desafortunadamente, %{domain} está cerrando de manera permanente. Si tenías una cuenta ahí, no puedes continuar utilizándolo, pero puedes solicitar un respaldo de tus datos.
title: Este servidor está cerrando
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 921db752ab1d00..2984fbf2adbeb1 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1676,7 +1676,7 @@ es:
scheduled_statuses:
over_daily_limit: Ha superado el límite de %{limit} publicaciones programadas para ese día
over_total_limit: Ha superado el límite de %{limit} publicaciones programadas
- too_soon: La fecha programada debe estar en el futuro
+ too_soon: la fecha debe ser en el futuro
self_destruct:
lead_html: Desafortunadamente, %{domain} va a cerrar permanentemente. Si tenías una cuenta allí, no podrás continuar usándola, pero aún puedes solicitar una copia de tus datos.
title: Este servidor está cerrando
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 40db2eede0b3a6..ea4545ac4260ef 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1661,7 +1661,6 @@ et:
scheduled_statuses:
over_daily_limit: Lubatud ajastatud postituste arv %{limit} päevas on tänaseks ületatud
over_total_limit: Oled jõudnud ajastatud postituste lubatud maksimumarvuni %{limit}
- too_soon: Ajastatud kuupäev peab olema tukevikus
self_destruct:
lead_html: Kahjuks suletakse %{domain} lõplikult. Kui sul oli seal konto, ei saa sa seda enam kasutada, kuid siiski võid taotleda oma andmete varukoopiat.
title: See server suletakse
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index dc064ebc7ba82c..c1e5ab1ee67b66 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1517,7 +1517,6 @@ eu:
scheduled_statuses:
over_daily_limit: 'Egun horretarako programatutako bidalketa kopuruaren muga gainditu duzu: %{limit}'
over_total_limit: 'Programatutako bidalketa kopuruaren muga gainditu duzu: %{limit}'
- too_soon: Programatutako data etorkizunean egon behar du
self_destruct:
lead_html: Zoritxarrez, %{domain} betirako itxiko da. Kontu bat baduzu bertan, ezin izango duzu erabiltzen jarraitu, baina, oraindik zure datuen babeskopia bat eska dezakezu.
title: Zerbitzari hau ixtear dago
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 7cb0714c28e86f..ad242ca503906f 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1464,7 +1464,6 @@ fa:
scheduled_statuses:
over_daily_limit: شما از حد مجاز %{limit} فرسته زمانبندیشده در آن روز فراتر رفتهاید
over_total_limit: شما از حد مجاز %{limit} فرسته زمانبندیشده فراتر رفتهاید
- too_soon: زمان تعیینشده باید در آینده باشد
self_destruct:
title: این کارساز دارد بسته میشود
sessions:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 7b8b28097571a0..eec42d0bfb25cf 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1676,7 +1676,7 @@ fi:
scheduled_statuses:
over_daily_limit: Olet ylittänyt %{limit} ajoitetun julkaisun rajan tälle päivälle
over_total_limit: Olet ylittänyt %{limit} ajoitetun julkaisun rajan
- too_soon: Ajoitetun päiväyksen pitää olla tulevaisuudessa
+ too_soon: päivämäärän on oltava tulevaisuudessa
self_destruct:
lead_html: Valitettavasti %{domain} sulkeutuu pysyvästi. Jos sinulla on siellä tili, et voi jatkaa sen käyttöä mutta voit yhä pyytää varmuuskopiota tiedoistasi.
title: Tämä palvelin sulkeutuu
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 502c027b5db268..6f2f94242c7c42 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1676,7 +1676,7 @@ fo:
scheduled_statuses:
over_daily_limit: Tú er komin at markinum, sum er %{limit} skrálagdir postar, í dag
over_total_limit: Tú er komin at markinum, sum er %{limit} skrálagdir postar
- too_soon: Ætlanardagfestingin má vera í framtíðini
+ too_soon: dagfesting má vera í framtíðini
self_destruct:
lead_html: Tíverri, %{domain} er í ferð við at blíva lukkað niður med alla. Um tú hevði eina kontu har, so ber ikki til framhaldandi at brúka hana, men tú kann framvegis biðja um trygdaravrit av tínum dátum.
title: Hesin ambætarin er í ferð við at lukka
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 9c2bf3398ef84f..057dac582ceae1 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1661,7 +1661,6 @@ fr-CA:
scheduled_statuses:
over_daily_limit: Vous avez dépassé la limite de %{limit} messages planifiés par jour
over_total_limit: Vous avez dépassé la limite de %{limit} messages planifiés
- too_soon: La date planifiée doit être dans le futur
self_destruct:
lead_html: Malheureusement, %{domain} ferme définitivement. Si vous y aviez un compte, vous ne pourrez pas continuer à l’utiliser, mais vous pouvez toujours demander une sauvegarde de vos données.
title: Ce serveur est en cours de fermeture
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 650147eb5d33fa..e21e4f3e09c205 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1661,7 +1661,6 @@ fr:
scheduled_statuses:
over_daily_limit: Vous avez dépassé la limite de %{limit} messages planifiés par jour
over_total_limit: Vous avez dépassé la limite de %{limit} messages planifiés
- too_soon: La date planifiée doit être dans le futur
self_destruct:
lead_html: Malheureusement, %{domain} ferme définitivement. Si vous y aviez un compte, vous ne pourrez pas continuer à l’utiliser, mais vous pouvez toujours demander une sauvegarde de vos données.
title: Ce serveur est en cours de fermeture
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 24be51d9d737b7..088e49cb9d8af6 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1661,7 +1661,6 @@ fy:
scheduled_statuses:
over_daily_limit: Jo binne oer de limyt fan %{limit} yn te plannen berjochten foar hjoed
over_total_limit: Jo binne oer de limyt fan %{limit} yn te plannen berjochten
- too_soon: De datum foar it ynplande berjocht moat yn de takomst lizze
self_destruct:
lead_html: Spitigernôch sil %{domain} permanint ôfslute. As jo dêr in account hiene, kinne jo dizze net mear brûke, mar jo kinne noch hieltyd in reservekopy fan jo gegevens opfreegje.
title: Deze server sil ôfslute
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index deb99866918b65..424302fc2ebcad 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1790,7 +1790,6 @@ ga:
scheduled_statuses:
over_daily_limit: Tá an teorainn de %{limit} postáil sceidealaithe sáraithe agat don lá atá inniu ann
over_total_limit: Tá an teorainn de %{limit} postáil sceidealaithe sáraithe agat
- too_soon: Caithfidh an dáta sceidealta a bheith sa todhchaí
self_destruct:
lead_html: Ar an drochuair, tá %{domain} ag dúnadh síos go buan. Má bhí cuntas agat ann, ní bheidh tú in ann leanúint ar aghaidh á úsáid, ach is féidir leat cúltaca de do shonraí a iarraidh fós.
title: Tá an freastalaí seo ag dúnadh
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 7581f6c856c482..ae714cddcf856a 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1752,7 +1752,6 @@ gd:
scheduled_statuses:
over_daily_limit: Chaidh thu thar na crìoch de %{limit} post(aichean) sgeidealaichte an-diugh
over_total_limit: Chaidh thu thar na crìoch de %{limit} post(aichean) sgeidealaichte
- too_soon: Feumaidh ceann-latha an sgeideil a bhith san àm ri teachd
self_destruct:
lead_html: Gu mì-fhortanach, thèid %{domain} a dhùnadh gu buan. Ma tha cunntas agad ann, chan urrainn dhut cumail a’ gol ’ga chleachdadh ach ’s urrainn dhut lethbhreac-glèidhidh dhen dàta agad iarraidh fhathast.
title: Tha am frithealaiche seo gu bhith dùnadh
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index feda673621e80d..cf5363196c5235 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1676,7 +1676,7 @@ gl:
scheduled_statuses:
over_daily_limit: Excedeches o límite de %{limit} publicacións programadas para ese día
over_total_limit: Excedeches o límite de %{limit} publicacións programadas
- too_soon: A data de programación debe estar no futuro
+ too_soon: a data ten que estar no futuro
self_destruct:
lead_html: Desafortunadamente, %{domain} vai deixar de dar servizo. Se tes unha conta aquí non poderás seguir usándoa, mais podes solicitar un ficheiro cos teus datos.
title: Este servidor vai fechar
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 513583f6669c4c..1c2796173be476 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1752,7 +1752,6 @@ he:
scheduled_statuses:
over_daily_limit: חרגת מהמספר המקסימלי של הודעות מתוזמנות להיום, שהוא %{limit}
over_total_limit: חרגת מהמספר המקסימלי של הודעות מתוזמנות, שהוא %{limit}
- too_soon: תאריך התזמון חייב להיות בעתיד
self_destruct:
lead_html: לרוע המזל, %{domain} עומד לרדת באופן סופי. אם היה לך חשבון כאן, לא תהיה אפשרות להמשיך להשתמש בו, אבל ניתן לבקש גיבוי של כל המידע שלך.
title: שרת זה בתהליכי סגירה
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 9c3f7f03b1dede..fccda994eab369 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1676,7 +1676,7 @@ hu:
scheduled_statuses:
over_daily_limit: Túllépted az időzített bejegyzésekre vonatkozó %{limit} db-os napi limitet
over_total_limit: Túllépted az időzített bejegyzésekre vonatkozó %{limit} db-os limitet
- too_soon: Az időzített időpontnak a jövőben kell lennie
+ too_soon: a dátumnak a jövőben kell lennie
self_destruct:
lead_html: Sajnos a %{domain} végleg bezár. Ha volt itt fiókod, nem fogod tudni tovább használni, de kérheted majd az adataid biztonsági mentését.
title: A kiszolgáló bezár
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 3b4aaf3629fa9e..a6924c2b075ecb 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -711,8 +711,6 @@ hy:
remove_selected_followers: Հեռացնել նշուած հետեւորդներին
remove_selected_follows: Ապահետեւել նշուած օգտատէրերին
status: Հաշուի կարգավիճակ
- scheduled_statuses:
- too_soon: Նախադրուած ամսաթիւը պէտք է լինի ապագայում
sessions:
activity: Վերջին Ակտիւութիւնը
browser: Դիտարկիչ
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 54401b1c5adf59..9914db1aec12c3 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1676,7 +1676,6 @@ ia:
scheduled_statuses:
over_daily_limit: Tu ha excedite le limite de %{limit} messages programmate pro hodie
over_total_limit: Tu ha excedite le limite de %{limit} messages programmate
- too_soon: Le data programmate debe esser in le futuro
self_destruct:
lead_html: Infortunatemente, %{domain} tosto claudera permanentemente. Si tu habeva un conto illac, tu non potera continuar a usar lo, ma tu pote ancora requestar un copia de tu datos.
title: Iste servitor va clauder
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 34b690828d6625..60c202666793c1 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1294,7 +1294,6 @@ id:
scheduled_statuses:
over_daily_limit: Anda telah melampaui batas %{limit} kiriman terjadwal untuk sehari
over_total_limit: Anda telah melampaui batas %{limit} kiriman terjadwal
- too_soon: Tanggal terjadwal haruslah pada hari yang akan datang
sessions:
activity: Aktivitas terakhir
browser: Peramban
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index f006f2c8adc9a4..5dde082330faca 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1515,7 +1515,6 @@ ie:
scheduled_statuses:
over_daily_limit: Tu ha atinget li límite de %{limit} planat postas por hodie
over_total_limit: Tu ha atinget li límite de %{limit} planat postas
- too_soon: Li planat date deve esser in li future
self_destruct:
lead_html: Ínfortunatmen, %{domain} va bentost permanentmen cluder. Si tu havet un conto ta, tu ne va posser continuar usar it, ma tu ancor posse demandar un archive de tui data.
title: Ti-ci servitor va cluder bentost
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 83c92484ff4fc5..c0e4ac6dc176eb 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1481,7 +1481,6 @@ io:
scheduled_statuses:
over_daily_limit: Vu ecesas limito quale esas %{limit} projetita posti por hodio
over_total_limit: Vu ecesas limito quale esas %{limit} projetita posti
- too_soon: Projetita dato mustas esar en futuro
self_destruct:
lead_html: Desfortunoze, %{domain} balde klozos. Se vu havis konto ibe, vu ne plus povas uzar it, ma vu ankore povas demandar exportacajo de vua datumi.
title: Ca servilo balde klozos
diff --git a/config/locales/is.yml b/config/locales/is.yml
index cad01257fd3845..d6061064219b73 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1680,7 +1680,7 @@ is:
scheduled_statuses:
over_daily_limit: Þú hefur farið fram úr hámarkinu með %{limit} áætlaðar færslur fyrir þennan dag
over_total_limit: Þú hefur farið fram úr hámarkinu með %{limit} áætlaðar færslur
- too_soon: Áætluð dagsetning verður að vera í framtíðinni
+ too_soon: dagsetning verður að vera fram í tímann
self_destruct:
lead_html: Því miður, %{domain} er að hætta starfsemi endanlega. Ef þú varst með aðgang þar, muntu ekki geta haldið áfram að nota hann, en þú getur áfram beðið um afrit af gögnunum þínum.
title: Þessi netþjónn er að hætta starfsemi
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 3b36bd3f7a1ca2..f80728be0a1cf5 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1678,7 +1678,7 @@ it:
scheduled_statuses:
over_daily_limit: Hai superato il limite di %{limit} post programmati per questo giorno
over_total_limit: Hai superato il limite di %{limit} post programmati
- too_soon: La data di pubblicazione deve essere nel futuro
+ too_soon: la data deve essere nel futuro
self_destruct:
lead_html: Sfortunatamente, %{domain} sta chiudendo definitivamente. Se hai un account lì, non potrai continuare a usarlo, ma puoi ancora richiedere un backup dei tuoi dati.
title: Questo server sta chiudendo
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 66461889a87fcd..51e7f0e05c4979 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -595,7 +595,7 @@ ja:
instance_accounts_dimension: 最もフォローされているアカウント
instance_accounts_measure: 保存されたアカウント
instance_followers_measure: そこでの我々のフォロワー
- instance_follows_measure: リモートフォローしているアカウント
+ instance_follows_measure: こちらからのフォロー数
instance_languages_dimension: 人気の言語
instance_media_attachments_measure: 保存されたメディア
instance_reports_measure: 通報
@@ -1961,7 +1961,6 @@ ja:
scheduled_statuses:
over_daily_limit: その日予約できる投稿数 %{limit}を超えています
over_total_limit: 予約できる投稿数 %{limit}を超えています
- too_soon: より先の時間を指定してください
self_destruct:
lead_html: 残念ながら、%{domain} は恒久的に閉鎖されます。ここにお持ちだったアカウントを今後使うことはできませんが、これまでのデータのバックアップを要求することはまだ可能です。
title: このサーバーは閉鎖されます
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 7ab33b31344016..a2123107ed02f2 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -575,7 +575,6 @@ kk:
scheduled_statuses:
over_daily_limit: Сіз бір күндік %{limit} жазба лимитін тауыстыңыз
over_total_limit: Сіз %{limit} жазба лимитін тауыстыңыз
- too_soon: Жоспарланған күн болашақта болуы керек
sessions:
activity: Соңғы әрекеттер
browser: Браузер
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 3394433758ece2..c7e12961b677e4 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1640,7 +1640,7 @@ ko:
scheduled_statuses:
over_daily_limit: 그 날짜에 대한 %{limit}개의 예약 게시물 제한을 초과합니다
over_total_limit: 예약 게시물 제한 %{limit}을 초과합니다
- too_soon: 예약 날짜는 미래여야 합니다
+ too_soon: 미래의 날짜여야 합니다
self_destruct:
lead_html: 안타깝게도, %{domain} 도메인을 영구히 폐쇄합니다. 이곳의 계정을 가졌다면, 이제 이용할 수 없으며, 당분간 백업 데이터를 요청할 수 있습니다.
title: 이 서버는 폐쇄중입니다
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index 5337610992c5a1..77d14c6ca8ab3a 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1316,7 +1316,6 @@ ku:
scheduled_statuses:
over_daily_limit: Te sînorê %{limit} şandiyên demsazkirî yên ji bo îro derbas kir
over_total_limit: Te sînorê %{limit} şandiyên demsazkirî derbas kir
- too_soon: Dîroka bernamesazkirinê divê dîrokeke ji îro pêşvetir be
sessions:
activity: Çalakiya dawî
browser: Gerok
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 2612ae21317962..69bcd5b9412a7b 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1598,7 +1598,6 @@ lad:
scheduled_statuses:
over_daily_limit: Tienes superado el limito de %{limit} publikasyones programadas para akel diya
over_total_limit: Tienes superado el limito de %{limit} publikasyones programadas
- too_soon: La data programada deve estar en el avenir
self_destruct:
lead_html: Malorozamente, %{domain} va serrar permanentemente. Si teniyas un kuento ayi, ya no podras utilizarlo, ama ainda puedes solisitar una kopya de tus datos.
title: Este sirvidor esta serrando
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 65bd4456aeb24a..e629373483aae3 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1070,7 +1070,6 @@ lt:
scheduled_statuses:
over_daily_limit: Jūs pasieketė limitą (%{limit}) galimų toot'ų per dieną
over_total_limit: Jūs pasieketė %{limit} limitą galimų toot'ų
- too_soon: Planuota data privalo būti ateityje
sessions:
activity: Paskutinė veikla
browser: Naršyklė
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index d6f44cad5ad6da..b49b57f27c5db3 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1612,7 +1612,6 @@ lv:
scheduled_statuses:
over_daily_limit: Tu esi pārsniedzis šodien ieplānoto %{limit} ziņu ierobežojumu
over_total_limit: Tu esi pārsniedzis ieplānoto %{limit} ziņu ierobežojumu
- too_soon: Ieplānotajam datumam ir jābūt nākotnē
self_destruct:
lead_html: Diemžēl domēns %{domain} tiek neatgriezeniski slēgts. Ja tev tur bija konts, tu nevarēsi turpināt to lietot, taču joprojām vari pieprasīt savu datu kopiju.
title: Šis serveris tiek slēgts
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 948ad56a54c3ff..d872c342cb1486 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1455,7 +1455,6 @@ ms:
scheduled_statuses:
over_daily_limit: Anda telah melebihi had %{limit} pos berjadual untuk hari ini
over_total_limit: Anda telah melebihi had %{limit} pos berjadual
- too_soon: Tarikh yang dijadualkan mestilah pada masa hadapan
self_destruct:
lead_html: Malangnya, %{domain} akan ditutup secara kekal. Jika anda mempunyai akaun di situ, anda tidak akan dapat terus menggunakannya, tetapi anda masih boleh meminta sandaran data anda.
title: Pelayan ini akan ditutup
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 44288438556c55..4c9573c2eb225d 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1456,7 +1456,6 @@ my:
scheduled_statuses:
over_daily_limit: ယနေ့အတွက် စီစဉ်ထားသည့် ပို့စ်များ၏ ကန့်သတ်ချက် %{limit} ကို ကျော်လွန်သွားပါပြီ
over_total_limit: စီစဉ်ထားသည့် ပို့စ်များ၏ ကန့်သတ်ချက် %{limit} ကို ကျော်လွန်သွားပါပြီ
- too_soon: စီစဉ်ထားသောရက်စွဲမှာ အနာဂတ်အတွက်ဖြစ်သည်
self_destruct:
title: ဤဆာဗာ ပိတ်ထားပါသည်
sessions:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d5d60bc31f30de..86fc42527a7895 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1676,7 +1676,7 @@ nl:
scheduled_statuses:
over_daily_limit: Je hebt de limiet van %{limit} in te plannen berichten voor vandaag overschreden
over_total_limit: Je hebt de limiet van %{limit} in te plannen berichten overschreden
- too_soon: De datum voor het ingeplande bericht moet in de toekomst liggen
+ too_soon: datum moet in de toekomst liggen
self_destruct:
lead_html: Helaas gaat %{domain} permanent sluiten. Als je daar een account had, kun je deze niet meer gebruiken, maar je kunt nog steeds een back-up van je gegevens opvragen.
title: Deze server gaat sluiten
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index dbb8b6c693ef89..c0b6aac8bd7a7f 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1676,7 +1676,6 @@ nn:
scheduled_statuses:
over_daily_limit: Du har overskredet grensen på %{limit} planlagte tuter for den dagen
over_total_limit: Du har overskredet grensen på %{limit} planlagte tuter
- too_soon: Den planlagte datoen må være i fremtiden
self_destruct:
lead_html: Diverre stengjer %{domain} dørene for godt. Viss du hadde ein brukarkonto der, vil du ikkje kunna halda fram å bruka han, men du kan få ut ein tryggingskopi av dataa dine.
title: Denne tenaren stengjer
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 8bf5daad0e57f8..01672fe3b345d8 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1509,7 +1509,6 @@
scheduled_statuses:
over_daily_limit: Du har overskredet grensen på %{limit} planlagte innlegg for i dag
over_total_limit: Du har overskredet grensen på %{limit} planlagte innlegg
- too_soon: Den planlagte datoen må være i fremtiden
self_destruct:
lead_html: Dessverre stenger %{domain} for alltid. Hvis du hadde en konto der vil du ikke kunne fortsette å bruke den, men du kan fremdeles be om en sikkerhetskopi av dataene dine.
title: Denne serveren stenger
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 5dec5ebb77366d..a67f55c6b7d9e2 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -765,7 +765,6 @@ oc:
scheduled_statuses:
over_daily_limit: Avètz passat la limita de %{limit} tuts programats per aquel jorn
over_total_limit: Avètz passat la limita de %{limit} tuts programats
- too_soon: La data planificada deu èsser dins lo futur
sessions:
activity: Darrièra activitat
browser: Navigator
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 3592ea53f68086..32425d884443af 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1690,7 +1690,6 @@ pl:
scheduled_statuses:
over_daily_limit: Przekroczyłeś(-aś) limit %{limit} zaplanowanych wpisów na ten dzień
over_total_limit: Przekroczyłeś(-aś) limit %{limit} zaplanowanych wpisów
- too_soon: Zaplanowana data musi wypadać w przyszłości
self_destruct:
lead_html: Niestety, %{domain} jest permanentnie zamykane. Konta z tego serwera nie będą dostępne, ale można jeszcze odzyskać kopię zapasową danych.
title: Ten serwer jest zamykany
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index bbeca8490572d2..23a3b61f9e7d04 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1652,7 +1652,7 @@ pt-BR:
scheduled_statuses:
over_daily_limit: Você excedeu o limite de %{limit} publicações agendadas para esse dia
over_total_limit: Você excedeu o limite de %{limit} publicações agendadas
- too_soon: A data agendada precisa ser no futuro
+ too_soon: a data deve ser no futuro
self_destruct:
lead_html: Infelizmente, %{domain} está se encerrando de forma permanente. Se você tem uma conta lá, não poderá continuar a usá-la, mas ainda pode solicitar uma cópia dos seus dados.
title: Este servidor está sendo fechado
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index cceceb0534f8dc..cdbed49a8d42eb 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1603,7 +1603,6 @@ pt-PT:
scheduled_statuses:
over_daily_limit: Excedeste o limite de %{limit} publicações agendadas para esse dia
over_total_limit: Tu excedeste o limite de %{limit} publicações agendadas
- too_soon: A data de agendamento tem de ser futura
self_destruct:
lead_html: Infelizmente, %{domain} vai fechar definitivamente. Se lá tinha conta, não pode continuar a usá-la, mas ainda pode pedir uma cópia dos seus dados.
title: Este servidor vai fechar
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index d4f202637b3b9d..37c51cf1b55f6c 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -653,7 +653,6 @@ ro:
scheduled_statuses:
over_daily_limit: Ai depășit limita de %{limit} postări programate pentru acea zi
over_total_limit: Ai depășit limita de %{limit} postări programate
- too_soon: Data programată trebuie să fie în viitor
sessions:
activity: Ultima activitate
browser: Navigator
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ade13952ca71e8..4a1dbb1dc1b6b4 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1347,7 +1347,7 @@ ru:
edit:
add_keyword: Добавить ключевое слово
keywords: Ключевые слова
- statuses: Отдельные сообщения
+ statuses: Отдельные посты
statuses_hint_html: Этот фильтр применяется для выбора отдельных постов, независимо от того, соответствуют ли они ключевым словам ниже. Просмотрите или удалите посты из фильтра.
title: Изменить фильтр
errors:
@@ -1752,7 +1752,7 @@ ru:
scheduled_statuses:
over_daily_limit: Вы превысили лимит в %{limit} запланированных постов на указанный день
over_total_limit: Вы превысили лимит на %{limit} запланированных постов
- too_soon: Запланированная дата должна быть в будущем
+ too_soon: дата публикации должна быть в будущем
self_destruct:
lead_html: К сожалению, %{domain} закрывается навсегда. Если вас учётная запись находиться здесь вы не сможете продолжить использовать его, но вы можете запросить резервную копию ваших данных.
title: Этот сервер закрывается
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 38ede0a72c19c3..c9f0053bc465d7 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1066,7 +1066,6 @@ sc:
scheduled_statuses:
over_daily_limit: As superadu su lìmite de %{limit} publicatziones programmadas pro cudda die
over_total_limit: As superadu su lìmite de %{limit} tuts programmados
- too_soon: Sa data programmada depet èssere benidora
sessions:
activity: Ùrtima atividade
browser: Navigadore
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index ff3a730b17f686..be3383ea668371 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1306,7 +1306,6 @@ sco:
scheduled_statuses:
over_daily_limit: Ye'v went by the limit o %{limit} scheduled posts thit ye'r allooed fir the day
over_total_limit: Ye'v went by the limit o %{limit} scheduled posts
- too_soon: The schedult date haes tae be in the future
sessions:
activity: Last activity
browser: Brooser
diff --git a/config/locales/si.yml b/config/locales/si.yml
index cd4abf6451dd59..5c31bc7e124506 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -1176,8 +1176,6 @@ si:
content_warning: 'අන්තර්ගත අනතුරු ඇඟවීම:'
descriptions:
account: "@%{acct} වෙතින් ප්රසිද්ධ ලිපි"
- scheduled_statuses:
- too_soon: නියමිත දිනය අනාගතයේ විය යුතුය
sessions:
activity: අවසාන ක්රියාකාරකම
browser: අතිරික්සුව
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 17b7bd6239886c..2f9af21aebbcb9 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -60,6 +60,7 @@ bg:
setting_display_media_default: Скриване на мултимедия отбелязана като деликатна
setting_display_media_hide_all: Винаги скриване на мултимедията
setting_display_media_show_all: Винаги показване на мултимедията
+ setting_system_scrollbars_ui: Прилага се само към настолни браузъри, основаващи се на Safari и Chrome
setting_use_blurhash: Преливането е въз основа на цветовете на скритите визуализации, но се замъгляват подробностите
setting_use_pending_items: Да се показват обновявания на часовата ос само след щракване вместо автоматично превъртане на инфоканала
username: Може да ползвате букви, цифри и долни черти
@@ -223,6 +224,7 @@ bg:
setting_hide_network: Скриване на социалния ви свързан граф
setting_reduce_motion: Обездвижване на анимациите
setting_system_font_ui: Употреба на стандартния шрифт на системата
+ setting_system_scrollbars_ui: Употреба на системната подразбираща се лента за превъртане
setting_theme: Тема на сайта
setting_trends: Показване на днешното налагащо се
setting_unfollow_modal: Показване на прозорче за потвърждение преди прекратяване следването на някого
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 3a70c4109715f4..d2bf790c9ec3c2 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -60,6 +60,7 @@ ca:
setting_display_media_default: Amaga el contingut gràfic marcat com a sensible
setting_display_media_hide_all: Oculta sempre tot el contingut multimèdia
setting_display_media_show_all: Mostra sempre el contingut gràfic
+ setting_system_scrollbars_ui: S'aplica només als navegadors d'escriptori basats en Safari i Chrome
setting_use_blurhash: Els degradats es basen en els colors de les imatges ocultes, però n'enfosqueixen els detalls
setting_use_pending_items: Amaga les actualitzacions de la línia de temps després de fer un clic, en lloc de desplaçar-les automàticament
username: Pots emprar lletres, números i subratllats
@@ -223,6 +224,7 @@ ca:
setting_hide_network: Amaga la teva xarxa
setting_reduce_motion: Redueix el moviment de les animacions
setting_system_font_ui: Usa la lletra predeterminada del sistema
+ setting_system_scrollbars_ui: Usa la barra de desplaçament predeterminada del sistema
setting_theme: Tema del lloc
setting_trends: Mostra les tendències d'avui
setting_unfollow_modal: Mostra el diàleg de confirmació abans de deixar de seguir algú
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 32e8e90b858f0d..78629c95ca8120 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -60,6 +60,7 @@ da:
setting_display_media_default: Skjul medier med sensitiv-markering
setting_display_media_hide_all: Skjul altid medier
setting_display_media_show_all: Vis altid medier
+ setting_system_scrollbars_ui: Gælder kun for computerwebbrowsere baseret på Safari og Chrome
setting_use_blurhash: Gradienter er baseret på de skjulte grafikelementers farver, men slører alle detaljer
setting_use_pending_items: Skjul tidslinjeopdateringer bag et klik i stedet for brug af auto-feedrulning
username: Bogstaver, cifre og understregningstegn kan benyttes
@@ -223,6 +224,7 @@ da:
setting_hide_network: Skjul din sociale graf
setting_reduce_motion: Reducér animationsbevægelse
setting_system_font_ui: Brug systemets standardskrifttype
+ setting_system_scrollbars_ui: Brug standard systemrullebjælke
setting_theme: Webstedstema
setting_trends: Vis dagens tendenser
setting_unfollow_modal: Vis bekræftelsesdialog før ophør med at følge nogen
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index d6d6536737c071..2ac7791273b114 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -60,6 +60,7 @@ de:
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
+ setting_system_scrollbars_ui: Betrifft nur Desktop-Browser, die auf Chrome oder Safari basieren
setting_use_blurhash: Der Farbverlauf basiert auf den Farben der ausgeblendeten Medien, verschleiert aber jegliche Details
setting_use_pending_items: Neue Beiträge hinter einem Klick verstecken, anstatt automatisch zu scrollen
username: Du kannst Buchstaben, Zahlen und Unterstriche verwenden
@@ -223,6 +224,7 @@ de:
setting_hide_network: Follower und „Folge ich“ nicht anzeigen
setting_reduce_motion: Bewegung in Animationen verringern
setting_system_font_ui: Standardschriftart des Browsers verwenden
+ setting_system_scrollbars_ui: Bildlaufleiste des Systems verwenden
setting_theme: Design
setting_trends: Heutige Trends anzeigen
setting_unfollow_modal: Bestätigungsdialog beim Entfolgen eines Profils anzeigen
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index a04db4b2280680..8678ac376da3c2 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -3,12 +3,14 @@ el:
simple_form:
hints:
account:
+ attribution_domains_as_text: Μία ανά γραμμή. Προστατεύει από ψευδείς ιδιότητες.
discoverable: Οι δημόσιες δημοσιεύσεις και το προφίλ σου μπορεί να εμφανίζονται ή να συνιστώνται σε διάφορους τομείς του Mastodon και το προφίλ σου μπορεί να προτείνεται σε άλλους χρήστες.
display_name: Το πλήρες ή το αστείο σου όνομα.
fields: Η αρχική σου σελίδα, αντωνυμίες, ηλικία, ό,τι θες.
indexable: Οι δημόσιες δημοσιεύσεις σου μπορεί να εμφανιστούν στα αποτελέσματα αναζήτησης στο Mastodon. Άτομα που έχουν αλληλεπιδράσει με τις δημοσιεύσεις σου μπορεί να είναι σε θέση να τις αναζητήσουν όπως και να 'χει.
note: 'Μπορείς να @επισημάνεις άλλα άτομα ή #ετικέτες.'
show_collections: Οι χρήστες θα είναι σε θέση να περιηγηθούν στα άτομα που ακολουθείς και στους ακόλουθούς σου. Άτομα που ακολουθείς θα βλέπουν ότι τους ακολουθείς όπως και να 'χει.
+ unlocked: Οι χρήστες θα είναι σε θέση να σε ακολουθήσουν χωρίς να ζητούν έγκριση. Κατάργησε την επιλογή αν θες να αξιολογείς τα αιτήματα ακολούθησης και να επιλέξεις αν θα αποδεχθείς ή απορρίψεις νέους ακόλουθους.
account_alias:
acct: Όρισε το username@domain του λογαριασμού από τον οποίο θέλεις να μετακινηθείς
account_migration:
@@ -58,6 +60,7 @@ el:
setting_display_media_default: Απόκρυψη ευαίσθητων πολυμέσων
setting_display_media_hide_all: Μόνιμη απόκρυψη όλων των πολυμέσων
setting_display_media_show_all: Πάντα εμφάνιση πολυμέσων
+ setting_system_scrollbars_ui: Ισχύει μόνο για προγράμματα περιήγησης υπολογιστή με βάση το Safari και το Chrome
setting_use_blurhash: Οι χρωματισμοί βασίζονται στα χρώματα του κρυμμένου πολυμέσου αλλά θολώνουν τις λεπτομέρειες
setting_use_pending_items: Εμφάνιση ενημερώσεων ροής μετά από κλικ αντί για αυτόματη κύλισή τους
username: Μπορείς να χρησιμοποιήσεις γράμματα, αριθμούς και κάτω παύλες
@@ -142,6 +145,7 @@ el:
url: Πού θα σταλούν τα γεγονότα
labels:
account:
+ attribution_domains_as_text: Ιστοσελίδες που επιτρέπεται να σου δώσουν εύσημα
discoverable: Παροχή προφίλ και αναρτήσεων σε αλγορίθμους ανακάλυψης
fields:
name: Περιγραφή
@@ -220,6 +224,7 @@ el:
setting_hide_network: Κρύψε τις διασυνδέσεις σου
setting_reduce_motion: Μείωση κίνησης κινουμένων στοιχείων
setting_system_font_ui: Χρήση της προεπιλεγμένης γραμματοσειράς του συστήματος
+ setting_system_scrollbars_ui: Χρήση προκαθορισμένης γραμμής κύλισης του συστήματος
setting_theme: Θέμα ιστότοπου
setting_trends: Εμφάνιση σημερινών τάσεων
setting_unfollow_modal: Επιβεβαίωση πριν τη διακοπή παρακολούθησης κάποιου
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index c3a65c0cc2701b..85dc47853ce66c 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -60,6 +60,7 @@ es-AR:
setting_display_media_default: Ocultar medios marcados como sensibles
setting_display_media_hide_all: Siempre ocultar todos los medios
setting_display_media_show_all: Siempre mostrar todos los medios
+ setting_system_scrollbars_ui: Solo aplica para navegadores de escritorio basados en Safari y Chrome
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 actualizaciones de la línea temporal detrás de un clic en lugar de desplazar automáticamente el flujo
username: Podés usar letras, números y subguiones ("_")
@@ -223,6 +224,7 @@ es-AR:
setting_hide_network: Ocultá tu gráfica social
setting_reduce_motion: Reducir el movimiento de las animaciones
setting_system_font_ui: Utilizar la tipografía predeterminada del sistema
+ setting_system_scrollbars_ui: Utilizar barra de desplazamiento predeterminada del sistema
setting_theme: Tema del sitio
setting_trends: Mostrar las tendencias de hoy
setting_unfollow_modal: Mostrar diálogo de confirmación antes de dejar de seguir a una cuenta
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 23e41d77a678de..2278fda6dabb90 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -60,6 +60,7 @@ es-MX:
setting_display_media_default: Ocultar contenido multimedia marcado como sensible
setting_display_media_hide_all: Siempre ocultar todo el contenido multimedia
setting_display_media_show_all: Mostrar siempre contenido multimedia marcado como sensible
+ setting_system_scrollbars_ui: Solo se aplica a los navegadores de escritorio basados en Safari y Chrome
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 las publicaciones de la línea de tiempo tras un clic en lugar de desplazar automáticamente el feed
username: Puedes usar letras, números y guiones bajos
@@ -223,6 +224,7 @@ es-MX:
setting_hide_network: Ocultar tu red
setting_reduce_motion: Reducir el movimiento de las animaciones
setting_system_font_ui: Utilizar la tipografía por defecto del sistema
+ setting_system_scrollbars_ui: Usar la barra de desplazamiento por defecto del sistema
setting_theme: Tema del sitio
setting_trends: Mostrar las tendencias de hoy
setting_unfollow_modal: Mostrar diálogo de confirmación antes de dejar de seguir a alguien
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 56e9b33ee831e1..f83b4b1d1c21db 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -60,6 +60,7 @@ es:
setting_display_media_default: Ocultar contenido multimedia marcado como sensible
setting_display_media_hide_all: Siempre ocultar todo el contenido multimedia
setting_display_media_show_all: Mostrar siempre contenido multimedia marcado como sensible
+ setting_system_scrollbars_ui: Solo aplica para navegadores de escritorio basados en Safari y Chrome
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 nuevas publicaciones detrás de un clic en lugar de desplazar automáticamente el feed
username: Puedes usar letras, números y guiones bajos
@@ -223,6 +224,7 @@ es:
setting_hide_network: Ocultar tu red
setting_reduce_motion: Reducir el movimiento de las animaciones
setting_system_font_ui: Utilizar la tipografía por defecto del sistema
+ setting_system_scrollbars_ui: Utilizar barra de desplazamiento predeterminada del sistema
setting_theme: Tema del sitio
setting_trends: Mostrar las tendencias de hoy
setting_unfollow_modal: Mostrar diálogo de confirmación antes de dejar de seguir a alguien
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 8c914295fee3d4..ae3bbd5c9bd845 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -60,6 +60,7 @@ fi:
setting_display_media_default: Piilota arkaluonteiseksi merkitty mediasisältö
setting_display_media_hide_all: Piilota mediasisältö aina
setting_display_media_show_all: Näytä mediasisältö aina
+ setting_system_scrollbars_ui: Koskee vain Safari- ja Chrome-pohjaisia työpöytäselaimia
setting_use_blurhash: Liukuvärit perustuvat piilotettujen kuvien väreihin mutta sumentavat yksityiskohdat
setting_use_pending_items: Piilota aikajanan päivitykset napsautuksen taakse syötteen automaattisen vierityksen sijaan
username: Voit käyttää kirjaimia, numeroita ja alaviivoja
@@ -223,6 +224,7 @@ fi:
setting_hide_network: Piilota verkostotietosi
setting_reduce_motion: Vähennä animaatioiden liikettä
setting_system_font_ui: Käytä järjestelmän oletusfonttia
+ setting_system_scrollbars_ui: Käytä järjestelmän oletusarvoista vierityspalkkia
setting_theme: Sivuston teema
setting_trends: Näytä päivän trendit
setting_unfollow_modal: Kysy vahvistusta ennen seuraamisen lopettamista
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index e45183df99c1a8..0c9ec517229cbd 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -60,6 +60,7 @@ fo:
setting_display_media_default: Fjal miðlafílur, sum eru merktar sum viðkvæmar
setting_display_media_hide_all: Fjal altíð miðlafílur
setting_display_media_show_all: Vís altíð miðlafílur
+ setting_system_scrollbars_ui: Er einans viðkomandi fyri skriviborðskagar grundaðir á Safari og Chrome
setting_use_blurhash: Gradientar eru grundaðir á litirnar av fjaldu myndunum, men grugga allar smálutir
setting_use_pending_items: Fjal tíðarlinjudagføringar aftan fyri eitt klikk heldur enn at skrulla tilføringina sjálvvirkandi
username: Tú kanst brúka bókstavir, tøl og botnstrikur
@@ -223,6 +224,7 @@ fo:
setting_hide_network: Fjal sosiala grafin hjá tær
setting_reduce_motion: Minka um rørslu í teknimyndum
setting_system_font_ui: Brúka vanliga skriftaslagið hjá skipanini
+ setting_system_scrollbars_ui: Brúka vanliga skrullibjálkan hjá skipanini
setting_theme: Uppsetingareyðkenni
setting_trends: Vís dagsins rák
setting_unfollow_modal: Vís váttanarmynd, áðrenn tú gevst at fylgja onkrum
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index b29a071e800519..3dc6ea28d2c4fc 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -60,6 +60,7 @@ gl:
setting_display_media_default: Ocultar medios marcados como sensibles
setting_display_media_hide_all: Ocultar sempre os medios
setting_display_media_show_all: Mostrar sempre os medios marcados como sensibles
+ setting_system_scrollbars_ui: Aplícase só en navegadores de escritorio baseados en Safari e Chrome
setting_use_blurhash: Os gradientes toman as cores da imaxe oculta pero esvaecendo tódolos detalles
setting_use_pending_items: Agochar actualizacións da cronoloxía tras un click no lugar de desprazar automáticamente os comentarios
username: Podes usar letras, números e trazos baixos
@@ -223,6 +224,7 @@ gl:
setting_hide_network: Non mostrar contactos
setting_reduce_motion: Reducir o movemento nas animacións
setting_system_font_ui: Utilizar a tipografía por defecto do sistema
+ setting_system_scrollbars_ui: Usar barras de desprazamento predeterminadas no sistema
setting_theme: Decorado da instancia
setting_trends: Mostrar as tendencias de hoxe
setting_unfollow_modal: Solicitar confirmación antes de deixar de seguir alguén
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index d8d6af5e99ab60..1c82aa9d405acd 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -60,6 +60,7 @@ he:
setting_display_media_default: הסתרת מדיה המסומנת כרגישה
setting_display_media_hide_all: הסתר מדיה תמיד
setting_display_media_show_all: גלה מדיה תמיד
+ setting_system_scrollbars_ui: נוגע רק לגבי דפדפני דסקטופ מבוססים ספארי וכרום
setting_use_blurhash: הגראדיינטים מבוססים על תוכן התמונה המוסתרת, אבל מסתירים את כל הפרטים
setting_use_pending_items: הסתר עדכוני פיד מאחורי קליק במקום לגלול את הפיד אוטומטית
username: ניתן להשתמש בספרות, אותיות לטיניות ומקף תחתון
@@ -223,6 +224,7 @@ he:
setting_hide_network: להחביא את הגרף החברתי שלך
setting_reduce_motion: הפחתת תנועה בהנפשות
setting_system_font_ui: להשתמש בגופן ברירת המחדל של המערכת
+ setting_system_scrollbars_ui: להשתמש בפס הגלילה שהוא ברירת המחדל של המערכת
setting_theme: ערכת העיצוב של האתר
setting_trends: הצגת הנושאים החמים
setting_unfollow_modal: להראות תיבת אישור לפני הפסקת מעקב אחרי אחרים
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 60922b06b5c4cd..2290440449df95 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -60,6 +60,7 @@ hu:
setting_display_media_default: Kényes tartalomnak jelölt média elrejtése
setting_display_media_hide_all: Média elrejtése mindig
setting_display_media_show_all: Média megjelenítése mindig
+ setting_system_scrollbars_ui: Csak Chrome és Safari alapú asztali böngészőkre vonatkozik
setting_use_blurhash: A kihomályosítás az eredeti képből történik, de minden részletet elrejt
setting_use_pending_items: Idővonal frissítése csak kattintásra automatikus görgetés helyett
username: Betűk, számok és alávonások használhatók
@@ -223,6 +224,7 @@ hu:
setting_hide_network: Hálózatod elrejtése
setting_reduce_motion: Animációk mozgásának csökkentése
setting_system_font_ui: Rendszer betűtípusának használata
+ setting_system_scrollbars_ui: Rendszer alapértelmezett görgetősávjának használata
setting_theme: Megjelenítési sablon
setting_trends: Mai trend mutatása
setting_unfollow_modal: Megerősítés kérése mielőtt abbahagyod valaki követését
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 40ae267a064186..7c24ef80b1de5d 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -60,6 +60,7 @@ is:
setting_display_media_default: Fela myndefni sem merkt er viðkvæmt
setting_display_media_hide_all: Alltaf fela allt myndefni
setting_display_media_show_all: Alltaf birta myndefni sem merkt er viðkvæmt
+ setting_system_scrollbars_ui: Á einungis við um vafra fyrir vinnutölvur sem byggjast á Safari og Chrome
setting_use_blurhash: Litstiglarnir byggja á litunum í földu myndunum, en gera öll smáatriði óskýr
setting_use_pending_items: Fela uppfærslur tímalínu þar til smellt er, í stað þess að hún skruni streyminu sjálfvirkt
username: Þú mátt nota bókstafi, tölur og undirstrik
@@ -223,6 +224,7 @@ is:
setting_hide_network: Fela félagsnetið þitt
setting_reduce_motion: Minnka hreyfingu í hreyfimyndum
setting_system_font_ui: Nota sjálfgefið letur kerfisins
+ setting_system_scrollbars_ui: Nota sjálfgefna skrunstiku kerfisins
setting_theme: Þema vefsvæðis
setting_trends: Birta það sem er efst á baugi í dag
setting_unfollow_modal: Birta staðfestingarglugga áður en hætt er að fylgjast með einhverjum
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index b1fb6c3fc15e8d..27c1a003700a32 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -60,6 +60,7 @@ it:
setting_display_media_default: Nascondi media segnati come sensibili
setting_display_media_hide_all: Nascondi sempre tutti i media
setting_display_media_show_all: Mostra sempre i media segnati come sensibili
+ setting_system_scrollbars_ui: Si applica solo ai browser desktop basati su Safari e Chrome
setting_use_blurhash: I gradienti sono basati sui colori delle immagini nascoste ma offuscano tutti i dettagli
setting_use_pending_items: Fare clic per mostrare i nuovi messaggi invece di aggiornare la timeline automaticamente
username: Puoi usare lettere, numeri e caratteri di sottolineatura
@@ -223,6 +224,7 @@ it:
setting_hide_network: Nascondi la tua rete
setting_reduce_motion: Riduci movimento nelle animazioni
setting_system_font_ui: Usa il carattere predefinito del sistema
+ setting_system_scrollbars_ui: Utilizza la barra di scorrimento predefinita del sistema
setting_theme: Tema del sito
setting_trends: Mostra tendenze di oggi
setting_unfollow_modal: Chiedi conferma prima di smettere di seguire qualcuno
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 962f06253458b1..90c3d7f4b067bc 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -60,6 +60,7 @@ ko:
setting_display_media_default: 민감함으로 표시된 미디어 가리기
setting_display_media_hide_all: 모든 미디어를 가리기
setting_display_media_show_all: 모든 미디어를 보이기
+ setting_system_scrollbars_ui: 사파리와 크롬 기반의 데스크탑 브라우저만 적용됩니다
setting_use_blurhash: 그라디언트는 숨겨진 내용의 색상을 기반으로 하지만 상세 내용은 보이지 않게 합니다
setting_use_pending_items: 타임라인의 새 게시물을 자동으로 보여 주는 대신, 클릭해서 나타내도록 합니다
username: 문자, 숫자, 밑줄을 사용할 수 있습니다
@@ -223,6 +224,7 @@ ko:
setting_hide_network: 내 인맥 숨기기
setting_reduce_motion: 애니메이션 줄이기
setting_system_font_ui: 시스템의 기본 글꼴을 사용
+ setting_system_scrollbars_ui: 시스템 기본 스크롤바 사용
setting_theme: 사이트 테마
setting_trends: 오늘의 유행 보이기
setting_unfollow_modal: 누군가를 언팔로우 할 때 확인란 표시하기
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 77482d8012704f..b3885fb12b4815 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -60,6 +60,7 @@ lt:
setting_display_media_default: Slėpti mediją, pažymėtą kaip jautrią
setting_display_media_hide_all: Visada slėpti mediją
setting_display_media_show_all: Visada rodyti mediją
+ setting_system_scrollbars_ui: Taikoma tik darbalaukio naršyklėms, karkasiniais „Safari“ ir „Chrome“.
setting_use_blurhash: Gradientai pagrįsti paslėptų vizualizacijų spalvomis, bet užgožia bet kokias detales.
setting_use_pending_items: Slėpti laiko skalės naujienas po paspaudimo, vietoj automatinio srauto slinkimo.
username: Gali naudoti raides, skaičius ir pabraukimus
@@ -150,6 +151,7 @@ lt:
setting_hide_network: Slėpti savo socialinę diagramą
setting_reduce_motion: Sumažinti judėjimą animacijose
setting_system_font_ui: Naudoti numatytąjį sistemos šriftą
+ setting_system_scrollbars_ui: Naudoti numatytąją sistemos slankjuostę
setting_theme: Svetainės tema
setting_trends: Rodyti šiandienos trendus
setting_use_blurhash: Rodyti spalvingus paslėptos medijos gradientus
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 2bb31aa0f9dc93..b1d0927eda7648 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -60,6 +60,7 @@ nl:
setting_display_media_default: Als gevoelig gemarkeerde media verbergen
setting_display_media_hide_all: Media altijd verbergen
setting_display_media_show_all: Media altijd tonen
+ setting_system_scrollbars_ui: Alleen van toepassing op desktopbrowsers gebaseerd op Safari en Chrome
setting_use_blurhash: Wazige kleurovergangen zijn gebaseerd op de kleuren van de verborgen media, waarmee elk detail verdwijnt
setting_use_pending_items: De tijdlijn wordt bijgewerkt door op het aantal nieuwe items te klikken, in plaats van dat deze automatisch wordt bijgewerkt
username: Je kunt letters, cijfers en underscores gebruiken
@@ -223,6 +224,7 @@ nl:
setting_hide_network: Jouw volgers en wie je volgt verbergen
setting_reduce_motion: Beweging in animaties verminderen
setting_system_font_ui: Standaardlettertype van het systeem gebruiken
+ setting_system_scrollbars_ui: Standaard scrollbalk van het systeem gebruiken
setting_theme: Thema website
setting_trends: Trends van vandaag tonen
setting_unfollow_modal: Vraag voor het ontvolgen van iemand een bevestiging
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index c5ff55c15de10f..cf0981238292ab 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -60,6 +60,7 @@ pl:
setting_display_media_default: Ukrywaj zawartość multimedialną oznaczoną jako wrażliwa
setting_display_media_hide_all: Zawsze ukrywaj zawartość multimedialną
setting_display_media_show_all: Zawsze pokazuj zawartość multimedialną
+ setting_system_scrollbars_ui: Stosuje się tylko do przeglądarek komputerowych opartych na Safari i Chrome
setting_use_blurhash: Gradienty są oparte na kolorach ukrywanej zawartości, ale uniewidaczniają wszystkie szczegóły
setting_use_pending_items: Ukryj aktualizacje osi czasu za kliknięciem, zamiast automatycznego przewijania strumienia
username: Możesz używać liter, cyfr i podkreślników
@@ -223,6 +224,7 @@ pl:
setting_hide_network: Ukryj swoją sieć
setting_reduce_motion: Ogranicz ruch w animacjach
setting_system_font_ui: Używaj domyślnej czcionki systemu
+ setting_system_scrollbars_ui: Używaj domyślnego paska przewijania systemu
setting_theme: Motyw strony
setting_trends: Pokazuj dzisiejsze „Na czasie”
setting_unfollow_modal: Pytaj o potwierdzenie przed cofnięciem obserwacji
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index fca59515f0f22d..917b85a0bbc4a6 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -60,6 +60,7 @@ pt-BR:
setting_display_media_default: Sempre ocultar mídia sensível
setting_display_media_hide_all: Sempre ocultar todas as mídias
setting_display_media_show_all: Sempre mostrar mídia sensível
+ setting_system_scrollbars_ui: Se aplica apenas para navegadores de computador baseado no Safari e Chrome
setting_use_blurhash: O blur é baseado nas cores da imagem oculta, ofusca a maioria dos detalhes
setting_use_pending_items: Ocultar atualizações da linha do tempo atrás de um clique ao invés de rolar automaticamente
username: Você pode usar letras, números e underlines
@@ -223,6 +224,7 @@ pt-BR:
setting_hide_network: Ocultar suas relações
setting_reduce_motion: Reduzir animações
setting_system_font_ui: Usar fonte padrão do sistema
+ setting_system_scrollbars_ui: Usar barra de rolagem padrão do sistema
setting_theme: Tema do site
setting_trends: Mostrar em alta hoje
setting_unfollow_modal: Solicitar confirmação antes de deixar de seguir alguém
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 37626ff9fd1ec2..ae142826f42cc2 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -60,6 +60,7 @@ ru:
setting_display_media_default: Скрывать файлы «деликатного характера»
setting_display_media_hide_all: Всегда скрывать любые медиафайлы
setting_display_media_show_all: Всегда показывать любые медиафайлы
+ setting_system_scrollbars_ui: Работает только в браузерах для ПК на основе Safari или Chrome
setting_use_blurhash: Градиенты основаны на цветах скрытых медиа, но скрывают любые детали.
setting_use_pending_items: Показывать обновления в ленте только после клика вместо автоматической прокрутки.
username: Вы можете использовать буквы, цифры и знаки подчеркивания
@@ -223,6 +224,7 @@ ru:
setting_hide_network: Скрыть свои связи
setting_reduce_motion: Уменьшить движение в анимации
setting_system_font_ui: Использовать шрифт системы по умолчанию
+ setting_system_scrollbars_ui: Использовать системные полосы прокрутки
setting_theme: Тема сайта
setting_trends: Показывать сегодняшние тренды
setting_unfollow_modal: Всегда спрашивать перед отпиской от учётной записи
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 1ca9037e63464c..5a605e987254ba 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -60,6 +60,7 @@ sq:
setting_display_media_default: Fshih media me shenjën rezervat
setting_display_media_hide_all: Fshih përherë mediat
setting_display_media_show_all: Mediat shfaqi përherë
+ setting_system_scrollbars_ui: Ka vend vetëm për shfletues desktop bazuar në Safari dhe Chrome
setting_use_blurhash: Gradientët bazohen në ngjyrat e elementëve pamorë të fshehur, por errësojnë çfarëdo hollësie
setting_use_pending_items: Fshihi përditësimet e rrjedhës kohore pas një klikimi, në vend të rrëshqitjes automatike nëpër prurje
username: Mund të përdorni shkronja, numra dhe nënvija
@@ -223,6 +224,7 @@ sq:
setting_hide_network: Fshiheni rrjetin tuaj
setting_reduce_motion: Zvogëlo lëvizjen në animacione
setting_system_font_ui: Përdor shkronja parazgjedhje të sistemit
+ setting_system_scrollbars_ui: Përdor shtyllë rrëshqitjesh parazgjedhje të sistemit
setting_theme: Temë sajti
setting_trends: Shfaq prirjet sot
setting_unfollow_modal: Shfaq dialog ripohimi përpara heqjes së ndjekjes për dikë
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 74dcd3f9087589..91b35ead328d9b 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -60,6 +60,7 @@ uk:
setting_display_media_default: Приховувати медіа, позначені як делікатними
setting_display_media_hide_all: Завжди приховувати медіа
setting_display_media_show_all: Завжди показувати медіа
+ setting_system_scrollbars_ui: Застосовується лише для настільних браузерів на основі Safari та Chrome
setting_use_blurhash: Градієнти, що базуються на кольорах прихованих медіа, але роблять нерозрізненними будь-які деталі
setting_use_pending_items: Не додавати нові повідомлення до стрічок миттєво, показувати лише після додаткового клацання
username: Можна використовувати літери, цифри та підкреслення
@@ -223,6 +224,7 @@ uk:
setting_hide_network: Сховати вашу мережу
setting_reduce_motion: Менше руху в анімаціях
setting_system_font_ui: Використовувати типовий системний шрифт
+ setting_system_scrollbars_ui: Використовувати системну прокрутку
setting_theme: Тема сайту
setting_trends: Показувати популярні сьогодні дописи
setting_unfollow_modal: Показувати діалог підтвердження під час відписки від когось
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index 2b1d84f595ec58..c04e541f70e779 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -60,6 +60,7 @@ vi:
setting_display_media_default: Click để xem
setting_display_media_hide_all: Luôn ẩn
setting_display_media_show_all: Luôn hiện
+ setting_system_scrollbars_ui: Chỉ áp dụng trình duyệt Chrome và Safari bản desktop
setting_use_blurhash: Phủ lớp màu làm nhòe đi hình ảnh nhạy cảm
setting_use_pending_items: Dồn lại toàn bộ tút mới và chỉ hiển thị khi nhấn vào
username: Chỉ dùng ký tự, số và dấu gạch dưới
@@ -223,6 +224,7 @@ vi:
setting_hide_network: Ẩn quan hệ của bạn
setting_reduce_motion: Giảm chuyển động ảnh GIF
setting_system_font_ui: Dùng phông chữ mặc định hệ thống
+ setting_system_scrollbars_ui: Dùng scrollbar mặc định hệ thống
setting_theme: Giao diện
setting_trends: Hiển thị xu hướng trong ngày
setting_unfollow_modal: Hỏi trước khi bỏ theo dõi ai đó
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index f0f1bf15c5bd30..cbbb1556ee029a 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -8,7 +8,7 @@ zh-CN:
display_name: 你的全名或昵称。
fields: 你的主页、人称代词、年龄，以及任何你想要添加的内容。
indexable: 你的公开嘟文会出现在 Mastodon 的搜索结果中。无论是否勾选，与你的嘟文有过交互的人都可能通过搜索找到它们。
- note: '你可以提及 @其他人 或 #话题标签 。'
+ note: '你可以提及 @其他人 或 #话题 。'
show_collections: 人们将能够浏览你的关注和追随者。你关注的人会看到你关注他们。
unlocked: 人们将能够在不请求批准的情况下关注你。如果你希望审核关注请求并选择接受或拒绝新的关注者，请取消勾选此项。
account_alias:
@@ -16,7 +16,7 @@ zh-CN:
account_migration:
acct: 指定你想迁移过去的目标账号：用户名@站点域名
account_warning_preset:
- text: 你可以使用嘟文格式，例如加入 URL、话题标签和“@”
+ text: 你可以使用嘟文格式，例如加入 URL、话题和“@”
title: 可选。对接收者不可见
admin_account_action:
include_statuses: 用户将会看到哪些嘟文导致了管理操作或警告
@@ -60,6 +60,7 @@ zh-CN:
setting_display_media_default: 隐藏被标记为敏感内容的媒体
setting_display_media_hide_all: 始终隐藏媒体
setting_display_media_show_all: 始终显示媒体
+ setting_system_scrollbars_ui: 仅对基于 Safari 或 Chromium 内核的桌面端浏览器有效
setting_use_blurhash: 渐变是基于模糊后的隐藏内容生成的
setting_use_pending_items: 点击查看时间线更新，而非自动滚动更新动态。
username: 你只能使用字母、数字和下划线
@@ -87,7 +88,7 @@ zh-CN:
favicon: WEBP、PNG、GIF 或 JPG。使用自定义图标覆盖 Mastodon 的默认图标。
mascot: 覆盖高级网页界面中的绘图形象。
media_cache_retention_period: 来自外站用户嘟文的媒体文件将被缓存到你的实例上。当该值被设为正值时，缓存的媒体文件将在指定天数后被清除。如果媒体文件在被清除后重新被请求，且源站内容仍然可用，它将被重新下载。由于链接预览卡拉取第三方站点的频率受到限制，建议将此值设置为至少 14 天，如果小于该值，链接预览卡将不会按需更新。
- peers_api_enabled: 此服务器在联邦宇宙中遇到的实例列表。 此处不包含关于您是否与给定服务器联合的数据，只是您的服务器知道它。 这由收集一般意义上的联邦统计信息的服务使用。
+ peers_api_enabled: 本站在联邦宇宙中遇到的站点列表。 此处不包含关于您是否与给定站点联合的数据，只是您的实例知道它。 这由收集一般意义上的联合统计信息的服务使用。
profile_directory: 个人资料目录会列出所有选择可被发现的用户。
require_invite_text: 当注册需要手动批准时，将“你为什么想要加入？”设为必填项
site_contact_email: 他人需要询恰法务或支持信息时的联络方式
@@ -223,6 +224,7 @@ zh-CN:
setting_hide_network: 隐藏你的社交网络
setting_reduce_motion: 降低过渡动画效果
setting_system_font_ui: 使用系统默认字体
+ setting_system_scrollbars_ui: 使用系统默认样式的滚动条
setting_theme: 站点主题
setting_trends: 显示今日热门
setting_unfollow_modal: 在取消关注前询问我
@@ -238,7 +240,7 @@ zh-CN:
email_domain_block:
with_dns_records: 包括该域名的 MX 记录和 IP 地址
featured_tag:
- name: 话题标签
+ name: 话题
filters:
actions:
hide: 完全隐藏
@@ -258,8 +260,8 @@ zh-CN:
profile_directory: 启用用户目录
registrations_mode: 谁可以注册
require_invite_text: 注册时需要提供理由
- show_domain_blocks: 显示域名屏蔽列表
- show_domain_blocks_rationale: 显示域名屏蔽原因
+ show_domain_blocks: 显示站点屏蔽列表
+ show_domain_blocks_rationale: 显示站点屏蔽原因
site_contact_email: 联系邮箱
site_contact_username: 用于联系的公开用户名
site_extended_description: 完整说明
@@ -313,10 +315,10 @@ zh-CN:
indexable: 允许搜索引擎索引账户页
show_application: 显示你发嘟所用的应用
tag:
- listable: 允许这个话题标签在用户目录中显示
- name: 话题标签
+ listable: 允许这个话题在用户目录中显示
+ name: 话题
trendable: 允许在热门下显示此话题
- usable: 允许本站嘟文使用此话题标签
+ usable: 允许本站嘟文使用此话题
user:
role: 角色
time_zone: 时区
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 289a24f122c130..c1a3a8d6d9ca44 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -60,6 +60,7 @@ zh-TW:
setting_display_media_default: 隱藏標為敏感內容的媒體
setting_display_media_hide_all: 總是隱藏所有媒體
setting_display_media_show_all: 總是顯示標為敏感內容的媒體
+ setting_system_scrollbars_ui: 僅套用至基於 Safari 或 Chrome 之桌面瀏覽器
setting_use_blurhash: 彩色漸層圖樣是基於隱藏媒體內容顏色產生，所有細節將變得模糊
setting_use_pending_items: 關閉自動捲動更新，時間軸僅於點擊後更新
username: 您可以使用字幕、數字與底線
@@ -223,6 +224,7 @@ zh-TW:
setting_hide_network: 隱藏您的社交網路
setting_reduce_motion: 減少過渡動畫效果
setting_system_font_ui: 使用系統預設字型
+ setting_system_scrollbars_ui: 使用系統預設捲動軸
setting_theme: 佈景主題
setting_trends: 顯示本日熱門趨勢
setting_unfollow_modal: 取消跟隨某人前先詢問我
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index c946b8abf1a7e9..62d9eba758e376 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1194,7 +1194,6 @@ sk:
scheduled_statuses:
over_daily_limit: Prekročil/a si denný limit %{limit} predplánovaných príspevkov
over_total_limit: Prekročil/a si limit %{limit} predplánovaných príspevkov
- too_soon: Dátum musí byť stanovený do budúcnosti
sessions:
activity: Najnovšia aktivita
browser: Prehliadač
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 909b89e5a9e77e..b29808dc147974 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1654,7 +1654,6 @@ sl:
scheduled_statuses:
over_daily_limit: Za ta dan ste presegli omejitev %{limit} načrtovanih objav
over_total_limit: Presegli ste omejitev %{limit} načrtovanih objav
- too_soon: Načrtovani datum mora biti v prihodnosti
self_destruct:
lead_html: Na žalost se %{domain} za vedno zapira. Če ste tu imeli svoj račun, ga v prihodnje ne boste mogli več uporabljati. Zahtevate lahko kopijo svojih podatkov.
title: Ta strežnik se zapira
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index e9247ef365960a..afce58503dea1a 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1670,7 +1670,7 @@ sq:
scheduled_statuses:
over_daily_limit: Keni tejkaluar kufirin e %{limit} mesazheve të planifikuara për atë ditë
over_total_limit: Keni tejkaluar kufirin prej %{limit} mesazhesh të planifikuara
- too_soon: Data e planifikimit duhet të bjerë në të ardhmen
+ too_soon: data duhet të jetë në të ardhmen
self_destruct:
lead_html: Mjerisht, %{domain} po mbyllet përgjithmonë. Nëse patët një llogari këtu, s’do të jeni në gjendje të vazhdoni ta përdorni, por mundeni ende të kërkoni një kopjeruajtje të të dhënave tuaja.
title: Ky shërbyes po mbyllet
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 0b3043c47b950d..37c531b2078ac2 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1544,7 +1544,6 @@ sr-Latn:
scheduled_statuses:
over_daily_limit: Prekoračili ste granicu od %{limit} planiranih objava za danas
over_total_limit: Prekoračili ste granicu od %{limit} planiranih objava
- too_soon: Planirani datum mora biti u budućnosti
self_destruct:
lead_html: Nažalost, %{domain} se trajno zatvara. Ako ste tamo imali nalog, nećete moći da nastavite da ga koristite, ali i dalje možete da zatražite rezervnu kopiju svojih podataka.
title: Ovaj server se zatvara
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index e077a40eeef511..7a8469d6453a65 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1574,7 +1574,6 @@ sr:
scheduled_statuses:
over_daily_limit: Прекорачили сте границу од %{limit} планираних објава за данас
over_total_limit: Прекорачили сте границу од %{limit} планираних објава
- too_soon: Планирани датум мора бити у будућности
self_destruct:
lead_html: Нажалост, %{domain} се трајно затвара. Ако сте тамо имали налог, нећете моћи да наставите да га користите, али и даље можете да затражите резервну копију својих података.
title: Овај сервер се затвара
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 173dd24c88cd01..8d4aa7f7da75ee 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1676,7 +1676,6 @@ sv:
scheduled_statuses:
over_daily_limit: Du har överskridit dygnsgränsen på %{limit} schemalagda inlägg
over_total_limit: Du har överskridit gränsen på %{limit} schemalagda inlägg
- too_soon: Schemaläggningsdatumet måste vara i framtiden
self_destruct:
lead_html: Tyvärr stänger %{domain} för gott. Om du hade ett konto där kommer du inte längre kunna använda det, men du kan fortfarande begära en säkerhetskopia av din data.
title: Denna server stänger ned
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 6834f8ac260601..d0590d19ef1894 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1638,7 +1638,6 @@ th:
scheduled_statuses:
over_daily_limit: คุณมีโพสต์ที่จัดกำหนดการไว้เกินขีดจำกัดที่ %{limit} สำหรับวันนี้แล้ว
over_total_limit: คุณมีโพสต์ที่จัดกำหนดการไว้เกินขีดจำกัดที่ %{limit} แล้ว
- too_soon: วันที่จัดกำหนดการต้องอยู่ในอนาคต
self_destruct:
lead_html: น่าเสียดาย %{domain} กำลังปิดตัวลงอย่างถาวร หากคุณมีบัญชีที่นั่น คุณจะไม่สามารถใช้บัญชีต่อไปได้ แต่คุณยังคงสามารถขอข้อมูลสำรองของข้อมูลของคุณ
title: เซิร์ฟเวอร์นี้กำลังปิดตัวลง
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 48f6c5e240aab5..18e8dd133871e1 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1676,7 +1676,7 @@ tr:
scheduled_statuses:
over_daily_limit: Bugün için %{limit} zamanlanmış gönderi sınırını aştınız
over_total_limit: "%{limit} zamanlanmış gönderi sınırını aştınız"
- too_soon: Programlanan tarih bugünden ileri bir tarihte olmalıdır
+ too_soon: tarih ileri bir tarih olmalıdır
self_destruct:
lead_html: Maalesef %{domain} kalıcı olarak kapanıyor. Eğer orada hesabınız varsa, onu kullanmaya devam edemeyeceksiniz, ancak yine de verinizin bir yedeğini isteyebilirsiniz.
title: Bu sunucu kapanıyor
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 68ca10c0ccbdbf..40127b89176904 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1675,7 +1675,7 @@ uk:
scheduled_statuses:
over_daily_limit: Ви перевищили ліміт в %{limit} запланованих дописів на сьогодні
over_total_limit: Ви перевищили ліміт в %{limit} запланованих дописів
- too_soon: Запланована дата має бути в майбутньому
+ too_soon: дата повинна бути в майбутньому
self_destruct:
lead_html: На жаль, %{domain} остаточно закривається. Якщо у вас є обліковий запис там, ви не зможете продовжити його використання, але ви все ще можете надіслати запит на резервну копію даних.
title: Сервер закривається
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index acc69f96cd9267..b226c447010596 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1638,7 +1638,7 @@ vi:
scheduled_statuses:
over_daily_limit: Bạn đã vượt qua giới hạn được lên lịch đăng tút %{limit} hôm nay
over_total_limit: Bạn đã vượt quá giới hạn %{limit} của các tút được lên lịch
- too_soon: Ngày lên lịch phải trong tương lai
+ too_soon: ngày phải ở tương lai
self_destruct:
lead_html: Rất tiếc, %{domain}đã đóng cửa vĩnh viễn. Nếu bạn có tài khoản ở đó, bạn sẽ không thể tiếp tục sử dụng tài khoản đó nhưng bạn vẫn có thể yêu cầu bản sao lưu dữ liệu của mình.
title: Máy chủ đang đóng cửa
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 9f4b751044360c..7ce3eab939fc53 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -164,7 +164,7 @@ zh-CN:
unsubscribe: 取消订阅
unsuspended_msg: 已成功取消封禁 %{username} 的账号
username: 用户名
- view_domain: 查看域名摘要
+ view_domain: 查看站点摘要
warn: 警告
web: 站内页面
whitelisted: 允许联合
@@ -180,8 +180,8 @@ zh-CN:
create_announcement: 创建公告
create_canonical_email_block: 封禁新的邮箱
create_custom_emoji: 创建自定义表情符号
- create_domain_allow: 允许新域名
- create_domain_block: 封禁新域名
+ create_domain_allow: 允许联合
+ create_domain_block: 屏蔽站点
create_email_domain_block: 封禁新的邮箱域名
create_ip_block: 新建 IP 规则
create_relay: 创建中继站
@@ -191,10 +191,10 @@ zh-CN:
destroy_announcement: 删除公告
destroy_canonical_email_block: 解除邮箱封禁
destroy_custom_emoji: 删除自定义表情符号
- destroy_domain_allow: 解除域名允许
- destroy_domain_block: 解除域名封禁
+ destroy_domain_allow: 撤销联合许可
+ destroy_domain_block: 撤销站点屏蔽
destroy_email_domain_block: 解除邮箱域名封禁
- destroy_instance: 删除实例
+ destroy_instance: 清除实例
destroy_ip_block: 删除 IP 规则
destroy_relay: 删除中继站
destroy_status: 删除嘟文
@@ -228,7 +228,7 @@ zh-CN:
unsuspend_account: 解除账号封禁
update_announcement: 更新公告
update_custom_emoji: 更新自定义表情符号
- update_domain_block: 更新域名屏蔽
+ update_domain_block: 更新站点屏蔽
update_ip_block: 编辑 IP 封禁规则
update_report: 更新举报
update_status: 更新嘟文
@@ -244,8 +244,8 @@ zh-CN:
create_announcement_html: "%{name} 创建了新公告 %{target}"
create_canonical_email_block_html: "%{name} 封禁了 hash 为 %{target} 的邮箱地址"
create_custom_emoji_html: "%{name} 添加了新的自定义表情 %{target}"
- create_domain_allow_html: "%{name} 允许了与实例 %{target} 的联合"
- create_domain_block_html: "%{name} 屏蔽了域名 %{target}"
+ create_domain_allow_html: "%{name} 允许了与站点 %{target} 的联合"
+ create_domain_block_html: "%{name} 屏蔽了站点 %{target}"
create_email_domain_block_html: "%{name} 封禁了邮箱域名 %{target}"
create_ip_block_html: "%{name} 为 IP %{target} 创建了规则"
create_relay_html: "%{name} 添加了中继站 %{target}"
@@ -255,10 +255,10 @@ zh-CN:
destroy_announcement_html: "%{name} 删除了公告 %{target}"
destroy_canonical_email_block_html: "%{name} 解封了 hash 为 %{target} 的邮箱地址"
destroy_custom_emoji_html: "%{name} 删除了自定义表情 %{target}"
- destroy_domain_allow_html: "%{name} 拒绝了与实例 %{target} 的联合"
- destroy_domain_block_html: "%{name} 解除了对域名 %{target} 的屏蔽"
+ destroy_domain_allow_html: "%{name} 拒绝了与站点 %{target} 的联合"
+ destroy_domain_block_html: "%{name} 解除了对站点 %{target} 的屏蔽"
destroy_email_domain_block_html: "%{name} 解封了邮箱域名 %{target}"
- destroy_instance_html: "%{name} 删除了实例 %{target}"
+ destroy_instance_html: "%{name} 清除了实例 %{target}"
destroy_ip_block_html: "%{name} 删除了 IP %{target} 的规则"
destroy_relay_html: "%{name} 删除了中继站 %{target}"
destroy_status_html: "%{name} 删除了 %{target} 的嘟文"
@@ -366,7 +366,7 @@ zh-CN:
pending_reports_html:
other: "%{count} 个待处理举报"
pending_tags_html:
- other: "%{count} 个待处理话题标签"
+ other: "%{count} 个待处理话题"
pending_users_html:
other: "%{count} 个待处理用户"
resolved_reports: 已处理的举报
@@ -382,27 +382,27 @@ zh-CN:
empty: 未找到申诉。
title: 申诉
domain_allows:
- add_new: 允许与此实例联合
- created_msg: 实例已被允许联合
- destroyed_msg: 实例已被禁止联合
+ add_new: 允许与此站点联合
+ created_msg: 站点已被允许联合
+ destroyed_msg: 站点已被禁止联合
export: 导出
import: 导入
- undo: 禁止与此实例联合
+ undo: 禁止与此站点联合
domain_blocks:
- add_new: 添加新屏蔽域名
+ add_new: 添加新站点屏蔽
confirm_suspension:
cancel: 取消
confirm: 封禁
- permanent_action: 撤销暂停不会恢复任何数据或关系。
- preamble_html: 你将要暂停 %{domain} 及其子域。
- remove_all_data: 这将从你的实例上删除此域名下账户的所有内容、媒体和个人资料数据。
- stop_communication: 你的实例将停止与这些实例的通信。
- title: 确认对 %{domain} 的封锁
- undo_relationships: 这将解除你的实例与这些实例上账户之间的任何关注。
- created_msg: 正在进行域名屏蔽
- destroyed_msg: 域名屏蔽已撤销
+ permanent_action: 撤销屏蔽不会恢复任何数据或关系。
+ preamble_html: 你即将封禁 %{domain} 及其子域名上的站点。
+ remove_all_data: 这将从你的站点上删除对方站点的账户的全部内容、媒体与个人资料数据。
+ stop_communication: 你的站点将停止与这些站点的通信。
+ title: 确认屏蔽 %{domain}
+ undo_relationships: 这将解除你的站点与对方站点的账户之间的任何关注。
+ created_msg: 正在执行站点屏蔽
+ destroyed_msg: 站点屏蔽已被撤销
domain: 域名
- edit: 编辑域名屏蔽
+ edit: 编辑站点屏蔽列表
existing_domain_block: 你已经对 %{name} 设置了更严格的限制。
existing_domain_block_html: 你已经对 %{name} 施加了更严格的限制，你需要先 解封。
export: 导出
@@ -421,7 +421,7 @@ zh-CN:
obfuscate: 混淆域名
obfuscate_hint: 如果启用了域名列表公开限制，就部分混淆列表中的域名
private_comment: 私密评论
- private_comment_hint: 给这一域名限制添加备注，供监察员内部使用
+ private_comment_hint: 给这一域名限制添加备注，供管理员内部使用
public_comment: 公开评论
public_comment_hint: 给这一域名限制添加公开的评论，在公告域名限制列表开启时这些评论将会公开可见。
reject_media: 拒绝接收媒体文件
@@ -475,14 +475,14 @@ zh-CN:
unsuppress: 恢复推荐关注
instances:
audit_log:
- title: 近期审计日志
- view_all: 查看完整审计日志
+ title: 近期审核记录
+ view_all: 查看完整审核记录
availability:
description_html:
- other: 如果连续 %{count} 天 均无法成功向该域名投递消息，则将不再尝试向其投递，直至收到来自该域名的消息。
+ other: 若连续 %{count} 天 均无法成功向该站点投递消息，则将不再尝试向其投递，直至收到来自该站点的消息。
failure_threshold_reached: 于 %{date} 达到失败阈值。
failures_recorded:
- other: 在 %{count} 天中尝试失败。
+ other: 连续 %{count} 天投递失败。
no_failures_recorded: 没有失败记录。
title: 可用性
warning: 上一次尝试连接此服务器失败
@@ -490,7 +490,7 @@ zh-CN:
back_to_limited: 受限
back_to_warning: 警告
by_domain: 域名
- confirm_purge: 你确认要从这个实例中永久地删除数据吗？
+ confirm_purge: 确定要删除此站点的全部数据吗？
content_policies:
comment: 内部备注
description_html: 你可以设置应用于此域名所有账号和其所有子域名的内容策略。
@@ -502,12 +502,12 @@ zh-CN:
suspend: 封禁
policy: 策略
reason: 公开理由
- title: 本站点内容发布规则
+ title: 内容策略
dashboard:
instance_accounts_dimension: 被关注最多的账号
instance_accounts_measure: 存储的账号
- instance_followers_measure: 本站关注者
- instance_follows_measure: 对方关注者
+ instance_followers_measure: 本站在对方站点的关注者
+ instance_follows_measure: 对方在本站的关注者
instance_languages_dimension: 语言排行
instance_media_attachments_measure: 存储的媒体文件
instance_reports_measure: 关于对方的举报
@@ -515,14 +515,14 @@ zh-CN:
delivery:
all: 全部
clear: 清理投递错误
- failing: 发送失败
+ failing: 投递失败
restart: 重新投递
stop: 停止投递
unavailable: 不可用
delivery_available: 可投递
delivery_error_days: 投递错误天数
delivery_error_hint: 如果投递已不可用 %{count} 天，它将被自动标记为无法投递。
- destroyed_msg: "%{domain} 中的数据现在正在排队等待被立刻删除。"
+ destroyed_msg: 来自 %{domain} 的数据已被加入删除队列，即将删除。
empty: 暂无域名。
known_accounts:
other: "%{count} 个已知账号"
@@ -532,16 +532,16 @@ zh-CN:
title: 审核
private_comment: 私密评论
public_comment: 公开评论
- purge: 删除
+ purge: 清除
purge_description_html: 如果你确认此域名已永久离线，可以从存储中删除此域名的所有账号记录和相关数据。这将会需要一段时间。
- title: 已知实例
- total_blocked_by_us: 被我站屏蔽的
+ title: 联合
+ total_blocked_by_us: 被本站屏蔽的
total_followed_by_them: 被对方关注的
- total_followed_by_us: 被我站关注的
+ total_followed_by_us: 被本站关注的
total_reported: 关于对方的举报
total_storage: 媒体文件
totals_time_period_hint_html: 下方显示的总数来自全部历史数据。
- unknown_instance: 此服务器上目前没有此域名的记录。
+ unknown_instance: 本站目前没有此站点的记录。
invites:
deactivate_all: 全部停用
filter:
@@ -608,7 +608,7 @@ zh-CN:
remote: 已在其所属服务器被封禁
are_you_sure: 你确定吗？
assign_to_self: 接管
- assigned: 已接管的监察员
+ assigned: 已接管的管理员
by_target_domain: 被举报账户的域名
cancel: 取消
category: 类别
@@ -634,7 +634,7 @@ zh-CN:
delete: 删除
placeholder: 描述已经执行的操作，或其他任何相关的跟进情况…
title: 备注
- notes_description_html: 查看备注或向其他监察员留言
+ notes_description_html: 查看备注或向其他管理员留言
processed_msg: '举报 #%{id} 处理成功'
quick_actions_description_html: 快捷选择操作或向下滚动以查看举报内容：
remote_user_placeholder: 来自 %{instance} 的外站用户
@@ -707,7 +707,7 @@ zh-CN:
manage_custom_emojis: 管理自定义表情
manage_custom_emojis_description: 允许用户管理服务器上的自定义表情
manage_federation: 管理联合
- manage_federation_description: 允许用户屏蔽或允许同其他域名的邦联，并控制消息投递能力
+ manage_federation_description: 允许用户禁止或允许本站同其他站点的联合，并控制消息投递能力
manage_invites: 管理邀请
manage_invites_description: 允许用户浏览和停用邀请链接
manage_reports: 管理举报
@@ -909,8 +909,8 @@ zh-CN:
reset: 重置
review: 审核状态
search: 搜索
- title: 话题标签
- updated_msg: 话题标签设置更新成功
+ title: 话题
+ updated_msg: 话题设置更新成功
title: 管理
trends:
allow: 允许
@@ -940,7 +940,7 @@ zh-CN:
pending_review: 待审核
preview_card_providers:
allowed: 来自此发布者的链接可进入流行列表
- description_html: 这些域名所属的链接经常在此服务器上被分享。在对应域名获得批准前链接不会公开显示在热门中。批准和拒绝操作也会对子域名生效。
+ description_html: 以下域名是用户在本站分享的链接的常见来源。在对应域名获得批准前链接不会公开显示在热门中。批准和拒绝操作也会对子域名生效。
rejected: 来自此发布者的链接不会进入热门列表
title: 发布者
rejected: 已拒绝
@@ -1026,17 +1026,17 @@ zh-CN:
subject: "%{username} 对 %{instance} 的审核结果提出了申诉"
new_critical_software_updates:
body: 新的紧急更新版本Mastodon已经发布，你可能希望尽快更新！
- subject: 适用于 %{instance} 的Mastodon紧急更新已经可用。
+ subject: "%{instance} 有 Mastodon 的紧急更新！"
new_pending_account:
body: 新账户的详细信息如下。你可以批准或拒绝此申请。
- subject: 在 %{instance} 上有新账号 (%{username}) 需要审核
+ subject: "%{instance} 上有新账号 (%{username}) 需要审核"
new_report:
body: "%{reporter} 举报了用户 %{target}"
body_remote: 来自 %{domain} 的用户举报了用户 %{target}
subject: 来自 %{instance} 的用户举报（#%{id}）
new_software_updates:
body: 新的 Mastodon 版本已发布，你可能想要更新！
- subject: 适用于 %{instance} 的Mastodon版本更新已经可用！
+ subject: "%{instance} 有 Mastodon版本更新！"
new_trends:
body: 以下项目需要审核才能公开显示：
new_trending_links:
@@ -1087,7 +1087,7 @@ zh-CN:
hint_html: 只剩最后一件事了！我们需要确认你是一个人类（这样我们才能阻止恶意访问！）。请输入下面的验证码，然后点击“继续”。
title: 安全检查
confirmations:
- awaiting_review: 你的邮箱地址已确认！%{domain} 的工作人员正在审核你的注册信息。如果他们批准了你的账户，你将收到一封邮件通知！
+ awaiting_review: 邮箱确认成功！%{domain} 的工作人员正在审核你的注册信息。如果他们批准了你的账户，你将收到一封邮件通知！
awaiting_review_title: 你的注册申请正在审核中
clicking_this_link: 点击此链接
login_link: 登录
@@ -1132,7 +1132,7 @@ zh-CN:
back: 返回
invited_by: 欢迎加入%{domain}，你是通过以下用户的邀请加入的：
preamble: 以下规则由 %{domain} 的管理员设定并执行。
- preamble_invited: 在你继续之前，请考虑 %{domain} 的管理员设定的基本规则。
+ preamble_invited: 在继续操作前，请先阅读并同意 %{domain} 管理员设置的基本规则。
title: 一些基本规则。
title_invited: 通过邀请加入
security: 账户安全
@@ -1144,10 +1144,10 @@ zh-CN:
new_confirmation_instructions_sent: 你将在几分钟内收到一封带有确认链接的新邮件！
title: 请检查你的收件箱
sign_in:
- preamble_html: 使用你在 %{domain} 的账户和密码登录。如果你的账户托管在其他的服务器上，你将无法在此登录。
+ preamble_html: 使用你在 %{domain} 的账户和密码登录。如果你的账户是在其他站点上注册的，你将无法在此登录。
title: 登录到 %{domain}
sign_up:
- manual_review: 你在 %{domain} 上的注册需要经由管理人员手动审核。 为了帮助我们处理你的注册，请稍微介绍一下你为什么想在 %{domain} 上注册。
+ manual_review: 你在 %{domain} 上的注册需要经由管理人员手动审核。 为了帮助我们处理你的注册，请简要说明你为什么想在 %{domain} 上注册。
preamble: 有了这个Mastodon服务器上的账户，你就可以关注Mastodon网络上的任何其他人，无论他们的账户在哪里。
title: 让我们在 %{domain} 上开始。
status:
@@ -1156,7 +1156,7 @@ zh-CN:
functional: 你的账号可以正常使用了。
pending: 站务人员正在审核你的申请。这需要花点时间。在申请被批准后，你将收到一封邮件。
redirecting_to: 你的账户无效，因为它已被设置为跳转到 %{acct}
- self_destruct: 由于 %{domain} 即将关闭，你只能获得对你本人账号的有限访问权限。
+ self_destruct: "%{domain} 即将关闭，你只能获得对你自己的账号的有限访问权限。"
view_strikes: 查看针对你账号的处罚记录
too_fast: 表单提交过快，请重试。
use_security_key: 使用安全密钥
@@ -1224,7 +1224,7 @@ zh-CN:
approve_appeal: 批准申诉
associated_report: 相关举报
created_at: 日期
- description_html: 这些是针对你的账户采取的行动和警告，已经由 %{instance} 的工作人员发送给你。
+ description_html: 以下是针对你的账户采取的行动和警告，已经由 %{instance} 的工作人员发送给你。
recipient: 发送至
reject_appeal: 驳回申诉
status: '嘟文 #%{id}'
@@ -1274,15 +1274,15 @@ zh-CN:
blocks: 屏蔽的用户
bookmarks: 收藏
csv: CSV
- domain_blocks: 域名屏蔽
+ domain_blocks: 站点屏蔽列表
lists: 列表
mutes: 已被你隐藏的
storage: 媒体文件存储
featured_tags:
add_new: 添加新条目
errors:
- limit: 你所推荐的话题标签数已达上限
- hint_html: "什么是精选话题标签？ 它们被显示在你的公开个人资料中的突出位置，人们可以在这些标签下浏览你的公共嘟文。 它们是跟踪创作或长期项目的进度的重要工具。"
+ limit: 你所推荐的话题数已达上限
+ hint_html: "什么是精选话题？ 它们被显示在你的公开个人资料中的突出位置，人们可以在这些标签下浏览你的公共嘟文。 它们是跟踪创作或长期项目的进度的重要工具。"
filters:
contexts:
account: 账户
@@ -1363,7 +1363,7 @@ zh-CN:
bookmarks_html:
other: 你即将使用来自 %{filename} 的最多 %{count} 条嘟文替换你的收藏列表。
domain_blocking_html:
- other: 你即将使用来自 %{filename} 的最多 %{count} 个域名替换你的域名屏蔽列表。
+ other: 你即将使用来自 %{filename} 的最多 %{count} 个站点域名替换你的站点屏蔽列表。
following_html:
other: 你即将关注来自 %{filename} 的最多 %{count} 个账户，并停止关注其他所有人。
lists_html:
@@ -1376,7 +1376,7 @@ zh-CN:
bookmarks_html:
other: 你即将把来自 %{filename} 的 %{count} 篇嘟文添加到你的收藏夹中。
domain_blocking_html:
- other: 你即将屏蔽来自 %{filename} 的最多 %{count} 个域名。
+ other: 你即将屏蔽来自 %{filename} 的最多 %{count} 个站点。
following_html:
other: 你即将关注来自 %{filename} 的最多 %{count} 个账号。
lists_html:
@@ -1396,7 +1396,7 @@ zh-CN:
titles:
blocking: 正在导入被屏蔽的账户
bookmarks: 正在导入收藏
- domain_blocking: 正在导入被屏蔽的域名
+ domain_blocking: 正在导入站点屏蔽列表
following: 正在导入关注的账户
lists: 导入列表
muting: 正在导入隐藏的账户
@@ -1407,7 +1407,7 @@ zh-CN:
types:
blocking: 屏蔽列表
bookmarks: 收藏
- domain_blocking: 域名屏蔽列表
+ domain_blocking: 站点屏蔽列表
following: 关注列表
lists: 列表
muting: 隐藏列表
@@ -1621,7 +1621,7 @@ zh-CN:
mutual: 互相关注
primary: 主要
relationship: 关系
- remove_selected_domains: 从选定的域名中删除所有关注者
+ remove_selected_domains: 删除在选定站点中的所有关注者
remove_selected_followers: 移除选中的关注者
remove_selected_follows: 取消关注所选用户
status: 账户状态
@@ -1638,7 +1638,7 @@ zh-CN:
scheduled_statuses:
over_daily_limit: 你已超出每日定时嘟文的上限（%{limit} 条）
over_total_limit: 你已超出定时嘟文的上限（%{limit} 条）
- too_soon: 所定的时间必须在未来
+ too_soon: 日期必须晚于当前时间
self_destruct:
lead_html: 很遗憾，%{domain} 即将永久关闭。 如果你在其中设有账号，那么你将无法再继续使用，但你仍可以请求获得本人数据的备份。
title: 此服务器即将关闭
@@ -1699,7 +1699,7 @@ zh-CN:
development: 开发
edit_profile: 更改个人资料
export: 导出
- featured_tags: 精选话题标签
+ featured_tags: 精选话题
import: 导入
import_and_export: 导入与导出
migrate: 账户迁移
@@ -1720,7 +1720,7 @@ zh-CN:
user_domain_block: 你屏蔽了 %{target_name}
lost_followers: 失去的关注者
lost_follows: 失去的关注
- preamble: 当你屏蔽一个域名或你的管理员决定封禁一个外站服务器时，你可能会失去关注和粉丝。在这种情况下，你可以下载被切断的关系的列表，进行检查以便导入另一个服务器。
+ preamble: 如果你屏蔽了某个站点，或者管理员封禁了某个站点，你可能会丢失一部分关注和关注者。你可以下载联系被中断的账户列表，进行检查并导入到其他站点。
purged: 关于此服务器的信息已被你所在服务器的管理员清除。
type: 事件
statuses:
@@ -1736,7 +1736,7 @@ zh-CN:
content_warning: 内容警告：%{warning}
default_language: 与界面显示语言相同
disallowed_hashtags:
- other: 包含了这些禁止的话题标签：%{tags}
+ other: 包含以下被禁止的话题：%{tags}
edited_at_html: 编辑于 %{date}
errors:
in_reply_not_found: 你回复的嘟文似乎不存在
@@ -1864,9 +1864,9 @@ zh-CN:
spam: 垃圾信息
violation: 内容违反了以下社区准则
explanation:
- delete_statuses: 你的一些嘟文被发现违反了一条或多条社区准则，并已被 %{instance} 的监察员删除。
+ delete_statuses: 你的一些嘟文被发现违反了一条或多条社区准则，并已被 %{instance} 的管理员删除。
disable: 你不能再使用你的账户，但你的个人资料和其他数据保持不变。你可以请求数据备份，更改账户设置或删除账户。
- mark_statuses_as_sensitive: 你的一些嘟文已经被 %{instance} 检察员标记为敏感内容。这意味着别人需要在嘟文中点击媒体，才能显示媒体预览。你可以在今后发布嘟文时自行将媒体标记为敏感内容。
+ mark_statuses_as_sensitive: 你的一些嘟文已经被 %{instance} 管理员标记为敏感内容。这意味着别人需要在嘟文中点击媒体，才能显示媒体预览。你可以在今后发布嘟文时自行将媒体标记为敏感内容。
sensitive: 即刻起，你上传的所有媒体文件都将被标记为敏感内容并隐藏，在点击警告后才能查看。
silence: 你可以继续使用你的账号，但只有已关注你的人才能在看到你在此服务器上的嘟文，并且你会被排除在各类公共列表之外。其他用户仍可以手动关注你。
suspend: 你不能再使用你的账户，并且你的个人资料和其他数据都将无法访问。在大约30天内，你仍可以登录并请求数据备份，之后相关数据将被完全删除。我们会保留一些基础数据以避免封禁失效。
@@ -1917,8 +1917,8 @@ zh-CN:
hashtags_recent_count:
other: 过去2天内有 %{people} 人
hashtags_subtitle: 探索过去2天以来的热门内容
- hashtags_title: 热门话题标签
- hashtags_view_more: 查看更多热门话题标签
+ hashtags_title: 热门话题
+ hashtags_view_more: 查看更多热门话题
post_action: 撰写
post_step: 向世界打个招呼吧。
post_title: 发布你的第一条嘟文
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 752c9b5cbf0ebf..cff96797ee284d 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1489,7 +1489,6 @@ zh-HK:
scheduled_statuses:
over_daily_limit: 你已經超越了當天排定發文的限額 (%{limit})
over_total_limit: 你已經超越了排定發文的限額 (%{limit})
- too_soon: 不可以改變過去哦，嘟文只可以排定在未來
self_destruct:
lead_html: 很遺憾，%{domain} 即將永久停止服務。如果你在該處擁有帳號，你將無法繼續使用它，但你仍然可以要求備份你的數據。
title: 這個伺服器即將停止服務
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index d14bfee1b4acf5..6de2e0fd5274be 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1640,7 +1640,7 @@ zh-TW:
scheduled_statuses:
over_daily_limit: 您已經超過了本日排定發嘟的限額 (%{limit})
over_total_limit: 您已經超過排程發嘟的限額 (%{limit})
- too_soon: 嘟文不可以改變過去哦，只能預定未來 (咦)
+ too_soon: 日期必須為未來
self_destruct:
lead_html: 很遺憾，%{domain} 即將永久停止服務。如果您於該伺服器擁有帳號，您將無法繼續使用它，但您仍然可以請求您的資料備份。
title: 這個伺服器即將停止服務
diff --git a/db/migrate/20220304195405_migrate_hide_network_preference.rb b/db/migrate/20220304195405_migrate_hide_network_preference.rb
index 0083e0422aa8e8..996b7d78ab12fc 100644
--- a/db/migrate/20220304195405_migrate_hide_network_preference.rb
+++ b/db/migrate/20220304195405_migrate_hide_network_preference.rb
@@ -13,6 +13,13 @@ class User < ApplicationRecord
belongs_to :account
end
+ class Setting < ApplicationRecord
+ # Mirror the behavior of the `Setting` model at this point in db history
+ def value
+ YAML.safe_load(self[:value], permitted_classes: [ActiveSupport::HashWithIndifferentAccess, Symbol]) if self[:value].present?
+ end
+ end
+
def up
Account.reset_column_information
diff --git a/db/migrate/20241111141355_create_tag_trends.rb b/db/migrate/20241111141355_create_tag_trends.rb
new file mode 100644
index 00000000000000..c4c7d13d19243e
--- /dev/null
+++ b/db/migrate/20241111141355_create_tag_trends.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateTagTrends < ActiveRecord::Migration[7.2]
+ def change
+ create_table :tag_trends do |t| # rubocop:disable Rails/CreateTableWithTimestamps
+ t.references :tag, null: false, foreign_key: { on_delete: :cascade }, index: false
+ t.float :score, null: false, default: 0
+ t.integer :rank, null: false, default: 0
+ t.boolean :allowed, null: false, default: false
+ t.string :language, null: false, default: ''
+ end
+
+ add_index :tag_trends, [:tag_id, :language], unique: true
+ end
+end
diff --git a/db/migrate/20241205135901_remove_legacy_user_settings_data.rb b/db/migrate/20241205135901_remove_legacy_user_settings_data.rb
new file mode 100644
index 00000000000000..09cc80842c2ffa
--- /dev/null
+++ b/db/migrate/20241205135901_remove_legacy_user_settings_data.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class RemoveLegacyUserSettingsData < ActiveRecord::Migration[7.2]
+ def up
+ connection.execute(<<~SQL.squish)
+ DELETE FROM settings
+ WHERE
+ thing_type IS NOT NULL
+ AND thing_id IS NOT NULL
+ SQL
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/post_migrate/20190519130537_remove_boosts_widening_audience.rb b/db/post_migrate/20190519130537_remove_boosts_widening_audience.rb
index 89a95041ee0235..a1b8fa70327311 100644
--- a/db/post_migrate/20190519130537_remove_boosts_widening_audience.rb
+++ b/db/post_migrate/20190519130537_remove_boosts_widening_audience.rb
@@ -4,19 +4,26 @@ class RemoveBoostsWideningAudience < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
def up
- public_boosts = Status.find_by_sql(<<-SQL.squish)
- SELECT boost.id
- FROM statuses AS boost
- LEFT JOIN statuses AS boosted ON boost.reblog_of_id = boosted.id
- WHERE
- boost.id > 101746055577600000
- AND (boost.local = TRUE OR boost.uri IS NULL)
- AND boost.visibility IN (0, 1)
- AND boost.reblog_of_id IS NOT NULL
- AND boosted.visibility = 2
- SQL
+ # add_column :statuses, :searchability, :integer
+ # add_column :statuses, :limited_scope, :integer
- RemovalWorker.push_bulk(public_boosts.pluck(:id))
+ # Status.find_by_sql(<<-SQL.squish)
+ # SELECT boost.id
+ # FROM statuses AS boost
+ # LEFT JOIN statuses AS boosted ON boost.reblog_of_id = boosted.id
+ # WHERE
+ # boost.id > 101746055577600000
+ # AND (boost.local = TRUE OR boost.uri IS NULL)
+ # AND boost.visibility IN (0, 1)
+ # AND boost.reblog_of_id IS NOT NULL
+ # AND boosted.visibility = 2
+ # SQL
+
+ # Sorry, but remove to fix test
+ # RemovalWorker.push_bulk(public_boosts.pluck(:id))
+
+ # remove_column :statuses, :searchability
+ # remove_column :statuses, :limited_scope
end
def down
diff --git a/db/post_migrate/20241123160722_move_tag_trends_to_table.rb b/db/post_migrate/20241123160722_move_tag_trends_to_table.rb
new file mode 100644
index 00000000000000..629592ba8addfd
--- /dev/null
+++ b/db/post_migrate/20241123160722_move_tag_trends_to_table.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class MoveTagTrendsToTable < ActiveRecord::Migration[7.2]
+ include Redisable
+
+ disable_ddl_transaction!
+
+ def up
+ redis.zrange('trending_tags:all', 0, -1, with_scores: true).each_slice(1_000) do |data|
+ TagTrend.upsert_all(data.map { |(tag_id, score)| { tag_id: tag_id, score: score, language: '', allowed: redis.zscore('trending_tags:allowed', tag_id).present? } }, unique_by: %w(tag_id language))
+ end
+
+ TagTrend.recalculate_ordered_rank
+
+ redis.del('trending_tags:allowed', 'trending_tags:all')
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/post_migrate/20241205135925_remove_legacy_user_settings_columns.rb b/db/post_migrate/20241205135925_remove_legacy_user_settings_columns.rb
new file mode 100644
index 00000000000000..f713f18f255a0a
--- /dev/null
+++ b/db/post_migrate/20241205135925_remove_legacy_user_settings_columns.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class RemoveLegacyUserSettingsColumns < ActiveRecord::Migration[7.2]
+ disable_ddl_transaction!
+
+ def up
+ # In normal usage this should not find anything to delete
+ # Deletion here is already done in RemoveLegacyUserSettingsData migration
+ # and no data like this should be created from app at this point
+ # Deleting again out of caution
+ connection.execute(<<~SQL.squish)
+ DELETE FROM settings
+ WHERE
+ thing_type IS NOT NULL
+ AND thing_id IS NOT NULL
+ SQL
+
+ add_index :settings, :var, unique: true, algorithm: :concurrently
+ remove_index :settings, [:thing_type, :thing_id, :var], name: :index_settings_on_thing_type_and_thing_id_and_var, unique: true
+
+ safety_assured do
+ remove_column :settings, :thing_type, :string
+ remove_column :settings, :thing_id, :bigint
+ end
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c0037165408839..584c38337c9033 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.2].define(version: 2024_11_04_082851) do
+ActiveRecord::Schema[7.2].define(version: 2024_12_05_135925) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -1267,11 +1267,9 @@
create_table "settings", force: :cascade do |t|
t.string "var", null: false
t.text "value"
- t.string "thing_type"
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
+ t.index ["var"], name: "index_settings_on_var", unique: true
end
create_table "severed_relationships", force: :cascade do |t|
@@ -1449,6 +1447,15 @@
t.index ["tag_id"], name: "index_tag_follows_on_tag_id"
end
+ create_table "tag_trends", force: :cascade do |t|
+ t.bigint "tag_id", null: false
+ t.float "score", default: 0.0, null: false
+ t.integer "rank", default: 0, null: false
+ t.boolean "allowed", default: false, null: false
+ t.string "language", default: "", null: false
+ t.index ["tag_id", "language"], name: "index_tag_trends_on_tag_id_and_language", unique: true
+ end
+
create_table "tags", force: :cascade do |t|
t.string "name", default: "", null: false
t.datetime "created_at", precision: nil, null: false
@@ -1745,6 +1752,7 @@
add_foreign_key "statuses_tags", "tags", name: "fk_3081861e21", on_delete: :cascade
add_foreign_key "tag_follows", "accounts", on_delete: :cascade
add_foreign_key "tag_follows", "tags", on_delete: :cascade
+ add_foreign_key "tag_trends", "tags", on_delete: :cascade
add_foreign_key "tombstones", "accounts", on_delete: :cascade
add_foreign_key "user_invite_requests", "users", on_delete: :cascade
add_foreign_key "users", "accounts", name: "fk_50500f500d", on_delete: :cascade
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 73de0c120faa09..3288e72d46c875 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -43,8 +43,14 @@ namespace :db do
end
task pre_migration_check: :environment do
- version = ActiveRecord::Base.connection.database_version
- abort 'This version of Mastodon requires PostgreSQL 12.0 or newer. Please update PostgreSQL before updating Mastodon.' if version < 120_000
+ pg_version = ActiveRecord::Base.connection.database_version
+ abort 'This version of Mastodon requires PostgreSQL 12.0 or newer. Please update PostgreSQL before updating Mastodon.' if pg_version < 120_000
+
+ schema_version = ActiveRecord::Migrator.current_version
+ abort <<~MESSAGE if ENV['SKIP_POST_DEPLOYMENT_MIGRATIONS'] && schema_version < 2023_09_07_150100
+ Zero-downtime migrations from Mastodon versions earlier than 4.2.0 are not supported.
+ Please update to Mastodon 4.2.x first or upgrade by stopping all services and running migrations without `SKIP_POST_DEPLOYMENT_MIGRATIONS`.
+ MESSAGE
end
Rake::Task['db:migrate'].enhance(['db:pre_migration_check'])
diff --git a/package.json b/package.json
index 3df795954631df..6751e62960015b 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
"@babel/preset-typescript": "^7.21.5",
"@babel/runtime": "^7.23.7",
"@dnd-kit/core": "^6.1.0",
- "@dnd-kit/sortable": "^9.0.0",
+ "@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@formatjs/intl-pluralrules": "^5.2.2",
"@gamestdio/websocket": "^0.3.2",
diff --git a/spec/fabricators/setting_fabricator.rb b/spec/fabricators/setting_fabricator.rb
index ce9a48e9019eaf..689a0de00239b5 100644
--- a/spec/fabricators/setting_fabricator.rb
+++ b/spec/fabricators/setting_fabricator.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
Fabricator(:setting) do
- var 'var'
+ var { sequence(:var) { |n| "var_#{n}" } }
end
diff --git a/spec/fabricators/tag_trend_fabricator.rb b/spec/fabricators/tag_trend_fabricator.rb
new file mode 100644
index 00000000000000..ddf9b9bf40632e
--- /dev/null
+++ b/spec/fabricators/tag_trend_fabricator.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Fabricator(:tag_trend) do
+ tag
+end
diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb
index 846147902ded8e..22386189ca8220 100644
--- a/spec/mailers/admin_mailer_spec.rb
+++ b/spec/mailers/admin_mailer_spec.rb
@@ -91,6 +91,7 @@
before do
PreviewCardTrend.create!(preview_card: link)
StatusTrend.create!(status: status, account: Fabricate(:account))
+ TagTrend.create!(tag: tag)
recipient.user.update(locale: :en)
end
diff --git a/spec/models/tag_trend_spec.rb b/spec/models/tag_trend_spec.rb
new file mode 100644
index 00000000000000..37b50686db980c
--- /dev/null
+++ b/spec/models/tag_trend_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe TagTrend do
+ include_examples 'RankedTrend'
+
+ describe 'Associations' do
+ it { is_expected.to belong_to(:tag).required }
+ end
+end
diff --git a/spec/models/trends/tags_spec.rb b/spec/models/trends/tags_spec.rb
index 91ca91f078b98d..c1d741baf2d29a 100644
--- a/spec/models/trends/tags_spec.rb
+++ b/spec/models/trends/tags_spec.rb
@@ -88,10 +88,10 @@
it 'decays scores' do
subject.refresh(yesterday + 12.hours)
- original_score = subject.score(tag_ocs.id)
+ original_score = TagTrend.find_by(tag: tag_ocs).score
expect(original_score).to eq 144.0
subject.refresh(yesterday + 12.hours + subject.options[:max_score_halflife])
- decayed_score = subject.score(tag_ocs.id)
+ decayed_score = TagTrend.find_by(tag: tag_ocs).score
expect(decayed_score).to be <= original_score / 2
end
end
diff --git a/spec/requests/api/v2/instance_spec.rb b/spec/requests/api/v2/instance_spec.rb
index fae92b739108c4..bdccfdb626cf73 100644
--- a/spec/requests/api/v2/instance_spec.rb
+++ b/spec/requests/api/v2/instance_spec.rb
@@ -55,6 +55,9 @@ def include_configuration_limits
max_characters: StatusLengthValidator::MAX_CHARS,
max_media_attachments: Status::MEDIA_ATTACHMENTS_LIMIT
),
+ media_attachments: include(
+ description_limit: MediaAttachment::MAX_DESCRIPTION_LENGTH
+ ),
polls: include(
max_options: PollValidator::MAX_OPTIONS
)
diff --git a/spec/requests/tags_spec.rb b/spec/requests/tags_spec.rb
index fbd1f7d56ee4ae..f04d1bc2d3a1ef 100644
--- a/spec/requests/tags_spec.rb
+++ b/spec/requests/tags_spec.rb
@@ -7,6 +7,29 @@
context 'when tag exists' do
let(:tag) { Fabricate :tag }
+ context 'with HTML format' do
+ before { get tag_path(tag) }
+
+ it 'returns page with links to alternate resources' do
+ expect(rss_links.first[:href])
+ .to eq(tag_url(tag))
+ expect(activity_json_links.first[:href])
+ .to eq(tag_url(tag))
+ end
+
+ def rss_links
+ alternate_links.css('[type="application/rss+xml"]')
+ end
+
+ def activity_json_links
+ alternate_links.css('[type="application/activity+json"]')
+ end
+
+ def alternate_links
+ response.parsed_body.css('link[rel=alternate]')
+ end
+ end
+
context 'with JSON format' do
before { get tag_path(tag, format: :json) }
diff --git a/spec/serializers/rest/preview_card_serializer_spec.rb b/spec/serializers/rest/preview_card_serializer_spec.rb
new file mode 100644
index 00000000000000..6dbc33786564df
--- /dev/null
+++ b/spec/serializers/rest/preview_card_serializer_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe REST::PreviewCardSerializer do
+ subject do
+ serialized_record_json(
+ preview_card,
+ described_class
+ )
+ end
+
+ context 'when preview card does not have author data' do
+ let(:preview_card) { Fabricate.build :preview_card }
+
+ it 'includes empty authors array' do
+ expect(subject.deep_symbolize_keys)
+ .to include(
+ authors: be_an(Array).and(be_empty)
+ )
+ end
+ end
+
+ context 'when preview card has author data' do
+ let(:preview_card) { Fabricate.build :preview_card, author_name: 'Name', author_url: 'https://host.example/123' }
+
+ it 'includes populated authors array' do
+ expect(subject.deep_symbolize_keys)
+ .to include(
+ authors: be_an(Array).and(
+ contain_exactly(
+ include(
+ name: 'Name',
+ url: 'https://host.example/123'
+ )
+ )
+ )
+ )
+ end
+ end
+end
diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
index 62dc556b8c3b3b..df0db9149edcc8 100644
--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -7,10 +7,12 @@
let(:thread) { nil }
let!(:status) { Fabricate(:status, text: 'Hello world', account: Fabricate(:account, domain: 'example.com'), thread: thread) }
+ let(:bogus_mention) { 'https://example.com/users/erroringuser' }
let(:json_tags) do
[
{ type: 'Hashtag', name: 'hoge' },
{ type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
+ { type: 'Mention', href: bogus_mention },
]
end
let(:content) { 'Hello universe' }
@@ -39,16 +41,18 @@
mentions.each { |a| Fabricate(:mention, status: status, account: a) }
tags.each { |t| status.tags << t }
media_attachments.each { |m| status.media_attachments << m }
+ stub_request(:get, bogus_mention).to_raise(HTTP::ConnectionError)
end
describe '#call' do
- it 'updates text and content warning' do
+ it 'updates text and content warning, and schedules re-fetching broken mention' do
subject.call(status, json, json)
expect(status.reload)
.to have_attributes(
text: eq('Hello universe'),
spoiler_text: eq('Show more')
)
+ expect(MentionResolveWorker).to have_enqueued_sidekiq_job(status.id, bogus_mention, anything)
end
context 'when the changes are only in sanitized-out HTML' do
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 09a532d6da1803..51982f52dff92e 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -70,7 +70,7 @@
subject.call(account, text: 'Hi future!', scheduled_at: invalid_scheduled_time)
end.to raise_error(
ActiveRecord::RecordInvalid,
- 'Validation failed: Scheduled at The scheduled date must be in the future'
+ 'Validation failed: Scheduled at date must be in the future'
)
end
end
diff --git a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
index b1be7c46117203..604f528586afb2 100644
--- a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
@@ -9,6 +9,7 @@
let!(:old_unconfirmed_user) { Fabricate(:user) }
let!(:confirmed_user) { Fabricate(:user) }
let!(:moderation_note) { Fabricate(:account_moderation_note, account: Fabricate(:account), target_account: old_unconfirmed_user.account) }
+ let!(:webauthn_credential) { Fabricate(:webauthn_credential, user_id: old_unconfirmed_user.id) }
describe '#perform' do
before do
@@ -26,6 +27,8 @@
.from(true).to(false)
expect { moderation_note.reload }
.to raise_error(ActiveRecord::RecordNotFound)
+ expect { webauthn_credential.reload }
+ .to raise_error(ActiveRecord::RecordNotFound)
expect_preservation_of(new_unconfirmed_user)
expect_preservation_of(confirmed_user)
end
diff --git a/yarn.lock b/yarn.lock
index 009709cfb4bd95..f7ed7abb2abc06 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1972,8 +1972,8 @@ __metadata:
linkType: hard
"@dnd-kit/core@npm:^6.1.0":
- version: 6.2.0
- resolution: "@dnd-kit/core@npm:6.2.0"
+ version: 6.3.0
+ resolution: "@dnd-kit/core@npm:6.3.0"
dependencies:
"@dnd-kit/accessibility": "npm:^3.1.1"
"@dnd-kit/utilities": "npm:^3.2.2"
@@ -1981,20 +1981,20 @@ __metadata:
peerDependencies:
react: ">=16.8.0"
react-dom: ">=16.8.0"
- checksum: 10c0/478d6bb027441b0e5fa5ecd9a4da8a5876811505147303de1a5a0783a4418c5f7f464bd3eb07b4be77ef7626364d1b905dc2a4f9055093b845cf39e1d6f13b73
+ checksum: 10c0/7b6ebae619921ac27a367b5f168cf66729ab2f5041a5376bb05399cdfd05e03c8fac5d218632ee04fe7c1e049bde9222930c6e8ee1dbb0ca8bde38038f1a1a48
languageName: node
linkType: hard
-"@dnd-kit/sortable@npm:^9.0.0":
- version: 9.0.0
- resolution: "@dnd-kit/sortable@npm:9.0.0"
+"@dnd-kit/sortable@npm:^10.0.0":
+ version: 10.0.0
+ resolution: "@dnd-kit/sortable@npm:10.0.0"
dependencies:
"@dnd-kit/utilities": "npm:^3.2.2"
tslib: "npm:^2.0.0"
peerDependencies:
- "@dnd-kit/core": ^6.2.0
+ "@dnd-kit/core": ^6.3.0
react: ">=16.8.0"
- checksum: 10c0/30566ec05371bd59729c0fb87537d78cd1760f08e4b49b5fa8298ebd3cb9f29fc258a48425c6a060b9efeca88e36a059000e770d630681986626abcc3589e97a
+ checksum: 10c0/37ee48bc6789fb512dc0e4c374a96d19abe5b2b76dc34856a5883aaa96c3297891b94cc77bbc409e074dcce70967ebcb9feb40cd9abadb8716fc280b4c7f99af
languageName: node
linkType: hard
@@ -2842,7 +2842,7 @@ __metadata:
"@babel/preset-typescript": "npm:^7.21.5"
"@babel/runtime": "npm:^7.23.7"
"@dnd-kit/core": "npm:^6.1.0"
- "@dnd-kit/sortable": "npm:^9.0.0"
+ "@dnd-kit/sortable": "npm:^10.0.0"
"@dnd-kit/utilities": "npm:^3.2.2"
"@formatjs/cli": "npm:^6.1.1"
"@formatjs/intl-pluralrules": "npm:^5.2.2"
@@ -3120,6 +3120,150 @@ __metadata:
languageName: node
linkType: hard
+"@parcel/watcher-android-arm64@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@parcel/watcher-android-arm64@npm:2.5.0"
+ conditions: os=android & cpu=arm64
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-darwin-arm64@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@parcel/watcher-darwin-arm64@npm:2.5.0"
+ conditions: os=darwin & cpu=arm64
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-darwin-x64@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@parcel/watcher-darwin-x64@npm:2.5.0"
+ conditions: os=darwin & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-freebsd-x64@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@parcel/watcher-freebsd-x64@npm:2.5.0"
+ conditions: os=freebsd & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-linux-arm-glibc@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@parcel/watcher-linux-arm-glibc@npm:2.5.0"
+ conditions: os=linux & cpu=arm & libc=glibc
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-linux-arm-musl@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@parcel/watcher-linux-arm-musl@npm:2.5.0"
+ conditions: os=linux & cpu=arm & libc=musl
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-linux-arm64-glibc@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@parcel/watcher-linux-arm64-glibc@npm:2.5.0"
+ conditions: os=linux & cpu=arm64 & libc=glibc
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-linux-arm64-musl@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@parcel/watcher-linux-arm64-musl@npm:2.5.0"
+ conditions: os=linux & cpu=arm64 & libc=musl
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-linux-x64-glibc@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@parcel/watcher-linux-x64-glibc@npm:2.5.0"
+ conditions: os=linux & cpu=x64 & libc=glibc
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-linux-x64-musl@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@parcel/watcher-linux-x64-musl@npm:2.5.0"
+ conditions: os=linux & cpu=x64 & libc=musl
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-win32-arm64@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@parcel/watcher-win32-arm64@npm:2.5.0"
+ conditions: os=win32 & cpu=arm64
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-win32-ia32@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@parcel/watcher-win32-ia32@npm:2.5.0"
+ conditions: os=win32 & cpu=ia32
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-win32-x64@npm:2.5.0":
+ version: 2.5.0
+ resolution: "@parcel/watcher-win32-x64@npm:2.5.0"
+ conditions: os=win32 & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher@npm:^2.4.1":
+ version: 2.5.0
+ resolution: "@parcel/watcher@npm:2.5.0"
+ dependencies:
+ "@parcel/watcher-android-arm64": "npm:2.5.0"
+ "@parcel/watcher-darwin-arm64": "npm:2.5.0"
+ "@parcel/watcher-darwin-x64": "npm:2.5.0"
+ "@parcel/watcher-freebsd-x64": "npm:2.5.0"
+ "@parcel/watcher-linux-arm-glibc": "npm:2.5.0"
+ "@parcel/watcher-linux-arm-musl": "npm:2.5.0"
+ "@parcel/watcher-linux-arm64-glibc": "npm:2.5.0"
+ "@parcel/watcher-linux-arm64-musl": "npm:2.5.0"
+ "@parcel/watcher-linux-x64-glibc": "npm:2.5.0"
+ "@parcel/watcher-linux-x64-musl": "npm:2.5.0"
+ "@parcel/watcher-win32-arm64": "npm:2.5.0"
+ "@parcel/watcher-win32-ia32": "npm:2.5.0"
+ "@parcel/watcher-win32-x64": "npm:2.5.0"
+ detect-libc: "npm:^1.0.3"
+ is-glob: "npm:^4.0.3"
+ micromatch: "npm:^4.0.5"
+ node-addon-api: "npm:^7.0.0"
+ node-gyp: "npm:latest"
+ dependenciesMeta:
+ "@parcel/watcher-android-arm64":
+ optional: true
+ "@parcel/watcher-darwin-arm64":
+ optional: true
+ "@parcel/watcher-darwin-x64":
+ optional: true
+ "@parcel/watcher-freebsd-x64":
+ optional: true
+ "@parcel/watcher-linux-arm-glibc":
+ optional: true
+ "@parcel/watcher-linux-arm-musl":
+ optional: true
+ "@parcel/watcher-linux-arm64-glibc":
+ optional: true
+ "@parcel/watcher-linux-arm64-musl":
+ optional: true
+ "@parcel/watcher-linux-x64-glibc":
+ optional: true
+ "@parcel/watcher-linux-x64-musl":
+ optional: true
+ "@parcel/watcher-win32-arm64":
+ optional: true
+ "@parcel/watcher-win32-ia32":
+ optional: true
+ "@parcel/watcher-win32-x64":
+ optional: true
+ checksum: 10c0/9bad727d8b11e5d150ec47459254544c583adaa47d047b8ef65e1c74aede1a0767dc7fc6b8997649dae07318d6ef39caba6a1c405d306398d5bcd47074ec5d29
+ languageName: node
+ linkType: hard
+
"@pkgjs/parseargs@npm:^0.11.0":
version: 0.11.0
resolution: "@pkgjs/parseargs@npm:0.11.0"
@@ -5156,13 +5300,13 @@ __metadata:
linkType: hard
"axios@npm:^1.4.0":
- version: 1.7.8
- resolution: "axios@npm:1.7.8"
+ version: 1.7.9
+ resolution: "axios@npm:1.7.9"
dependencies:
follow-redirects: "npm:^1.15.6"
form-data: "npm:^4.0.0"
proxy-from-env: "npm:^1.1.0"
- checksum: 10c0/23ae2d0105aea9170c34ac9b6f30d9b2ab2fa8b1370205d2f7ce98b9f9510ab420148c13359ee837ea5a4bf2fb028ff225bd2fc92052fb0c478c6b4a836e2d5f
+ checksum: 10c0/b7a41e24b59fee5f0f26c1fc844b45b17442832eb3a0fb42dd4f1430eb4abc571fe168e67913e8a1d91c993232bd1d1ab03e20e4d1fee8c6147649b576fc1b0b
languageName: node
linkType: hard
@@ -7190,6 +7334,15 @@ __metadata:
languageName: node
linkType: hard
+"detect-libc@npm:^1.0.3":
+ version: 1.0.3
+ resolution: "detect-libc@npm:1.0.3"
+ bin:
+ detect-libc: ./bin/detect-libc.js
+ checksum: 10c0/4da0deae9f69e13bc37a0902d78bf7169480004b1fed3c19722d56cff578d16f0e11633b7fbf5fb6249181236c72e90024cbd68f0b9558ae06e281f47326d50d
+ languageName: node
+ linkType: hard
+
"detect-newline@npm:^3.0.0":
version: 3.1.0
resolution: "detect-newline@npm:3.1.0"
@@ -7399,9 +7552,9 @@ __metadata:
linkType: hard
"dotenv@npm:^16.0.3":
- version: 16.4.5
- resolution: "dotenv@npm:16.4.5"
- checksum: 10c0/48d92870076832af0418b13acd6e5a5a3e83bb00df690d9812e94b24aff62b88ade955ac99a05501305b8dc8f1b0ee7638b18493deb6fe93d680e5220936292f
+ version: 16.4.7
+ resolution: "dotenv@npm:16.4.7"
+ checksum: 10c0/be9f597e36a8daf834452daa1f4cc30e5375a5968f98f46d89b16b983c567398a330580c88395069a77473943c06b877d1ca25b4afafcdd6d4adb549e8293462
languageName: node
linkType: hard
@@ -9627,13 +9780,20 @@ __metadata:
languageName: node
linkType: hard
-"immutable@npm:^4.0.0, immutable@npm:^4.0.0-rc.1, immutable@npm:^4.3.0":
+"immutable@npm:^4.0.0-rc.1, immutable@npm:^4.3.0":
version: 4.3.7
resolution: "immutable@npm:4.3.7"
checksum: 10c0/9b099197081b22f6433003e34929da8ecddbbdc1474cdc8aa3b7669dee4adda349c06143de22def36016d1b6de5322b043eccd7a11db1dad2ca85dad4fff5435
languageName: node
linkType: hard
+"immutable@npm:^5.0.2":
+ version: 5.0.3
+ resolution: "immutable@npm:5.0.3"
+ checksum: 10c0/3269827789e1026cd25c2ea97f0b2c19be852ffd49eda1b674b20178f73d84fa8d945ad6f5ac5bc4545c2b4170af9f6e1f77129bc1cae7974a4bf9b04a9cdfb9
+ languageName: node
+ linkType: hard
+
"import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0":
version: 3.3.0
resolution: "import-fresh@npm:3.3.0"
@@ -11878,7 +12038,7 @@ __metadata:
languageName: node
linkType: hard
-"micromatch@npm:^4.0.4, micromatch@npm:^4.0.8, micromatch@npm:~4.0.8":
+"micromatch@npm:^4.0.4, micromatch@npm:^4.0.5, micromatch@npm:^4.0.8, micromatch@npm:~4.0.8":
version: 4.0.8
resolution: "micromatch@npm:4.0.8"
dependencies:
@@ -12249,6 +12409,15 @@ __metadata:
languageName: node
linkType: hard
+"node-addon-api@npm:^7.0.0":
+ version: 7.1.1
+ resolution: "node-addon-api@npm:7.1.1"
+ dependencies:
+ node-gyp: "npm:latest"
+ checksum: 10c0/fb32a206276d608037fa1bcd7e9921e177fe992fc610d098aa3128baca3c0050fc1e014fa007e9b3874cf865ddb4f5bd9f43ccb7cbbbe4efaff6a83e920b17e9
+ languageName: node
+ linkType: hard
+
"node-fetch@npm:^2.6.0":
version: 2.6.11
resolution: "node-fetch@npm:2.6.11"
@@ -15484,15 +15653,19 @@ __metadata:
linkType: hard
"sass@npm:^1.62.1":
- version: 1.79.3
- resolution: "sass@npm:1.79.3"
+ version: 1.82.0
+ resolution: "sass@npm:1.82.0"
dependencies:
+ "@parcel/watcher": "npm:^2.4.1"
chokidar: "npm:^4.0.0"
- immutable: "npm:^4.0.0"
+ immutable: "npm:^5.0.2"
source-map-js: "npm:>=0.6.2 <2.0.0"
+ dependenciesMeta:
+ "@parcel/watcher":
+ optional: true
bin:
sass: sass.js
- checksum: 10c0/ad171bbbb2d7a789cc47803a59dcf2d0ac92ede34b538bb3fd683b6391a9ac3dc3eabaac264fc9582c770c4e435b85840e011785b7adfc0ac002b51ba91179c9
+ checksum: 10c0/7f86fe6ade4f6018862c448ed69d5c52f485b0125c9dab24e63f679739a04cc7c56562d588e3cf16b5efb4d2c4d0530e62740e1cfd273e2e3707d04d11011736
languageName: node
linkType: hard