From 216cea1e277530d39eefddbfccb519d2eca72b8b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 12 Mar 2024 04:38:32 -0400
Subject: [PATCH 1/4] Fix incorrect frequency value in `FriendsOfFriendsSource`
data (#29550)
---
.../friends_of_friends_source.rb | 12 +++++---
.../friends_of_friends_source_spec.rb | 30 +++++++++++++++----
2 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/app/models/account_suggestions/friends_of_friends_source.rb b/app/models/account_suggestions/friends_of_friends_source.rb
index 0c95d21a3e..b4f549bf31 100644
--- a/app/models/account_suggestions/friends_of_friends_source.rb
+++ b/app/models/account_suggestions/friends_of_friends_source.rb
@@ -2,15 +2,19 @@
class AccountSuggestions::FriendsOfFriendsSource < AccountSuggestions::Source
def get(account, limit: DEFAULT_LIMIT)
+ source_query(account, limit: limit)
+ .map { |id, _frequency, _followers_count| [id, key] }
+ end
+
+ def source_query(account, limit: DEFAULT_LIMIT)
first_degree = account.following.where.not(hide_collections: true).select(:id).reorder(nil)
base_account_scope(account)
.joins(:account_stat)
- .where(id: Follow.where(account_id: first_degree).select(:target_account_id))
+ .joins(:passive_relationships).where(passive_relationships: { account_id: first_degree })
.group('accounts.id, account_stats.id')
- .reorder('frequency DESC, followers_count DESC')
+ .reorder(frequency: :desc, followers_count: :desc)
.limit(limit)
- .pluck(Arel.sql('accounts.id, COUNT(*) AS frequency'))
- .map { |id, _frequency| [id, key] }
+ .pluck(Arel.sql('accounts.id, COUNT(*) AS frequency, followers_count'))
end
private
diff --git a/spec/models/account_suggestions/friends_of_friends_source_spec.rb b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
index 56a974add5..d7915985f8 100644
--- a/spec/models/account_suggestions/friends_of_friends_source_spec.rb
+++ b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
@@ -11,9 +11,9 @@ RSpec.describe AccountSuggestions::FriendsOfFriendsSource do
let!(:eve) { Fabricate(:account, discoverable: true, hide_collections: false) }
let!(:mallory) { Fabricate(:account, discoverable: false, hide_collections: false) }
let!(:eugen) { Fabricate(:account, discoverable: true, hide_collections: false) }
+ let!(:neil) { Fabricate(:account, discoverable: true, hide_collections: false) }
let!(:john) { Fabricate(:account, discoverable: true, hide_collections: false) }
let!(:jerk) { Fabricate(:account, discoverable: true, hide_collections: false) }
- let!(:neil) { Fabricate(:account, discoverable: true, hide_collections: false) }
let!(:larry) { Fabricate(:account, discoverable: true, hide_collections: false) }
context 'with follows and blocks' do
@@ -70,13 +70,31 @@ RSpec.describe AccountSuggestions::FriendsOfFriendsSource do
end
it 'returns eligible accounts in the expected order' do
- expect(subject.get(bob)).to eq [
- [eugen.id, :friends_of_friends], # followed by 2 friends, 3 followers total
- [john.id, :friends_of_friends], # followed by 2 friends, 2 followers total
- [neil.id, :friends_of_friends], # followed by 1 friend, 2 followers total
- [jerk.id, :friends_of_friends], # followed by 1 friend, 1 follower total
+ expect(subject.get(bob)).to eq expected_results
+ end
+
+ it 'contains correct underlying source data' do
+ expect(source_query_values)
+ .to contain_exactly(
+ [eugen.id, 2, 3], # Followed by 2 friends of bob (eve, mallory), 3 followers total (breaks tie)
+ [john.id, 2, 2], # Followed by 2 friends of bob (eve, mallory), 2 followers total
+ [neil.id, 1, 2], # Followed by 1 friends of bob (mallory), 2 followers total (breaks tie)
+ [jerk.id, 1, 1] # Followed by 1 friends of bob (eve), 1 followers total
+ )
+ end
+
+ def expected_results
+ [
+ [eugen.id, :friends_of_friends],
+ [john.id, :friends_of_friends],
+ [neil.id, :friends_of_friends],
+ [jerk.id, :friends_of_friends],
]
end
+
+ def source_query_values
+ subject.source_query(bob).to_a
+ end
end
end
end
From dc36b961aa1bb293c5f78cd8382033d9e143c4f5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 12 Mar 2024 10:03:51 +0100
Subject: [PATCH 2/4] New Crowdin Translations (automated) (#29554)
Co-authored-by: GitHub Actions <noreply@github.com>
---
app/javascript/mastodon/locales/an.json | 4 ---
app/javascript/mastodon/locales/ar.json | 4 ---
app/javascript/mastodon/locales/ast.json | 4 ---
app/javascript/mastodon/locales/be.json | 4 ---
app/javascript/mastodon/locales/bg.json | 6 ++---
app/javascript/mastodon/locales/bn.json | 3 ---
app/javascript/mastodon/locales/br.json | 5 +---
app/javascript/mastodon/locales/ca.json | 20 ++++++++++++---
app/javascript/mastodon/locales/ckb.json | 4 ---
app/javascript/mastodon/locales/co.json | 3 ---
app/javascript/mastodon/locales/cs.json | 4 ---
app/javascript/mastodon/locales/cy.json | 4 ---
app/javascript/mastodon/locales/da.json | 19 +++++++++++---
app/javascript/mastodon/locales/de.json | 20 ++++++++++++---
app/javascript/mastodon/locales/el.json | 4 ---
app/javascript/mastodon/locales/en-GB.json | 4 ---
app/javascript/mastodon/locales/eo.json | 4 ---
app/javascript/mastodon/locales/es-AR.json | 20 ++++++++++++---
app/javascript/mastodon/locales/es-MX.json | 20 ++++++++++++---
app/javascript/mastodon/locales/es.json | 20 ++++++++++++---
app/javascript/mastodon/locales/et.json | 4 ---
app/javascript/mastodon/locales/eu.json | 20 ++++++++++++---
app/javascript/mastodon/locales/fa.json | 4 ---
app/javascript/mastodon/locales/fi.json | 4 ---
app/javascript/mastodon/locales/fo.json | 20 ++++++++++++---
app/javascript/mastodon/locales/fr-CA.json | 4 ---
app/javascript/mastodon/locales/fr.json | 4 ---
app/javascript/mastodon/locales/fy.json | 4 ---
app/javascript/mastodon/locales/ga.json | 4 ---
app/javascript/mastodon/locales/gd.json | 4 ---
app/javascript/mastodon/locales/gl.json | 4 ---
app/javascript/mastodon/locales/he.json | 20 ++++++++++++---
app/javascript/mastodon/locales/hi.json | 3 ---
app/javascript/mastodon/locales/hr.json | 3 ---
app/javascript/mastodon/locales/hu.json | 20 ++++++++++++---
app/javascript/mastodon/locales/hy.json | 4 ---
app/javascript/mastodon/locales/ia.json | 1 -
app/javascript/mastodon/locales/id.json | 4 ---
app/javascript/mastodon/locales/ie.json | 4 ---
app/javascript/mastodon/locales/io.json | 4 ---
app/javascript/mastodon/locales/is.json | 20 ++++++++++++---
app/javascript/mastodon/locales/it.json | 20 ++++++++++++---
app/javascript/mastodon/locales/ja.json | 4 ---
app/javascript/mastodon/locales/ka.json | 1 -
app/javascript/mastodon/locales/kab.json | 3 ---
app/javascript/mastodon/locales/kk.json | 3 ---
app/javascript/mastodon/locales/ko.json | 19 ++++++++++----
app/javascript/mastodon/locales/ku.json | 4 ---
app/javascript/mastodon/locales/kw.json | 3 ---
app/javascript/mastodon/locales/lad.json | 9 ++++---
app/javascript/mastodon/locales/lt.json | 4 ---
app/javascript/mastodon/locales/lv.json | 4 ---
app/javascript/mastodon/locales/mk.json | 1 -
app/javascript/mastodon/locales/ml.json | 2 --
app/javascript/mastodon/locales/mr.json | 1 -
app/javascript/mastodon/locales/ms.json | 4 ---
app/javascript/mastodon/locales/my.json | 4 ---
app/javascript/mastodon/locales/nl.json | 20 ++++++++++++---
app/javascript/mastodon/locales/nn.json | 4 ---
app/javascript/mastodon/locales/no.json | 4 ---
app/javascript/mastodon/locales/oc.json | 4 ---
app/javascript/mastodon/locales/pa.json | 1 -
app/javascript/mastodon/locales/pl.json | 20 ++++++++++++---
app/javascript/mastodon/locales/pt-BR.json | 4 ---
app/javascript/mastodon/locales/pt-PT.json | 17 ++++++++++---
app/javascript/mastodon/locales/ro.json | 4 ---
app/javascript/mastodon/locales/ru.json | 4 ---
app/javascript/mastodon/locales/sa.json | 4 ---
app/javascript/mastodon/locales/sc.json | 3 ---
app/javascript/mastodon/locales/sco.json | 4 ---
app/javascript/mastodon/locales/si.json | 4 ---
app/javascript/mastodon/locales/sk.json | 4 ---
app/javascript/mastodon/locales/sl.json | 17 ++++++++++---
app/javascript/mastodon/locales/sq.json | 4 ---
app/javascript/mastodon/locales/sr-Latn.json | 4 ---
app/javascript/mastodon/locales/sr.json | 4 ---
app/javascript/mastodon/locales/sv.json | 7 +++---
app/javascript/mastodon/locales/ta.json | 3 ---
app/javascript/mastodon/locales/te.json | 3 ---
app/javascript/mastodon/locales/th.json | 18 +++++++++++---
app/javascript/mastodon/locales/tr.json | 4 ---
app/javascript/mastodon/locales/tt.json | 1 -
app/javascript/mastodon/locales/uk.json | 9 ++++---
app/javascript/mastodon/locales/ur.json | 2 --
app/javascript/mastodon/locales/uz.json | 1 -
app/javascript/mastodon/locales/vi.json | 4 ---
app/javascript/mastodon/locales/zh-CN.json | 20 ++++++++++++---
app/javascript/mastodon/locales/zh-HK.json | 4 ---
app/javascript/mastodon/locales/zh-TW.json | 26 ++++++++++++++------
config/locales/doorkeeper.zh-TW.yml | 2 +-
config/locales/lt.yml | 8 +++---
config/locales/lv.yml | 2 +-
config/locales/simple_form.bg.yml | 2 ++
config/locales/simple_form.br.yml | 1 +
config/locales/simple_form.ca.yml | 2 ++
config/locales/simple_form.cy.yml | 2 ++
config/locales/simple_form.da.yml | 2 ++
config/locales/simple_form.de.yml | 2 ++
config/locales/simple_form.es-AR.yml | 2 ++
config/locales/simple_form.es-MX.yml | 2 ++
config/locales/simple_form.es.yml | 2 ++
config/locales/simple_form.eu.yml | 2 ++
config/locales/simple_form.fo.yml | 2 ++
config/locales/simple_form.fy.yml | 2 ++
config/locales/simple_form.gd.yml | 2 ++
config/locales/simple_form.gl.yml | 2 ++
config/locales/simple_form.he.yml | 2 ++
config/locales/simple_form.hu.yml | 2 ++
config/locales/simple_form.is.yml | 2 ++
config/locales/simple_form.it.yml | 2 ++
config/locales/simple_form.ko.yml | 2 ++
config/locales/simple_form.lad.yml | 1 +
config/locales/simple_form.lt.yml | 3 +++
config/locales/simple_form.nl.yml | 2 ++
config/locales/simple_form.nn.yml | 2 ++
config/locales/simple_form.pl.yml | 2 ++
config/locales/simple_form.pt-PT.yml | 2 ++
config/locales/simple_form.sl.yml | 2 ++
config/locales/simple_form.sq.yml | 2 ++
config/locales/simple_form.sr-Latn.yml | 1 +
config/locales/simple_form.sr.yml | 1 +
config/locales/simple_form.sv.yml | 1 +
config/locales/simple_form.th.yml | 2 ++
config/locales/simple_form.uk.yml | 2 ++
config/locales/simple_form.vi.yml | 2 ++
config/locales/simple_form.zh-CN.yml | 2 ++
config/locales/simple_form.zh-TW.yml | 6 +++--
config/locales/zh-TW.yml | 2 +-
128 files changed, 404 insertions(+), 333 deletions(-)
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index e9d609a1ce..bf3a1a43a9 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -253,7 +253,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "Seguir etiqueta",
"hashtag.unfollow": "Deixar de seguir etiqueta",
- "home.column_settings.basic": "Basico",
"home.column_settings.show_reblogs": "Amostrar retutz",
"home.column_settings.show_replies": "Amostrar respuestas",
"home.hide_announcements": "Amagar anuncios",
@@ -363,9 +362,6 @@
"notifications.column_settings.admin.report": "Nuevos informes:",
"notifications.column_settings.admin.sign_up": "Nuevos rechistros:",
"notifications.column_settings.alert": "Notificacions d'escritorio",
- "notifications.column_settings.filter_bar.advanced": "Amostrar totas las categorías",
- "notifications.column_settings.filter_bar.category": "Barra de filtrau rapido",
- "notifications.column_settings.filter_bar.show_bar": "Amostrar barra de filtros",
"notifications.column_settings.follow": "Nuevos seguidores:",
"notifications.column_settings.follow_request": "Nuevas solicitutz de seguimiento:",
"notifications.column_settings.mention": "Mencions:",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 914c15ad95..38653b4a34 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -314,7 +314,6 @@
"hashtag.follow": "اتبع الوسم",
"hashtag.unfollow": "ألغِ متابعة الوسم",
"hashtags.and_other": "…و {count, plural, zero {} one {# واحد آخر} two {# اثنان آخران} few {# آخرون} many {# آخَرًا}other {# آخرون}}",
- "home.column_settings.basic": "الأساسية",
"home.column_settings.show_reblogs": "اعرض المعاد نشرها",
"home.column_settings.show_replies": "اعرض الردود",
"home.hide_announcements": "إخفاء الإعلانات",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
"notifications.column_settings.alert": "إشعارات سطح المكتب",
"notifications.column_settings.favourite": "المفضلة:",
- "notifications.column_settings.filter_bar.advanced": "اعرض كافة الفئات",
- "notifications.column_settings.filter_bar.category": "شريط الفلترة السريعة",
- "notifications.column_settings.filter_bar.show_bar": "إظهار شريط التصفية",
"notifications.column_settings.follow": "متابعُون جُدُد:",
"notifications.column_settings.follow_request": "الطلبات الجديد لِمتابَعتك:",
"notifications.column_settings.mention": "الإشارات:",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 8e69d434b4..76fa44202d 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -221,7 +221,6 @@
"hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
"hashtag.follow": "Siguir a la etiqueta",
"hashtag.unfollow": "Dexar de siguir a la etiqueta",
- "home.column_settings.basic": "Configuración básica",
"home.column_settings.show_reblogs": "Amosar los artículos compartíos",
"home.column_settings.show_replies": "Amosar les rempuestes",
"home.pending_critical_update.body": "¡Anueva'l sirvidor de Mastodon namás que puedas!",
@@ -311,9 +310,6 @@
"notifications.clear": "Borrar los avisos",
"notifications.column_settings.admin.report": "Informes nuevos:",
"notifications.column_settings.admin.sign_up": "Rexistros nuevos:",
- "notifications.column_settings.filter_bar.advanced": "Amosar toles categoríes",
- "notifications.column_settings.filter_bar.category": "Barra de peñera rápida",
- "notifications.column_settings.filter_bar.show_bar": "Amosar la barra de peñera",
"notifications.column_settings.follow": "Siguidores nuevos:",
"notifications.column_settings.follow_request": "Solicitúes de siguimientu nueves:",
"notifications.column_settings.mention": "Menciones:",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index c0b744fbaf..bbe21f0569 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Падпісацца на хэштэг",
"hashtag.unfollow": "Адпісацца ад хэштэга",
"hashtags.and_other": "…і яшчэ {count, plural, other {#}}",
- "home.column_settings.basic": "Асноўныя",
"home.column_settings.show_reblogs": "Паказаць пашырэнні",
"home.column_settings.show_replies": "Паказваць адказы",
"home.hide_announcements": "Схаваць аб'явы",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Новыя ўваходы:",
"notifications.column_settings.alert": "Апавяшчэнні на працоўным стале",
"notifications.column_settings.favourite": "Упадабанае:",
- "notifications.column_settings.filter_bar.advanced": "Паказваць усе катэгорыі",
- "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
- "notifications.column_settings.filter_bar.show_bar": "Паказваць панэль фільтрацыі",
"notifications.column_settings.follow": "Новыя падпісчыкі:",
"notifications.column_settings.follow_request": "Новыя запыты на падпіску:",
"notifications.column_settings.mention": "Згадванні:",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 93823496b7..ab3eda9cd3 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Следване на хаштаг",
"hashtag.unfollow": "Спиране на следване на хаштаг",
"hashtags.and_other": "…и {count, plural, other {# още}}",
- "home.column_settings.basic": "Основно",
"home.column_settings.show_reblogs": "Показване на подсилванията",
"home.column_settings.show_replies": "Показване на отговорите",
"home.hide_announcements": "Скриване на оповестяванията",
@@ -440,15 +439,13 @@
"notification.reblog": "{name} подсили ваша публикация",
"notification.status": "{name} току-що публикува",
"notification.update": "{name} промени публикация",
+ "notification_requests.notifications_from": "Известия от {name}",
"notifications.clear": "Изчистване на известията",
"notifications.clear_confirmation": "Наистина ли искате да изчистите завинаги всичките си известия?",
"notifications.column_settings.admin.report": "Нови доклади:",
"notifications.column_settings.admin.sign_up": "Нови регистрации:",
"notifications.column_settings.alert": "Известия на работния плот",
"notifications.column_settings.favourite": "Любими:",
- "notifications.column_settings.filter_bar.advanced": "Показване на всички категории",
- "notifications.column_settings.filter_bar.category": "Лента за бърз филтър",
- "notifications.column_settings.filter_bar.show_bar": "Показване на лентата с филтри",
"notifications.column_settings.follow": "Нови последователи:",
"notifications.column_settings.follow_request": "Нови заявки за последване:",
"notifications.column_settings.mention": "Споменавания:",
@@ -474,6 +471,7 @@
"notifications.permission_denied": "Известията на работния плот не са налични поради предварително отказана заявка за разрешение в браузъра",
"notifications.permission_denied_alert": "Известията на работния плот не могат да се включат, тъй като разрешението на браузъра е отказвано преди",
"notifications.permission_required": "Известията на работния плот ги няма, щото няма дадено нужното позволение.",
+ "notifications.policy.filter_new_accounts_title": "Нови акаунти",
"notifications_permission_banner.enable": "Включване на известията на работния плот",
"notifications_permission_banner.how_to_control": "За да получавате известия, когато Mastodon не е отворен, включете известията на работния плот. Може да управлявате точно кои видове взаимодействия пораждат известия на работния плот чрез бутона {icon} по-горе, след като бъдат включени.",
"notifications_permission_banner.title": "Никога не пропускайте нищо",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 508caa2f42..85f1598889 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -248,7 +248,6 @@
"hashtag.column_settings.tag_mode.any": "এর ভেতরে যেকোনোটা",
"hashtag.column_settings.tag_mode.none": "এগুলোর একটাও না",
"hashtag.column_settings.tag_toggle": "আরো ট্যাগ এই কলামে যুক্ত করতে",
- "home.column_settings.basic": "সাধারণ",
"home.column_settings.show_reblogs": "সমর্থনগুলো দেখান",
"home.column_settings.show_replies": "মতামত দেখান",
"home.hide_announcements": "ঘোষণা লুকান",
@@ -338,8 +337,6 @@
"notifications.clear_confirmation": "আপনি কি নির্চিত প্রজ্ঞাপনগুলো মুছে ফেলতে চান ?",
"notifications.column_settings.alert": "কম্পিউটারে প্রজ্ঞাপনগুলি",
"notifications.column_settings.favourite": "পছন্দসমূহ:",
- "notifications.column_settings.filter_bar.advanced": "সব শ্রেণীগুলো দেখানো",
- "notifications.column_settings.filter_bar.category": "সংক্ষিপ্ত ছাঁকনি অংশ",
"notifications.column_settings.follow": "নতুন অনুসরণকারীরা:",
"notifications.column_settings.follow_request": "অনুসরণের অনুরোধগুলি:",
"notifications.column_settings.mention": "প্রজ্ঞাপনগুলো:",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 3b376ac470..9e0979641e 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -289,7 +289,6 @@
"hashtag.follow": "Heuliañ ar ger-klik",
"hashtag.unfollow": "Paouez heuliañ an hashtag",
"hashtags.and_other": "…{count, plural, one {hag # all} other {ha # all}}",
- "home.column_settings.basic": "Diazez",
"home.column_settings.show_reblogs": "Diskouez ar skignadennoù",
"home.column_settings.show_replies": "Diskouez ar respontoù",
"home.hide_announcements": "Kuzhat ar c'hemennoù",
@@ -410,9 +409,6 @@
"notifications.column_settings.admin.sign_up": "Enskrivadurioù nevez :",
"notifications.column_settings.alert": "Kemennoù war ar burev",
"notifications.column_settings.favourite": "Muiañ-karet:",
- "notifications.column_settings.filter_bar.advanced": "Skrammañ an-holl rummadoù",
- "notifications.column_settings.filter_bar.category": "Barrenn siloù prim",
- "notifications.column_settings.filter_bar.show_bar": "Diskouezh barrenn siloù",
"notifications.column_settings.follow": "Heulierien nevez:",
"notifications.column_settings.follow_request": "Pedadoù heuliañ nevez :",
"notifications.column_settings.mention": "Menegoù:",
@@ -438,6 +434,7 @@
"notifications.permission_denied": "Kemennoù war ar burev n'int ket hegerz rak pedadenn aotren ar merdeer a zo bet nullet araok",
"notifications.permission_denied_alert": "Kemennoù wa ar burev na c'hellont ket bezañ lezelet, rak aotre ar merdeer a zo bet nac'het a-raok",
"notifications.permission_required": "Kemennoù war ar burev n'int ket hegerz abalamour d'an aotre rekis n'eo ket bet roet.",
+ "notifications.policy.filter_new_accounts_title": "Kontoù nevez",
"notifications_permission_banner.enable": "Lezel kemennoù war ar burev",
"notifications_permission_banner.how_to_control": "Evit reseviñ kemennoù pa ne vez ket digoret Mastodon, lezelit kemennoù war ar burev. Gallout a rit kontrollañ peseurt eskemmoù a c'henel kemennoù war ar burev gant ar {icon} nozelenn a-us kentre ma'z int lezelet.",
"notifications_permission_banner.title": "Na vankit netra morse",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 2345424728..0c237ccda0 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -241,6 +241,7 @@
"empty_column.list": "Encara no hi ha res en aquesta llista. Quan els membres facin nous tuts, apareixeran aquí.",
"empty_column.lists": "Encara no tens cap llista. Quan en facis una, apareixerà aquí.",
"empty_column.mutes": "Encara no has silenciat cap usuari.",
+ "empty_column.notification_requests": "Tot net, ja no hi ha res aquí! Quan rebeu notificacions noves, segons la vostra configuració, apareixeran aquí.",
"empty_column.notifications": "Encara no tens notificacions. Quan altre gent interactuï amb tu, les veuràs aquí.",
"empty_column.public": "Aquí no hi ha res! Escriu públicament alguna cosa o segueix manualment usuaris d'altres servidors per omplir-ho",
"error.unexpected_crash.explanation": "A causa d'un error en el nostre codi o d'un problema de compatibilitat amb el navegador, aquesta pàgina no s'ha pogut mostrar correctament.",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
"filter_modal.select_filter.title": "Filtra aquest tut",
"filter_modal.title.status": "Filtra un tut",
+ "filtered_notifications_banner.pending_requests": "Notificacions de {count, plural, =0 {no} one {una persona} other {# persones}} que potser coneixeu",
+ "filtered_notifications_banner.title": "Notificacions filtrades",
"firehose.all": "Tots",
"firehose.local": "Aquest servidor",
"firehose.remote": "Altres servidors",
@@ -314,7 +317,6 @@
"hashtag.follow": "Segueix l'etiqueta",
"hashtag.unfollow": "Deixa de seguir l'etiqueta",
"hashtags.and_other": "…i {count, plural, other {# més}}",
- "home.column_settings.basic": "Bàsic",
"home.column_settings.show_reblogs": "Mostra els impulsos",
"home.column_settings.show_replies": "Mostra les respostes",
"home.hide_announcements": "Amaga els anuncis",
@@ -440,15 +442,16 @@
"notification.reblog": "{name} t'ha impulsat",
"notification.status": "{name} acaba de publicar",
"notification.update": "{name} ha editat un tut",
+ "notification_requests.accept": "Accepta",
+ "notification_requests.dismiss": "Ignora",
+ "notification_requests.notifications_from": "Notificacions de {name}",
+ "notification_requests.title": "Notificacions filtrades",
"notifications.clear": "Esborra les notificacions",
"notifications.clear_confirmation": "Segur que vols esborrar permanentment totes les teves notificacions?",
"notifications.column_settings.admin.report": "Nous informes:",
"notifications.column_settings.admin.sign_up": "Registres nous:",
"notifications.column_settings.alert": "Notificacions d'escriptori",
"notifications.column_settings.favourite": "Favorits:",
- "notifications.column_settings.filter_bar.advanced": "Mostra totes les categories",
- "notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",
- "notifications.column_settings.filter_bar.show_bar": "Mostra la barra de filtres",
"notifications.column_settings.follow": "Nous seguidors:",
"notifications.column_settings.follow_request": "Noves sol·licituds de seguiment:",
"notifications.column_settings.mention": "Mencions:",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "Les notificacions d’escriptori no estan disponibles perquè prèviament s’ha denegat el permís al navegador",
"notifications.permission_denied_alert": "No es poden activar les notificacions de l'escriptori perquè abans s'ha denegat el permís del navegador",
"notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquè el permís requerit no ha estat concedit.",
+ "notifications.policy.filter_new_accounts.hint": "Creat durant els passats {days, plural, one {un dia} other {# dies}}",
+ "notifications.policy.filter_new_accounts_title": "Comptes nous",
+ "notifications.policy.filter_not_followers_hint": "Incloent les persones que us segueixen fa menys de {days, plural, one {un dia} other {# dies}}",
+ "notifications.policy.filter_not_followers_title": "Persones que no us segueixen",
+ "notifications.policy.filter_not_following_hint": "Fins que no ho aproveu de forma manual",
+ "notifications.policy.filter_not_following_title": "Persones que no seguiu",
+ "notifications.policy.filter_private_mentions_hint": "Filtra-ho excepte si és en resposta a una menció vostra o si seguiu el remitent",
+ "notifications.policy.filter_private_mentions_title": "Mencions privades no sol·licitades",
+ "notifications.policy.title": "Filtra les notificacions de…",
"notifications_permission_banner.enable": "Activa les notificacions d’escriptori",
"notifications_permission_banner.how_to_control": "Per a rebre notificacions quan Mastodon no és obert cal activar les notificacions d’escriptori. Pots controlar amb precisió quins tipus d’interaccions generen notificacions d’escriptori després d’activar el botó {icon} de dalt.",
"notifications_permission_banner.title": "No et perdis mai res",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 62195b72dc..a78a45c8de 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -300,7 +300,6 @@
"hashtag.counter_by_accounts": "{count, plural, one {{counter} participant} other {{counter} participants}}",
"hashtag.follow": "شوێنکەوتنی هاشتاگ",
"hashtag.unfollow": "شوێن نەکەوتنی هاشتاگ",
- "home.column_settings.basic": "بنەڕەتی",
"home.column_settings.show_reblogs": "پیشاندانی بەهێزکردن",
"home.column_settings.show_replies": "وەڵامدانەوەکان پیشان بدە",
"home.hide_announcements": "شاردنەوەی راگەیەنراوەکان",
@@ -412,9 +411,6 @@
"notifications.column_settings.admin.report": "ڕاپۆرتە نوێیەکان:",
"notifications.column_settings.admin.sign_up": "چوونەژوورەوەی نوێ:",
"notifications.column_settings.alert": "ئاگانامەکانی پیشانگەرر ڕومێزی",
- "notifications.column_settings.filter_bar.advanced": "هەموو پۆلەکان پیشان بدە",
- "notifications.column_settings.filter_bar.category": "شریتی پاڵێوەری خێرا",
- "notifications.column_settings.filter_bar.show_bar": "نیشاندانی شریتی پاڵافتن",
"notifications.column_settings.follow": "شوێنکەوتوانی نوێ:",
"notifications.column_settings.follow_request": "شوینکەوتنی داواکاری نوێ:",
"notifications.column_settings.mention": "ئاماژەکان:",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 9d0b0306c8..e547382a7c 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -167,7 +167,6 @@
"hashtag.column_settings.tag_mode.any": "Unu di quessi",
"hashtag.column_settings.tag_mode.none": "Nisunu di quessi",
"hashtag.column_settings.tag_toggle": "Inchjude tag addiziunali per sta colonna",
- "home.column_settings.basic": "Bàsichi",
"home.column_settings.show_reblogs": "Vede e spartere",
"home.column_settings.show_replies": "Vede e risposte",
"home.hide_announcements": "Piattà annunzii",
@@ -258,8 +257,6 @@
"notifications.clear": "Purgà e nutificazione",
"notifications.clear_confirmation": "Site sicuru·a che vulete toglie tutte ste nutificazione?",
"notifications.column_settings.alert": "Nutificazione nant'à l'urdinatore",
- "notifications.column_settings.filter_bar.advanced": "Affissà tutte e categurie",
- "notifications.column_settings.filter_bar.category": "Barra di ricerca pronta",
"notifications.column_settings.follow": "Abbunati novi:",
"notifications.column_settings.follow_request": "Nove dumande d'abbunamentu:",
"notifications.column_settings.mention": "Minzione:",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 00b27e0521..5beb06d9b2 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Sledovat hashtag",
"hashtag.unfollow": "Přestat sledovat hashtag",
"hashtags.and_other": "…a {count, plural, one {# další} few {# další} other {# dalších}}",
- "home.column_settings.basic": "Základní",
"home.column_settings.show_reblogs": "Zobrazit boosty",
"home.column_settings.show_replies": "Zobrazit odpovědi",
"home.hide_announcements": "Skrýt oznámení",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Nové registrace:",
"notifications.column_settings.alert": "Oznámení na počítači",
"notifications.column_settings.favourite": "Oblíbené:",
- "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie",
- "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",
- "notifications.column_settings.filter_bar.show_bar": "Zobrazit panel filtrů",
"notifications.column_settings.follow": "Noví sledující:",
"notifications.column_settings.follow_request": "Nové žádosti o sledování:",
"notifications.column_settings.mention": "Zmínky:",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 0c1472dcad..583660b283 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Dilyn hashnod",
"hashtag.unfollow": "Dad-ddilyn hashnod",
"hashtags.and_other": "…a {count, plural, other {# more}}",
- "home.column_settings.basic": "Syml",
"home.column_settings.show_reblogs": "Dangos hybiau",
"home.column_settings.show_replies": "Dangos atebion",
"home.hide_announcements": "Cuddio cyhoeddiadau",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Cofrestriadau newydd:",
"notifications.column_settings.alert": "Hysbysiadau bwrdd gwaith",
"notifications.column_settings.favourite": "Ffefrynnau:",
- "notifications.column_settings.filter_bar.advanced": "Dangos pob categori",
- "notifications.column_settings.filter_bar.category": "Bar hidlo cyflym",
- "notifications.column_settings.filter_bar.show_bar": "Dangos y bar hidlo",
"notifications.column_settings.follow": "Dilynwyr newydd:",
"notifications.column_settings.follow_request": "Ceisiadau dilyn newydd:",
"notifications.column_settings.mention": "Crybwylliadau:",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index b9ef82bf0c..ddc0440abc 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -241,6 +241,7 @@
"empty_column.list": "Der er ikke noget på denne liste endnu. Når medlemmer af listen udgiver nye indlæg vil de fremgå hér.",
"empty_column.lists": "Du har endnu ingen lister. Når du opretter én, vil den fremgå hér.",
"empty_column.mutes": "Du har endnu ikke skjult (muted) nogle brugere.",
+ "empty_column.notification_requests": "Alt er klar! Der er intet her. Når der modtages nye notifikationer, fremgår de her jf. dine indstillinger.",
"empty_column.notifications": "Du har endnu ingen notifikationer. Når andre interagerer med dig, vil det fremgå hér.",
"empty_column.public": "Der er intet hér! Skriv noget offentligt eller følg manuelt brugere fra andre servere for at se indhold",
"error.unexpected_crash.explanation": "Grundet en fejl i vores kode, eller en browser-kompatibilitetsfejl, kunne siden ikke vises korrekt.",
@@ -271,6 +272,7 @@
"filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
"filter_modal.select_filter.title": "Filtrér dette indlæg",
"filter_modal.title.status": "Filtrér et indlæg",
+ "filtered_notifications_banner.title": "Filtrerede notifikationer",
"firehose.all": "Alle",
"firehose.local": "Denne server",
"firehose.remote": "Andre servere",
@@ -314,7 +316,6 @@
"hashtag.follow": "Følg hashtag",
"hashtag.unfollow": "Stop med at følge hashtag",
"hashtags.and_other": "…og {count, plural, one {}other {# flere}}",
- "home.column_settings.basic": "Grundlæggende",
"home.column_settings.show_reblogs": "Vis boosts",
"home.column_settings.show_replies": "Vis svar",
"home.hide_announcements": "Skjul bekendtgørelser",
@@ -440,15 +441,16 @@
"notification.reblog": "{name} boostede dit indlæg",
"notification.status": "{name} har netop postet",
"notification.update": "{name} redigerede et indlæg",
+ "notification_requests.accept": "Acceptér",
+ "notification_requests.dismiss": "Afvis",
+ "notification_requests.notifications_from": "Notifikationer fra {name}",
+ "notification_requests.title": "Filtrerede notifikationer",
"notifications.clear": "Ryd notifikationer",
"notifications.clear_confirmation": "Er du sikker på, at du vil rydde alle dine notifikationer permanent?",
"notifications.column_settings.admin.report": "Nye anmeldelser:",
"notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
"notifications.column_settings.alert": "Computernotifikationer",
"notifications.column_settings.favourite": "Favoritter:",
- "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
- "notifications.column_settings.filter_bar.category": "Hurtigfilterbjælke",
- "notifications.column_settings.filter_bar.show_bar": "Vis filterbjælke",
"notifications.column_settings.follow": "Nye følgere:",
"notifications.column_settings.follow_request": "Nye følgeanmodninger:",
"notifications.column_settings.mention": "Omtaler:",
@@ -474,6 +476,15 @@
"notifications.permission_denied": "Computernotifikationer er utilgængelige grundet tidligere afvist browsertilladelsesanmodning",
"notifications.permission_denied_alert": "Computernotifikationer kan ikke aktiveres, da browsertilladelse tidligere blev nægtet",
"notifications.permission_required": "Computernotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
+ "notifications.policy.filter_new_accounts.hint": "Oprettet indenfor {days, plural, one {den seneste dag} other {de seneste # dage}}",
+ "notifications.policy.filter_new_accounts_title": "Ny konti",
+ "notifications.policy.filter_not_followers_hint": "Inklusiv personer, som har fulgt dig {days, plural, one {mindre end én dag} other {færre end # dage}}",
+ "notifications.policy.filter_not_followers_title": "Folk, som ikke følger dig",
+ "notifications.policy.filter_not_following_hint": "Indtil de manuelt godkendes",
+ "notifications.policy.filter_not_following_title": "Folk, du ikke følger",
+ "notifications.policy.filter_private_mentions_hint": "Filtreret, medmindre det er i svar på egen omtale, eller hvis afsenderen følges",
+ "notifications.policy.filter_private_mentions_title": "Uopfordrede private omtaler",
+ "notifications.policy.title": "Bortfiltrér notifikationer fra…",
"notifications_permission_banner.enable": "Aktivér computernotifikationer",
"notifications_permission_banner.how_to_control": "Aktivér computernotifikationer for at få besked, når Mastodon ikke er åben. Når de er aktiveret, kan man via knappen {icon} ovenfor præcist styre, hvilke typer af interaktioner, som genererer computernotifikationer.",
"notifications_permission_banner.title": "Gå aldrig glip af noget",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 3700b5d91d..70537cdb05 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -241,6 +241,7 @@
"empty_column.list": "Diese Liste ist derzeit leer. Wenn Konten auf dieser Liste neue Beiträge veröffentlichen, werden sie hier erscheinen.",
"empty_column.lists": "Du hast noch keine Listen. Sobald du eine anlegst, wird sie hier erscheinen.",
"empty_column.mutes": "Du hast keine Profile stummgeschaltet.",
+ "empty_column.notification_requests": "Alles klar! Hier gibt es nichts. Wenn Sie neue Mitteilungen erhalten, werden diese entsprechend Ihren Einstellungen hier angezeigt.",
"empty_column.notifications": "Du hast noch keine Benachrichtigungen. Sobald andere Personen mit dir interagieren, wirst du hier darüber informiert.",
"empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Servern, um die Timeline aufzufüllen",
"error.unexpected_crash.explanation": "Wegen eines Fehlers in unserem Code oder aufgrund einer Browser-Inkompatibilität kann diese Seite nicht korrekt angezeigt werden.",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
"filter_modal.select_filter.title": "Diesen Beitrag filtern",
"filter_modal.title.status": "Beitrag per Filter ausblenden",
+ "filtered_notifications_banner.pending_requests": "Benachrichtigungen von {count, plural, =0 {keinem Profil, das du möglicherweise kennst} one {einem Profil, das du möglicherweise kennst} other {# Profilen, die du möglicherweise kennst}}",
+ "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
"firehose.all": "Alles",
"firehose.local": "Dieser Server",
"firehose.remote": "Andere Server",
@@ -314,7 +317,6 @@
"hashtag.follow": "Hashtag folgen",
"hashtag.unfollow": "Hashtag entfolgen",
"hashtags.and_other": "… und {count, plural, one{# weiterer} other {# weitere}}",
- "home.column_settings.basic": "Allgemein",
"home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
"home.column_settings.show_replies": "Antworten anzeigen",
"home.hide_announcements": "Ankündigungen ausblenden",
@@ -440,15 +442,16 @@
"notification.reblog": "{name} teilte deinen Beitrag",
"notification.status": "{name} hat gerade etwas gepostet",
"notification.update": "{name} bearbeitete einen Beitrag",
+ "notification_requests.accept": "Akzeptieren",
+ "notification_requests.dismiss": "Ablehnen",
+ "notification_requests.notifications_from": "Benachrichtigungen von {name}",
+ "notification_requests.title": "Gefilterte Benachrichtigungen",
"notifications.clear": "Benachrichtigungen löschen",
"notifications.clear_confirmation": "Möchtest du wirklich alle Benachrichtigungen für immer löschen?",
"notifications.column_settings.admin.report": "Neue Meldungen:",
"notifications.column_settings.admin.sign_up": "Neue Registrierungen:",
"notifications.column_settings.alert": "Desktop-Benachrichtigungen",
"notifications.column_settings.favourite": "Favoriten:",
- "notifications.column_settings.filter_bar.advanced": "Alle Filterkategorien anzeigen",
- "notifications.column_settings.filter_bar.category": "Filterleiste:",
- "notifications.column_settings.filter_bar.show_bar": "Filterleiste anzeigen",
"notifications.column_settings.follow": "Neue Follower:",
"notifications.column_settings.follow_request": "Neue Follower-Anfragen:",
"notifications.column_settings.mention": "Erwähnungen:",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "Desktop-Benachrichtigungen können aufgrund einer zuvor verweigerten Berechtigung nicht aktiviert werden",
"notifications.permission_denied_alert": "Desktop-Benachrichtigungen können nicht aktiviert werden, da die Browser-Berechtigung zuvor verweigert wurde",
"notifications.permission_required": "Desktop-Benachrichtigungen sind nicht verfügbar, da die erforderliche Berechtigung nicht erteilt wurde.",
+ "notifications.policy.filter_new_accounts.hint": "Innerhalb {days, plural, one {des letzten Tages} other {der letzten # Tagen}} erstellt",
+ "notifications.policy.filter_new_accounts_title": "Neuen Konten",
+ "notifications.policy.filter_not_followers_hint": "Einschließlich Profilen, die dir seit weniger als {days, plural, one {einem Tag} other {# Tagen}} folgen",
+ "notifications.policy.filter_not_followers_title": "Profilen, die mir nicht folgen",
+ "notifications.policy.filter_not_following_hint": "Solange du sie nicht manuell akzeptierst",
+ "notifications.policy.filter_not_following_title": "Profilen, denen ich nicht folge",
+ "notifications.policy.filter_private_mentions_hint": "Solange sie keine Antwort auf deine Erwähnung ist oder du dem Profil nicht folgst",
+ "notifications.policy.filter_private_mentions_title": "Unerwünschten privaten Erwähnungen",
+ "notifications.policy.title": "Benachrichtigungen herausfiltern von …",
"notifications_permission_banner.enable": "Aktiviere Desktop-Benachrichtigungen",
"notifications_permission_banner.how_to_control": "Um Benachrichtigungen zu erhalten, wenn Mastodon nicht geöffnet ist, aktiviere die Desktop-Benachrichtigungen. Du kannst genau bestimmen, welche Arten von Interaktionen Desktop-Benachrichtigungen über die {icon} -Taste erzeugen, sobald diese aktiviert sind.",
"notifications_permission_banner.title": "Nichts verpassen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index a5ed320831..5d1f03b090 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -289,7 +289,6 @@
"hashtag.column_settings.tag_toggle": "Προσθήκη επιπλέον ταμπελών για την κολώνα",
"hashtag.follow": "Παρακολούθηση ετικέτας",
"hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας",
- "home.column_settings.basic": "Βασικές ρυθμίσεις",
"home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
"home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
"home.hide_announcements": "Απόκρυψη ανακοινώσεων",
@@ -411,9 +410,6 @@
"notifications.column_settings.admin.sign_up": "Νέες εγγραφές:",
"notifications.column_settings.alert": "Ειδοποιήσεις επιφάνειας εργασίας",
"notifications.column_settings.favourite": "Αγαπημένα:",
- "notifications.column_settings.filter_bar.advanced": "Εμφάνιση όλων των κατηγοριών",
- "notifications.column_settings.filter_bar.category": "Μπάρα γρήγορου φίλτρου",
- "notifications.column_settings.filter_bar.show_bar": "Εμφάνιση μπάρας φίλτρου",
"notifications.column_settings.follow": "Νέοι ακόλουθοι:",
"notifications.column_settings.follow_request": "Νέο αίτημα ακολούθησης:",
"notifications.column_settings.mention": "Επισημάνσεις:",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 6232207af2..e88209625f 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -308,7 +308,6 @@
"hashtag.follow": "Follow hashtag",
"hashtag.unfollow": "Unfollow hashtag",
"hashtags.and_other": "…and {count, plural, one {one more} other {# more}}",
- "home.column_settings.basic": "Basic",
"home.column_settings.show_reblogs": "Show boosts",
"home.column_settings.show_replies": "Show replies",
"home.hide_announcements": "Hide announcements",
@@ -440,9 +439,6 @@
"notifications.column_settings.admin.sign_up": "New sign-ups:",
"notifications.column_settings.alert": "Desktop notifications",
"notifications.column_settings.favourite": "Favourites:",
- "notifications.column_settings.filter_bar.advanced": "Display all categories",
- "notifications.column_settings.filter_bar.category": "Quick filter bar",
- "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
"notifications.column_settings.follow": "New followers:",
"notifications.column_settings.follow_request": "New follow requests:",
"notifications.column_settings.mention": "Mentions:",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 911502d85f..5d2dc61135 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -295,7 +295,6 @@
"hashtag.follow": "Sekvi la kradvorton",
"hashtag.unfollow": "Ne plu sekvi la kradvorton",
"hashtags.and_other": "…kaj {count, plural,other {# pli}}",
- "home.column_settings.basic": "Bazaj agordoj",
"home.column_settings.show_reblogs": "Montri diskonigojn",
"home.column_settings.show_replies": "Montri respondojn",
"home.hide_announcements": "Kaŝi la anoncojn",
@@ -427,9 +426,6 @@
"notifications.column_settings.admin.sign_up": "Novaj registriĝoj:",
"notifications.column_settings.alert": "Sciigoj de la retumilo",
"notifications.column_settings.favourite": "Stelumoj:",
- "notifications.column_settings.filter_bar.advanced": "Montri ĉiujn kategoriojn",
- "notifications.column_settings.filter_bar.category": "Rapida filtra breto",
- "notifications.column_settings.filter_bar.show_bar": "Montri la breton de filtrilo",
"notifications.column_settings.follow": "Novaj sekvantoj:",
"notifications.column_settings.follow_request": "Novaj petoj de sekvado:",
"notifications.column_settings.mention": "Mencioj:",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index ead3355589..48d4580056 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -241,6 +241,7 @@
"empty_column.list": "Todavía no hay nada en esta lista. Cuando miembros de esta lista envíen nuevos mensaje, se mostrarán acá.",
"empty_column.lists": "Todavía no tenés ninguna lista. Cuando creés una, se mostrará acá.",
"empty_column.mutes": "Todavía no silenciaste a ningún usuario.",
+ "empty_column.notification_requests": "¡Todo limpio! No hay nada acá. Cuando recibás nuevas notificaciones, aparecerán acá, acorde a tu configuración.",
"empty_column.notifications": "Todavía no tenés ninguna notificación. Cuando otras cuentas interactúen con vos, vas a ver la notificación acá.",
"empty_column.public": "¡Naranja! Escribí algo públicamente, o seguí usuarios manualmente de otros servidores para ir llenando esta línea temporal",
"error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador web, esta página no se pudo mostrar correctamente.",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
"filter_modal.select_filter.title": "Filtrar este mensaje",
"filter_modal.title.status": "Filtrar un mensaje",
+ "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {ninguna cuenta} one {una cuenta} other {# cuentas}} que podrías conocer",
+ "filtered_notifications_banner.title": "Notificaciones filtradas",
"firehose.all": "Todos",
"firehose.local": "Este servidor",
"firehose.remote": "Otros servidores",
@@ -314,7 +317,6 @@
"hashtag.follow": "Seguir etiqueta",
"hashtag.unfollow": "Dejar de seguir etiqueta",
"hashtags.and_other": "…y {count, plural, other {# más}}",
- "home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Mostrar adhesiones",
"home.column_settings.show_replies": "Mostrar respuestas",
"home.hide_announcements": "Ocultar anuncios",
@@ -440,15 +442,16 @@
"notification.reblog": "{name} adhirió a tu mensaje",
"notification.status": "{name} acaba de enviar un mensaje",
"notification.update": "{name} editó un mensaje",
+ "notification_requests.accept": "Aceptar",
+ "notification_requests.dismiss": "Descartar",
+ "notification_requests.notifications_from": "Notificaciones de {name}",
+ "notification_requests.title": "Notificaciones filtradas",
"notifications.clear": "Limpiar notificaciones",
"notifications.clear_confirmation": "¿Estás seguro que querés limpiar todas tus notificaciones permanentemente?",
"notifications.column_settings.admin.report": "Nuevas denuncias:",
"notifications.column_settings.admin.sign_up": "Nuevos registros:",
"notifications.column_settings.alert": "Notificaciones de escritorio",
"notifications.column_settings.favourite": "Favoritos:",
- "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
- "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
- "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
"notifications.column_settings.follow": "Nuevos seguidores:",
"notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
"notifications.column_settings.mention": "Menciones:",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "Las notificaciones de escritorio no están disponibles, debido a una solicitud de permiso del navegador web previamente denegada",
"notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado antes",
"notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se concedió el permiso requerido.",
+ "notifications.policy.filter_new_accounts.hint": "Creada hace {days, plural, one {un día} other {# días}}",
+ "notifications.policy.filter_new_accounts_title": "Nuevas cuentas",
+ "notifications.policy.filter_not_followers_hint": "Incluyendo cuentas que te han estado siguiendo menos de {days, plural, one {un día} other {# días}}",
+ "notifications.policy.filter_not_followers_title": "Cuentas que no te siguen",
+ "notifications.policy.filter_not_following_hint": "Hasta que las aprobés manualmente",
+ "notifications.policy.filter_not_following_title": "Cuentas que no seguís",
+ "notifications.policy.filter_private_mentions_hint": "Filtradas, a menos que sea en respuesta a tu propia mención o si seguís al remitente",
+ "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+ "notifications.policy.title": "Filtrar notificaciones de…",
"notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
"notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no está abierto, habilitá las notificaciones de escritorio. Podés controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba, una vez que estén habilitadas.",
"notifications_permission_banner.title": "No te pierdas nada",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index ba54843236..b1a7757081 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -241,6 +241,7 @@
"empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
"empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.",
"empty_column.mutes": "Aún no has silenciado a ningún usuario.",
+ "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
"empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
"empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
"error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
"filter_modal.select_filter.title": "Filtrar esta publicación",
"filter_modal.title.status": "Filtrar una publicación",
+ "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+ "filtered_notifications_banner.title": "Notificaciones filtradas",
"firehose.all": "Todas",
"firehose.local": "Este servidor",
"firehose.remote": "Otros servidores",
@@ -314,7 +317,6 @@
"hashtag.follow": "Seguir etiqueta",
"hashtag.unfollow": "Dejar de seguir etiqueta",
"hashtags.and_other": "…y {count, plural, other {# más}}",
- "home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Mostrar retoots",
"home.column_settings.show_replies": "Mostrar respuestas",
"home.hide_announcements": "Ocultar anuncios",
@@ -440,15 +442,16 @@
"notification.reblog": "{name} ha retooteado tu estado",
"notification.status": "{name} acaba de publicar",
"notification.update": "{name} editó una publicación",
+ "notification_requests.accept": "Aceptar",
+ "notification_requests.dismiss": "Descartar",
+ "notification_requests.notifications_from": "Notificaciones de {name}",
+ "notification_requests.title": "Notificaciones filtradas",
"notifications.clear": "Limpiar notificaciones",
"notifications.clear_confirmation": "¿Seguro de querer borrar permanentemente todas tus notificaciones?",
"notifications.column_settings.admin.report": "Nuevas denuncias:",
"notifications.column_settings.admin.sign_up": "Registros nuevos:",
"notifications.column_settings.alert": "Notificaciones de escritorio",
"notifications.column_settings.favourite": "Favoritos:",
- "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
- "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
- "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
"notifications.column_settings.follow": "Nuevos seguidores:",
"notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
"notifications.column_settings.mention": "Menciones:",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
"notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
"notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
+ "notifications.policy.filter_new_accounts.hint": "Creadas durante {days, plural, one {el último día} other {los últimos # días}}",
+ "notifications.policy.filter_new_accounts_title": "Cuentas nuevas",
+ "notifications.policy.filter_not_followers_hint": "Incluyendo personas que te han estado siguiendo desde hace menos de {days, plural, one {un día} other {# días}}",
+ "notifications.policy.filter_not_followers_title": "Personas que no te siguen",
+ "notifications.policy.filter_not_following_hint": "Hasta que las apruebes manualmente",
+ "notifications.policy.filter_not_following_title": "Personas que no sigues",
+ "notifications.policy.filter_private_mentions_hint": "Filtrada, a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
+ "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+ "notifications.policy.title": "Filtrar notificaciones de…",
"notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
"notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
"notifications_permission_banner.title": "Nunca te pierdas nada",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index b4cc241814..d7f54a3e2a 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -241,6 +241,7 @@
"empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
"empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.",
"empty_column.mutes": "Aún no has silenciado a ningún usuario.",
+ "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
"empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
"empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
"error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
"filter_modal.select_filter.title": "Filtrar esta publicación",
"filter_modal.title.status": "Filtrar una publicación",
+ "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+ "filtered_notifications_banner.title": "Notificaciones filtradas",
"firehose.all": "Todas",
"firehose.local": "Este servidor",
"firehose.remote": "Otros servidores",
@@ -314,7 +317,6 @@
"hashtag.follow": "Seguir etiqueta",
"hashtag.unfollow": "Dejar de seguir etiqueta",
"hashtags.and_other": "…y {count, plural, other {# más}}",
- "home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Mostrar impulsos",
"home.column_settings.show_replies": "Mostrar respuestas",
"home.hide_announcements": "Ocultar anuncios",
@@ -440,15 +442,16 @@
"notification.reblog": "{name} ha impulsado tu publicación",
"notification.status": "{name} acaba de publicar",
"notification.update": "{name} editó una publicación",
+ "notification_requests.accept": "Aceptar",
+ "notification_requests.dismiss": "Descartar",
+ "notification_requests.notifications_from": "Notificaciones de {name}",
+ "notification_requests.title": "Notificaciones filtradas",
"notifications.clear": "Limpiar notificaciones",
"notifications.clear_confirmation": "¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
"notifications.column_settings.admin.report": "Nuevos informes:",
"notifications.column_settings.admin.sign_up": "Nuevos registros:",
"notifications.column_settings.alert": "Notificaciones de escritorio",
"notifications.column_settings.favourite": "Favoritos:",
- "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
- "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
- "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
"notifications.column_settings.follow": "Nuevos seguidores:",
"notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
"notifications.column_settings.mention": "Menciones:",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
"notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
"notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
+ "notifications.policy.filter_new_accounts.hint": "Creadas durante {days, plural, one {el último día} other {los últimos # días}}",
+ "notifications.policy.filter_new_accounts_title": "Cuentas nuevas",
+ "notifications.policy.filter_not_followers_hint": "Incluyendo personas que te han estado siguiendo desde hace menos de {days, plural, one {un día} other {# días}}",
+ "notifications.policy.filter_not_followers_title": "Personas que no te siguen",
+ "notifications.policy.filter_not_following_hint": "Hasta que las apruebes manualmente",
+ "notifications.policy.filter_not_following_title": "Personas que no sigues",
+ "notifications.policy.filter_private_mentions_hint": "Filtrada, a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
+ "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+ "notifications.policy.title": "Filtrar notificaciones de…",
"notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
"notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
"notifications_permission_banner.title": "Nunca te pierdas nada",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index be0c262c32..2759c96a10 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Jälgi silti",
"hashtag.unfollow": "Lõpeta sildi jälgimine",
"hashtags.and_other": "…ja {count, plural, one {}other {# veel}}",
- "home.column_settings.basic": "Peamine",
"home.column_settings.show_reblogs": "Näita jagamisi",
"home.column_settings.show_replies": "Näita vastuseid",
"home.hide_announcements": "Peida teadaanded",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Uued kasutajad:",
"notifications.column_settings.alert": "Töölauateated",
"notifications.column_settings.favourite": "Lemmikud:",
- "notifications.column_settings.filter_bar.advanced": "Kuva kõik kategooriad",
- "notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
- "notifications.column_settings.filter_bar.show_bar": "Näita filtririba",
"notifications.column_settings.follow": "Uued jälgijad:",
"notifications.column_settings.follow_request": "Uued jälgimistaotlused:",
"notifications.column_settings.mention": "Mainimised:",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index c21fa1d204..4af5aaaaf5 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -241,6 +241,7 @@
"empty_column.list": "Ez dago ezer zerrenda honetan. Zerrenda honetako kideek bidalketa berriak argitaratzean, hemen agertuko dira.",
"empty_column.lists": "Ez duzu zerrendarik oraindik. Baten bat sortzen duzunean hemen agertuko da.",
"empty_column.mutes": "Ez duzu erabiltzailerik mututu oraindik.",
+ "empty_column.notification_requests": "Garbi-garbi! Ezertxo ere ez hemen. Jakinarazpenak jasotzen dituzunean, hemen agertuko dira zure ezarpenen arabera.",
"empty_column.notifications": "Ez duzu jakinarazpenik oraindik. Jarri besteekin harremanetan elkarrizketa abiatzeko.",
"empty_column.public": "Ez dago ezer hemen! Idatzi zerbait publikoki edo jarraitu eskuz beste zerbitzari batzuetako erabiltzaileei hau betetzen joateko",
"error.unexpected_crash.explanation": "Gure kodean arazoren bat dela eta, edo nabigatzailearekin bateragarritasun arazoren bat dela eta, orri hau ezin izan da ongi bistaratu.",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "Hautatu lehendik dagoen kategoria bat edo sortu berria",
"filter_modal.select_filter.title": "Iragazi bidalketa hau",
"filter_modal.title.status": "Iragazi bidalketa bat",
+ "filtered_notifications_banner.pending_requests": "Ezagutu {count, plural, =0 {dezakezun inoren} one {dezakezun pertsona baten} other {ditzakezun # pertsonen}} jakinarazpenak",
+ "filtered_notifications_banner.title": "Iragazitako jakinarazpenak",
"firehose.all": "Guztiak",
"firehose.local": "Zerbitzari hau",
"firehose.remote": "Beste zerbitzariak",
@@ -314,7 +317,6 @@
"hashtag.follow": "Jarraitu traolari",
"hashtag.unfollow": "Utzi traola jarraitzeari",
"hashtags.and_other": "…eta {count, plural, one {}other {# gehiago}}",
- "home.column_settings.basic": "Oinarrizkoa",
"home.column_settings.show_reblogs": "Erakutsi bultzadak",
"home.column_settings.show_replies": "Erakutsi erantzunak",
"home.hide_announcements": "Ezkutatu iragarpenak",
@@ -440,15 +442,16 @@
"notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
"notification.status": "{name} erabiltzaileak bidalketa egin berri du",
"notification.update": "{name} erabiltzaileak bidalketa bat editatu du",
+ "notification_requests.accept": "Onartu",
+ "notification_requests.dismiss": "Baztertu",
+ "notification_requests.notifications_from": "{name} erabiltzailearen jakinarazpenak",
+ "notification_requests.title": "Iragazitako jakinarazpenak",
"notifications.clear": "Garbitu jakinarazpenak",
"notifications.clear_confirmation": "Ziur zure jakinarazpen guztiak behin betirako garbitu nahi dituzula?",
"notifications.column_settings.admin.report": "Txosten berriak:",
"notifications.column_settings.admin.sign_up": "Izen-emate berriak:",
"notifications.column_settings.alert": "Mahaigaineko jakinarazpenak",
"notifications.column_settings.favourite": "Gogokoak:",
- "notifications.column_settings.filter_bar.advanced": "Erakutsi kategoria guztiak",
- "notifications.column_settings.filter_bar.category": "Iragazki azkarraren barra",
- "notifications.column_settings.filter_bar.show_bar": "Erakutsi iragazki-barra",
"notifications.column_settings.follow": "Jarraitzaile berriak:",
"notifications.column_settings.follow_request": "Jarraitzeko eskaera berriak:",
"notifications.column_settings.mention": "Aipamenak:",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "Mahaigaineko jakinarazpenak ez daude erabilgarri, nabigatzaileari baimen eskaera ukatu zitzaiolako",
"notifications.permission_denied_alert": "Mahaigaineko jakinarazpenak ezin dira gaitu, nabigatzaileari baimena ukatu zitzaiolako",
"notifications.permission_required": "Mahaigaineko jakinarazpenak ez daude erabilgarri, horretarako behar den baimena ez delako eman.",
+ "notifications.policy.filter_new_accounts.hint": "Azken {days, plural, one {egunean} other {# egunetan}} sortua",
+ "notifications.policy.filter_new_accounts_title": "Kontu berriak",
+ "notifications.policy.filter_not_followers_hint": "{days, plural, one {Egun batez} other {# egunez}} baino gutxiago jarraitu zaituen jendea barne",
+ "notifications.policy.filter_not_followers_title": "Jarraitzen ez zaituen jendea",
+ "notifications.policy.filter_not_following_hint": "Eskuz onartzen dituzun arte",
+ "notifications.policy.filter_not_following_title": "Jarraitzen ez duzun jendea",
+ "notifications.policy.filter_private_mentions_hint": "Iragazita, baldin eta zure aipamenaren erantzuna bada edo bidaltzailea jarraitzen baduzu",
+ "notifications.policy.filter_private_mentions_title": "Eskatu gabeko aipamen pribatuak",
+ "notifications.policy.title": "Ez iragazi hemengo jakinarazpenak…",
"notifications_permission_banner.enable": "Gaitu mahaigaineko jakinarazpenak",
"notifications_permission_banner.how_to_control": "Mastodon irekita ez dagoenean jakinarazpenak jasotzeko, gaitu mahaigaineko jakinarazpenak. Mahaigaineko jakinarazpenak ze elkarrekintzak eragingo dituzten zehazki kontrolatu dezakezu goiko {icon} botoia erabiliz, gaituta daudenean.",
"notifications_permission_banner.title": "Ez galdu ezer inoiz",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 9029ba3cb5..9e6128b873 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -314,7 +314,6 @@
"hashtag.follow": "پیگرفتن برچسب",
"hashtag.unfollow": "پینگرفتن برچسب",
"hashtags.and_other": "…و {count, plural, other {# بیشتر}}",
- "home.column_settings.basic": "پایهای",
"home.column_settings.show_reblogs": "نمایش تقویتها",
"home.column_settings.show_replies": "نمایش پاسخها",
"home.hide_announcements": "نهفتن اعلامیهها",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "ثبت نامهای جدید:",
"notifications.column_settings.alert": "آگاهیهای میزکار",
"notifications.column_settings.favourite": "برگزیدهها:",
- "notifications.column_settings.filter_bar.advanced": "نمایش همۀ دستهها",
- "notifications.column_settings.filter_bar.category": "نوار پالایش سریع",
- "notifications.column_settings.filter_bar.show_bar": "نمایش نوار پالایه",
"notifications.column_settings.follow": "پیگیرندگان جدید:",
"notifications.column_settings.follow_request": "درخواستهای جدید پیگیری:",
"notifications.column_settings.mention": "اشارهها:",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 7588b084fd..3f964a7101 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Seuraa aihetunnistetta",
"hashtag.unfollow": "Lopeta aihetunnisteen seuraaminen",
"hashtags.and_other": "…ja {count, plural, other {# lisää}}",
- "home.column_settings.basic": "Perusasetukset",
"home.column_settings.show_reblogs": "Näytä tehostukset",
"home.column_settings.show_replies": "Näytä vastaukset",
"home.hide_announcements": "Piilota tiedotteet",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Uudet rekisteröitymiset:",
"notifications.column_settings.alert": "Työpöytäilmoitukset",
"notifications.column_settings.favourite": "Suosikit:",
- "notifications.column_settings.filter_bar.advanced": "Näytä kaikki luokat",
- "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki",
- "notifications.column_settings.filter_bar.show_bar": "Näytä suodatinpalkki",
"notifications.column_settings.follow": "Uudet seuraajat:",
"notifications.column_settings.follow_request": "Uudet seuraamispyynnöt:",
"notifications.column_settings.mention": "Maininnat:",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 13e49eb314..67b323e2cf 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -241,6 +241,7 @@
"empty_column.list": "Einki er í hesum listanum enn. Tá limir í hesum listanum posta nýggjar postar, so síggjast teir her.",
"empty_column.lists": "Tú hevur ongar goymdar listar enn. Tá tú gert ein lista, so sært tú hann her.",
"empty_column.mutes": "Tú hevur enn ikki doyvt nakran brúkara.",
+ "empty_column.notification_requests": "Alt er klárt! Her er einki. Tá tú fært nýggjar fráboðanir, síggjast tær her sambært tínum stillingum.",
"empty_column.notifications": "Tú hevur ongar fráboðanir enn. Tá onnur samskifta við teg, so sær tú fráboðaninar her.",
"empty_column.public": "Einki er her! Skriva okkurt alment ella fylg brúkarum frá øðrum ambætarum fyri at fylla tilfar í",
"error.unexpected_crash.explanation": "Orsakað av einum feili í okkara kotu ella orsakað av at kagin hjá tær ikki er sambæriligur við skipanina, so bar ikki til at vísa hesa síðuna rætt.",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
"filter_modal.select_filter.title": "Filtrera hendan postin",
"filter_modal.title.status": "Filtrera ein post",
+ "filtered_notifications_banner.pending_requests": "Fráboðanir frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú møguliga kennir",
+ "filtered_notifications_banner.title": "Sáldaðar fráboðanir",
"firehose.all": "Allar",
"firehose.local": "Hesin ambætarin",
"firehose.remote": "Aðrir ambætarar",
@@ -314,7 +317,6 @@
"hashtag.follow": "Fylg frámerki",
"hashtag.unfollow": "Gevst at fylgja frámerki",
"hashtags.and_other": "…og {count, plural, other {# afturat}}",
- "home.column_settings.basic": "Grundleggjandi",
"home.column_settings.show_reblogs": "Vís lyft",
"home.column_settings.show_replies": "Vís svar",
"home.hide_announcements": "Fjal kunngerðir",
@@ -440,15 +442,16 @@
"notification.reblog": "{name} lyfti tín post",
"notification.status": "{name} hevur júst postað",
"notification.update": "{name} rættaði ein post",
+ "notification_requests.accept": "Góðtak",
+ "notification_requests.dismiss": "Avvís",
+ "notification_requests.notifications_from": "Fráboðanir frá {name}",
+ "notification_requests.title": "Sáldaðar fráboðanir",
"notifications.clear": "Rudda fráboðanir",
"notifications.clear_confirmation": "Ert tú vís/ur í, at tú vilt strika allar tínar fráboðanir?",
"notifications.column_settings.admin.report": "Nýggjar fráboðanir:",
"notifications.column_settings.admin.sign_up": "Nýggjar tilmeldingar:",
"notifications.column_settings.alert": "Skriviborðsfráboðanir",
"notifications.column_settings.favourite": "Dámdir postar:",
- "notifications.column_settings.filter_bar.advanced": "Vís allar bólkar",
- "notifications.column_settings.filter_bar.category": "Skjótfilturbjálki",
- "notifications.column_settings.filter_bar.show_bar": "Vís filturbjálka",
"notifications.column_settings.follow": "Nýggir fylgjarar:",
"notifications.column_settings.follow_request": "Nýggjar umbønir um at fylgja:",
"notifications.column_settings.mention": "Umrøður:",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "Skriviborðsfráboðanir eru ikki tøkar tí at ein kaga-umbøn áður bleiv noktað",
"notifications.permission_denied_alert": "Tað ber ikki til at sláa skriviborðsfráboðanir til, tí at kagarættindi áður eru noktaði",
"notifications.permission_required": "Skriviborðsfráboðanir eru ikki tøkar, tí at neyðugu rættindini eru ikki latin.",
+ "notifications.policy.filter_new_accounts.hint": "Stovnaðar {days, plural, one {seinasta dagin} other {seinastu # dagarnar}}",
+ "notifications.policy.filter_new_accounts_title": "Nýggjar kontur",
+ "notifications.policy.filter_not_followers_hint": "Íroknað fólk, sum hava fylgt tær styttri enn {days, plural, one {ein dag} other {# dagar}}",
+ "notifications.policy.filter_not_followers_title": "Fólk, sum ikki fylgja tær",
+ "notifications.policy.filter_not_following_hint": "Til tú góðkennir tey manuelt",
+ "notifications.policy.filter_not_following_title": "Fólk, sum tú ikki fylgir",
+ "notifications.policy.filter_private_mentions_hint": "Sáldaði, uttan so at tað er í svari til tínar egnu nevningar ella um tú fylgir sendaranum",
+ "notifications.policy.filter_private_mentions_title": "Óbidnar privatar umrøður",
+ "notifications.policy.title": "Sálda burtur fráboðanir frá…",
"notifications_permission_banner.enable": "Ger skriviborðsfráboðanir virknar",
"notifications_permission_banner.how_to_control": "Ger skriviborðsfráboðanir virknar fyri at móttaka fráboðanir, tá Mastodon ikki er opið. Tá tær eru gjørdar virknar, kanst tú stýra, hvørji sløg av samvirkni geva skriviborðsfráboðanir. Hetta umvegis {icon} knøttin omanfyri.",
"notifications_permission_banner.title": "Miss einki",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index fc969b02f4..8aff0b5afe 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Suivre ce hashtag",
"hashtag.unfollow": "Ne plus suivre ce hashtag",
"hashtags.and_other": "…et {count, plural, other {# de plus}}",
- "home.column_settings.basic": "Basique",
"home.column_settings.show_reblogs": "Afficher boosts",
"home.column_settings.show_replies": "Afficher réponses",
"home.hide_announcements": "Masquer les annonces",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Nouvelles inscriptions:",
"notifications.column_settings.alert": "Notifications navigateur",
"notifications.column_settings.favourite": "Favoris:",
- "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
- "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
- "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
"notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e⋅s:",
"notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement:",
"notifications.column_settings.mention": "Mentions:",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 8396679d06..223878f6f9 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Suivre le hashtag",
"hashtag.unfollow": "Ne plus suivre le hashtag",
"hashtags.and_other": "…et {count, plural, other {# de plus}}",
- "home.column_settings.basic": "Basique",
"home.column_settings.show_reblogs": "Afficher les partages",
"home.column_settings.show_replies": "Afficher les réponses",
"home.hide_announcements": "Masquer les annonces",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Nouvelles inscriptions :",
"notifications.column_settings.alert": "Notifications du navigateur",
"notifications.column_settings.favourite": "Favoris :",
- "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
- "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
- "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
"notifications.column_settings.follow": "Nouveaux·elles abonné·e·s :",
"notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement :",
"notifications.column_settings.mention": "Mentions :",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index bc4fecb93d..5757f2cde7 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Hashtag folgje",
"hashtag.unfollow": "Hashtag ûntfolgje",
"hashtags.and_other": "…en {count, plural, one {}other {# mear}}",
- "home.column_settings.basic": "Algemien",
"home.column_settings.show_reblogs": "Boosts toane",
"home.column_settings.show_replies": "Reaksjes toane",
"home.hide_announcements": "Meidielingen ferstopje",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Nije registraasjes:",
"notifications.column_settings.alert": "Desktopmeldingen",
"notifications.column_settings.favourite": "Favoriten:",
- "notifications.column_settings.filter_bar.advanced": "Alle kategoryen toane",
- "notifications.column_settings.filter_bar.category": "Flugge filterbalke",
- "notifications.column_settings.filter_bar.show_bar": "Filterbalke toane",
"notifications.column_settings.follow": "Nije folgers:",
"notifications.column_settings.follow_request": "Nij folchfersyk:",
"notifications.column_settings.mention": "Fermeldingen:",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index a708088fbb..44af2fb4f6 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -249,7 +249,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "Lean haischlib",
"hashtag.unfollow": "Ná lean haischlib",
- "home.column_settings.basic": "Bunúsach",
"home.column_settings.show_reblogs": "Taispeáin moltaí",
"home.column_settings.show_replies": "Taispeán freagraí",
"home.hide_announcements": "Cuir fógraí i bhfolach",
@@ -349,9 +348,6 @@
"notifications.clear": "Glan fógraí",
"notifications.column_settings.admin.report": "Tuairiscí nua:",
"notifications.column_settings.alert": "Fógraí deisce",
- "notifications.column_settings.filter_bar.advanced": "Taispeáin na catagóirí go léir",
- "notifications.column_settings.filter_bar.category": "Barra scagaire tapa",
- "notifications.column_settings.filter_bar.show_bar": "Taispeáin barra scagaire",
"notifications.column_settings.follow": "Leantóirí nua:",
"notifications.column_settings.follow_request": "Iarratais leanúnaí nua:",
"notifications.column_settings.mention": "Tráchtanna:",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index f4d12d6337..ae190a51b0 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Lean an taga hais",
"hashtag.unfollow": "Na lean an taga hais tuilleadh",
"hashtags.and_other": "…agus {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}",
- "home.column_settings.basic": "Bunasach",
"home.column_settings.show_reblogs": "Seall na brosnachaidhean",
"home.column_settings.show_replies": "Seall na freagairtean",
"home.hide_announcements": "Falaich na brathan-fios",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Clàraidhean ùra:",
"notifications.column_settings.alert": "Brathan deasga",
"notifications.column_settings.favourite": "Annsachdan:",
- "notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa",
- "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
- "notifications.column_settings.filter_bar.show_bar": "Seall am bàr-criathraidh",
"notifications.column_settings.follow": "Luchd-leantainn ùr:",
"notifications.column_settings.follow_request": "Iarrtasan leantainn ùra:",
"notifications.column_settings.mention": "Iomraidhean:",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 91b6870be7..52e0ee6f6d 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Seguir cancelo",
"hashtag.unfollow": "Deixar de seguir cancelo",
"hashtags.and_other": "…e {count, plural, one {}other {# máis}}",
- "home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Amosar compartidos",
"home.column_settings.show_replies": "Amosar respostas",
"home.hide_announcements": "Agochar anuncios",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Novas usuarias:",
"notifications.column_settings.alert": "Notificacións de escritorio",
"notifications.column_settings.favourite": "Favoritas:",
- "notifications.column_settings.filter_bar.advanced": "Amosar todas as categorías",
- "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
- "notifications.column_settings.filter_bar.show_bar": "Amosar barra de filtros",
"notifications.column_settings.follow": "Novas seguidoras:",
"notifications.column_settings.follow_request": "Novas peticións de seguimento:",
"notifications.column_settings.mention": "Mencións:",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 2eef70f0fe..dcbc30308c 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -241,6 +241,7 @@
"empty_column.list": "אין עדיין פריטים ברשימה. כאשר חברים ברשימה הזאת יפרסמו הודעות חדשות, הן יופיעו פה.",
"empty_column.lists": "אין לך שום רשימות עדיין. לכשיהיו, הן תופענה כאן.",
"empty_column.mutes": "עוד לא השתקת שום משתמש.",
+ "empty_column.notification_requests": "בום! אין פה כלום. כשיווצרו עוד התראות, הן יופיעו כאן על בסיס ההעדפות שלך.",
"empty_column.notifications": "אין התראות עדיין. יאללה, הגיע הזמן להתחיל להתערבב.",
"empty_column.public": "אין פה כלום! כדי למלא את הטור הזה אפשר לכתוב משהו, או להתחיל לעקוב אחרי אנשים מקהילות אחרות",
"error.unexpected_crash.explanation": "עקב תקלה בקוד שלנו או בעיית תאימות דפדפן, לא ניתן להציג דף זה כראוי.",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
"filter_modal.select_filter.title": "סינון ההודעה הזו",
"filter_modal.title.status": "סנן הודעה",
+ "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין התראות ממשתמשים ה}one {התראה אחת ממישהו/מישהי ה}other {יש # התראות ממשתמשים }}מוכרים לך",
+ "filtered_notifications_banner.title": "התראות מסוננות",
"firehose.all": "הכל",
"firehose.local": "שרת זה",
"firehose.remote": "שרתים אחרים",
@@ -314,7 +317,6 @@
"hashtag.follow": "לעקוב אחרי תגית",
"hashtag.unfollow": "להפסיק לעקוב אחרי תגית",
"hashtags.and_other": "…{count, plural,other {ועוד #}}",
- "home.column_settings.basic": "למתחילים",
"home.column_settings.show_reblogs": "הצגת הדהודים",
"home.column_settings.show_replies": "הצגת תגובות",
"home.hide_announcements": "הסתר הכרזות",
@@ -440,15 +442,16 @@
"notification.reblog": "הודעתך הודהדה על ידי {name}",
"notification.status": "{name} הרגע פרסמו",
"notification.update": "{name} ערכו הודעה",
+ "notification_requests.accept": "לקבל",
+ "notification_requests.dismiss": "לבטל",
+ "notification_requests.notifications_from": "התראות מ־ {name}",
+ "notification_requests.title": "התראות מסוננות",
"notifications.clear": "הסרת התראות",
"notifications.clear_confirmation": "להסיר את כל ההתראות לצמיתות ? ",
"notifications.column_settings.admin.report": "דו\"חות חדשים",
"notifications.column_settings.admin.sign_up": "הרשמות חדשות:",
"notifications.column_settings.alert": "התראות לשולחן העבודה",
"notifications.column_settings.favourite": "חיבובים:",
- "notifications.column_settings.filter_bar.advanced": "הצג את כל הקטגוריות",
- "notifications.column_settings.filter_bar.category": "שורת סינון מהיר",
- "notifications.column_settings.filter_bar.show_bar": "הצג שורת סינון",
"notifications.column_settings.follow": "עוקבים חדשים:",
"notifications.column_settings.follow_request": "בקשות מעקב חדשות:",
"notifications.column_settings.mention": "פניות:",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "לא ניתן להציג התראות מסך כיוון כיוון שהרשאות דפדפן נשללו בעבר",
"notifications.permission_denied_alert": "לא ניתן לאפשר נוטיפיקציות מסך שכן הדפדפן סורב הרשאה בעבר",
"notifications.permission_required": "לא ניתן לאפשר נוטיפיקציות מסך כיוון שהרשאה דרושה לא ניתנה.",
+ "notifications.policy.filter_new_accounts.hint": "נוצר {days, plural,one {ביום האחרון} two {ביומיים האחרונים} other {ב־# הימים האחרונים}}",
+ "notifications.policy.filter_new_accounts_title": "חשבונות חדשים",
+ "notifications.policy.filter_not_followers_hint": "כולל משתמשים שעקבו אחריך פחות מ{days, plural,one {יום} two {יומיים} other {־# ימים}}",
+ "notifications.policy.filter_not_followers_title": "משתמשים שלא עוקבות.ים אחריך",
+ "notifications.policy.filter_not_following_hint": "עד שיאושרו ידנית על ידיך",
+ "notifications.policy.filter_not_following_title": "משתמשים שאינך עוקב(ת) אחריהםן",
+ "notifications.policy.filter_private_mentions_hint": "מסונן אלא אם זו תשובה למינשון שלך או אם אתם עוקבים אחרי העונה",
+ "notifications.policy.filter_private_mentions_title": "מינשונים בפרטי שלא הוזמנו",
+ "notifications.policy.title": "להסתיר התראות מ…",
"notifications_permission_banner.enable": "לאפשר נוטיפיקציות מסך",
"notifications_permission_banner.how_to_control": "כדי לקבל התראות גם כאשר מסטודון סגור יש לאפשר התראות מסך. ניתן לשלוט בדיוק איזה סוג של אינטראקציות יביא להתראות מסך דרך כפתור ה- {icon} מרגע שהן מאופשרות.",
"notifications_permission_banner.title": "לעולם אל תחמיץ דבר",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index f88fe19569..edab89a84a 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -277,7 +277,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "हैशटैग को फॉलो करें",
"hashtag.unfollow": "हैशटैग को उनफ़ोल्लोव करें",
- "home.column_settings.basic": "बुनियादी",
"home.column_settings.show_reblogs": "बूस्ट दिखाए",
"home.column_settings.show_replies": "जवाबों को दिखाए",
"home.hide_announcements": "घोषणाएँ छिपाएँ",
@@ -376,8 +375,6 @@
"notifications.clear": "सूचनाएं हटाए",
"notifications.column_settings.admin.report": "नई रिपोर्ट:",
"notifications.column_settings.favourite": "पसंदीदा:",
- "notifications.column_settings.filter_bar.advanced": "सभी श्रेणियाँ दिखाएं",
- "notifications.column_settings.filter_bar.category": "फ़िल्टर बार",
"notifications.column_settings.follow": "नए फ़ॉलोअर्स",
"notifications.column_settings.mention": "उल्लेख:",
"notifications.column_settings.poll": "चुनाव परिणाम",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 9fe15f5a2d..45d1b53268 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -261,7 +261,6 @@
"hashtag.column_settings.tag_toggle": "Uključi dodatne oznake za ovaj stupac",
"hashtag.follow": "Prati hashtag",
"hashtag.unfollow": "Prestani pratiti hashtag",
- "home.column_settings.basic": "Osnovno",
"home.column_settings.show_reblogs": "Pokaži boostove",
"home.column_settings.show_replies": "Pokaži odgovore",
"home.hide_announcements": "Sakrij najave",
@@ -358,8 +357,6 @@
"notifications.clear": "Očisti obavijesti",
"notifications.clear_confirmation": "Želite li zaista trajno očistiti sve Vaše obavijesti?",
"notifications.column_settings.alert": "Obavijesti radne površine",
- "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije",
- "notifications.column_settings.filter_bar.category": "Brza traka filtera",
"notifications.column_settings.follow": "Novi pratitelji:",
"notifications.column_settings.follow_request": "Novi zahtjevi za praćenje:",
"notifications.column_settings.mention": "Spominjanja:",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index f499e08f6d..5dd0e7aee5 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -241,6 +241,7 @@
"empty_column.list": "A lista jelenleg üres. Ha a listatagok bejegyzést tesznek közzé, itt fog megjelenni.",
"empty_column.lists": "Még nincs egyetlen listád sem. Ha létrehozol egyet, itt fog megjelenni.",
"empty_column.mutes": "Még egy felhasználót sem némítottál le.",
+ "empty_column.notification_requests": "Minden tiszta! Itt nincs semmi. Ha új értesítéseket kapsz, azok itt jelennek meg a beállításoknak megfelelően.",
"empty_column.notifications": "Jelenleg még nincsenek értesítéseid. Ha mások kapcsolatba lépnek veled, ezek itt lesznek láthatóak.",
"empty_column.public": "Jelenleg itt nincs semmi! Írj valamit nyilvánosan vagy kövess más kiszolgálón levő felhasználókat, hogy megtöltsd.",
"error.unexpected_crash.explanation": "Egy kód- vagy böngészőkompatibilitási hiba miatt ez az oldal nem jeleníthető meg helyesen.",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
"filter_modal.select_filter.title": "E bejegyzés szűrése",
"filter_modal.title.status": "Egy bejegyzés szűrése",
+ "filtered_notifications_banner.pending_requests": "Értesítések {count, plural, =0 {0 személytől} one {egy feltehetőleg ismert személytől} other {# feltehetőleg ismert személytől}}",
+ "filtered_notifications_banner.title": "Szűrt értesítések",
"firehose.all": "Összes",
"firehose.local": "Ez a kiszolgáló",
"firehose.remote": "Egyéb kiszolgálók",
@@ -314,7 +317,6 @@
"hashtag.follow": "Hashtag követése",
"hashtag.unfollow": "Hashtag követésének megszüntetése",
"hashtags.and_other": "…és {count, plural, other {# további}}",
- "home.column_settings.basic": "Általános",
"home.column_settings.show_reblogs": "Megtolások megjelenítése",
"home.column_settings.show_replies": "Válaszok megjelenítése",
"home.hide_announcements": "Közlemények elrejtése",
@@ -440,15 +442,16 @@
"notification.reblog": "{name} megtolta a bejegyzésedet",
"notification.status": "{name} bejegyzést tett közzé",
"notification.update": "{name} szerkesztett egy bejegyzést",
+ "notification_requests.accept": "Elfogadás",
+ "notification_requests.dismiss": "Elvetés",
+ "notification_requests.notifications_from": "{name} értesítései",
+ "notification_requests.title": "Szűrt értesítések",
"notifications.clear": "Értesítések törlése",
"notifications.clear_confirmation": "Biztos, hogy véglegesen törölni akarod az összes értesítésed?",
"notifications.column_settings.admin.report": "Új jelentések:",
"notifications.column_settings.admin.sign_up": "Új regisztrálók:",
"notifications.column_settings.alert": "Asztali értesítések",
"notifications.column_settings.favourite": "Kedvencek:",
- "notifications.column_settings.filter_bar.advanced": "Minden kategória megjelenítése",
- "notifications.column_settings.filter_bar.category": "Gyorsszűrő sáv",
- "notifications.column_settings.filter_bar.show_bar": "Szűrősáv megjelenítése",
"notifications.column_settings.follow": "Új követők:",
"notifications.column_settings.follow_request": "Új követési kérelmek:",
"notifications.column_settings.mention": "Megemlítések:",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "Az asztali értesítések nem érhetők el a korábban elutasított böngészőengedély-kérelem miatt",
"notifications.permission_denied_alert": "Az asztali értesítések nem engedélyezhetők a korábban elutasított böngésző engedély miatt",
"notifications.permission_required": "Az asztali értesítések nem érhetőek el, mivel a szükséges engedély nem lett megadva.",
+ "notifications.policy.filter_new_accounts.hint": "Az elmúlt {days, plural, one {napban} other {# napban}} létrehozva",
+ "notifications.policy.filter_new_accounts_title": "Új fiókok",
+ "notifications.policy.filter_not_followers_hint": "Beleértve azokat, akik kevesebb mint {days, plural, one {egy napja} other {# napja}} követnek",
+ "notifications.policy.filter_not_followers_title": "Olyan emberek, akik nem követnek",
+ "notifications.policy.filter_not_following_hint": "Amíg kézileg jóvá nem hagyod őket",
+ "notifications.policy.filter_not_following_title": "Nem követett emberek",
+ "notifications.policy.filter_private_mentions_hint": "Kiszűrve, hacsak nem a saját említésedre válaszol, vagy ha nem követed a feladót",
+ "notifications.policy.filter_private_mentions_title": "Kéretlen személyes említések",
+ "notifications.policy.title": "Feladó értesítéseinek kiszűrése…",
"notifications_permission_banner.enable": "Asztali értesítések engedélyezése",
"notifications_permission_banner.how_to_control": "Ahhoz, hogy értesítéseket kapj akkor, amikor a Mastodon nincs megnyitva, engedélyezd az asztali értesítéseket. Pontosan be tudod állítani, hogy milyen interakciókról értesülj a fenti {icon} gombon keresztül, ha egyszer már engedélyezted őket.",
"notifications_permission_banner.title": "Soha ne mulassz el semmit",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 6ddcfcdb21..67a7aa49ff 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -235,7 +235,6 @@
"hashtag.column_settings.tag_toggle": "Ներառել լրացուցիչ պիտակները այս սիւնակում ",
"hashtag.follow": "Հետեւել պիտակին",
"hashtag.unfollow": "Չհետեւել պիտակին",
- "home.column_settings.basic": "Հիմնական",
"home.column_settings.show_reblogs": "Ցուցադրել տարածածները",
"home.column_settings.show_replies": "Ցուցադրել պատասխանները",
"home.hide_announcements": "Թաքցնել յայտարարութիւնները",
@@ -345,9 +344,6 @@
"notifications.column_settings.admin.sign_up": "Նոր գրանցումներ՝",
"notifications.column_settings.alert": "Աշխատատիրոյթի ծանուցումներ",
"notifications.column_settings.favourite": "Հաւանածներ՝",
- "notifications.column_settings.filter_bar.advanced": "Ցուցադրել բոլոր կատեգորիաները",
- "notifications.column_settings.filter_bar.category": "Արագ զտման վահանակ",
- "notifications.column_settings.filter_bar.show_bar": "Ցոյց տալ զտման պանելը",
"notifications.column_settings.follow": "Նոր հետեւողներ՝",
"notifications.column_settings.follow_request": "Նոր հետեւելու հայցեր:",
"notifications.column_settings.mention": "Նշումներ՝",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 31c9ef7394..a935bf1112 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -297,7 +297,6 @@
"notifications.clear": "Rader notificationes",
"notifications.column_settings.alert": "Notificationes de scriptorio",
"notifications.column_settings.favourite": "Favoritos:",
- "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
"notifications.column_settings.follow": "Nove sequitores:",
"notifications.column_settings.mention": "Mentiones:",
"notifications.column_settings.poll": "Resultatos del inquesta:",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 88e99a7086..9b841a08bb 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -270,7 +270,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "Ikuti tagar",
"hashtag.unfollow": "Batalkan pengikutan tagar",
- "home.column_settings.basic": "Dasar",
"home.column_settings.show_reblogs": "Tampilkan boost",
"home.column_settings.show_replies": "Tampilkan balasan",
"home.hide_announcements": "Sembunyikan pengumuman",
@@ -381,9 +380,6 @@
"notifications.column_settings.admin.report": "Laporan baru:",
"notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
"notifications.column_settings.alert": "Notifikasi desktop",
- "notifications.column_settings.filter_bar.advanced": "Tampilkan semua kategori",
- "notifications.column_settings.filter_bar.category": "Bilah penyaring cepat",
- "notifications.column_settings.filter_bar.show_bar": "Tampilkan bilah filter",
"notifications.column_settings.follow": "Pengikut baru:",
"notifications.column_settings.follow_request": "Permintaan mengikuti baru:",
"notifications.column_settings.mention": "Balasan:",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 7bd938c1bf..1f60b42400 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Sequer hashtag",
"hashtag.unfollow": "Dessequer hashtag",
"hashtags.and_other": "…e {count, plural, other {# in plu}}",
- "home.column_settings.basic": "Basic",
"home.column_settings.show_reblogs": "Monstrar boosts",
"home.column_settings.show_replies": "Monstrar responses",
"home.hide_announcements": "Celar proclamationes",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Nov registrationes:",
"notifications.column_settings.alert": "Notificationes sur li computator",
"notifications.column_settings.favourite": "Favorites:",
- "notifications.column_settings.filter_bar.advanced": "Monstrar omni categories",
- "notifications.column_settings.filter_bar.category": "Rapid filtre-barre",
- "notifications.column_settings.filter_bar.show_bar": "Monstrar filtre-barre",
"notifications.column_settings.follow": "Nov sequitores:",
"notifications.column_settings.follow_request": "Nov petitiones de sequer:",
"notifications.column_settings.mention": "Mentiones:",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index c468f689ab..235b6b92af 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -292,7 +292,6 @@
"hashtag.follow": "Sequez hashtago",
"hashtag.unfollow": "Desequez hashtago",
"hashtags.and_other": "…e {count, plural, one {# plusa}other {# plusa}}",
- "home.column_settings.basic": "Simpla",
"home.column_settings.show_reblogs": "Montrar repeti",
"home.column_settings.show_replies": "Montrar respondi",
"home.hide_announcements": "Celez anunci",
@@ -424,9 +423,6 @@
"notifications.column_settings.admin.sign_up": "Nova registranti:",
"notifications.column_settings.alert": "Desktopavizi",
"notifications.column_settings.favourite": "Favoriziti:",
- "notifications.column_settings.filter_bar.advanced": "Montrez omna kategorii",
- "notifications.column_settings.filter_bar.category": "Rapidfiltrobaro",
- "notifications.column_settings.filter_bar.show_bar": "Montrez filtrobaro",
"notifications.column_settings.follow": "Nova sequanti:",
"notifications.column_settings.follow_request": "Nova sequodemandi:",
"notifications.column_settings.mention": "Mencioni:",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 1f42180159..2310325b7c 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -241,6 +241,7 @@
"empty_column.list": "Það er ennþá ekki neitt á þessum lista. Þegar meðlimir á listanum senda inn nýjar færslur, munu þær birtast hér.",
"empty_column.lists": "Þú ert ennþá ekki með neina lista. Þegar þú býrð til einhvern lista, munu hann birtast hér.",
"empty_column.mutes": "Þú hefur ekki þaggað niður í neinum notendum ennþá.",
+ "empty_column.notification_requests": "Allt hreint! Það er ekkert hér. Þegar þú færð nýjar tilkynningar, munu þær birtast hér í samræmi við stillingarnar þínar.",
"empty_column.notifications": "Þú ert ekki ennþá með neinar tilkynningar. Vertu í samskiptum við aðra til að umræður fari af stað.",
"empty_column.public": "Það er ekkert hér! Skrifaðu eitthvað opinberlega, eða fylgstu með notendum á öðrum netþjónum til að fylla upp í þetta",
"error.unexpected_crash.explanation": "Vegna villu í kóðanum okkar eða samhæfnivandamála í vafra er ekki hægt að birta þessa síðu svo vel sé.",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "Notaðu fyrirliggjandi flokk eða útbúðu nýjan",
"filter_modal.select_filter.title": "Sía þessa færslu",
"filter_modal.title.status": "Sía færslu",
+ "filtered_notifications_banner.pending_requests": "Tilkynningar frá {count, plural, =0 {engum} one {einum aðila} other {# aðilum}} sem þú gætir þekkt",
+ "filtered_notifications_banner.title": "Síaðar tilkynningar",
"firehose.all": "Allt",
"firehose.local": "þessum netþjóni",
"firehose.remote": "öðrum netþjónum",
@@ -314,7 +317,6 @@
"hashtag.follow": "Fylgjast með myllumerki",
"hashtag.unfollow": "Hætta að fylgjast með myllumerki",
"hashtags.and_other": "…og {count, plural, other {# til viðbótar}}",
- "home.column_settings.basic": "Einfalt",
"home.column_settings.show_reblogs": "Sýna endurbirtingar",
"home.column_settings.show_replies": "Birta svör",
"home.hide_announcements": "Fela auglýsingar",
@@ -440,15 +442,16 @@
"notification.reblog": "{name} endurbirti færsluna þína",
"notification.status": "{name} sendi inn rétt í þessu",
"notification.update": "{name} breytti færslu",
+ "notification_requests.accept": "Samþykkja",
+ "notification_requests.dismiss": "Afgreiða",
+ "notification_requests.notifications_from": "Tilkynningar frá {name}",
+ "notification_requests.title": "Síaðar tilkynningar",
"notifications.clear": "Hreinsa tilkynningar",
"notifications.clear_confirmation": "Ertu viss um að þú viljir endanlega eyða öllum tilkynningunum þínum?",
"notifications.column_settings.admin.report": "Nýjar kærur:",
"notifications.column_settings.admin.sign_up": "Nýjar skráningar:",
"notifications.column_settings.alert": "Tilkynningar á skjáborði",
"notifications.column_settings.favourite": "Eftirlæti:",
- "notifications.column_settings.filter_bar.advanced": "Birta alla flokka",
- "notifications.column_settings.filter_bar.category": "Skyndisíustika",
- "notifications.column_settings.filter_bar.show_bar": "Birta síustikuna",
"notifications.column_settings.follow": "Nýir fylgjendur:",
"notifications.column_settings.follow_request": "Nýjar beiðnir um að fylgjast með:",
"notifications.column_settings.mention": "Tilvísanir:",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "Tilkynningar á skjáborði eru ekki aðgengilegar megna áður hafnaðra beiðna fyrir vafra",
"notifications.permission_denied_alert": "Ekki var hægt að virkja tilkynningar á skjáborði, þar sem heimildum fyrir vafra var áður hafnað",
"notifications.permission_required": "Tilkynningar á skjáborði eru ekki aðgengilegar þar sem nauðsynlegar heimildir hafa ekki verið veittar.",
+ "notifications.policy.filter_new_accounts.hint": "Útbúið {days, plural, one {síðasta daginn} other {síðustu # daga}}",
+ "notifications.policy.filter_new_accounts_title": "Nýir notendur",
+ "notifications.policy.filter_not_followers_hint": "Þar með talið fólk sem hefur fylgst með þér í minna en {days, plural, one {einn dag} other {# daga}}",
+ "notifications.policy.filter_not_followers_title": "Fólk sem fylgist ekki með þér",
+ "notifications.policy.filter_not_following_hint": "Þar til þú samþykkir viðkomandi handvirkt",
+ "notifications.policy.filter_not_following_title": "Fólk sem þú fylgist ekki með",
+ "notifications.policy.filter_private_mentions_hint": "Síað nema það sé í svari við einhverju þar sem þú minntist á viðkomandi eða ef þú fylgist með sendandanum",
+ "notifications.policy.filter_private_mentions_title": "Óumbeðið einkaspjall",
+ "notifications.policy.title": "Sía út tilkynningar frá…",
"notifications_permission_banner.enable": "Virkja tilkynningar á skjáborði",
"notifications_permission_banner.how_to_control": "Til að taka á móti tilkynningum þegar Mastodon er ekki opið, skaltu virkja tilkynningar á skjáborði. Þegar þær eru orðnar virkar geturðu stýrt nákvæmlega hverskonar atvik framleiða tilkynningar með því að nota {icon}-hnappinn hér fyrir ofan.",
"notifications_permission_banner.title": "Aldrei missa af neinu",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 9e68216a33..303abd4982 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -241,6 +241,7 @@
"empty_column.list": "Non c'è ancora nulla in questa lista. Quando i membri di questa lista pubblicheranno dei nuovi post, appariranno qui.",
"empty_column.lists": "Non hai ancora alcuna lista. Quando ne creerai una, apparirà qui.",
"empty_column.mutes": "Non hai ancora silenziato alcun utente.",
+ "empty_column.notification_requests": "Tutto chiaro! Non c'è niente qui. Quando ricevi nuove notifiche, verranno visualizzate qui in base alle tue impostazioni.",
"empty_column.notifications": "Non hai ancora nessuna notifica. Quando altre persone interagiranno con te, le vedrai qui.",
"empty_column.public": "Non c'è nulla qui! Scrivi qualcosa pubblicamente o segui manualmente gli utenti dagli altri server per riempire questo spazio",
"error.unexpected_crash.explanation": "A causa di un bug nel nostro codice o di un problema di compatibilità del browser, non è stato possibile visualizzare correttamente questa pagina.",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
"filter_modal.select_filter.title": "Filtra questo post",
"filter_modal.title.status": "Filtra un post",
+ "filtered_notifications_banner.pending_requests": "Notifiche da {count, plural, =0 {nessuna persona} one {una persona} other {# persone}} che potresti conoscere",
+ "filtered_notifications_banner.title": "Notifiche filtrate",
"firehose.all": "Tutto",
"firehose.local": "Questo server",
"firehose.remote": "Altri server",
@@ -314,7 +317,6 @@
"hashtag.follow": "Segui l'hashtag",
"hashtag.unfollow": "Smetti di seguire l'hashtag",
"hashtags.and_other": "…e {count, plural, other {# in più}}",
- "home.column_settings.basic": "Base",
"home.column_settings.show_reblogs": "Mostra reblog",
"home.column_settings.show_replies": "Mostra risposte",
"home.hide_announcements": "Nascondi annunci",
@@ -440,15 +442,16 @@
"notification.reblog": "{name} ha rebloggato il tuo post",
"notification.status": "{name} ha appena pubblicato un post",
"notification.update": "{name} ha modificato un post",
+ "notification_requests.accept": "Accetta",
+ "notification_requests.dismiss": "Ignora",
+ "notification_requests.notifications_from": "Notifiche da {name}",
+ "notification_requests.title": "Notifiche filtrate",
"notifications.clear": "Cancella le notifiche",
"notifications.clear_confirmation": "Sei sicuro di voler cancellare permanentemente tutte le tue notifiche?",
"notifications.column_settings.admin.report": "Nuove segnalazioni:",
"notifications.column_settings.admin.sign_up": "Nuove iscrizioni:",
"notifications.column_settings.alert": "Notifiche desktop",
"notifications.column_settings.favourite": "Preferiti:",
- "notifications.column_settings.filter_bar.advanced": "Mostra tutte le categorie",
- "notifications.column_settings.filter_bar.category": "Barra rapida del filtro",
- "notifications.column_settings.filter_bar.show_bar": "Mostra la barra del filtro",
"notifications.column_settings.follow": "Nuovi seguaci:",
"notifications.column_settings.follow_request": "Nuove richieste di seguirti:",
"notifications.column_settings.mention": "Menzioni:",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "Notifiche desktop non disponibili a causa della precedentemente negata richiesta di autorizzazioni del browser",
"notifications.permission_denied_alert": "Impossibile abilitare le notifiche desktop, poiché l'autorizzazione del browser è stata precedentemente negata",
"notifications.permission_required": "Notifiche destkop non disponibili poiché l'autorizzazione richiesta non è stata concessa.",
+ "notifications.policy.filter_new_accounts.hint": "Creato {days, plural, one {un giorno} other {# giorni}} fa",
+ "notifications.policy.filter_new_accounts_title": "Nuovi account",
+ "notifications.policy.filter_not_followers_hint": "Incluse le persone che ti seguono da meno di {days, plural, one {un giorno} other {# giorni}}",
+ "notifications.policy.filter_not_followers_title": "Persone che non ti seguono",
+ "notifications.policy.filter_not_following_hint": "Fino a quando non le approvi manualmente",
+ "notifications.policy.filter_not_following_title": "Persone che non segui",
+ "notifications.policy.filter_private_mentions_hint": "Filtrate, a meno che non sia in risposta alla tua menzione o se segui il mittente",
+ "notifications.policy.filter_private_mentions_title": "Menzioni private indesiderate",
+ "notifications.policy.title": "Filtra le notifiche da…",
"notifications_permission_banner.enable": "Abilita le notifiche desktop",
"notifications_permission_banner.how_to_control": "Per ricevere le notifiche quando Mastodon non è aperto, abilita le notifiche desktop. Puoi controllare precisamente quali tipi di interazioni generano le notifiche destkop, tramite il pulsante {icon} sopra, una volta abilitate.",
"notifications_permission_banner.title": "Non perderti mai nulla",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 27ed9816a7..872293b230 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -314,7 +314,6 @@
"hashtag.follow": "ハッシュタグをフォローする",
"hashtag.unfollow": "ハッシュタグのフォローを解除",
"hashtags.and_other": "ほか{count, plural, other {#個}}",
- "home.column_settings.basic": "基本設定",
"home.column_settings.show_reblogs": "ブースト表示",
"home.column_settings.show_replies": "返信表示",
"home.hide_announcements": "お知らせを隠す",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "新規登録:",
"notifications.column_settings.alert": "デスクトップ通知",
"notifications.column_settings.favourite": "お気に入り:",
- "notifications.column_settings.filter_bar.advanced": "すべてのカテゴリを表示",
- "notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
- "notifications.column_settings.filter_bar.show_bar": "フィルターバーを表示",
"notifications.column_settings.follow": "新しいフォロワー:",
"notifications.column_settings.follow_request": "新しいフォローリクエスト:",
"notifications.column_settings.mention": "返信:",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 8628cb38a2..964a764a93 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -114,7 +114,6 @@
"follow_request.reject": "უარყოფა",
"getting_started.heading": "დაწყება",
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
- "home.column_settings.basic": "ძირითადი",
"home.column_settings.show_reblogs": "ბუსტების ჩვენება",
"home.column_settings.show_replies": "პასუხების ჩვენება",
"keyboard_shortcuts.back": "უკან გადასასვლელად",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 94f620491f..4ffae68bd0 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -242,7 +242,6 @@
"hashtag.counter_by_uses_today": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}} assa",
"hashtag.follow": "Ḍfeṛ ahacṭag",
"hashtags.and_other": "…d {count, plural, one {}other {# nniḍen}}",
- "home.column_settings.basic": "Igejdanen",
"home.column_settings.show_reblogs": "Ssken-d beṭṭu",
"home.column_settings.show_replies": "Ssken-d tiririyin",
"home.hide_announcements": "Ffer ulɣuyen",
@@ -355,8 +354,6 @@
"notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?",
"notifications.column_settings.alert": "Tilɣa n tnarit",
"notifications.column_settings.favourite": "Imenyafen:",
- "notifications.column_settings.filter_bar.advanced": "Ssken-d meṛṛa tiggayin",
- "notifications.column_settings.filter_bar.category": "Iri n usizdeg uzrib",
"notifications.column_settings.follow": "Imeḍfaṛen imaynuten:",
"notifications.column_settings.follow_request": "Isuturen imaynuten n teḍfeṛt:",
"notifications.column_settings.mention": "Abdar:",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 1f6cc78a57..f71c10f916 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -181,7 +181,6 @@
"hashtag.column_settings.tag_mode.any": "Осылардың біреуін",
"hashtag.column_settings.tag_mode.none": "Бұлардың ешқайсысын",
"hashtag.column_settings.tag_toggle": "Осы бағанға қосымша тегтерді қосыңыз",
- "home.column_settings.basic": "Негізгі",
"home.column_settings.show_reblogs": "Бөлісулерді көрсету",
"home.column_settings.show_replies": "Жауаптарды көрсету",
"home.hide_announcements": "Анонстарды жасыр",
@@ -263,8 +262,6 @@
"notifications.clear": "Ескертпелерді тазарт",
"notifications.clear_confirmation": "Шынымен барлық ескертпелерді өшіресіз бе?",
"notifications.column_settings.alert": "Үстел ескертпелері",
- "notifications.column_settings.filter_bar.advanced": "Барлық категорияны көрсет",
- "notifications.column_settings.filter_bar.category": "Жедел сүзгі",
"notifications.column_settings.follow": "Жаңа оқырмандар:",
"notifications.column_settings.follow_request": "Жазылуға жаңа сұранымдар:",
"notifications.column_settings.mention": "Аталымдар:",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index d9192e5c61..7dd7636089 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -271,10 +271,12 @@
"filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
"filter_modal.select_filter.title": "이 게시물을 필터",
"filter_modal.title.status": "게시물 필터",
+ "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0명} one {한 명} other {# 명}}의 사람들로부터의 알림",
+ "filtered_notifications_banner.title": "걸러진 알림",
"firehose.all": "모두",
"firehose.local": "이 서버",
"firehose.remote": "다른 서버",
- "follow_request.authorize": "허가",
+ "follow_request.authorize": "승인",
"follow_request.reject": "거부",
"follow_requests.unlocked_explanation": "귀하의 계정이 잠긴 계정이 아닐지라도, {domain} 스태프는 이 계정들의 팔로우 요청을 수동으로 처리해 주시면 좋겠다고 생각했습니다.",
"follow_suggestions.curated_suggestion": "스태프의 추천",
@@ -314,7 +316,6 @@
"hashtag.follow": "팔로우",
"hashtag.unfollow": "팔로우 해제",
"hashtags.and_other": "…그리고 {count, plural,other {#개 더}}",
- "home.column_settings.basic": "기본",
"home.column_settings.show_reblogs": "부스트 표시",
"home.column_settings.show_replies": "답글 표시",
"home.hide_announcements": "공지사항 숨기기",
@@ -440,15 +441,16 @@
"notification.reblog": "{name} 님이 부스트했습니다",
"notification.status": "{name} 님이 방금 게시물을 올렸습니다",
"notification.update": "{name} 님이 게시물을 수정했습니다",
+ "notification_requests.accept": "수락",
+ "notification_requests.dismiss": "지우기",
+ "notification_requests.notifications_from": "{name} 님으로부터의 알림",
+ "notification_requests.title": "걸러진 알림",
"notifications.clear": "알림 비우기",
"notifications.clear_confirmation": "정말로 알림을 삭제하시겠습니까?",
"notifications.column_settings.admin.report": "새 신고:",
"notifications.column_settings.admin.sign_up": "새로운 가입:",
"notifications.column_settings.alert": "데스크탑 알림",
"notifications.column_settings.favourite": "좋아요:",
- "notifications.column_settings.filter_bar.advanced": "모든 범주 표시하기",
- "notifications.column_settings.filter_bar.category": "빠른 필터 막대",
- "notifications.column_settings.filter_bar.show_bar": "필터 막대 보이기",
"notifications.column_settings.follow": "새 팔로워:",
"notifications.column_settings.follow_request": "새 팔로우 요청:",
"notifications.column_settings.mention": "멘션:",
@@ -474,6 +476,13 @@
"notifications.permission_denied": "권한이 거부되었기 때문에 데스크탑 알림을 활성화할 수 없음",
"notifications.permission_denied_alert": "이전에 브라우저 권한이 거부되었기 때문에, 데스크탑 알림이 활성화 될 수 없습니다.",
"notifications.permission_required": "필요한 권한이 승인되지 않아 데스크탑 알림을 사용할 수 없습니다.",
+ "notifications.policy.filter_new_accounts.hint": "{days, plural, one {하루} other {#일}} 안에 만들어진",
+ "notifications.policy.filter_new_accounts_title": "새 계정",
+ "notifications.policy.filter_not_followers_title": "나를 팔로우하지 않는 사람들",
+ "notifications.policy.filter_not_following_hint": "내가 수동으로 승인하기 전까지",
+ "notifications.policy.filter_not_following_title": "내가 팔로우하지 않는 사람들",
+ "notifications.policy.filter_private_mentions_title": "청하지 않은 개인적인 멘션",
+ "notifications.policy.title": "알림을 거를 사람들…",
"notifications_permission_banner.enable": "데스크탑 알림 활성화",
"notifications_permission_banner.how_to_control": "마스토돈이 열려 있지 않을 때에도 알림을 받으려면, 데스크탑 알림을 활성화 하세요. 당신은 어떤 종류의 반응이 데스크탑 알림을 발생할 지를 {icon} 버튼을 통해 세세하게 설정할 수 있습니다.",
"notifications_permission_banner.title": "아무것도 놓치지 마세요",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 4a0fd671db..a106101081 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -258,7 +258,6 @@
"hashtag.column_settings.tag_toggle": "Ji bo vê stûnê hin pêvekan tevlî bike",
"hashtag.follow": "Hashtagê bişopîne",
"hashtag.unfollow": "Hashtagê neşopîne",
- "home.column_settings.basic": "Bingehîn",
"home.column_settings.show_reblogs": "Bilindkirinan nîşan bike",
"home.column_settings.show_replies": "Bersivan nîşan bide",
"home.hide_announcements": "Reklaman veşêre",
@@ -370,9 +369,6 @@
"notifications.column_settings.admin.report": "Ragihandinên nû:",
"notifications.column_settings.admin.sign_up": "Tomarkirinên nû:",
"notifications.column_settings.alert": "Agahdariyên sermaseyê",
- "notifications.column_settings.filter_bar.advanced": "Hemû beşan nîşan bide",
- "notifications.column_settings.filter_bar.category": "Şivika parzûna bilêz",
- "notifications.column_settings.filter_bar.show_bar": "Darika parzûnê nîşan bide",
"notifications.column_settings.follow": "Şopînerên nû:",
"notifications.column_settings.follow_request": "Daxwazên şopandinê nû:",
"notifications.column_settings.mention": "Qalkirin:",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index e42f50aeff..f9c70db53e 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -166,7 +166,6 @@
"hashtag.column_settings.tag_mode.any": "Pynag a'n re ma",
"hashtag.column_settings.tag_mode.none": "Travyth a'n re ma",
"hashtag.column_settings.tag_toggle": "Yssynsi taggys ynwedhek rag an goloven ma",
- "home.column_settings.basic": "Selyek",
"home.column_settings.show_reblogs": "Diskwedhes kenerthow",
"home.column_settings.show_replies": "Diskwedhes gorthebow",
"home.hide_announcements": "Kudha deklaryansow",
@@ -257,8 +256,6 @@
"notifications.clear": "Dilea gwarnyansow",
"notifications.clear_confirmation": "Owgh hwi sur a vynnes dilea agas gwarnyansow oll yn fast?",
"notifications.column_settings.alert": "Gwarnyansow pennskrin",
- "notifications.column_settings.filter_bar.advanced": "Displetya rummow oll",
- "notifications.column_settings.filter_bar.category": "Barr sidhla skav",
"notifications.column_settings.follow": "Holyoryon nowydh:",
"notifications.column_settings.follow_request": "Govynnow holya nowydh:",
"notifications.column_settings.mention": "Menegow:",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 91540d58ca..de84becca3 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -271,6 +271,7 @@
"filter_modal.select_filter.subtitle": "Kulanea una kategoria egzistente o kriya mueva",
"filter_modal.select_filter.title": "Filtra esta publikasyon",
"filter_modal.title.status": "Filtra una publikasyon",
+ "filtered_notifications_banner.title": "Avizos filtrados",
"firehose.all": "Todo",
"firehose.local": "Este sirvidor",
"firehose.remote": "Otros sirvidores",
@@ -314,7 +315,6 @@
"hashtag.follow": "Sige etiketa",
"hashtag.unfollow": "Desige etiketa",
"hashtags.and_other": "…i {count, plural, one {}other {# mas}}",
- "home.column_settings.basic": "Opsyones bazikas",
"home.column_settings.show_reblogs": "Amostra repartajasyones",
"home.column_settings.show_replies": "Amostra repuestas",
"home.hide_announcements": "Eskonde pregones",
@@ -440,15 +440,15 @@
"notification.reblog": "{name} repartajo tu publikasyon",
"notification.status": "{name} publiko algo",
"notification.update": "{name} edito una publikasyon",
+ "notification_requests.accept": "Acheta",
+ "notification_requests.dismiss": "Kita",
+ "notification_requests.title": "Avizos filtrados",
"notifications.clear": "Efasa avizos",
"notifications.clear_confirmation": "Estas siguro ke keres permanentemente efasar todos tus avizos?",
"notifications.column_settings.admin.report": "Muveos raportos:",
"notifications.column_settings.admin.sign_up": "Muevas enrejistrasyones:",
"notifications.column_settings.alert": "Avizos de ensimameza",
"notifications.column_settings.favourite": "Te plazen:",
- "notifications.column_settings.filter_bar.advanced": "Amostra todas las kategorias",
- "notifications.column_settings.filter_bar.category": "Vara de filtrado rapido",
- "notifications.column_settings.filter_bar.show_bar": "Amostra vara de filtros",
"notifications.column_settings.follow": "Muevos suivantes:",
"notifications.column_settings.follow_request": "Muevas solisitudes de segimiento:",
"notifications.column_settings.mention": "Enmentaduras:",
@@ -474,6 +474,7 @@
"notifications.permission_denied": "Avizos de ensimameza no estan desponivles porke ya se tiene refuzado el permiso",
"notifications.permission_denied_alert": "\"No se pueden kapasitar los avizos de ensimameza, porke ya se tiene refuzado el permiso de navigador",
"notifications.permission_required": "Avizos de ensimameza no estan desponivles porke los nesesarios permisos no tienen sido risividos.",
+ "notifications.policy.filter_new_accounts_title": "Muevos kuentos",
"notifications_permission_banner.enable": "Kapasita avizos de ensimameza",
"notifications_permission_banner.how_to_control": "Para risivir avizos kuando Mastodon no esta avierto, kapasita avizos de ensimameza. Puedes kontrolar presizamente kualos tipos de enteraksiones djeneren avizos de ensimameza kon el boton {icon} arriva kuando esten kapasitadas.",
"notifications_permission_banner.title": "Nunkua te piedres niente",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 8b757484ce..6963c43a3a 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Sekti saitažodį",
"hashtag.unfollow": "Nebesekti saitažodį",
"hashtags.and_other": "…ir {count, plural, one {# daugiau} few {# daugiau} many {# daugiau}other {# daugiau}}",
- "home.column_settings.basic": "Paprastas",
"home.column_settings.show_reblogs": "Rodyti pakėlimus",
"home.column_settings.show_replies": "Rodyti atsakymus",
"home.hide_announcements": "Slėpti skelbimus",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Naujos registracijos:",
"notifications.column_settings.alert": "Darbalaukio pranešimai",
"notifications.column_settings.favourite": "Mėgstami:",
- "notifications.column_settings.filter_bar.advanced": "Rodyti visas kategorijas",
- "notifications.column_settings.filter_bar.category": "Spartaus filtro juosta",
- "notifications.column_settings.filter_bar.show_bar": "Rodyti filtro juostą",
"notifications.column_settings.follow": "Nauji sekėjai:",
"notifications.column_settings.follow_request": "Nauji sekimo prašymai:",
"notifications.column_settings.mention": "Paminėjimai:",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 8044e78923..47f10d94c1 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -306,7 +306,6 @@
"hashtag.follow": "Sekot tēmturim",
"hashtag.unfollow": "Pārstāt sekot tēmturim",
"hashtags.and_other": "..un {count, plural, other {# vairāk}}",
- "home.column_settings.basic": "Pamata",
"home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
"home.column_settings.show_replies": "Rādīt atbildes",
"home.hide_announcements": "Slēpt paziņojumus",
@@ -438,9 +437,6 @@
"notifications.column_settings.admin.sign_up": "Jaunas pierakstīšanās:",
"notifications.column_settings.alert": "Darbvirsmas paziņojumi",
"notifications.column_settings.favourite": "Izlase:",
- "notifications.column_settings.filter_bar.advanced": "Rādīt visas kategorijas",
- "notifications.column_settings.filter_bar.category": "Ātro filtru josla",
- "notifications.column_settings.filter_bar.show_bar": "Rādīt filtru joslu",
"notifications.column_settings.follow": "Jauni sekotāji:",
"notifications.column_settings.follow_request": "Jauni sekošanas pieprasījumi:",
"notifications.column_settings.mention": "Pieminēšanas:",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index f7080842b7..cd30e29493 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -137,7 +137,6 @@
"hashtag.column_settings.tag_mode.any": "Било кои",
"hashtag.column_settings.tag_mode.none": "Никои",
"hashtag.column_settings.tag_toggle": "Стави додатни тагови за оваа колона",
- "home.column_settings.basic": "Основно",
"home.column_settings.show_reblogs": "Прикажи бустирања",
"home.column_settings.show_replies": "Прикажи одговори",
"intervals.full.days": "{number, plural, one {# ден} other {# дена}}",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 0059dd333b..6f1ec3c117 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -181,7 +181,6 @@
"hashtag.column_settings.tag_mode.any": "ഇവയിലേതെങ്കിലും",
"hashtag.column_settings.tag_mode.none": "ഇതിലൊന്നുമല്ല",
"hashtag.column_settings.tag_toggle": "ഈ എഴുത്തുപംക്തിക്ക് കൂടുതൽ ഉപനാമങ്ങൾ ചേർക്കുക",
- "home.column_settings.basic": "അടിസ്ഥാനം",
"home.column_settings.show_reblogs": "ബൂസ്റ്റുകൾ കാണിക്കുക",
"home.column_settings.show_replies": "മറുപടികൾ കാണിക്കുക",
"home.hide_announcements": "പ്രഖ്യാപനങ്ങൾ മറയ്ക്കുക",
@@ -255,7 +254,6 @@
"notifications.clear": "അറിയിപ്പ് മായ്ക്കുക",
"notifications.clear_confirmation": "നിങ്ങളുടെ എല്ലാ അറിയിപ്പുകളും ശാശ്വതമായി മായ്ക്കണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?",
"notifications.column_settings.alert": "ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകൾ",
- "notifications.column_settings.filter_bar.advanced": "എല്ലാ വിഭാഗങ്ങളും പ്രദർശിപ്പിക്കുക",
"notifications.column_settings.follow": "പുതിയ പിന്തുടരുന്നവർ:",
"notifications.column_settings.follow_request": "പുതിയ പിന്തുടരൽ അഭ്യർത്ഥനകൾ:",
"notifications.column_settings.mention": "സൂചനകൾ:",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 20231f0bbf..0cd5e7ef78 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -122,7 +122,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "हॅशटॅग फॉलो करा",
"hashtag.unfollow": "हॅशटॅग अनफॉलो करा",
- "home.column_settings.basic": "मूळ",
"home.column_settings.show_reblogs": "बूस्ट दाखवा",
"home.column_settings.show_replies": "उत्तरे दाखवा",
"home.hide_announcements": "घोषणा लपवा",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 3d6ba920c9..20bd248c3a 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -311,7 +311,6 @@
"hashtag.follow": "Ikuti hashtag",
"hashtag.unfollow": "Nyahikut tanda pagar",
"hashtags.and_other": "…dan {count, plural, other {# more}}",
- "home.column_settings.basic": "Asas",
"home.column_settings.show_reblogs": "Tunjukkan galakan",
"home.column_settings.show_replies": "Tunjukkan balasan",
"home.hide_announcements": "Sembunyikan pengumuman",
@@ -443,9 +442,6 @@
"notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
"notifications.column_settings.alert": "Pemberitahuan atas meja",
"notifications.column_settings.favourite": "Kegemaran:",
- "notifications.column_settings.filter_bar.advanced": "Papar semua kategori",
- "notifications.column_settings.filter_bar.category": "Bar penapis pantas",
- "notifications.column_settings.filter_bar.show_bar": "Paparkan bar penapis",
"notifications.column_settings.follow": "Pengikut baharu:",
"notifications.column_settings.follow_request": "Permintaan ikutan baharu:",
"notifications.column_settings.mention": "Sebutan:",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 0d5985b1ce..1b129aaa0f 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -292,7 +292,6 @@
"hashtag.follow": "Hashtag ကို စောင့်ကြည့်မယ်",
"hashtag.unfollow": "Hashtag ကို မစောင့်ကြည့်ပါ",
"hashtags.and_other": "{count, plural, other {# more}} နှင့်",
- "home.column_settings.basic": "အခြေခံ",
"home.column_settings.show_reblogs": "Boost များကို ပြပါ",
"home.column_settings.show_replies": "ပြန်စာများကို ပြပါ",
"home.hide_announcements": "ကြေညာချက်များကို ဖျောက်ပါ",
@@ -424,9 +423,6 @@
"notifications.column_settings.admin.sign_up": "အကောင့်အသစ်များ -",
"notifications.column_settings.alert": "Desktop သတိပေးချက်များ",
"notifications.column_settings.favourite": "Favorites:",
- "notifications.column_settings.filter_bar.advanced": "ခေါင်းစဥ်အားလုံးများကိုဖော်ပြပါ",
- "notifications.column_settings.filter_bar.category": "အမြန်စစ်ထုတ်မှုဘား",
- "notifications.column_settings.filter_bar.show_bar": "စစ်ထုတ်မှုဘားကို ပြပါ",
"notifications.column_settings.follow": "စောင့်ကြည့်သူအသစ်များ -",
"notifications.column_settings.follow_request": "စောင့်ကြည့်ရန် တောင်းဆိုမှုအသစ်များ -",
"notifications.column_settings.mention": "ဖော်ပြချက်များ -",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index a8d42e5ff6..da5c4d8643 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -241,6 +241,7 @@
"empty_column.list": "Er is nog niks te zien in deze lijst. Wanneer lijstleden nieuwe berichten plaatsen, zijn deze hier te zien.",
"empty_column.lists": "Je hebt nog geen lijsten. Wanneer je er een aanmaakt, zal dat hier verschijnen.",
"empty_column.mutes": "Jij hebt nog geen gebruikers genegeerd.",
+ "empty_column.notification_requests": "Helemaal leeg! Er is hier niets. Wanneer je nieuwe meldingen ontvangt, verschijnen deze hier volgens jouw instellingen.",
"empty_column.notifications": "Je hebt nog geen meldingen. Begin met iemand een gesprek.",
"empty_column.public": "Er is hier helemaal niks! Plaatst een openbaar bericht of volg mensen van andere servers om het te vullen",
"error.unexpected_crash.explanation": "Als gevolg van een bug in onze broncode of als gevolg van een compatibiliteitsprobleem met jouw webbrowser, kan deze pagina niet goed worden weergegeven.",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
"filter_modal.select_filter.title": "Dit bericht filteren",
"filter_modal.title.status": "Een bericht filteren",
+ "filtered_notifications_banner.pending_requests": "Meldingen van {count, plural, =0 {no} one {één persoon} other {# mensen}} die je misschien kent",
+ "filtered_notifications_banner.title": "Gefilterde meldingen",
"firehose.all": "Alles",
"firehose.local": "Deze server",
"firehose.remote": "Andere servers",
@@ -314,7 +317,6 @@
"hashtag.follow": "Hashtag volgen",
"hashtag.unfollow": "Hashtag ontvolgen",
"hashtags.and_other": "…en {count, plural, one {}other {# meer}}",
- "home.column_settings.basic": "Algemeen",
"home.column_settings.show_reblogs": "Boosts tonen",
"home.column_settings.show_replies": "Reacties tonen",
"home.hide_announcements": "Mededelingen verbergen",
@@ -440,15 +442,16 @@
"notification.reblog": "{name} boostte jouw bericht",
"notification.status": "{name} heeft zojuist een bericht geplaatst",
"notification.update": "{name} heeft een bericht bewerkt",
+ "notification_requests.accept": "Accepteren",
+ "notification_requests.dismiss": "Afwijzen",
+ "notification_requests.notifications_from": "Meldingen van {name}",
+ "notification_requests.title": "Gefilterde meldingen",
"notifications.clear": "Meldingen verwijderen",
"notifications.clear_confirmation": "Weet je het zeker dat je al jouw meldingen wilt verwijderen?",
"notifications.column_settings.admin.report": "Nieuwe rapportages:",
"notifications.column_settings.admin.sign_up": "Nieuwe registraties:",
"notifications.column_settings.alert": "Desktopmeldingen",
"notifications.column_settings.favourite": "Favorieten:",
- "notifications.column_settings.filter_bar.advanced": "Alle categorieën tonen",
- "notifications.column_settings.filter_bar.category": "Snelle filterbalk",
- "notifications.column_settings.filter_bar.show_bar": "Filterbalk tonen",
"notifications.column_settings.follow": "Nieuwe volgers:",
"notifications.column_settings.follow_request": "Nieuw volgverzoek:",
"notifications.column_settings.mention": "Vermeldingen:",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "Desktopmeldingen zijn niet beschikbaar omdat een eerdere browsertoestemming werd geweigerd",
"notifications.permission_denied_alert": "Desktopmeldingen kunnen niet worden ingeschakeld, omdat een eerdere browsertoestemming werd geweigerd",
"notifications.permission_required": "Desktopmeldingen zijn niet beschikbaar omdat de benodigde toestemming niet is verleend.",
+ "notifications.policy.filter_new_accounts.hint": "In de afgelopen {days, plural, one {24 uur} other {# dagen}} geregistreerd",
+ "notifications.policy.filter_new_accounts_title": "Nieuwe accounts",
+ "notifications.policy.filter_not_followers_hint": "Inclusief mensen die jou korter dan {days, plural, one {24 uur} other {# dagen}} volgen",
+ "notifications.policy.filter_not_followers_title": "Mensen die jou niet volgen",
+ "notifications.policy.filter_not_following_hint": "Totdat je ze handmatig goedkeurt",
+ "notifications.policy.filter_not_following_title": "Mensen die jij niet volgt",
+ "notifications.policy.filter_private_mentions_hint": "Onzichtbaar tenzij het een antwoord is op een privébericht van jou of wanneer je de afzender volgt",
+ "notifications.policy.filter_private_mentions_title": "Ongevraagde privéberichten",
+ "notifications.policy.title": "Meldingen verbergen van…",
"notifications_permission_banner.enable": "Desktopmeldingen inschakelen",
"notifications_permission_banner.how_to_control": "Om meldingen te ontvangen wanneer Mastodon niet open staat. Je kunt precies bepalen welke soort interacties wel of geen desktopmeldingen geven via de bovenstaande {icon} knop.",
"notifications_permission_banner.title": "Mis nooit meer iets",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 3cc537f54f..b8a0512b8c 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Fylg emneknagg",
"hashtag.unfollow": "Slutt å fylgje emneknaggen",
"hashtags.and_other": "…og {count, plural, one {}other {# fleire}}",
- "home.column_settings.basic": "Grunnleggjande",
"home.column_settings.show_reblogs": "Vis framhevingar",
"home.column_settings.show_replies": "Vis svar",
"home.hide_announcements": "Skjul kunngjeringar",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Nyleg registrerte:",
"notifications.column_settings.alert": "Skrivebordsvarsel",
"notifications.column_settings.favourite": "Favorittar:",
- "notifications.column_settings.filter_bar.advanced": "Vis alle kategoriar",
- "notifications.column_settings.filter_bar.category": "Snarfilterlinje",
- "notifications.column_settings.filter_bar.show_bar": "Vis filterlinja",
"notifications.column_settings.follow": "Nye fylgjarar:",
"notifications.column_settings.follow_request": "Ny fylgjarførespurnader:",
"notifications.column_settings.mention": "Omtalar:",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index a172fc69f4..14e33e9f18 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -304,7 +304,6 @@
"hashtag.follow": "Følg emneknagg",
"hashtag.unfollow": "Slutt å følge emneknagg",
"hashtags.and_other": "…og {count, plural, one{en til} other {# til}}",
- "home.column_settings.basic": "Enkelt",
"home.column_settings.show_reblogs": "Vis fremhevinger",
"home.column_settings.show_replies": "Vis svar",
"home.hide_announcements": "Skjul kunngjøring",
@@ -436,9 +435,6 @@
"notifications.column_settings.admin.sign_up": "Nye registreringer:",
"notifications.column_settings.alert": "Skrivebordsvarslinger",
"notifications.column_settings.favourite": "Favoritter:",
- "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
- "notifications.column_settings.filter_bar.category": "Hurtigfiltreringslinje",
- "notifications.column_settings.filter_bar.show_bar": "Vis filterlinjen",
"notifications.column_settings.follow": "Nye følgere:",
"notifications.column_settings.follow_request": "Nye følgerforespørsler:",
"notifications.column_settings.mention": "Nevnt:",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 5e122064fc..09276b3b32 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -262,7 +262,6 @@
"hashtag.follow": "Sègre l’etiqueta",
"hashtag.unfollow": "Quitar de sègre l’etiqueta",
"hashtags.and_other": "…e {count, plural, one {}other {# de mai}}",
- "home.column_settings.basic": "Basic",
"home.column_settings.show_reblogs": "Mostrar los partatges",
"home.column_settings.show_replies": "Mostrar las responsas",
"home.hide_announcements": "Rescondre las anóncias",
@@ -379,9 +378,6 @@
"notifications.column_settings.admin.sign_up": "Nòus inscrits :",
"notifications.column_settings.alert": "Notificacions localas",
"notifications.column_settings.favourite": "Favorits :",
- "notifications.column_settings.filter_bar.advanced": "Mostrar totas las categorias",
- "notifications.column_settings.filter_bar.category": "Barra de recèrca rapida",
- "notifications.column_settings.filter_bar.show_bar": "Afichar la barra de filtres",
"notifications.column_settings.follow": "Nòus seguidors :",
"notifications.column_settings.follow_request": "Novèla demanda d’abonament :",
"notifications.column_settings.mention": "Mencions :",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index ee47c1872d..69360184fc 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -153,7 +153,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
"hashtag.unfollow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
- "home.column_settings.basic": "ਆਮ",
"home.pending_critical_update.link": "ਅੱਪਡੇਟ ਵੇਖੋ",
"interaction_modal.title.follow": "{name} ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
"keyboard_shortcuts.back": "ਪਿੱਛੇ ਜਾਓ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 01b88eacdc..51f705b692 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -241,6 +241,7 @@
"empty_column.list": "Nie ma nic na tej liście. Kiedy członkowie listy dodadzą nowe wpisy, pojawia się one tutaj.",
"empty_column.lists": "Nie masz żadnych list. Kiedy utworzysz jedną, pojawi się tutaj.",
"empty_column.mutes": "Nie wyciszyłeś(-aś) jeszcze żadnego użytkownika.",
+ "empty_column.notification_requests": "To wszystko – kiedy otrzymasz nowe powiadomienia, pokażą się tutaj zgodnie z twoimi ustawieniami.",
"empty_column.notifications": "Nie masz żadnych powiadomień. Rozpocznij interakcje z innymi użytkownikami.",
"empty_column.public": "Tu nic nie ma! Napisz coś publicznie, lub dodaj ludzi z innych serwerów, aby to wyświetlić",
"error.unexpected_crash.explanation": "W związku z błędem w naszym kodzie lub braku kompatybilności przeglądarki, ta strona nie może być poprawnie wyświetlona.",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "Użyj istniejącej kategorii lub utwórz nową",
"filter_modal.select_filter.title": "Filtruj ten wpis",
"filter_modal.title.status": "Filtruj wpis",
+ "filtered_notifications_banner.pending_requests": "Powiadomienia od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
+ "filtered_notifications_banner.title": "Powiadomienia filtrowane",
"firehose.all": "Wszystko",
"firehose.local": "Ten serwer",
"firehose.remote": "Inne serwery",
@@ -314,7 +317,6 @@
"hashtag.follow": "Obserwuj hasztag",
"hashtag.unfollow": "Przestań obserwować hashtag",
"hashtags.and_other": "…i {count, plural, other {jeszcze #}}",
- "home.column_settings.basic": "Podstawowe",
"home.column_settings.show_reblogs": "Pokazuj podbicia",
"home.column_settings.show_replies": "Pokazuj odpowiedzi",
"home.hide_announcements": "Ukryj ogłoszenia",
@@ -440,15 +442,16 @@
"notification.reblog": "Twój post został podbity przez {name}",
"notification.status": "{name} opublikował(a) nowy wpis",
"notification.update": "{name} edytował(a) post",
+ "notification_requests.accept": "Akceptuj",
+ "notification_requests.dismiss": "Odrzuć",
+ "notification_requests.notifications_from": "Powiadomienia od {name}",
+ "notification_requests.title": "Powiadomienia filtrowane",
"notifications.clear": "Wyczyść powiadomienia",
"notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunąć wszystkie powiadomienia?",
"notifications.column_settings.admin.report": "Nowe zgłoszenia:",
"notifications.column_settings.admin.sign_up": "Nowe rejestracje:",
"notifications.column_settings.alert": "Powiadomienia na pulpicie",
"notifications.column_settings.favourite": "Ulubione:",
- "notifications.column_settings.filter_bar.advanced": "Wyświetl wszystkie kategorie",
- "notifications.column_settings.filter_bar.category": "Szybkie filtrowanie",
- "notifications.column_settings.filter_bar.show_bar": "Pokaż filtry",
"notifications.column_settings.follow": "Nowi obserwujący:",
"notifications.column_settings.follow_request": "Nowe prośby o możliwość obserwacji:",
"notifications.column_settings.mention": "Wspomnienia:",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "Powiadomienia na pulpicie nie są dostępne, ponieważ wcześniej nie udzielono uprawnień w przeglądarce",
"notifications.permission_denied_alert": "Powiadomienia na pulpicie nie mogą zostać włączone, ponieważ wcześniej odmówiono uprawnień",
"notifications.permission_required": "Powiadomienia na pulpicie nie są dostępne, ponieważ nie przyznano wymaganego uprawnienia.",
+ "notifications.policy.filter_new_accounts.hint": "Utworzone w ciągu {days, plural, one {ostatniego dnia} other {ostatnich # dni}}",
+ "notifications.policy.filter_new_accounts_title": "Nowe konta",
+ "notifications.policy.filter_not_followers_hint": "Zawierające osoby które obserwują cię krócej niż {days, plural, one {dzień} other {# dni}}",
+ "notifications.policy.filter_not_followers_title": "Ludzie, którzy cię nie obserwują",
+ "notifications.policy.filter_not_following_hint": "Aż ich ręcznie nie zatwierdzisz",
+ "notifications.policy.filter_not_following_title": "Ludzie, których nie obserwujesz",
+ "notifications.policy.filter_private_mentions_hint": "Odfiltrowane, chyba że są odpowiedzią na twoją własną wzmiankę, lub obserwujesz wysyłającego",
+ "notifications.policy.filter_private_mentions_title": "Nieproszone prywatne wzmianki",
+ "notifications.policy.title": "Odfiltruj powiadomienia od…",
"notifications_permission_banner.enable": "Włącz powiadomienia na pulpicie",
"notifications_permission_banner.how_to_control": "Aby otrzymywać powiadomienia, gdy Mastodon nie jest otwarty, włącz powiadomienia pulpitu. Możesz dokładnie kontrolować, októrych działaniach będziesz powiadomienia na pulpicie za pomocą przycisku {icon} powyżej, jeżeli tylko zostaną włączone.",
"notifications_permission_banner.title": "Nie przegap niczego",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 8911afe946..a0b66e74e7 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -308,7 +308,6 @@
"hashtag.follow": "Seguir hashtag",
"hashtag.unfollow": "Parar de seguir hashtag",
"hashtags.and_other": "…e {count, plural, one {}other {outros #}}",
- "home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Mostrar boosts",
"home.column_settings.show_replies": "Mostrar respostas",
"home.hide_announcements": "Ocultar comunicados",
@@ -440,9 +439,6 @@
"notifications.column_settings.admin.sign_up": "Novas inscrições:",
"notifications.column_settings.alert": "Notificações no computador",
"notifications.column_settings.favourite": "Favoritos:",
- "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
- "notifications.column_settings.filter_bar.category": "Barra de filtro rápido das notificações",
- "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtro",
"notifications.column_settings.follow": "Seguidores:",
"notifications.column_settings.follow_request": "Seguidores pendentes:",
"notifications.column_settings.mention": "Menções:",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 26aa0f0b5f..da947f9bf4 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -241,6 +241,7 @@
"empty_column.list": "Ainda não existem publicações nesta lista. Quando membros desta lista fizerem novas publicações, elas aparecerão aqui.",
"empty_column.lists": "Ainda não tem qualquer lista. Quando criar uma, ela irá aparecer aqui.",
"empty_column.mutes": "Ainda não silenciaste qualquer utilizador.",
+ "empty_column.notification_requests": "Tudo limpo! Não há nada aqui. Quando você receber novas notificações, elas aparecerão aqui conforme as suas configurações.",
"empty_column.notifications": "Não tens notificações. Interage com outros utilizadores para iniciar uma conversa.",
"empty_column.public": "Não há nada aqui! Escreve algo publicamente ou segue outros utilizadores para veres aqui os conteúdos públicos",
"error.unexpected_crash.explanation": "Devido a um erro no nosso código ou a uma compatilidade com o seu navegador, esta página não pôde ser apresentada correctamente.",
@@ -271,6 +272,7 @@
"filter_modal.select_filter.subtitle": "Utilize uma categoria existente ou crie uma nova",
"filter_modal.select_filter.title": "Filtrar esta publicação",
"filter_modal.title.status": "Filtrar uma publicação",
+ "filtered_notifications_banner.title": "Notificações filtradas",
"firehose.all": "Todas",
"firehose.local": "Este servidor",
"firehose.remote": "Outros servidores",
@@ -314,7 +316,6 @@
"hashtag.follow": "Seguir #etiqueta",
"hashtag.unfollow": "Deixar de seguir #etiqueta",
"hashtags.and_other": "…e {count, plural, other {mais #}}",
- "home.column_settings.basic": "Básico",
"home.column_settings.show_reblogs": "Mostrar impulsos",
"home.column_settings.show_replies": "Mostrar respostas",
"home.hide_announcements": "Ocultar comunicações",
@@ -440,15 +441,16 @@
"notification.reblog": "{name} reforçou a tua publicação",
"notification.status": "{name} acabou de publicar",
"notification.update": "{name} editou uma publicação",
+ "notification_requests.accept": "Aceitar",
+ "notification_requests.dismiss": "Descartar",
+ "notification_requests.notifications_from": "Notificações de {name}",
+ "notification_requests.title": "Notificações filtradas",
"notifications.clear": "Limpar notificações",
"notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?",
"notifications.column_settings.admin.report": "Novas denúncias:",
"notifications.column_settings.admin.sign_up": "Novas inscrições:",
"notifications.column_settings.alert": "Notificações no ambiente de trabalho",
"notifications.column_settings.favourite": "Favoritos:",
- "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
- "notifications.column_settings.filter_bar.category": "Barra de filtros rápidos",
- "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
"notifications.column_settings.follow": "Novos seguidores:",
"notifications.column_settings.follow_request": "Novos pedidos de seguidor:",
"notifications.column_settings.mention": "Menções:",
@@ -474,6 +476,13 @@
"notifications.permission_denied": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão, solicitada pelo navegador, foi recusada anteriormente",
"notifications.permission_denied_alert": "Notificações no ambiente de trabalho não podem ser ativadas, pois a permissão do navegador foi recusada anteriormente",
"notifications.permission_required": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão necessária não foi concedida.",
+ "notifications.policy.filter_new_accounts_title": "Novas contas",
+ "notifications.policy.filter_not_followers_title": "Pessoas não te seguem",
+ "notifications.policy.filter_not_following_hint": "Até que você os aprove manualmente",
+ "notifications.policy.filter_not_following_title": "Pessoas que você não segue",
+ "notifications.policy.filter_private_mentions_hint": "Filtrado, a menos que seja em resposta à sua própria menção ou se você seguir o remetente",
+ "notifications.policy.filter_private_mentions_title": "Menções privadas não solicitadas",
+ "notifications.policy.title": "Filtrar notificações de…",
"notifications_permission_banner.enable": "Ativar notificações no ambiente de trabalho",
"notifications_permission_banner.how_to_control": "Para receber notificações quando o Mastodon não estiver aberto, ative as notificações no ambiente de trabalho. Depois da sua ativação, pode controlar precisamente quais tipos de interações geram notificações, através do botão {icon} acima.",
"notifications_permission_banner.title": "Nunca perca nada",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index b8bb779f85..f31499f845 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -292,7 +292,6 @@
"hashtag.column_settings.tag_toggle": "Adaugă etichete suplimentare pentru această coloană",
"hashtag.follow": "Urmărește haștagul",
"hashtag.unfollow": "Nu mai urmări haștagul",
- "home.column_settings.basic": "De bază",
"home.column_settings.show_reblogs": "Afișează distribuirile",
"home.column_settings.show_replies": "Afișează răspunsurile",
"home.hide_announcements": "Ascunde anunțurile",
@@ -414,9 +413,6 @@
"notifications.column_settings.admin.report": "Raportări noi:",
"notifications.column_settings.admin.sign_up": "Înscrieri noi:",
"notifications.column_settings.alert": "Notificări pe desktop",
- "notifications.column_settings.filter_bar.advanced": "Afișează toate categoriile",
- "notifications.column_settings.filter_bar.category": "Bară de filtrare rapidă",
- "notifications.column_settings.filter_bar.show_bar": "Arată bara de filtrare",
"notifications.column_settings.follow": "Noi urmăritori:",
"notifications.column_settings.follow_request": "Noi cereri de abonare:",
"notifications.column_settings.mention": "Mențiuni:",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index fde170db60..000d485eda 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -308,7 +308,6 @@
"hashtag.follow": "Подписаться на новые посты",
"hashtag.unfollow": "Отписаться",
"hashtags.and_other": "...и {count, plural, other {# ещё}}",
- "home.column_settings.basic": "Основные",
"home.column_settings.show_reblogs": "Показывать продвижения",
"home.column_settings.show_replies": "Показывать ответы",
"home.hide_announcements": "Скрыть объявления",
@@ -440,9 +439,6 @@
"notifications.column_settings.admin.sign_up": "Новые регистрации:",
"notifications.column_settings.alert": "Уведомления на рабочем столе",
"notifications.column_settings.favourite": "Избранные:",
- "notifications.column_settings.filter_bar.advanced": "Отображать все категории",
- "notifications.column_settings.filter_bar.category": "Панель сортировки",
- "notifications.column_settings.filter_bar.show_bar": "Отображать панель сортировки",
"notifications.column_settings.follow": "У вас новый подписчик:",
"notifications.column_settings.follow_request": "Новые запросы на подписку:",
"notifications.column_settings.mention": "Вас упомянули в посте:",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 469930c3ed..36dae25c17 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -264,7 +264,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "प्रचलितवस्तु अनुसर",
"hashtag.unfollow": "प्रचलितवस्तु अनुसरणं वारय",
- "home.column_settings.basic": "मूलभूतम्",
"home.column_settings.show_reblogs": "बुस्त् दर्शय",
"home.column_settings.show_replies": "उत्तराणि दर्शय",
"home.hide_announcements": "विज्ञापनानि प्रच्छादय",
@@ -376,9 +375,6 @@
"notifications.column_settings.admin.report": "नूतनावेदनानि",
"notifications.column_settings.admin.sign_up": "नूतनपञ्जीकरणम्:",
"notifications.column_settings.alert": "देस्क्टप्विज्ञापनानि",
- "notifications.column_settings.filter_bar.advanced": "सर्वाणि वर्गाणि प्रदर्शय",
- "notifications.column_settings.filter_bar.category": "द्रुतशोधकशलाका",
- "notifications.column_settings.filter_bar.show_bar": "शोधकशालकां दर्शय",
"notifications.column_settings.follow": "नूतनानुसारिणः:",
"notifications.column_settings.follow_request": "नूतनानुसरणानुरोधाः:",
"notifications.column_settings.mention": "उल्लिखितानि :",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 90b663aea7..a3d11d7dbd 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -200,7 +200,6 @@
"hashtag.column_settings.tag_mode.none": "Perunu de custos",
"hashtag.column_settings.tag_toggle": "Include etichetas additzionales pro custa colunna",
"hashtag.follow": "Sighi su hashtag",
- "home.column_settings.basic": "Bàsicu",
"home.column_settings.show_reblogs": "Ammustra is cumpartziduras",
"home.column_settings.show_replies": "Ammustra rispostas",
"home.hide_announcements": "Cua annùntzios",
@@ -300,8 +299,6 @@
"notifications.clear": "Lìmpia notìficas",
"notifications.clear_confirmation": "Seguru chi boles isboidare in manera permanente totu is notìficas tuas?",
"notifications.column_settings.alert": "Notìficas de iscrivania",
- "notifications.column_settings.filter_bar.advanced": "Ammustra totu is categorias",
- "notifications.column_settings.filter_bar.category": "Barra lestra de filtros",
"notifications.column_settings.follow": "Sighiduras noas:",
"notifications.column_settings.follow_request": "Rechestas noas de sighidura:",
"notifications.column_settings.mention": "Mèntovos:",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index b7563022a9..7e9778b57c 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -249,7 +249,6 @@
"hashtag.column_settings.tag_toggle": "Pit in mair hashtags fir this column",
"hashtag.follow": "Follae hashtag",
"hashtag.unfollow": "Unfollae hashtag",
- "home.column_settings.basic": "Basic",
"home.column_settings.show_reblogs": "Shaw boosts",
"home.column_settings.show_replies": "Shaw replies",
"home.hide_announcements": "Hide annooncements",
@@ -359,9 +358,6 @@
"notifications.column_settings.admin.report": "New reports:",
"notifications.column_settings.admin.sign_up": "New sign-ups:",
"notifications.column_settings.alert": "Desktap notes",
- "notifications.column_settings.filter_bar.advanced": "Shaw aw caitegories",
- "notifications.column_settings.filter_bar.category": "Quick filter baur",
- "notifications.column_settings.filter_bar.show_bar": "Shaw filter baur",
"notifications.column_settings.follow": "New follaers:",
"notifications.column_settings.follow_request": "New follae requests:",
"notifications.column_settings.mention": "Menshies:",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 2058d1415b..a2194b56cb 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -201,7 +201,6 @@
"hashtag.column_settings.tag_mode.all": "මේ සියල්ලම",
"hashtag.column_settings.tag_mode.none": "මේ කිසිවක් නැත",
"hashtag.column_settings.tag_toggle": "මෙම තීරුවේ අමතර ටැග් ඇතුළත් කරන්න",
- "home.column_settings.basic": "මූලික",
"home.column_settings.show_replies": "පිළිතුරු පෙන්වන්න",
"home.hide_announcements": "නිවේදන සඟවන්න",
"home.pending_critical_update.link": "යාවත්කාල බලන්න",
@@ -285,9 +284,6 @@
"notifications.column_settings.admin.sign_up": "නව ලියාපදිංචි:",
"notifications.column_settings.alert": "වැඩතල දැනුම්දීම්",
"notifications.column_settings.favourite": "ප්රියතමයන්:",
- "notifications.column_settings.filter_bar.advanced": "සියළු ප්රවර්ග පෙන්වන්න",
- "notifications.column_settings.filter_bar.category": "ඉක්මන් පෙරහන් තීරුව",
- "notifications.column_settings.filter_bar.show_bar": "පෙරහන් තීරුව පෙන්වන්න",
"notifications.column_settings.follow": "නව අනුගාමිකයින්:",
"notifications.column_settings.follow_request": "නව අනුගමන ඉල්ලීම්:",
"notifications.column_settings.mention": "සැඳහුම්:",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 7eee0c29c2..a9c7affab1 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Sledovať hashtag",
"hashtag.unfollow": "Prestať sledovať hashtag",
"hashtags.and_other": "…a {count, plural, other {# ďalších}}",
- "home.column_settings.basic": "Základné",
"home.column_settings.show_reblogs": "Zobraziť zdieľania",
"home.column_settings.show_replies": "Zobraziť odpovede",
"home.hide_announcements": "Skryť oznámenia",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Nové registrácie:",
"notifications.column_settings.alert": "Upozornenia na ploche",
"notifications.column_settings.favourite": "Ohviezdičkované:",
- "notifications.column_settings.filter_bar.advanced": "Zobraziť všetky kategórie",
- "notifications.column_settings.filter_bar.category": "Rýchly filter",
- "notifications.column_settings.filter_bar.show_bar": "Zobraziť filter",
"notifications.column_settings.follow": "Nové sledovania od:",
"notifications.column_settings.follow_request": "Nové žiadosti o sledovanie od:",
"notifications.column_settings.mention": "Označenia:",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 8396e02a68..df150fc291 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -241,6 +241,7 @@
"empty_column.list": "Na tem seznamu ni ničesar. Ko bodo člani tega seznama objavili nove statuse, se bodo pojavili tukaj.",
"empty_column.lists": "Nimate seznamov. Ko ga boste ustvarili, se bo prikazal tukaj.",
"empty_column.mutes": "Niste utišali še nobenega uporabnika.",
+ "empty_column.notification_requests": "Vse prebrano! Tu ni ničesar več. Ko prejmete nova obvestila, se bodo pojavila tu glede na vaše nastavitve.",
"empty_column.notifications": "Nimate še nobenih obvestil. Povežite se z drugimi, da začnete pogovor.",
"empty_column.public": "Tukaj ni ničesar! Da ga napolnite, napišite nekaj javnega ali pa ročno sledite uporabnikom iz drugih strežnikov",
"error.unexpected_crash.explanation": "Zaradi hrošča v naši kodi ali težave z združljivostjo brskalnika te strani ni mogoče ustrezno prikazati.",
@@ -271,6 +272,7 @@
"filter_modal.select_filter.subtitle": "Uporabite obstoječo kategorijo ali ustvarite novo",
"filter_modal.select_filter.title": "Filtriraj to objavo",
"filter_modal.title.status": "Filtrirajte objavo",
+ "filtered_notifications_banner.title": "Filtrirana obvestila",
"firehose.all": "Vse",
"firehose.local": "Ta strežnik",
"firehose.remote": "Drugi strežniki",
@@ -314,7 +316,6 @@
"hashtag.follow": "Sledi ključniku",
"hashtag.unfollow": "Nehaj slediti ključniku",
"hashtags.and_other": "…in še {count, plural, other {#}}",
- "home.column_settings.basic": "Osnovno",
"home.column_settings.show_reblogs": "Pokaži izpostavitve",
"home.column_settings.show_replies": "Pokaži odgovore",
"home.hide_announcements": "Skrij obvestila",
@@ -440,15 +441,16 @@
"notification.reblog": "{name} je izpostavila/a vašo objavo",
"notification.status": "{name} je pravkar objavil/a",
"notification.update": "{name} je uredil(a) objavo",
+ "notification_requests.accept": "Sprejmi",
+ "notification_requests.dismiss": "Zavrni",
+ "notification_requests.notifications_from": "Obvestila od {name}",
+ "notification_requests.title": "Filtrirana obvestila",
"notifications.clear": "Počisti obvestila",
"notifications.clear_confirmation": "Ali ste prepričani, da želite trajno izbrisati vsa svoja obvestila?",
"notifications.column_settings.admin.report": "Nove prijave:",
"notifications.column_settings.admin.sign_up": "Novi vpisi:",
"notifications.column_settings.alert": "Namizna obvestila",
"notifications.column_settings.favourite": "Priljubljeni:",
- "notifications.column_settings.filter_bar.advanced": "Prikaži vse kategorije",
- "notifications.column_settings.filter_bar.category": "Vrstica za hitro filtriranje",
- "notifications.column_settings.filter_bar.show_bar": "Pokaži vrstico s filtri",
"notifications.column_settings.follow": "Novi sledilci:",
"notifications.column_settings.follow_request": "Nove prošnje za sledenje:",
"notifications.column_settings.mention": "Omembe:",
@@ -474,6 +476,13 @@
"notifications.permission_denied": "Namizna obvestila niso na voljo zaradi poprej zavrnjene zahteve dovoljenja brskalnika.",
"notifications.permission_denied_alert": "Namiznih obvestil ni mogoče omogočiti, ker je bilo dovoljenje brskalnika že prej zavrnjeno",
"notifications.permission_required": "Namizna obvestila niso na voljo, ker zahtevano dovoljenje ni bilo podeljeno.",
+ "notifications.policy.filter_new_accounts_title": "Novi računi",
+ "notifications.policy.filter_not_followers_title": "Ljudje, ki vam ne sledijo",
+ "notifications.policy.filter_not_following_hint": "Dokler jih ročno ne odobrite",
+ "notifications.policy.filter_not_following_title": "Ljudje, ki jim ne sledite",
+ "notifications.policy.filter_private_mentions_hint": "Filtrirano, razen če je odgovor na vašo lastno omembo ali če sledite pošiljatelju",
+ "notifications.policy.filter_private_mentions_title": "Neželene zasebne omembe",
+ "notifications.policy.title": "Skrij obvestila od …",
"notifications_permission_banner.enable": "Omogoči obvestila na namizju",
"notifications_permission_banner.how_to_control": "Če želite prejemati obvestila, ko Mastodon ni odprt, omogočite namizna obvestila. Natančno lahko nadzirate, katere vrste interakcij naj tvorijo namizna obvestila; ko so omogočena, za to uporabite gumb {icon} zgoraj.",
"notifications_permission_banner.title": "Nikoli ne zamudite ničesar",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index c388ebb865..00d517de72 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Ndiqe hashtag-un",
"hashtag.unfollow": "Hiqe ndjekjen e hashtag-ut",
"hashtags.and_other": "…dhe {count, plural, one {}other {# më tepër}}",
- "home.column_settings.basic": "Bazë",
"home.column_settings.show_reblogs": "Shfaq përforcime",
"home.column_settings.show_replies": "Shfaq përgjigje",
"home.hide_announcements": "Fshihi lajmërimet",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Regjistrime të reja:",
"notifications.column_settings.alert": "Njoftime desktopi",
"notifications.column_settings.favourite": "Të parapëlqyer:",
- "notifications.column_settings.filter_bar.advanced": "Shfaq krejt kategoritë",
- "notifications.column_settings.filter_bar.category": "Shtyllë filtrimesh të shpejta",
- "notifications.column_settings.filter_bar.show_bar": "Shfaq shtyllë filtrash",
"notifications.column_settings.follow": "Ndjekës të rinj:",
"notifications.column_settings.follow_request": "Kërkesa të reja për ndjekje:",
"notifications.column_settings.mention": "Përmendje:",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 35bfc79f2e..4c0264465d 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Zaprati heš oznaku",
"hashtag.unfollow": "Otprati heš oznaku",
"hashtags.and_other": "…i {count, plural, one {još #} few {još #}other {još #}}",
- "home.column_settings.basic": "Osnovna",
"home.column_settings.show_reblogs": "Prikaži podržavanja",
"home.column_settings.show_replies": "Prikaži odgovore",
"home.hide_announcements": "Sakrij najave",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Nove ragistracije:",
"notifications.column_settings.alert": "Obaveštenja na radnoj površini",
"notifications.column_settings.favourite": "Omiljeno:",
- "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije",
- "notifications.column_settings.filter_bar.category": "Traka za brzo filtriranje",
- "notifications.column_settings.filter_bar.show_bar": "Prikaži traku sa filterima",
"notifications.column_settings.follow": "Novi pratioci:",
"notifications.column_settings.follow_request": "Novi zahtevi za praćenje:",
"notifications.column_settings.mention": "Pominjanja:",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index dc20585c92..d00e322b42 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Запрати хеш ознаку",
"hashtag.unfollow": "Отпрати хеш ознаку",
"hashtags.and_other": "…и {count, plural, one {још #} few {још #}other {још #}}",
- "home.column_settings.basic": "Основна",
"home.column_settings.show_reblogs": "Прикажи подржавања",
"home.column_settings.show_replies": "Прикажи одговоре",
"home.hide_announcements": "Сакриј најаве",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Нове рагистрације:",
"notifications.column_settings.alert": "Обавештења на радној површини",
"notifications.column_settings.favourite": "Омиљено:",
- "notifications.column_settings.filter_bar.advanced": "Прикажи све категорије",
- "notifications.column_settings.filter_bar.category": "Трака за брзо филтрирање",
- "notifications.column_settings.filter_bar.show_bar": "Прикажи траку са филтерима",
"notifications.column_settings.follow": "Нови пратиоци:",
"notifications.column_settings.follow_request": "Нови захтеви за праћење:",
"notifications.column_settings.mention": "Помињања:",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 55503ddf50..37886cd80f 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Följ hashtagg",
"hashtag.unfollow": "Avfölj hashtagg",
"hashtags.and_other": "…och {count, plural, one {}other {# mer}}",
- "home.column_settings.basic": "Grundläggande",
"home.column_settings.show_reblogs": "Visa boostar",
"home.column_settings.show_replies": "Visa svar",
"home.hide_announcements": "Dölj notiser",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Nya registreringar:",
"notifications.column_settings.alert": "Skrivbordsaviseringar",
"notifications.column_settings.favourite": "Favoriter:",
- "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier",
- "notifications.column_settings.filter_bar.category": "Snabbfilter",
- "notifications.column_settings.filter_bar.show_bar": "Visa filterfält",
"notifications.column_settings.follow": "Nya följare:",
"notifications.column_settings.follow_request": "Ny följ-förfrågan:",
"notifications.column_settings.mention": "Omnämningar:",
@@ -474,6 +470,9 @@
"notifications.permission_denied": "Skrivbordsaviseringar är otillgängliga på grund av tidigare nekade förfrågningar om behörighet i webbläsaren",
"notifications.permission_denied_alert": "Skrivbordsaviseringar kan inte aktiveras, eftersom att webbläsarens behörighet har nekats innan",
"notifications.permission_required": "Skrivbordsaviseringar är otillgängliga eftersom att rättigheten som krävs inte har godkänts.",
+ "notifications.policy.filter_new_accounts_title": "Nya konton",
+ "notifications.policy.filter_not_followers_title": "Personer som inte följer dig",
+ "notifications.policy.filter_not_following_title": "Personer du inte följer",
"notifications_permission_banner.enable": "Aktivera skrivbordsaviseringar",
"notifications_permission_banner.how_to_control": "För att ta emot aviseringar när Mastodon inte är öppet, aktivera skrivbordsaviseringar. När de är aktiverade kan du styra exakt vilka typer av interaktioner som aviseras via {icon} -knappen ovan.",
"notifications_permission_banner.title": "Missa aldrig något",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 6210c3d0b1..7de7146bf6 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -211,7 +211,6 @@
"hashtag.column_settings.tag_mode.any": "இவற்றில் எவையேனும்",
"hashtag.column_settings.tag_mode.none": "இவற்றில் ஏதுமில்லை",
"hashtag.column_settings.tag_toggle": "இந்த நெடுவரிசையில் கூடுதல் சிட்டைகளைச் சேர்க்கவும்",
- "home.column_settings.basic": "அடிப்படையானவை",
"home.column_settings.show_reblogs": "பகிர்வுகளைக் காண்பி",
"home.column_settings.show_replies": "மறுமொழிகளைக் காண்பி",
"home.hide_announcements": "அறிவிப்புகளை மறை",
@@ -293,8 +292,6 @@
"notifications.clear": "அறிவிப்புகளை அழிக்கவும்",
"notifications.clear_confirmation": "உங்கள் எல்லா அறிவிப்புகளையும் நிரந்தரமாக அழிக்க விரும்புகிறீர்களா?",
"notifications.column_settings.alert": "டெஸ்க்டாப் அறிவிப்புகள்",
- "notifications.column_settings.filter_bar.advanced": "எல்லா வகைகளையும் காட்டு",
- "notifications.column_settings.filter_bar.category": "விரைவு வடிகட்டி பட்டை",
"notifications.column_settings.follow": "புதிய பின்பற்றுபவர்கள்:",
"notifications.column_settings.follow_request": "புதிய பின்தொடர் கோரிக்கைகள்:",
"notifications.column_settings.mention": "குறிப்பிடுகிறது:",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 24a67247c0..1202de1556 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -127,7 +127,6 @@
"hashtag.column_settings.tag_mode.any": "వీటిలో ఏవైనా",
"hashtag.column_settings.tag_mode.none": "ఇవేవీ కావు",
"hashtag.column_settings.tag_toggle": "ఈ నిలువు వరుసలో మరికొన్ని ట్యాగులను చేర్చండి",
- "home.column_settings.basic": "ప్రాథమిక",
"home.column_settings.show_reblogs": "బూస్ట్ లను చూపించు",
"home.column_settings.show_replies": "ప్రత్యుత్తరాలను చూపించు",
"keyboard_shortcuts.back": "వెనక్కి తిరిగి వెళ్ళడానికి",
@@ -198,8 +197,6 @@
"notifications.clear": "ప్రకటనలను తుడిచివేయు",
"notifications.clear_confirmation": "మీరు మీ అన్ని నోటిఫికేషన్లను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",
"notifications.column_settings.alert": "డెస్క్టాప్ నోటిఫికేషన్లు",
- "notifications.column_settings.filter_bar.advanced": "అన్ని విభాగాలను చూపించు",
- "notifications.column_settings.filter_bar.category": "క్విక్ ఫిల్టర్ బార్",
"notifications.column_settings.follow": "క్రొత్త అనుచరులు:",
"notifications.column_settings.mention": "ప్రస్తావనలు:",
"notifications.column_settings.poll": "ఎన్నిక ఫలితాలు:",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 0865b18542..d92cbcda1f 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -271,6 +271,7 @@
"filter_modal.select_filter.subtitle": "ใช้หมวดหมู่ที่มีอยู่หรือสร้างหมวดหมู่ใหม่",
"filter_modal.select_filter.title": "กรองโพสต์นี้",
"filter_modal.title.status": "กรองโพสต์",
+ "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
"firehose.all": "ทั้งหมด",
"firehose.local": "เซิร์ฟเวอร์นี้",
"firehose.remote": "เซิร์ฟเวอร์อื่น ๆ",
@@ -314,7 +315,6 @@
"hashtag.follow": "ติดตามแฮชแท็ก",
"hashtag.unfollow": "เลิกติดตามแฮชแท็ก",
"hashtags.and_other": "…และอีก {count, plural, other {# เพิ่มเติม}}",
- "home.column_settings.basic": "พื้นฐาน",
"home.column_settings.show_reblogs": "แสดงการดัน",
"home.column_settings.show_replies": "แสดงการตอบกลับ",
"home.hide_announcements": "ซ่อนประกาศ",
@@ -440,15 +440,16 @@
"notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
"notification.status": "{name} เพิ่งโพสต์",
"notification.update": "{name} ได้แก้ไขโพสต์",
+ "notification_requests.accept": "ยอมรับ",
+ "notification_requests.dismiss": "ปิด",
+ "notification_requests.notifications_from": "การแจ้งเตือนจาก {name}",
+ "notification_requests.title": "การแจ้งเตือนที่กรองอยู่",
"notifications.clear": "ล้างการแจ้งเตือน",
"notifications.clear_confirmation": "คุณแน่ใจหรือไม่ว่าต้องการล้างการแจ้งเตือนทั้งหมดของคุณอย่างถาวร?",
"notifications.column_settings.admin.report": "รายงานใหม่:",
"notifications.column_settings.admin.sign_up": "การลงทะเบียนใหม่:",
"notifications.column_settings.alert": "การแจ้งเตือนบนเดสก์ท็อป",
"notifications.column_settings.favourite": "รายการโปรด:",
- "notifications.column_settings.filter_bar.advanced": "แสดงหมวดหมู่ทั้งหมด",
- "notifications.column_settings.filter_bar.category": "แถบตัวกรองด่วน",
- "notifications.column_settings.filter_bar.show_bar": "แสดงแถบตัวกรอง",
"notifications.column_settings.follow": "ผู้ติดตามใหม่:",
"notifications.column_settings.follow_request": "คำขอติดตามใหม่:",
"notifications.column_settings.mention": "การกล่าวถึง:",
@@ -474,6 +475,15 @@
"notifications.permission_denied": "การแจ้งเตือนบนเดสก์ท็อปไม่พร้อมใช้งานเนื่องจากมีการปฏิเสธคำขอสิทธิอนุญาตเบราว์เซอร์ก่อนหน้านี้",
"notifications.permission_denied_alert": "ไม่สามารถเปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป เนื่องจากมีการปฏิเสธสิทธิอนุญาตเบราว์เซอร์ก่อนหน้านี้",
"notifications.permission_required": "การแจ้งเตือนบนเดสก์ท็อปไม่พร้อมใช้งานเนื่องจากไม่ได้ให้สิทธิอนุญาตที่จำเป็น",
+ "notifications.policy.filter_new_accounts.hint": "สร้างขึ้นภายใน {days, plural, other {# วัน}}ที่ผ่านมา",
+ "notifications.policy.filter_new_accounts_title": "บัญชีใหม่",
+ "notifications.policy.filter_not_followers_hint": "รวมถึงผู้คนที่ได้ติดตามคุณน้อยกว่า {days, plural, other {# วัน}}",
+ "notifications.policy.filter_not_followers_title": "ผู้คนที่ไม่ได้ติดตามคุณ",
+ "notifications.policy.filter_not_following_hint": "จนกว่าคุณจะอนุมัติเขาด้วยตนเอง",
+ "notifications.policy.filter_not_following_title": "ผู้คนที่คุณไม่ได้ติดตาม",
+ "notifications.policy.filter_private_mentions_hint": "กรองไว้เว้นแต่การกล่าวถึงแบบส่วนตัวอยู่ในการตอบกลับการกล่าวถึงของคุณเองหรือหากคุณติดตามผู้ส่ง",
+ "notifications.policy.filter_private_mentions_title": "การกล่าวถึงแบบส่วนตัวที่ไม่พึงประสงค์",
+ "notifications.policy.title": "กรองการแจ้งเตือนจาก…",
"notifications_permission_banner.enable": "เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป",
"notifications_permission_banner.how_to_control": "เพื่อรับการแจ้งเตือนเมื่อ Mastodon ไม่ได้เปิด เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป คุณสามารถควบคุมชนิดของการโต้ตอบที่สร้างการแจ้งเตือนบนเดสก์ท็อปได้อย่างแม่นยำผ่านปุ่ม {icon} ด้านบนเมื่อเปิดใช้งานการแจ้งเตือน",
"notifications_permission_banner.title": "ไม่พลาดสิ่งใด",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 02c9159be5..6774ad48e1 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Etiketi takip et",
"hashtag.unfollow": "Etiketi takibi bırak",
"hashtags.and_other": "…ve {count, plural, one {}other {# fazlası}}",
- "home.column_settings.basic": "Temel",
"home.column_settings.show_reblogs": "Yeniden paylaşımları göster",
"home.column_settings.show_replies": "Yanıtları göster",
"home.hide_announcements": "Duyuruları gizle",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Yeni kayıtlar:",
"notifications.column_settings.alert": "Masaüstü bildirimleri",
"notifications.column_settings.favourite": "Favorilerin:",
- "notifications.column_settings.filter_bar.advanced": "Tüm kategorileri görüntüle",
- "notifications.column_settings.filter_bar.category": "Hızlı süzgeç çubuğu",
- "notifications.column_settings.filter_bar.show_bar": "Süzgeç çubuğunu göster",
"notifications.column_settings.follow": "Yeni takipçiler:",
"notifications.column_settings.follow_request": "Yeni takip istekleri:",
"notifications.column_settings.mention": "Değinmeler:",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 17de9884e7..49c7e9a145 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -236,7 +236,6 @@
"hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.follow": "Хэштегка язылу",
"hashtag.unfollow": "Хэштегка язылу юк",
- "home.column_settings.basic": "Төп",
"home.column_settings.show_reblogs": "Табышмаклау",
"home.column_settings.show_replies": "Җаваплар күрсәтү",
"home.hide_announcements": "Игъланнарны яшерү",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index d14654d17c..49d79d32d1 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Стежити за хештегом",
"hashtag.unfollow": "Не стежити за хештегом",
"hashtags.and_other": "…і {count, plural, other {ще #}}",
- "home.column_settings.basic": "Основні",
"home.column_settings.show_reblogs": "Показувати поширення",
"home.column_settings.show_replies": "Показувати відповіді",
"home.hide_announcements": "Приховати оголошення",
@@ -440,15 +439,16 @@
"notification.reblog": "{name} поширює ваш допис",
"notification.status": "{name} щойно дописує",
"notification.update": "{name} змінює допис",
+ "notification_requests.accept": "Прийняти",
+ "notification_requests.dismiss": "Відхилити",
+ "notification_requests.notifications_from": "Сповіщення від {name}",
+ "notification_requests.title": "Відфільтровані сповіщення",
"notifications.clear": "Очистити сповіщення",
"notifications.clear_confirmation": "Ви впевнені, що хочете назавжди видалити всі сповіщення?",
"notifications.column_settings.admin.report": "Нові скарги:",
"notifications.column_settings.admin.sign_up": "Нові реєстрації:",
"notifications.column_settings.alert": "Сповіщення стільниці",
"notifications.column_settings.favourite": "Уподобане:",
- "notifications.column_settings.filter_bar.advanced": "Показати всі категорії",
- "notifications.column_settings.filter_bar.category": "Панель швидкого фільтру",
- "notifications.column_settings.filter_bar.show_bar": "Показати панель фільтра",
"notifications.column_settings.follow": "Нові підписники:",
"notifications.column_settings.follow_request": "Нові запити на підписку:",
"notifications.column_settings.mention": "Згадки:",
@@ -474,6 +474,7 @@
"notifications.permission_denied": "Сповіщення стільниці недоступні через раніше відхилений запит дозволів для браузера",
"notifications.permission_denied_alert": "Сповіщення не можна ввімкнути оскільки у дозволі вже було відмовлено раніше",
"notifications.permission_required": "Сповіщення на стільниці не доступні, оскільки необхідний дозвіл не надано.",
+ "notifications.policy.filter_new_accounts_title": "Нові облікові записи",
"notifications_permission_banner.enable": "Увімкнути сповіщення стільниці",
"notifications_permission_banner.how_to_control": "Щоб отримувати сповіщення, коли Mastodon не відкрито, увімкніть сповіщення стільниці. Ви можете контролювати, які типи взаємодій створюють сповіщення через кнопку {icon} вгорі після їхнього увімкнення.",
"notifications_permission_banner.title": "Не проґавте нічого",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index fee2cc3a98..d344f00c87 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -189,7 +189,6 @@
"hashtag.column_settings.tag_mode.any": "ان میں سے کوئی",
"hashtag.column_settings.tag_mode.none": "ان میں سے کوئی بھی نہیں",
"hashtag.column_settings.tag_toggle": "اس کالم کے لئے مزید ٹیگز شامل کریں",
- "home.column_settings.basic": "بنیادی",
"home.column_settings.show_reblogs": "افزائشات دکھائیں",
"home.column_settings.show_replies": "جوابات دکھائیں",
"intervals.full.days": "{number, plural, one {# روز} other {# روز}}",
@@ -253,7 +252,6 @@
"notifications.clear": "اطلاعات ہٹائیں",
"notifications.clear_confirmation": "کیا آپ واقعی اپنی تمام اطلاعات کو صاف کرنا چاہتے ہیں؟",
"notifications.column_settings.alert": "ڈیسک ٹاپ اطلاعات",
- "notifications.column_settings.filter_bar.advanced": "تمام زمرے دکھائیں",
"notifications.column_settings.status": "New toots:",
"onboarding.actions.go_to_explore": "See what's trending",
"onboarding.actions.go_to_home": "Go to your home feed",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 8f231c8c77..b307d917fa 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -255,7 +255,6 @@
"hashtag.column_settings.tag_toggle": "Ushbu ustun uchun qo'shimcha teglarni qo'shing",
"hashtag.follow": "Hashtagni kuzatish",
"hashtag.unfollow": "Hashtagni kuzatishni to'xtatish",
- "home.column_settings.basic": "Asos",
"home.column_settings.show_reblogs": "Boostlarni ko'rish",
"home.column_settings.show_replies": "Javoblarni ko'rish",
"home.hide_announcements": "E'lonlarni yashirish",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 9a4182e540..b1785ca5d0 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -314,7 +314,6 @@
"hashtag.follow": "Theo dõi hashtag",
"hashtag.unfollow": "Bỏ theo dõi hashtag",
"hashtags.and_other": "…và {count, plural, other {# nữa}}",
- "home.column_settings.basic": "Tùy chỉnh",
"home.column_settings.show_reblogs": "Hiện những lượt đăng lại",
"home.column_settings.show_replies": "Hiện những tút dạng trả lời",
"home.hide_announcements": "Ẩn thông báo máy chủ",
@@ -446,9 +445,6 @@
"notifications.column_settings.admin.sign_up": "Người mới tham gia:",
"notifications.column_settings.alert": "Báo trên máy tính",
"notifications.column_settings.favourite": "Lượt thích:",
- "notifications.column_settings.filter_bar.advanced": "Toàn bộ",
- "notifications.column_settings.filter_bar.category": "Phân loại",
- "notifications.column_settings.filter_bar.show_bar": "Hiện bộ lọc",
"notifications.column_settings.follow": "Người theo dõi:",
"notifications.column_settings.follow_request": "Yêu cầu theo dõi:",
"notifications.column_settings.mention": "Lượt nhắc đến:",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 3e714987c0..6d6cd4b6c7 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -241,6 +241,7 @@
"empty_column.list": "列表中还没有任何内容。当列表成员发布新嘟文时，它们将出现在这里。",
"empty_column.lists": "你还没有创建过列表。你创建的列表会在这里显示。",
"empty_column.mutes": "你没有隐藏任何用户。",
+ "empty_column.notification_requests": "都看完了！这里没有任何未读通知。当收到新的通知时，它们将根据您的设置显示在这里。",
"empty_column.notifications": "你还没有收到过任何通知，快和其他用户互动吧。",
"empty_column.public": "这里什么都没有！写一些公开的嘟文，或者关注其他服务器的用户后，这里就会有嘟文出现了",
"error.unexpected_crash.explanation": "此页面无法正确显示，这可能是因为我们的代码中有错误，也可能是因为浏览器兼容问题。",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "使用一个已存在类别，或创建一个新类别",
"filter_modal.select_filter.title": "过滤此嘟文",
"filter_modal.title.status": "过滤一条嘟文",
+ "filtered_notifications_banner.pending_requests": "来自你可能认识的 {count, plural, =0 {0 个人} other {# 个人}}的通知",
+ "filtered_notifications_banner.title": "通知（已过滤）",
"firehose.all": "全部",
"firehose.local": "此服务器",
"firehose.remote": "其他服务器",
@@ -314,7 +317,6 @@
"hashtag.follow": "关注话题标签",
"hashtag.unfollow": "取消关注话题标签",
"hashtags.and_other": "… 和另外 {count, plural, other {# 个话题}}",
- "home.column_settings.basic": "基本设置",
"home.column_settings.show_reblogs": "显示转嘟",
"home.column_settings.show_replies": "显示回复",
"home.hide_announcements": "隐藏公告",
@@ -440,15 +442,16 @@
"notification.reblog": "{name} 转发了你的嘟文",
"notification.status": "{name} 刚刚发布嘟文",
"notification.update": "{name} 编辑了嘟文",
+ "notification_requests.accept": "接受",
+ "notification_requests.dismiss": "拒绝",
+ "notification_requests.notifications_from": "来自 {name} 的通知",
+ "notification_requests.title": "通知（已过滤）",
"notifications.clear": "清空通知列表",
"notifications.clear_confirmation": "你确定要永久清空通知列表吗？",
"notifications.column_settings.admin.report": "新举报：",
"notifications.column_settings.admin.sign_up": "新注册：",
"notifications.column_settings.alert": "桌面通知",
"notifications.column_settings.favourite": "喜欢：",
- "notifications.column_settings.filter_bar.advanced": "显示所有类别",
- "notifications.column_settings.filter_bar.category": "快速筛选栏",
- "notifications.column_settings.filter_bar.show_bar": "显示过滤栏",
"notifications.column_settings.follow": "新粉丝：",
"notifications.column_settings.follow_request": "新关注请求：",
"notifications.column_settings.mention": "提及：",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "由于权限被拒绝，无法启用桌面通知。",
"notifications.permission_denied_alert": "由于在此之前浏览器权限请求就已被拒绝，所以启用桌面通知失败",
"notifications.permission_required": "所需权限未被授予，所以桌面通知不可用",
+ "notifications.policy.filter_new_accounts.hint": "在 {days, plural, other {# 天}}内创建的账户",
+ "notifications.policy.filter_new_accounts_title": "新账户",
+ "notifications.policy.filter_not_followers_hint": "包括关注你少于 {days, plural, other {# 天}}的人",
+ "notifications.policy.filter_not_followers_title": "未关注你的人",
+ "notifications.policy.filter_not_following_hint": "直到你手动批准",
+ "notifications.policy.filter_not_following_title": "你没有关注的人",
+ "notifications.policy.filter_private_mentions_hint": "过滤通知，除非通知是在回复提及你自己的内容，或发送者是你关注的人",
+ "notifications.policy.filter_private_mentions_title": "不请自来的提及",
+ "notifications.policy.title": "通知过滤范围",
"notifications_permission_banner.enable": "启用桌面通知",
"notifications_permission_banner.how_to_control": "启用桌面通知以在 Mastodon 未打开时接收通知。你可以通过交互通过上面的 {icon} 按钮来精细控制可以发送桌面通知的交互类型。",
"notifications_permission_banner.title": "精彩不容错过",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 2382e3c61c..74a5c5a2d6 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -308,7 +308,6 @@
"hashtag.follow": "追蹤主題標籤",
"hashtag.unfollow": "取消追蹤主題標籤",
"hashtags.and_other": "…及{count, plural, other {其他 # 個}}",
- "home.column_settings.basic": "基本",
"home.column_settings.show_reblogs": "顯示被轉推的文章",
"home.column_settings.show_replies": "顯示回應文章",
"home.hide_announcements": "隱藏公告",
@@ -440,9 +439,6 @@
"notifications.column_settings.admin.sign_up": "新註冊：",
"notifications.column_settings.alert": "顯示桌面通知",
"notifications.column_settings.favourite": "最愛：",
- "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
- "notifications.column_settings.filter_bar.category": "快速過濾欄",
- "notifications.column_settings.filter_bar.show_bar": "顯示篩選欄",
"notifications.column_settings.follow": "新追蹤者：",
"notifications.column_settings.follow_request": "新的追蹤請求：",
"notifications.column_settings.mention": "提及你：",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index f52f283810..ff0bd4c8ff 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -241,6 +241,7 @@
"empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出新的嘟文時，它們將顯示於此。",
"empty_column.lists": "您還沒有新增任何列表。當您新增列表時，它將於此顯示。",
"empty_column.mutes": "您尚未靜音任何使用者。",
+ "empty_column.notification_requests": "清空啦！已經沒有任何通知。當您收到新通知時，它們將依照您的設定於此顯示。",
"empty_column.notifications": "您還沒有收到任何通知，當您與別人開始互動時，它將於此顯示。",
"empty_column.public": "這裡什麼都沒有！嘗試寫些公開的嘟文，或者跟隨其他伺服器的使用者後，就會有嘟文出現了",
"error.unexpected_crash.explanation": "由於發生系統故障或瀏覽器相容性問題，無法正常顯示此頁面。",
@@ -271,6 +272,8 @@
"filter_modal.select_filter.subtitle": "使用既有的類別或是新增",
"filter_modal.select_filter.title": "過濾此嘟文",
"filter_modal.title.status": "過濾一則嘟文",
+ "filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} other {# 人}} 之通知",
+ "filtered_notifications_banner.title": "已過濾之通知",
"firehose.all": "全部",
"firehose.local": "本站",
"firehose.remote": "聯邦宇宙",
@@ -314,7 +317,6 @@
"hashtag.follow": "跟隨主題標籤",
"hashtag.unfollow": "取消跟隨主題標籤",
"hashtags.and_other": "…及其他 {count, plural, other {# 個}}",
- "home.column_settings.basic": "基本設定",
"home.column_settings.show_reblogs": "顯示轉嘟",
"home.column_settings.show_replies": "顯示回覆",
"home.hide_announcements": "隱藏公告",
@@ -394,7 +396,7 @@
"lists.replies_policy.list": "列表成員",
"lists.replies_policy.none": "沒有人",
"lists.replies_policy.title": "顯示回覆：",
- "lists.search": "搜尋您跟隨的使用者",
+ "lists.search": "搜尋您跟隨之使用者",
"lists.subheading": "您的列表",
"load_pending": "{count, plural, one {# 個新項目} other {# 個新項目}}",
"loading_indicator.label": "正在載入...",
@@ -440,15 +442,16 @@
"notification.reblog": "{name} 已轉嘟您的嘟文",
"notification.status": "{name} 剛剛嘟文",
"notification.update": "{name} 已編輯嘟文",
+ "notification_requests.accept": "接受",
+ "notification_requests.dismiss": "關閉",
+ "notification_requests.notifications_from": "來自 {name} 之通知",
+ "notification_requests.title": "已過濾之通知",
"notifications.clear": "清除通知",
"notifications.clear_confirmation": "您確定要永久清除您的通知嗎？",
"notifications.column_settings.admin.report": "新檢舉報告：",
"notifications.column_settings.admin.sign_up": "新註冊帳號：",
"notifications.column_settings.alert": "桌面通知",
"notifications.column_settings.favourite": "最愛：",
- "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
- "notifications.column_settings.filter_bar.category": "快速過濾器",
- "notifications.column_settings.filter_bar.show_bar": "顯示過濾器",
"notifications.column_settings.follow": "新的跟隨者：",
"notifications.column_settings.follow_request": "新的跟隨請求：",
"notifications.column_settings.mention": "提及：",
@@ -474,6 +477,15 @@
"notifications.permission_denied": "由於之前已拒絕瀏覽器請求，因此無法使用桌面通知",
"notifications.permission_denied_alert": "由於之前瀏覽器權限被拒絕，無法啟用桌面通知",
"notifications.permission_required": "由於尚未授予所需的權限，因此無法使用桌面通知。",
+ "notifications.policy.filter_new_accounts.hint": "新增於過去 {days, plural, other {# 日}}",
+ "notifications.policy.filter_new_accounts_title": "新帳號",
+ "notifications.policy.filter_not_followers_hint": "包含最近 {days, plural, other {# 日}} 內跟隨您之使用者",
+ "notifications.policy.filter_not_followers_title": "未跟隨您之使用者",
+ "notifications.policy.filter_not_following_hint": "直至您手動核准他們",
+ "notifications.policy.filter_not_following_title": "您未跟隨之使用者",
+ "notifications.policy.filter_private_mentions_hint": "過濾通知，除非嘟文包含於您的提及，或您跟隨該發嘟帳號",
+ "notifications.policy.filter_private_mentions_title": "不請自來的私訊",
+ "notifications.policy.title": "過濾通知來自...",
"notifications_permission_banner.enable": "啟用桌面通知",
"notifications_permission_banner.how_to_control": "啟用桌面通知以於 Mastodon 沒有開啟的時候接收通知。啟用桌面通知後，您可以透過上面的 {icon} 按鈕準確的控制哪些類型的互動會產生桌面通知。",
"notifications_permission_banner.title": "不要錯過任何東西！",
@@ -486,7 +498,7 @@
"onboarding.follows.lead": "您的首頁時間軸是 Mastodon 的核心體驗。若您跟隨更多人，它將會變得更活躍有趣。這些個人檔案也許是個好起點，您可以隨時取消跟隨他們！",
"onboarding.follows.title": "客製化您的首頁時間軸",
"onboarding.profile.discoverable": "使我的個人檔案可以被找到",
- "onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會出現於搜尋結果與趨勢中。您的個人檔案可能會被推薦給與您志趣相投的人。",
+ "onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會顯示於搜尋結果與趨勢中。您的個人檔案可能會被推薦給與您志趣相投的人。",
"onboarding.profile.display_name": "顯示名稱",
"onboarding.profile.display_name_hint": "完整名稱或暱稱...",
"onboarding.profile.lead": "您隨時可以稍候於設定中完成此操作，將有更多自訂選項可使用。",
@@ -531,7 +543,7 @@
"privacy.change": "調整嘟文隱私狀態",
"privacy.direct.long": "此嘟文提及之所有人",
"privacy.direct.short": "指定使用者",
- "privacy.private.long": "只有跟隨您的人能看到",
+ "privacy.private.long": "只有跟隨您之使用者能看到",
"privacy.private.short": "跟隨者",
"privacy.public.long": "所有人 (無論在 Mastodon 上與否)",
"privacy.public.short": "公開",
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index 65926dfeef..f9813b1319 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -172,7 +172,7 @@ zh-TW:
read:bookmarks: 檢視您的書籤
read:favourites: 檢視您收藏之最愛嘟文
read:filters: 檢視您的過濾條件
- read:follows: 檢視您跟隨的人
+ read:follows: 檢視您跟隨之使用者
read:lists: 檢視您的列表
read:mutes: 檢視您靜音的人
read:notifications: 檢視您的通知
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 62336d89d4..52321b87bc 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -403,10 +403,12 @@ lt:
import: Importuoti
new:
create: Sukurti bloką
- hint: Domeno blokavimas nesustabdys vartotojų paskyrų sukūrimo duomenų sistemoje, tačiau automatiškai pritaikys atitinkamus moderavimo metodus šioms paskyroms.
+ hint: Domeno blokas netrukdys kurti paskyrų įrašų duomenų bazėje, bet atgaline data ir automatiškai taikys tam tikrus tų paskyrų prižiūrėjimo būdus.
severity:
+ desc_html: "<strong>Ribojimas</strong> padarys šio domeno paskyrų įrašus nematomus visiems, kurie jų neseka. <strong>Pristabdymas</strong> iš tavo serverio pašalins visą šio domeno paskyrų turinį, mediją ir profilio duomenis. Naudok <strong>Nieko</strong>, jei nori tik atmesti medijos failus."
noop: Nieko
- suspend: Draudimas
+ silence: Riboti
+ suspend: Pristabdyti
title: Naujos domeno blokas
reject_media: Atmesti medijos failai
reject_media_hint: Panaikina lokaliai saugomus medijos failus bei atsisako jų parsisiuntimo ateityje. Neliečia užblokavimu
@@ -468,7 +470,7 @@ lt:
assign_to_self: Paskirti man
assigned: Paskirtas moderatorius
comment:
- none: Nėra
+ none: Nieko
created_at: Reportuotas
forwarded_replies_explanation: Šis ataskaita yra iš nuotolinio naudotojo ir susijusi su nuotoliniu turiniu. Jis buvo persiųstas tau, nes turinys, apie kurį pranešta, yra atsakymas vienam iš tavo naudotojų.
mark_as_resolved: Pažymėti kaip išsprestą
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index d6d0f05c50..83489f7e7b 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -473,7 +473,7 @@ lv:
status: Statuss
suppress: Apspiest sekošanas rekomendāciju
suppressed: Apspiestie
- title: Sekošanas rekomendācijas
+ title: Sekošanas ieteikumi
unsuppress: Atjaunot sekošanas rekomendāciju
instances:
availability:
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 831e1a2f8c..e85e753e88 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -116,6 +116,7 @@ bg:
sign_up_requires_approval: Новите регистрации ще изискват одобрението ви
severity: Изберете какво да се случва със заявките от този IP
rule:
+ hint: По избор. Дайте по-подробно за правилото
text: Опишете правило или изискване за потребителите на този сървър. Опитайте се да го направите кратко и просто
sessions:
otp: 'Въведете двуфакторния код, породен от приложението на телефона си или използвайте един от кодовете си за възстановяване:'
@@ -299,6 +300,7 @@ bg:
patch: Известие за обновявания на оправени грешки
trending_tag: Изискване на преглед за новонашумели
rule:
+ hint: Допълнителни сведения
text: Правило
settings:
indexable: Включване на страницата на профила в търсачките
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
index 529e3224e6..196711aee9 100644
--- a/config/locales/simple_form.br.yml
+++ b/config/locales/simple_form.br.yml
@@ -67,6 +67,7 @@ br:
notification_emails:
follow: Heuliañ a ra {name} ac'hanoc'h
rule:
+ hint: Titouroù ouzhpenn
text: Reolenn
tag:
name: Hashtag
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 7d0f799d0c..357f482b83 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -116,6 +116,7 @@ ca:
sign_up_requires_approval: Els nous registres requeriran la teva aprovació
severity: Tria què passarà amb les sol·licituds des d’aquesta IP
rule:
+ hint: Opcional. Proporciona més detalls de la regla
text: Descriu una norma o requeriment pels usuaris d'aquest servidor. Intenta fer-la curta i senzilla
sessions:
otp: 'Introdueix el codi de dos factors generat per el teu telèfon o utilitza un dels teus codis de recuperació:'
@@ -299,6 +300,7 @@ ca:
patch: Notificar sobre les actualitzacions de correcció d'errors
trending_tag: Nova tendència requereix revisió
rule:
+ hint: Informació addicional
text: Norma
settings:
indexable: Inclou la pàgina del perfil en els motors de cerca
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 3daedfc860..21cd1ddc0a 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -116,6 +116,7 @@ cy:
sign_up_requires_approval: Bydd angen eich cymeradwyaeth ar gyfer cofrestriadau newydd
severity: Dewiswch beth fydd yn digwydd gyda cheisiadau o'r IP hwn
rule:
+ hint: Dewisol. Darparwch ragor o fanylion am y rheol
text: Disgrifiwch reol neu ofyniad ar gyfer defnyddwyr ar y gweinydd hwn. Ceisiwch ei gadw'n fyr ac yn syml
sessions:
otp: 'Mewnbynnwch y cod dau gam a gynhyrchwyd gan eich ap ffôn neu defnyddiwch un o''ch codau adfer:'
@@ -299,6 +300,7 @@ cy:
patch: Rhoi gwybod am ddiweddariadau trwsio byg
trending_tag: Mae pwnc llosg newydd angen adolygiad
rule:
+ hint: Gwybodaeth ychwanegol
text: Rheol
settings:
indexable: Cynnwys tudalen proffil mewn peiriannau chwilio
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index fde0bcc248..6c8d995bfd 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -116,6 +116,7 @@ da:
sign_up_requires_approval: Nye tilmeldinger kræver din godkendelse
severity: Afgør, hvordan forespørgsler fra denne IP behandles
rule:
+ hint: Valgfrit. Oplys yderligere detaljer om reglen
text: Beskriv på en kort og enkel form en regel/krav for brugere på denne server
sessions:
otp: 'Angiv tofaktorkoden generet af din mobil-app eller brug en af genoprettelseskoderne:'
@@ -299,6 +300,7 @@ da:
patch: Notificér om fejlrettelsesopdateringer
trending_tag: Ny tendens kræver revidering
rule:
+ hint: Yderligere oplysninger
text: Regel
settings:
indexable: Inkludér profilside i søgemaskiner
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index b8fec42d66..1d608af08b 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -116,6 +116,7 @@ de:
sign_up_requires_approval: Neue Registrierungen müssen genehmigt werden
severity: Wähle aus, was mit Anfragen von dieser IP-Adresse geschehen soll
rule:
+ hint: "(Optional) Gib weitere Details zu dieser Regel an"
text: Führe eine Regel oder Auflage für Profile auf diesem Server ein. Bleib dabei kurz und knapp
sessions:
otp: 'Gib den Zwei-Faktor-Code von deinem Smartphone ein oder verwende einen deiner Wiederherstellungscodes:'
@@ -299,6 +300,7 @@ de:
patch: Über Fehlerbehebungen informieren
trending_tag: Neuer Trend erfordert eine Überprüfung
rule:
+ hint: Zusätzliche Informationen
text: Regel
settings:
indexable: Profilseite in Suchmaschinen einbeziehen
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index a074091313..0111624082 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -116,6 +116,7 @@ es-AR:
sign_up_requires_approval: Los nuevos registros requerirán tu aprobación
severity: Elegí lo que pasará con las solicitudes desde esta dirección IP
rule:
+ hint: Opcional. Ofrecé más detalles sobre la regla
text: Describí una regla o requisito para los usuarios de este servidor. Intentá hacerla corta y sencilla
sessions:
otp: 'Ingresá el código de autenticación de dos factores generado por la aplicación en tu dispositivo, o usá uno de tus códigos de recuperación:'
@@ -299,6 +300,7 @@ es-AR:
patch: Notificar sobre actualizaciones de corrección de errores
trending_tag: Una nueva tendencia requiere revisión
rule:
+ hint: Información adicional
text: Regla
settings:
indexable: Incluir la página de perfil en los motores de búsqueda
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index d8f1cf95a0..28253d385b 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -116,6 +116,7 @@ es-MX:
sign_up_requires_approval: Nuevos registros requerirán su aprobación
severity: Elegir lo que pasará con las peticiones desde esta IP
rule:
+ hint: Opcional. Proporciona más detalles sobre la regla
text: Describe una norma o requisito para los usuarios de este servidor. Intenta hacerla corta y sencilla
sessions:
otp: 'Introduce el código de autenticación de dos factores generado por tu aplicación de teléfono o usa uno de tus códigos de recuperación:'
@@ -299,6 +300,7 @@ es-MX:
patch: Notificar en actualizaciones de errores
trending_tag: La nueva tendencia requiere de revisión
rule:
+ hint: Información adicional
text: Norma
settings:
indexable: Incluir la página de perfil en los motores de búsqueda
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index fee260aa89..008ac16073 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -116,6 +116,7 @@ es:
sign_up_requires_approval: Nuevos registros requerirán su aprobación
severity: Elegir lo que pasará con las peticiones desde esta IP
rule:
+ hint: Opcional. Proporciona más detalles sobre la regla
text: Describe una norma o requisito para los usuarios de este servidor. Intenta hacerla corta y sencilla
sessions:
otp: 'Introduce el código de autenticación de dos factores generado por tu aplicación de teléfono o usa uno de tus códigos de recuperación:'
@@ -299,6 +300,7 @@ es:
patch: Notificar de actualizaciones de errores
trending_tag: Una nueva tendencia requiere revisión
rule:
+ hint: Información adicional
text: Norma
settings:
indexable: Incluye la página de perfil en los buscadores
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index b417b45fa9..03ba1aea6c 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -116,6 +116,7 @@ eu:
sign_up_requires_approval: Izen emate berriek zure onarpena beharko dute
severity: Aukeratu zer gertatuko den IP honetatik datozen eskaerekin
rule:
+ hint: Aukerakoa. Eman arauari buruzko xehetasun gehiago.
text: Deskribatu zerbitzari honetako erabiltzaileentzako arau edo betekizun bat. Saiatu labur eta sinple idazten
sessions:
otp: 'Sartu zure telefonoko aplikazioak sortutako bi faktoreetako kodea, edo erabili zure berreskuratze kodeetako bat:'
@@ -299,6 +300,7 @@ eu:
patch: Jakinarazi akats zuzenketa eguneraketa guztiak
trending_tag: Joera berriak berrikuspena behar du
rule:
+ hint: Informazio gehigarria
text: Araua
settings:
indexable: Gehitu profila bilaketa-motorretan
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index 003eede25b..599e79ea2f 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -116,6 +116,7 @@ fo:
sign_up_requires_approval: Nýggjar tilmeldingar fara at krevja tína góðkenning
severity: Vel, hvat skal henda við umbønum frá hesari IP adressuni
rule:
+ hint: Valfrítt. Gev fleiri smálutir um regluna
text: Lýs eina reglu ella eitt krav fyri brúkarar á hesum ambætaranum. Ger tað stutt og einfalt
sessions:
otp: 'Skriva tvey-faktor koduna frá telefon-appini ella brúka eina av tínum endurgerðskodum:'
@@ -299,6 +300,7 @@ fo:
patch: Gev fráboðan um feilrættingardagføringar
trending_tag: Broytt rák skal kannast
rule:
+ hint: Fleiri upplýsingar
text: Regla
settings:
indexable: Lat vangasíðu vera tøka í leitimaskinum
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index 5dc5ab2c90..e2e40f04dd 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -116,6 +116,7 @@ fy:
sign_up_requires_approval: Nije registraasjes fereaskje jo goedkarring
severity: Kies wat der barre moat mei oanfragen fan dit IP-adres
rule:
+ hint: Opsjoneel. Jou mear details oer de rigel
text: Omskriuw in rigel of eask foar brûkers op dizze server. Probearje it koart en simpel te hâlden
sessions:
otp: 'Fier de twa-stapstagongskoade fan jo mobile telefoan ôf yn of brûk ien fan jo werstelkoaden:'
@@ -299,6 +300,7 @@ fy:
patch: Meldingen by bugfix-fernijingen
trending_tag: Nije trend beoardieling fereasket
rule:
+ hint: Oanfoljende ynformaasje
text: Regel
settings:
indexable: Sykmasinen jo profylside fine litte
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index bd7e44455a..168e7168ed 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -116,6 +116,7 @@ gd:
sign_up_requires_approval: Bidh cleachdaichean air an ùr-chlàradh feumach air d’ aonta
severity: Tagh na thachras le iarrtasan on IP seo
rule:
+ hint: Roghainneil. Thoir seachad barrachd fiosrachaidh mun riaghailt
text: Mìnich riaghailt no riatanas do chleachdaichean an fhrithealaiche seo. Feuch an cùm thu sìmplidh goirid e
sessions:
otp: 'Cuir a-steach an còd dà-cheumnach a ghin aplacaid an fhòn agad no cleachd fear dhe na còdan aisig agad:'
@@ -299,6 +300,7 @@ gd:
patch: Thoir brathan dhomh do dh’ùrachaidhean càraidh
trending_tag: Tha treand ùr ri lèirmheasadh
rule:
+ hint: Barrachd fiosrachaidh
text: Riaghailt
settings:
indexable: Gabh a-staigh duilleag na pròifil sna h-einnseanan-luirg
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 719da8eefa..ffb12d31bc 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -116,6 +116,7 @@ gl:
sign_up_requires_approval: Os novos rexistros requerirán a túa aprobación
severity: Escolle que acontecerá coas peticións desde este IP
rule:
+ hint: Optativo. Proporciona máis detalles acerca da regra
text: Describe unha regra ou requerimento para as usuarias deste servidor. Intenta que sexa curta e simple
sessions:
otp: 'Escribe o código do segundo factor creado pola aplicación do teu móbil ou usa un dos códigos de recuperación:'
@@ -299,6 +300,7 @@ gl:
patch: Notificar as actualizacións de arranxos
trending_tag: Hai que revisar unha nova tendencia
rule:
+ hint: Información adicional
text: Regra
settings:
indexable: Incluír páxina de perfil nos motores de busca
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 3d7512c5f5..4f2611666a 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -116,6 +116,7 @@ he:
sign_up_requires_approval: הרשמות חדשות ידרשו את אישורך
severity: נא לבחור מה יקרה לבקשות מכתובת IP זו
rule:
+ hint: לא חובה. פירוט נוסף לגבי הכלל
text: נא לתאר את הכלל או הדרישה למשתמשים משרת זה. על התיאור להיות קצר ובהיר
sessions:
otp: 'נא להקליד קוד אימות דו-שלבי ממכשירך או להשתמש באחד מקודי אחזור הגישה שלך:'
@@ -299,6 +300,7 @@ he:
patch: קבלת הודעה על עדכוני תיקון שקצים
trending_tag: נושאים חמים חדשים דורשים סקירה
rule:
+ hint: מידע נוסף
text: כלל
settings:
indexable: חשיפת דף המשתמש במנועי החיפוש
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 573809c73a..8855494fdf 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -116,6 +116,7 @@ hu:
sign_up_requires_approval: Új regisztrációk csak a jóváhagyásoddal történhetnek majd meg
severity: Válaszd ki, mi történjen a kérésekkel erről az IP-ről
rule:
+ hint: Nem kötelező. Adj meg további részleteket a szabályról.
text: Írd le, mi a szabály vagy elvárás ezen a kiszolgálón a felhasználók felé. Próbálj röviden, egyszerűen fogalmazni.
sessions:
otp: 'Add meg a telefonodon generált kétlépcsős azonosító kódodat vagy használd az egyik tartalék bejelentkező kódot:'
@@ -299,6 +300,7 @@ hu:
patch: Értesítés hibajavítási frissítésekről
trending_tag: Új trend felülvizsgálatra vár
rule:
+ hint: További információk
text: Szabály
settings:
indexable: A profiloldal szerepeltetése a keresőmotorokban
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 0859e89897..cae9bbed5f 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -116,6 +116,7 @@ is:
sign_up_requires_approval: Nýskráningar munu þurfa samþykki þitt
severity: Veldu hvað munir gerast við beiðnir frá þessu IP-vistfangi
rule:
+ hint: Valkvætt. Gefðu nánari upplýsingar um regluna
text: Lýstu reglum eða kröfum sem gerðar eru til notenda á þessum netþjóni. Reyndu að hafa þetta skýrt og skorinort
sessions:
otp: 'Settu inn tveggja-þátta kóðann sem farsímaforritið útbjó eða notaðu einn af endurheimtukóðunum þínum:'
@@ -299,6 +300,7 @@ is:
patch: Láta vita við uppfærslur með lagfæringum
trending_tag: Nýtt vinsælt efni krefst yfirferðar
rule:
+ hint: Viðbótarupplýsingar
text: Regla
settings:
indexable: Hafa notandasnið með í leitarvélum
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 244cf7c44a..bf294a48c6 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -116,6 +116,7 @@ it:
sign_up_requires_approval: Le nuove iscrizioni richiederanno la tua approvazione
severity: Scegli cosa accadrà con le richieste da questo IP
rule:
+ hint: Opzionale. Fornisce maggiori dettagli sulla regola
text: Descrivi una regola o un requisito per gli utenti su questo server. Prova a mantenerla breve e semplice
sessions:
otp: 'Inserisci il codice a due fattori generato dall''app del tuo telefono o usa uno dei codici di recupero:'
@@ -299,6 +300,7 @@ it:
patch: Notifica sulle correzioni di bug
trending_tag: La nuova tendenza richiede un controllo
rule:
+ hint: Informazioni aggiuntive
text: Regola
settings:
indexable: Includi la pagina del profilo nei motori di ricerca
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 1dee6f1431..d948a88ed1 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -116,6 +116,7 @@ ko:
sign_up_requires_approval: 새 가입이 승인을 필요로 하도록 합니다
severity: 해당 IP로부터의 요청에 대해 무엇이 일어나게 할 지 고르세요
rule:
+ hint: 옵션사항. 규칙에 대한 더 상세한 정보를 제공하세요
text: 이 서버 사용자들이 지켜야 할 규칙과 요구사항을 설명해주세요. 짧고 간단하게 작성해주세요
sessions:
otp: '휴대전화에서 생성된 이중 인증 코드를 입력하거나, 복구 코드 중 하나를 사용하세요:'
@@ -299,6 +300,7 @@ ko:
patch: 버그픽스 업데이트에 대해 알림
trending_tag: 검토해야 할 새 유행
rule:
+ hint: 추가 정보
text: 규칙
settings:
indexable: 검색 엔진에 프로필 페이지 기재하기
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index f9ee9a4b9a..2de24c38ff 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -299,6 +299,7 @@ lad:
patch: Avizame de aktualizasyones de yerros
trending_tag: Un muevo trend nesesita revizyon
rule:
+ hint: Enformasyon adisyonala
text: Regla
settings:
indexable: Inkluye la pajina de profil en los bushkadores
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 53b8d672de..5431ea1b10 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -82,6 +82,8 @@ lt:
thumbnail: Maždaug 2:1 dydžio vaizdas, rodomas šalia tavo serverio informacijos.
timeline_preview: Atsijungę lankytojai galės naršyti naujausius viešus įrašus, esančius serveryje.
trends: Trendai rodo, kurios įrašai, saitažodžiai ir naujienų istorijos tavo serveryje sulaukia didžiausio susidomėjimo.
+ rule:
+ hint: Pasirinktinai. Pateik daugiau informacijos apie taisyklę.
sessions:
otp: 'Įvesk telefono programėlėje sugeneruotą dviejų tapatybės kodą arba naudok vieną iš atkūrimo kodų:'
webauthn: Jei tai USB raktas, būtinai jį įkišk ir, jei reikia, paspausk.
@@ -168,6 +170,7 @@ lt:
label: Yra nauja Mastodon versija
patch: Pranešti apie klaidų ištaisymo atnaujinimus
rule:
+ hint: Papildoma informacija
text: Taisyklė
settings:
show_application: Rodyti, iš kurios programėles išsiuntei įrašą
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 3f4f339b93..df108a2fec 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -116,6 +116,7 @@ nl:
sign_up_requires_approval: Nieuwe registraties vereisen jouw goedkeuring
severity: Kies wat er moet gebeuren met aanvragen van dit IP-adres
rule:
+ hint: Optioneel. Verstrek meer details over de regel
text: Omschrijf een regel of vereiste voor gebruikers op deze server. Probeer het kort en simpel te houden
sessions:
otp: 'Voer de tweestaps-toegangscode vanaf jouw mobiele telefoon in of gebruik een van jouw herstelcodes:'
@@ -299,6 +300,7 @@ nl:
patch: Meldingen bij bugfix-updates
trending_tag: Nieuwe trend vereist beoordeling
rule:
+ hint: Aanvullende informatie
text: Regel
settings:
indexable: Zoekmachines jouw profielpagina laten vinden
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 98cc372be7..72525619c7 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -116,6 +116,7 @@ nn:
sign_up_requires_approval: Du må godkjenna nye registreringar
severity: Vel kva som skal skje ved førespurnader frå denne IP
rule:
+ hint: Valfritt. Gje meir informasjon om regelen
text: Forklar ein regel eller eit krav for brukarar på denne tenaren. Prøv å skriva kort og lettfattleg
sessions:
otp: Angi tofaktorkoden fra din telefon eller bruk en av dine gjenopprettingskoder.
@@ -299,6 +300,7 @@ nn:
patch: Varsle om feilrettingsoppdateringar
trending_tag: Ny trend krev gjennomgang
rule:
+ hint: Meir informasjon
text: Regler
settings:
indexable: Ta med profilsida i søkjemotorar
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 4a8208202f..3a1c619f70 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -116,6 +116,7 @@ pl:
sign_up_requires_approval: Nowe rejestracje będą wymagać twojej zgody
severity: Wybierz co ma się stać z żadaniami z tego adresu IP
rule:
+ hint: Opcjonalne. Dodaj więcej szczegółów dot. tej zasady
text: Opisz wymóg lub regułę dla użytkowników na tym serwerze. Postaraj się, aby była krótka i prosta
sessions:
otp: 'Wprowadź kod weryfikacji dwuetapowej z telefonu lub wykorzystaj jeden z kodów zapasowych:'
@@ -299,6 +300,7 @@ pl:
patch: Powiadamiaj o aktualizacjach naprawiających błędy
trending_tag: Nowe popularne wymagają przeglądu
rule:
+ hint: Informacje dodatkowe
text: Zasada
settings:
indexable: Udostępniaj profil wyszukiwarkom
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 9c54e72140..a84f97f88d 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -116,6 +116,7 @@ pt-PT:
sign_up_requires_approval: Novas inscrições requererão a sua aprovação
severity: Escolha o que acontecerá com as solicitações deste IP
rule:
+ hint: Opcional. Forneça mais detalhes sobre a regra
text: Descreva uma regra ou requisito para os utilizadores nesta instância. Tente mantê-la curta e simples
sessions:
otp: 'Insira o código de autenticação em duas etapas gerado pelo seu telemóvel ou use um dos seus códigos de recuperação:'
@@ -299,6 +300,7 @@ pt-PT:
patch: Notificar sobre atualizações de correções de problemas
trending_tag: Uma nova publicação em alta requer avaliação
rule:
+ hint: Informação Adicional
text: Regra
settings:
indexable: Incluir página de perfil nos motores de busca
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index 1e56894384..cbf0570187 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -116,6 +116,7 @@ sl:
sign_up_requires_approval: Za nove registracije bo potrebna vaša odobritev
severity: Izberite, kaj se bo zgodilo z zahtevami iz tega IP-naslova
rule:
+ hint: Neobvezno. Vnesite dodatne podrobnosti o pravilu
text: Opišite pravilo ali zahtevo za uporabnike na tem strežniku. Poskusite biti kratki in jasni
sessions:
otp: 'Vnesite dvomestno kodo, ki je ustvarjena z aplikacijo na telefonu, ali uporabite eno od vaših obnovitvenih kod:'
@@ -299,6 +300,7 @@ sl:
patch: Obveščaj o posodobitvah z odpravljenimi hrošči
trending_tag: Nov trend zahteva pregled
rule:
+ hint: Dodatne informacije
text: Pravilo
settings:
indexable: V iskalnike vključi stran profila
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index b8404766f3..41ee3d9bd5 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -116,6 +116,7 @@ sq:
sign_up_requires_approval: Regjistrime të reja do të duan miratimin tuaj
severity: Zgjidhni ç’do të ndodhë me kërkesa nga kjo IP
rule:
+ hint: Opsionale. Jepni më tepër hollësi rreth këtij rregulli
text: Përshkruani një rregull ose një domosdoshmëri për përdoruesit në këtë shërbyes. Përpiquni të jetë i shkurtër dhe i thjeshtë
sessions:
otp: 'Jepni kodin dyfaktorësh të prodhuar nga aplikacioni i telefonit tuaj ose përdorni një nga kodet tuaj të rikthimeve:'
@@ -299,6 +300,7 @@ sq:
patch: Njofto për ndreqje të metash
trending_tag: Për gjëra të reja në modë lypset shqyrtim
rule:
+ hint: Informacion shtesë
text: Rregull
settings:
indexable: Përfshi faqe profili në motorë kërkimesh
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 3214a722df..6ed095e2a2 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -299,6 +299,7 @@ sr-Latn:
patch: Obavesti o ispravkama grešaka
trending_tag: Novi trend treba pregledati
rule:
+ hint: Dodatne informacije
text: Pravilo
settings:
indexable: Uključi stranicu profila u pretraživače
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index 9631efc053..4fb32000b7 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -299,6 +299,7 @@ sr:
patch: Обавести о исправкама грешака
trending_tag: Нови тренд треба прегледати
rule:
+ hint: Додатне информације
text: Правило
settings:
indexable: Укључи страницу профила у претраживаче
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 02806e711f..c3b8625c8e 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -299,6 +299,7 @@ sv:
patch: Meddela vid buggfix-uppdateringar
trending_tag: En ny trend kräver granskning
rule:
+ hint: Ytterligare information
text: Regel
settings:
indexable: Inkludera profilsidan i sökmotorer
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 259bb00099..b41cf0bea6 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -116,6 +116,7 @@ th:
sign_up_requires_approval: การลงทะเบียนใหม่จะต้องการการอนุมัติของคุณ
severity: เลือกสิ่งที่จะเกิดขึ้นกับคำขอจาก IP นี้
rule:
+ hint: ไม่จำเป็น ให้รายละเอียดเพิ่มเติมเกี่ยวกับกฎ
text: อธิบายกฎหรือข้อกำหนดสำหรับผู้ใช้ในเซิร์ฟเวอร์นี้ พยายามทำให้กฎหรือข้อกำหนดสั้นและเรียบง่าย
sessions:
otp: 'ป้อนรหัสสองปัจจัยที่สร้างโดยแอปในโทรศัพท์ของคุณหรือใช้หนึ่งในรหัสกู้คืนของคุณ:'
@@ -299,6 +300,7 @@ th:
patch: แจ้งเตือนการอัปเดตการแก้ไขข้อบกพร่อง
trending_tag: แนวโน้มใหม่ต้องการการตรวจทาน
rule:
+ hint: ข้อมูลเพิ่มเติม
text: กฎ
settings:
indexable: รวมหน้าโปรไฟล์ในเครื่องมือค้นหา
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index a85684a0f9..db8e4b4d27 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -119,6 +119,7 @@ uk:
sign_up_requires_approval: Нові реєстрації потребуватимуть затвердження вами
severity: Виберіть, що буде відбуватися з запитами з цієї IP
rule:
+ hint: Необов'язково. Докладніше про правило
text: Опис правила або вимоги для користувачів на цьому сервері. Спробуйте зробити його коротким і простим
sessions:
otp: 'Введіть код двофакторної автентифікації, згенерований вашим мобільним застосунком, або скористайтеся одним з ваших кодів відновлення:'
@@ -302,6 +303,7 @@ uk:
patch: Сповіщати про оновлення з виправленнями
trending_tag: Нове популярне вимагає розгляду
rule:
+ hint: Додаткова інформація
text: Правило
settings:
indexable: Включити сторінку профілю в пошукові системи
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index ae0a5ea560..f4d9f526b6 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -116,6 +116,7 @@ vi:
sign_up_requires_approval: Bạn sẽ phê duyệt những đăng ký mới từ IP này
severity: Chọn hành động nếu nhận được yêu cầu từ IP này
rule:
+ hint: Tùy chọn. Cung cấp chi tiết hơn về nội quy
text: Mô tả một nội quy bắt buộc trên máy chủ này. Nên để ngắn và đơn giản
sessions:
otp: 'Nhập mã xác minh 2 bước được tạo bởi ứng dụng điện thoại của bạn hoặc dùng một trong các mã khôi phục của bạn:'
@@ -299,6 +300,7 @@ vi:
patch: Thông báo bản cập sửa lỗi
trending_tag: Phê duyệt nội dung nổi bật mới
rule:
+ hint: Thông tin thêm
text: Nội quy
settings:
indexable: Cho phép hiện hồ sơ trong công cụ tìm kiếm
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index d0ca529a4d..7f2eee023c 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -116,6 +116,7 @@ zh-CN:
sign_up_requires_approval: 新注册需要你的批准
severity: 选择如何处理来自此 IP 的请求。
rule:
+ hint: 选填。提供关于这条规则的更多详情
text: 描述这个服务器上的用户规则或要求。尽量确保简洁、清晰易懂
sessions:
otp: 输入你手机应用上生成的双因素认证代码，或者任意一个恢复代码：
@@ -299,6 +300,7 @@ zh-CN:
patch: 通知错误修复更新
trending_tag: 新热门待审核
rule:
+ hint: 补充信息
text: 规则
settings:
indexable: 允许搜索引擎索引个人资料页面
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index fe938712e3..69a2794e6c 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -8,7 +8,7 @@ zh-TW:
fields: 烘培雞、自我認同代稱、年齡，及任何您想分享的。
indexable: 您的公開嘟文可能會顯示於 Mastodon 之搜尋結果中。曾與您嘟文互動過的人可能無論如何都能搜尋它們。
note: '您可以 @mention 其他人或者使用 #主題標籤。'
- show_collections: 人們將能瀏覽您跟隨中及跟隨者帳號。您所跟隨之人能得知您正在跟隨其帳號。
+ show_collections: 人們將能瀏覽您跟隨中及跟隨者帳號。您所跟隨之使用者能得知您正在跟隨其帳號。
unlocked: 人們將無需額外請求您的同意便能跟隨您的帳號。取消勾選以審查跟隨請求並選擇是否同意或拒絕新跟隨者。
account_alias:
acct: 指定要移動的帳號之「使用者名稱@網域名稱」
@@ -16,7 +16,7 @@ zh-TW:
acct: 指定欲移動至帳號之「使用者名稱@網域名稱」
account_warning_preset:
text: 您可使用嘟文語法，例如網址、「#」標籤與提及功能
- title: 可選。不會向收件者顯示
+ title: 可選的。不會向收件者顯示
admin_account_action:
include_statuses: 使用者可看到導致檢舉或警告的嘟文
send_email_notification: 使用者將收到帳號發生之事情的解釋
@@ -116,6 +116,7 @@ zh-TW:
sign_up_requires_approval: 新註冊申請需要先經過您的審核
severity: 請選擇將如何處理來自這個 IP 位址的請求
rule:
+ hint: 可選的。提供關於此規則更多細節
text: 說明使用者於此伺服器上需遵守的規則或條款。試著維持各項條款簡短而明瞭。
sessions:
otp: 請輸入產生自您手機 App 的兩階段驗證碼，或輸入其中一個備用驗證碼：
@@ -299,6 +300,7 @@ zh-TW:
patch: 通知錯誤修正更新
trending_tag: 新熱門趨勢需要審核
rule:
+ hint: 其他資訊
text: 規則
settings:
indexable: 於搜尋引擎中包含個人檔案頁面
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index d8952edec9..2eecfa7b46 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -397,7 +397,7 @@ zh-TW:
create: 新增封鎖
hint: 站點封鎖動作並不會阻止帳號紀錄被新增至資料庫，但會自動回溯性地對那些帳號套用特定管理設定。
severity:
- desc_html: "「<strong>靜音</strong>」令該站點下使用者的嘟文，設定為只對跟隨者顯示，沒有跟隨的人會看不到。「<strong>停權</strong>」會刪除將該站點下使用者的嘟文、媒體檔案與個人檔案。「<strong>無</strong>」則會拒絕接收來自該站點的媒體檔案。"
+ desc_html: "「<strong>靜音</strong>」令該站點下使用者的嘟文，設定為只對跟隨者顯示，沒有跟隨之使用者會看不到。「<strong>停權</strong>」會刪除將該站點下使用者的嘟文、媒體檔案與個人檔案。「<strong>無</strong>」則會拒絕接收來自該站點的媒體檔案。"
noop: 無
silence: 靜音
suspend: 停權
From 0ba9f58e171035e531e86e829975e55955390ae2 Mon Sep 17 00:00:00 2001
From: cuithon <65674308+cuithon@users.noreply.github.com>
Date: Tue, 12 Mar 2024 17:40:29 +0800
Subject: [PATCH 3/4] chore: fix some typos (#29555)
Signed-off-by: cuithon <dscs@outlook.com>
---
Dockerfile | 2 +-
Gemfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index facd9b8aa0..8778133e0d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} as ruby
# Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
# Example: v4.2.0-nightly.2023.11.09+something
-# Overwrite existance of 'alpha.0' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
+# Overwrite existence of 'alpha.0' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
ARG MASTODON_VERSION_PRERELEASE=""
# Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="something"]
ARG MASTODON_VERSION_METADATA=""
diff --git a/Gemfile b/Gemfile
index 355e69b0c4..d3bfeb4487 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,7 +112,7 @@ group :test do
# RSpec helpers for email specs
gem 'email_spec'
- # Extra RSpec extenion methods and helpers for sidekiq
+ # Extra RSpec extension methods and helpers for sidekiq
gem 'rspec-sidekiq', '~> 4.0'
# Browser integration testing
From af4e44e30a6a2701102a7d573e47e9db42025821 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 12 Mar 2024 10:42:51 +0100
Subject: [PATCH 4/4] Fix i18n typo (#29557)
---
.../notifications/components/filtered_notifications_banner.jsx | 2 +-
app/javascript/mastodon/locales/en.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
index dddb9d6412..bf9467bd63 100644
--- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
@@ -38,7 +38,7 @@ export const FilteredNotificationsBanner = () => {
<div className='filtered-notifications-banner__text'>
<strong><FormattedMessage id='filtered_notifications_banner.title' defaultMessage='Filtered notifications' /></strong>
- <span><FormattedMessage id='filtered_notifications_banner.pending_requests' defaultMessage='Notifications from {count, plural, =0 {no} one {one person} other {# people}} you may know' values={{ count: policy.getIn(['summary', 'pending_requests_count']) }} /></span>
+ <span><FormattedMessage id='filtered_notifications_banner.pending_requests' defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know' values={{ count: policy.getIn(['summary', 'pending_requests_count']) }} /></span>
</div>
<div className='filtered-notifications-banner__badge'>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index aed3a3a600..2f202bfe15 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -272,7 +272,7 @@
"filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
"filter_modal.select_filter.title": "Filter this post",
"filter_modal.title.status": "Filter a post",
- "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no} one {one person} other {# people}} you may know",
+ "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
"filtered_notifications_banner.title": "Filtered notifications",
"firehose.all": "All",
"firehose.local": "This server",