djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-27 02:24:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '670e4655d13975e0597bd1c74ebeeeeffc4edc37' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire 2024-08-07 19:22:25 +02:00
commit 06e034db15
123 changed files with 253 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/notifications/requests_controller.rb
View File

@ -29,7 +29,7 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
end
def dismiss
@request.destroy!
DismissNotificationRequestService.new.call(@request)
render_empty
end

7
app/javascript/mastodon/features/notifications_v2/index.tsx
View File

@ -26,6 +26,7 @@ import type { NotificationGap } from 'mastodon/reducers/notification_groups';
import {
selectUnreadNotificationGroupsCount,
selectPendingNotificationGroupsCount,
selectAnyPendingNotification,
} from 'mastodon/selectors/notifications';
import {
selectNeedsNotificationPermission,
@ -95,7 +96,7 @@ export const Notifications: React.FC<{
const lastReadId = useAppSelector((s) =>
selectSettingsNotificationsShowUnread(s)
? s.notificationGroups.lastReadId
? s.notificationGroups.readMarkerId
: '0',
);
@ -105,11 +106,13 @@ export const Notifications: React.FC<{
selectUnreadNotificationGroupsCount,
);
const anyPendingNotification = useAppSelector(selectAnyPendingNotification);
const isUnread = unreadNotificationsCount > 0;
const canMarkAsRead =
useAppSelector(selectSettingsNotificationsShowUnread) &&
unreadNotificationsCount > 0;
anyPendingNotification;
const needsNotificationPermission = useAppSelector(
selectNeedsNotificationPermission,

1
app/javascript/mastodon/locales/af.json
View File

@ -9,7 +9,6 @@
"about.not_available": "Hierdie inligting is nie op hierdie bediener beskikbaar gestel nie.",
"about.powered_by": "Gedesentraliseerde sosiale media aangedryf deur {mastodon}",
"about.rules": "Bedienerreëls",
"account.account_note_header": "Nota",
"account.add_or_remove_from_list": "Voeg by of verwyder van lyste",
"account.badges.bot": "Bot",
"account.badges.group": "Groep",

1
app/javascript/mastodon/locales/an.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Esta información no ye disponible en este servidor.",
"about.powered_by": "Retz socials descentralizaus con tecnolochía de {mastodon}",
"about.rules": "Reglas d'o servidor",
"account.account_note_header": "Nota",
"account.add_or_remove_from_list": "Adhibir u eliminar de listas",
"account.badges.bot": "Bot",
"account.badges.group": "Grupo",

1
app/javascript/mastodon/locales/ar.json
View File

@ -11,7 +11,6 @@
"about.not_available": "لم يتم توفير هذه المعلومات على هذا الخادم.",
"about.powered_by": "شبكة اجتماعية لامركزية مدعومة من {mastodon}",
"about.rules": "قواعد الخادم",
"account.account_note_header": "مُلاحظة",
"account.add_or_remove_from_list": "الإضافة أو الإزالة من القائمة",
"account.badges.bot": "آلي",
"account.badges.group": "فريق",

1
app/javascript/mastodon/locales/ast.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Esta información nun ta disponible nesti sirvidor.",
"about.powered_by": "Una rede social descentralizada que tien la teunoloxía de {mastodon}",
"about.rules": "Normes del sirvidor",
"account.account_note_header": "Nota",
"account.add_or_remove_from_list": "Amestar o quitar de les llistes",
"account.badges.group": "Grupu",
"account.block": "Bloquiar a @{name}",

1
app/javascript/mastodon/locales/be.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Дадзеная інфармацыя не дасяжная на гэтым серверы.",
"about.powered_by": "Дэцэнтралізаваная сацыяльная сетка, створаная {mastodon}",
"about.rules": "Правілы сервера",
"account.account_note_header": "Нататка",
"account.add_or_remove_from_list": "Дадаць або выдаліць са спісаў",
"account.badges.bot": "Бот",
"account.badges.group": "Група",

2
app/javascript/mastodon/locales/bg.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Тази информация не е публична на този сървър.",
"about.powered_by": "Децентрализирана социална мрежа, захранвана от {mastodon}",
"about.rules": "Правила на сървъра",
"account.account_note_header": "Бележка",
"account.account_note_header": "Лична бележка",
"account.add_or_remove_from_list": "Добавяне или премахване от списъци",
"account.badges.bot": "Бот",
"account.badges.group": "Група",

1
app/javascript/mastodon/locales/bn.json
View File

@ -11,7 +11,6 @@
"about.not_available": "এই তথ্য এই সার্ভারে উন্মুক্ত করা হয়নি.",
"about.powered_by": "{mastodon} দ্বারা তৈরি বিকেন্দ্রীভূত সামাজিক মিডিয়া।",
"about.rules": "সার্ভারের নিয়মাবলী",
"account.account_note_header": "বিজ্ঞপ্তি",
"account.add_or_remove_from_list": "তালিকাতে যোগ বা অপসারণ করো",
"account.badges.bot": "বট",
"account.badges.group": "দল",

1
app/javascript/mastodon/locales/br.json
View File

@ -11,7 +11,6 @@
"about.not_available": "An titour-mañ ne c'heller ket gwelet war ar servijer-mañ.",
"about.powered_by": "Rouedad sokial digreizenned kaset gant {mastodon}",
"about.rules": "Reolennoù ar servijer",
"account.account_note_header": "Notenn",
"account.add_or_remove_from_list": "Ouzhpenn pe dilemel eus al listennadoù",
"account.badges.bot": "Robot",
"account.badges.group": "Strollad",

2
app/javascript/mastodon/locales/ca.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Aquesta informació no és disponible en aquest servidor.",
"about.powered_by": "Xarxa social descentralitzada impulsada per {mastodon}",
"about.rules": "Normes del servidor",
"account.account_note_header": "Nota",
"account.account_note_header": "Nota personal",
"account.add_or_remove_from_list": "Afegeix o elimina de les llistes",
"account.badges.bot": "Automatitzat",
"account.badges.group": "Grup",

1
app/javascript/mastodon/locales/ckb.json
View File

@ -11,7 +11,6 @@
"about.not_available": "ئەم زانیاریانە لەسەر ئەم سێرڤەرە بەردەست نەکراون.",
"about.powered_by": "سۆشیال میدیای لامەرکەزی کە لەلایەن {mastodon} ەوە بەهێز دەکرێت",
"about.rules": "یاساکانی سێرڤەر",
"account.account_note_header": "تێبینی ",
"account.add_or_remove_from_list": "زیادکردن یان سڕینەوە لە پێرستەکان",
"account.badges.bot": "بوت",
"account.badges.group": "گرووپ",

1
app/javascript/mastodon/locales/co.json
View File

@ -1,5 +1,4 @@
{
"account.account_note_header": "Nota",
"account.add_or_remove_from_list": "Aghjunghje o toglie da e liste",
"account.badges.bot": "Bot",
"account.badges.group": "Gruppu",

6
app/javascript/mastodon/locales/cs.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Tato informace nebyla zpřístupněna na tomto serveru.",
"about.powered_by": "Decentralizovaná sociální média poháněná {mastodon}",
"about.rules": "Pravidla serveru",
"account.account_note_header": "Poznámka",
"account.account_note_header": "Osobní poznámka",
"account.add_or_remove_from_list": "Přidat nebo odstranit ze seznamů",
"account.badges.bot": "Bot",
"account.badges.group": "Skupina",
@ -471,6 +471,8 @@
"navigation_bar.security": "Zabezpečení",
"not_signed_in_indicator.not_signed_in": "Pro přístup k tomuto zdroji se musíte přihlásit.",
"notification.admin.report": "Uživatel {name} nahlásil {target}",
"notification.admin.report_statuses": "{name} nahlásil {target} za {category}",
"notification.admin.report_statuses_other": "{name} nahlásil {target}",
"notification.admin.sign_up": "Uživatel {name} se zaregistroval",
"notification.favourite": "Uživatel {name} si oblíbil váš příspěvek",
"notification.follow": "Uživatel {name} vás začal sledovat",
@ -487,6 +489,7 @@
"notification.moderation_warning.action_suspend": "Váš účet byl pozastaven.",
"notification.own_poll": "Vaše anketa skončila",
"notification.poll": "Anketa, ve které jste hlasovali, skončila",
"notification.private_mention": "{name} vás soukromě zmínil",
"notification.reblog": "Uživatel {name} boostnul váš příspěvek",
"notification.relationships_severance_event": "Kontakt ztracen s {name}",
"notification.relationships_severance_event.account_suspension": "Administrátor z {from} pozastavil {target}, což znamená, že již od nich nemůžete přijímat aktualizace nebo s nimi interagovat.",
@ -508,6 +511,7 @@
"notifications.column_settings.admin.sign_up": "Nové registrace:",
"notifications.column_settings.alert": "Oznámení na počítači",
"notifications.column_settings.beta.category": "Experimentální funkce",
"notifications.column_settings.beta.grouping": "Seskupit notifikace",
"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í",

1
app/javascript/mastodon/locales/cy.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Nid yw'r wybodaeth hon ar gael ar y gweinydd hwn.",
"about.powered_by": "Cyfrwng cymdeithasol datganoledig wedi ei yrru gan {mastodon}",
"about.rules": "Rheolau'r gweinydd",
"account.account_note_header": "Nodyn",
"account.add_or_remove_from_list": "Ychwanegu neu Ddileu o'r rhestrau",
"account.badges.bot": "Bot",
"account.badges.group": "Grŵp",

2
app/javascript/mastodon/locales/da.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Denne information er ikke blevet gjort tilgængelig på denne server.",
"about.powered_by": "Decentraliserede sociale medier drevet af {mastodon}",
"about.rules": "Serverregler",
"account.account_note_header": "Note",
"account.account_note_header": "Personligt notat",
"account.add_or_remove_from_list": "Tilføj eller fjern fra lister",
"account.badges.bot": "Bot",
"account.badges.group": "Gruppe",

2
app/javascript/mastodon/locales/de.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Diese Informationen sind auf diesem Server nicht verfügbar.",
"about.powered_by": "Ein dezentralisiertes soziales Netzwerk, angetrieben von {mastodon}",
"about.rules": "Serverregeln",
"account.account_note_header": "Notiz",
"account.account_note_header": "Persönliche Notiz",
"account.add_or_remove_from_list": "Hinzufügen oder Entfernen von Listen",
"account.badges.bot": "Automatisiert",
"account.badges.group": "Gruppe",

1
app/javascript/mastodon/locales/el.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Αυτές οι πληροφορίες δεν έχουν είναι διαθέσιμες σε αυτόν τον διακομιστή.",
"about.powered_by": "Αποκεντρωμένα μέσα κοινωνικής δικτύωσης που βασίζονται στο {mastodon}",
"about.rules": "Κανόνες διακομιστή",
"account.account_note_header": "Σημείωση",
"account.add_or_remove_from_list": "Προσθήκη ή Αφαίρεση από λίστες",
"account.badges.bot": "Αυτοματοποιημένος",
"account.badges.group": "Ομάδα",

1
app/javascript/mastodon/locales/en-GB.json
View File

@ -11,7 +11,6 @@
"about.not_available": "This information has not been made available on this server.",
"about.powered_by": "Decentralised social media powered by {mastodon}",
"about.rules": "Server rules",
"account.account_note_header": "Note",
"account.add_or_remove_from_list": "Add or Remove from lists",
"account.badges.bot": "Automated",
"account.badges.group": "Group",

1
app/javascript/mastodon/locales/eo.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Ĉi tiu informo ne estas disponebla ĉe ĉi tiu servilo.",
"about.powered_by": "Malcentrigita socia retejo pere de {mastodon}",
"about.rules": "Regularo de la servilo",
"account.account_note_header": "Noto",
"account.add_or_remove_from_list": "Aldoni al aŭ forigi el listoj",
"account.badges.bot": "Roboto",
"account.badges.group": "Grupo",

2
app/javascript/mastodon/locales/es-AR.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Esta información no está disponible en este servidor.",
"about.powered_by": "Redes sociales descentralizadas con tecnología de {mastodon}",
"about.rules": "Reglas del servidor",
"account.account_note_header": "Nota",
"account.account_note_header": "Nota personal",
"account.add_or_remove_from_list": "Agregar o quitar de las listas",
"account.badges.bot": "Automatizada",
"account.badges.group": "Grupo",

2
app/javascript/mastodon/locales/es-MX.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Esta información no está disponible en este servidor.",
"about.powered_by": "Medio social descentralizado con tecnología de {mastodon}",
"about.rules": "Reglas del servidor",
"account.account_note_header": "Nota",
"account.account_note_header": "Nota personal",
"account.add_or_remove_from_list": "Agregar o eliminar de las listas",
"account.badges.bot": "Bot",
"account.badges.group": "Grupo",

2
app/javascript/mastodon/locales/es.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Esta información no está disponible en este servidor.",
"about.powered_by": "Redes sociales descentralizadas con tecnología de {mastodon}",
"about.rules": "Reglas del servidor",
"account.account_note_header": "Nota",
"account.account_note_header": "Nota personal",
"account.add_or_remove_from_list": "Agregar o eliminar de listas",
"account.badges.bot": "Automatizada",
"account.badges.group": "Grupo",

1
app/javascript/mastodon/locales/et.json
View File

@ -11,7 +11,6 @@
"about.not_available": "See info ei ole sellel serveril saadavaks tehtud.",
"about.powered_by": "Hajutatud sotsiaalmeedia, mille taga on {mastodon}",
"about.rules": "Serveri reeglid",
"account.account_note_header": "Märge",
"account.add_or_remove_from_list": "Lisa või Eemalda nimekirjadest",
"account.badges.bot": "Robot",
"account.badges.group": "Grupp",

1
app/javascript/mastodon/locales/eu.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Zerbitzari honek ez du informazio hau eskuragarri jarri.",
"about.powered_by": "{mastodon} erabiltzen duen sare sozial deszentralizatua",
"about.rules": "Zerbitzariaren arauak",
"account.account_note_header": "Oharra",
"account.add_or_remove_from_list": "Gehitu edo kendu zerrendetatik",
"account.badges.bot": "Bot-a",
"account.badges.group": "Taldea",

1
app/javascript/mastodon/locales/fa.json
View File

@ -11,7 +11,6 @@
"about.not_available": "این اطّلاعات روی این کارساز موجود نشده.",
"about.powered_by": "رسانهٔ اجتماعی نامتمرکز قدرت گرفته از {mastodon}",
"about.rules": "قوانین کارساز",
"account.account_note_header": "یادداشت",
"account.add_or_remove_from_list": "افزودن یا برداشتن از سیاهه‌ها",
"account.badges.bot": "خودکار",
"account.badges.group": "گروه",

2
app/javascript/mastodon/locales/fi.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Näitä tietoja ei ole julkaistu tällä palvelimella.",
"about.powered_by": "Hajautetun sosiaalisen median tarjoaa {mastodon}",
"about.rules": "Palvelimen säännöt",
"account.account_note_header": "Muistiinpano",
"account.account_note_header": "Henkilökohtainen muistiinpano",
"account.add_or_remove_from_list": "Lisää tai poista listoilta",
"account.badges.bot": "Botti",
"account.badges.group": "Ryhmä",

1
app/javascript/mastodon/locales/fil.json
View File

@ -6,7 +6,6 @@
"about.domain_blocks.silenced.title": "Limitado",
"about.domain_blocks.suspended.title": "Suspendido",
"about.rules": "Mga alituntunin ng server",
"account.account_note_header": "Tala",
"account.add_or_remove_from_list": "I-dagdag o tanggalin mula sa mga listahan",
"account.badges.bot": "Pakusa",
"account.badges.group": "Pangkat",

4
app/javascript/mastodon/locales/fo.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Hetta er ikki tøkt á føroyska servaranum enn.",
"about.powered_by": "Miðfirra almennur miðil koyrandi á {mastodon}",
"about.rules": "Ambætarareglur",
"account.account_note_header": "Viðmerking",
"account.account_note_header": "Persónlig viðmerking",
"account.add_or_remove_from_list": "Legg afturat ella tak av listum",
"account.badges.bot": "Bottur",
"account.badges.group": "Bólkur",
@ -72,7 +72,7 @@
"account.unmute": "Doyv ikki @{name}",
"account.unmute_notifications_short": "Tendra fráboðanir",
"account.unmute_short": "Doyv ikki",
"account_note.placeholder": "Klikka fyri at leggja notu afturat",
"account_note.placeholder": "Klikka fyri at leggja viðmerking afturat",
"admin.dashboard.daily_retention": "Hvussu nógvir brúkarar eru eftir, síðani tey skrásettu seg, roknað í døgum",
"admin.dashboard.monthly_retention": "Hvussu nógvir brúkarar eru eftir síðani tey skrásettu seg, roknað í mánaðum",
"admin.dashboard.retention.average": "Miðal",

1
app/javascript/mastodon/locales/fr-CA.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Cette information n'a pas été rendue disponible sur ce serveur.",
"about.powered_by": "Réseau social décentralisé propulsé par {mastodon}",
"about.rules": "Règles du serveur",
"account.account_note_header": "Note",
"account.add_or_remove_from_list": "Ajouter ou enlever de listes",
"account.badges.bot": "Bot",
"account.badges.group": "Groupe",

1
app/javascript/mastodon/locales/fr.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Cette information n'a pas été rendue disponible sur ce serveur.",
"about.powered_by": "Réseau social décentralisé propulsé par {mastodon}",
"about.rules": "Règles du serveur",
"account.account_note_header": "Note",
"account.add_or_remove_from_list": "Ajouter ou retirer des listes",
"account.badges.bot": "Bot",
"account.badges.group": "Groupe",

1
app/javascript/mastodon/locales/fy.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Dizze ynformaasje is troch dizze server net iepenbier makke.",
"about.powered_by": "Desintralisearre sosjale media, mooglik makke troch {mastodon}",
"about.rules": "Serverrigels",
"account.account_note_header": "Opmerking",
"account.add_or_remove_from_list": "Tafoegje oan of fuortsmite út listen",
"account.badges.bot": "Automatisearre",
"account.badges.group": "Groep",

1
app/javascript/mastodon/locales/ga.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Níor cuireadh an t-eolas seo ar fáil ar an bhfreastalaí seo.",
"about.powered_by": "Meáin shóisialta díláraithe faoi chumhacht {mastodon}",
"about.rules": "Rialacha an fhreastalaí",
"account.account_note_header": "Nóta",
"account.add_or_remove_from_list": "Cuir Le nó Bain De na liostaí",
"account.badges.bot": "Bota",
"account.badges.group": "Grúpa",

4
app/javascript/mastodon/locales/gd.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Cha deach am fiosrachadh seo a sholar air an fhrithealaiche seo.",
"about.powered_by": "Lìonra sòisealta sgaoilte le cumhachd {mastodon}",
"about.rules": "Riaghailtean an fhrithealaiche",
"account.account_note_header": "Nòta",
"account.account_note_header": "Nòta pearsanta",
"account.add_or_remove_from_list": "Cuir ris no thoir air falbh o liostaichean",
"account.badges.bot": "Fèin-obrachail",
"account.badges.group": "Buidheann",
@ -505,6 +505,8 @@
"notification.update": "Dheasaich {name} post",
"notification_requests.accept": "Gabh ris",
"notification_requests.dismiss": "Leig seachad",
"notification_requests.maximize": "Làn-mheudaich",
"notification_requests.minimize_banner": "Fìor-lùghdaich bratach nam brathan criathraichte",
"notification_requests.notifications_from": "Brathan o {name}",
"notification_requests.title": "Brathan criathraichte",
"notifications.clear": "Falamhaich na brathan",

2
app/javascript/mastodon/locales/gl.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Esta información non está dispoñible neste servidor.",
"about.powered_by": "Comunicación social descentralizada grazas a {mastodon}",
"about.rules": "Regras do servidor",
"account.account_note_header": "Nota",
"account.account_note_header": "Nota persoal",
"account.add_or_remove_from_list": "Engadir ou eliminar das listaxes",
"account.badges.bot": "Automatizada",
"account.badges.group": "Grupo",

2
app/javascript/mastodon/locales/he.json
View File

@ -11,7 +11,7 @@
"about.not_available": "המידע אינו זמין על שרת זה.",
"about.powered_by": "רשת חברתית מבוזרת המופעלת על ידי {mastodon}",
"about.rules": "כללי השרת",
"account.account_note_header": "הערה",
"account.account_note_header": "הערה אישית",
"account.add_or_remove_from_list": "הוספה או הסרה מרשימות",
"account.badges.bot": "בוט",
"account.badges.group": "קבוצה",

1
app/javascript/mastodon/locales/hi.json
View File

@ -11,7 +11,6 @@
"about.not_available": "यह जानकारी इस सर्वर पर उपलब्ध नहीं कराई गई है।",
"about.powered_by": "{mastodon} द्वारा संचालित डेसेंट्रलीसेड सोशल मीडिया प्लैटफ़ॉर्म!",
"about.rules": "सर्वर के नियम",
"account.account_note_header": "टिप्पणियाँ",
"account.add_or_remove_from_list": "सूची में जोड़ें या हटाए",
"account.badges.bot": "बॉट",
"account.badges.group": "समूह",

1
app/javascript/mastodon/locales/hr.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Te informacije nisu dostupne na ovom poslužitelju.",
"about.powered_by": "Decentralizirani društveni mediji koje pokreće {mastodon}",
"about.rules": "Pravila servera",
"account.account_note_header": "Bilješka",
"account.add_or_remove_from_list": "Dodaj ili ukloni s liste",
"account.badges.bot": "Bot",
"account.badges.group": "Grupa",

2
app/javascript/mastodon/locales/hu.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Ez az információ nem lett közzétéve ezen a kiszolgálón.",
"about.powered_by": "Decentralizált közösségi média a {mastodon} segítségével",
"about.rules": "Kiszolgáló szabályai",
"account.account_note_header": "Feljegyzés",
"account.account_note_header": "Személyes megjegyzés",
"account.add_or_remove_from_list": "Hozzáadás vagy eltávolítás a listákról",
"account.badges.bot": "Automatizált",
"account.badges.group": "Csoport",

1
app/javascript/mastodon/locales/hy.json
View File

@ -7,7 +7,6 @@
"about.not_available": "Այս տեղեկութիւնը տեսանելի չի այս սերուերում։",
"about.powered_by": "Ապակենտրոն սոց. ցանց սեղծուած {mastodon}-ով։",
"about.rules": "Սերուերի կանոնները",
"account.account_note_header": "Նշում",
"account.add_or_remove_from_list": "Աւելացնել կամ հեռացնել ցանկերից",
"account.badges.bot": "Բոտ",
"account.badges.group": "Խումբ",

5
app/javascript/mastodon/locales/ia.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Iste information non ha essite rendite disponibile sur iste servitor.",
"about.powered_by": "Rete social decentralisate, actionate per {mastodon}",
"about.rules": "Regulas del servitor",
"account.account_note_header": "Nota",
"account.account_note_header": "Nota personal",
"account.add_or_remove_from_list": "Adder a, o remover de listas",
"account.badges.bot": "Automatisate",
"account.badges.group": "Gruppo",
@ -670,8 +670,11 @@
"report_notification.attached_statuses": "{count, plural, one {{count} message} other {{count} messages}} annexate",
"report_notification.categories.legal": "Juridic",
"report_notification.categories.other": "Alteres",
"report_notification.categories.other_sentence": "alteres",
"report_notification.categories.spam": "Spam",
"report_notification.categories.spam_sentence": "spam",
"report_notification.categories.violation": "Violation del regulas",
"report_notification.categories.violation_sentence": "violation del regulas",
"report_notification.open": "Aperir reporto",
"search.no_recent_searches": "Nulle recercas recente",
"search.placeholder": "Cercar",

1
app/javascript/mastodon/locales/id.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Informasi ini belum tersedia di server ini.",
"about.powered_by": "Media sosial terdesentralisasi diberdayakan oleh {mastodon}",
"about.rules": "Aturan server",
"account.account_note_header": "Catatan",
"account.add_or_remove_from_list": "Tambah atau Hapus dari daftar",
"account.badges.bot": "Bot",
"account.badges.group": "Grup",

1
app/javascript/mastodon/locales/ie.json
View File

@ -11,7 +11,6 @@
"about.not_available": "On ne ha disponibilisat ti-ci information sur ti-ci servitor.",
"about.powered_by": "Decentralisat social medie disponibilisat de {mastodon}",
"about.rules": "Regules del servitor",
"account.account_note_header": "Nota",
"account.add_or_remove_from_list": "Adjunter o remover de listes",
"account.badges.bot": "Automatisat",
"account.badges.group": "Gruppe",

1
app/javascript/mastodon/locales/io.json
View File

@ -10,7 +10,6 @@
"about.not_available": "Ca informo ne igesis che ca servilo.",
"about.powered_by": "Necentraligita sociala ret quo povigesas da {mastodon}",
"about.rules": "Servilreguli",
"account.account_note_header": "Noto",
"account.add_or_remove_from_list": "Insertez o removez de listi",
"account.badges.bot": "Boto",
"account.badges.group": "Grupo",

2
app/javascript/mastodon/locales/is.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Þessar upplýsingar hafa ekki verið gerðar aðgengilegar á þessum netþjóni.",
"about.powered_by": "Dreifhýstur samskiptamiðill keyrður með {mastodon}",
"about.rules": "Reglur netþjónsins",
"account.account_note_header": "Minnispunktur",
"account.account_note_header": "Einkaminnispunktur",
"account.add_or_remove_from_list": "Bæta við eða fjarlægja af listum",
"account.badges.bot": "Yrki",
"account.badges.group": "Hópur",

2
app/javascript/mastodon/locales/it.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Queste informazioni non sono state rese disponibili su questo server.",
"about.powered_by": "Social media decentralizzato alimentato da {mastodon}",
"about.rules": "Regole del server",
"account.account_note_header": "Nota",
"account.account_note_header": "Note personali",
"account.add_or_remove_from_list": "Aggiungi o Rimuovi dalle liste",
"account.badges.bot": "Bot",
"account.badges.group": "Gruppo",

1
app/javascript/mastodon/locales/ja.json
View File

@ -11,7 +11,6 @@
"about.not_available": "この情報はこのサーバーでは利用できません。",
"about.powered_by": "{mastodon}による分散型ソーシャルメディア",
"about.rules": "サーバーのルール",
"account.account_note_header": "メモ",
"account.add_or_remove_from_list": "リストから追加または外す",
"account.badges.bot": "Bot",
"account.badges.group": "Group",

1
app/javascript/mastodon/locales/ka.json
View File

@ -1,7 +1,6 @@
{
"about.contact": "კონტაქტი:",
"about.domain_blocks.no_reason_available": "მიზეზი მიუწვდომელია",
"account.account_note_header": "ჩანაწერი",
"account.add_or_remove_from_list": "სიებში დამატება ან წაშლა",
"account.badges.bot": "ბოტი",
"account.badges.group": "ჯგუფი",

8
app/javascript/mastodon/locales/kab.json
View File

@ -8,7 +8,6 @@
"about.not_available": "Talɣut-a ur tettwabder ara deg uqeddac-a.",
"about.powered_by": "Azeṭṭa inmetti yettwasɣelsen sɣur {mastodon}",
"about.rules": "Ilugan n uqeddac",
"account.account_note_header": "Tazmilt",
"account.add_or_remove_from_list": "Rnu neɣ kkes seg tebdarin",
"account.badges.bot": "Aṛubut",
"account.badges.group": "Agraw",
@ -84,6 +83,7 @@
"bundle_column_error.network.title": "Tuccḍa deg uẓeṭṭa",
"bundle_column_error.retry": "Ɛreḍ tikelt-nniḍen",
"bundle_column_error.return": "Uɣal ɣer ugejdan",
"bundle_column_error.routing.body": "Asebter i d-yettwasutren ur yettwaf ara. Tetḥeqqeḍ belli tansa URL deg ufeggag n tansa tṣeḥḥa?",
"bundle_column_error.routing.title": "404",
"bundle_modal_error.close": "Mdel",
"bundle_modal_error.message": "Tella-d kra n tuccḍa mi d-yettali ugbur-agi.",
@ -143,20 +143,22 @@
"confirmations.block.confirm": "Sewḥel",
"confirmations.delete.confirm": "Kkes",
"confirmations.delete.message": "Tebɣiḍ s tidet ad tekkseḍ tasuffeɣt-agi?",
"confirmations.delete.title": "Tukksa n tasuffeɣt?",
"confirmations.delete_list.confirm": "Kkes",
"confirmations.delete_list.message": "Tebɣiḍ s tidet ad tekkseḍ umuɣ-agi i lebda?",
"confirmations.delete_list.title": "Tukksa n tebdart?",
"confirmations.discard_edit_media.confirm": "Sefsex",
"confirmations.edit.confirm": "Ẓreg",
"confirmations.edit.message": "Abeddel tura ad d-yaru izen-nni i d-tegreḍ akka tura. Tetḥeqqeḍ tebɣiḍ ad tkemmleḍ?",
"confirmations.logout.confirm": "Ffeɣ",
"confirmations.logout.message": "D tidet tebɣiḍ ad teffɣeḍ?",
"confirmations.mute.confirm": "Sgugem",
"confirmations.redraft.confirm": "Sfeḍ & Ɛiwed tira",
"confirmations.redraft.confirm": "Kkes sakin ɛiwed tira",
"confirmations.reply.confirm": "Err",
"confirmations.reply.message": "Tiririt akka tura ad k-degger izen-agi i tettaruḍ. Tebɣiḍ ad tkemmleḍ?",
"confirmations.unfollow.confirm": "Ur ḍḍafaṛ ara",
"confirmations.unfollow.message": "Tetḥeqqeḍ belli tebɣiḍ ur teṭafaṛeḍ ara {name}?",
"conversation.delete": "Sfeḍ adiwenni",
"conversation.delete": "Kkes adiwenni",
"conversation.mark_as_read": "Creḍ yettwaɣṛa",
"conversation.open": "Ssken adiwenni",
"conversation.with": "Akked {names}",

1
app/javascript/mastodon/locales/kk.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Бұл ақпарат бұл серверде қолжетімді емес.",
"about.powered_by": "{mastodon} негізіндегі орталықсыз әлеуметтік желі",
"about.rules": "Сервер ережелері",
"account.account_note_header": "Жазба",
"account.add_or_remove_from_list": "Тізімге қосу немесе жою",
"account.badges.bot": "Бот",
"account.badges.group": "Топ",

1
app/javascript/mastodon/locales/kn.json
View File

@ -4,7 +4,6 @@
"about.disclaimer": "ಮಾಸ್ಟೋಡಾನ್ ಇದು ಉಚಿತ, ಮುಕ್ತ ತಂತ್ರಾಂಶ ಮತ್ತು Mastodon gGmbH ಇದರ ನೊಂದಾಯಿತ ಗುರುತು.",
"about.domain_blocks.no_reason_available": "ಕಾರಣ ಲಭ್ಯವಿಲ್ಲ",
"about.domain_blocks.preamble": "ಸಾಮಾನ್ಯವಾಗಿ ಮಾಸ್ಟೊಡಾನ್ ನಿಮಗೆ ಇತರೆ ಬಳಕೆದಾರರಿಂದ ಹಂಚಲ್ಪಟ್ಟ ವಿಷಯಗಳನ್ನು ನೋಡಲು ಮತ್ತು ಅವರೊಂದಿಗೆ ಸಂಭಾಷಿಸಲು ಅನುಮತಿಸುತ್ತದೆ.\nಆದರೆ ಈ ಸರ್ವ್ರರ್‌ನಲ್ಲಿ ಅಳವಡಿಸಲಾದ ಕೆಲವು ವಿನಾಯಿತಿಗಳು ಇಂತಿವೆ.",
"account.account_note_header": "ಟಿಪ್ಪಣಿ",
"account.add_or_remove_from_list": "ಪಟ್ಟಿಗೆ ಸೇರಿಸು ಅಥವ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದುಹಾಕು",
"account.badges.bot": "Bot",
"account.badges.group": "ಗುಂಪು",

8
app/javascript/mastodon/locales/ko.json
View File

@ -11,7 +11,7 @@
"about.not_available": "이 정보는 이 서버에서 사용할 수 없습니다.",
"about.powered_by": "{mastodon}으로 구동되는 분산 소셜 미디어",
"about.rules": "서버 규칙",
"account.account_note_header": "노트",
"account.account_note_header": "개인 메모",
"account.add_or_remove_from_list": "리스트에 추가 혹은 삭제",
"account.badges.bot": "자동화됨",
"account.badges.group": "그룹",
@ -505,6 +505,8 @@
"notification.update": "{name} 님이 게시물을 수정했습니다",
"notification_requests.accept": "수락",
"notification_requests.dismiss": "지우기",
"notification_requests.maximize": "최대화",
"notification_requests.minimize_banner": "걸러진 알림 배너 최소화",
"notification_requests.notifications_from": "{name} 님으로부터의 알림",
"notification_requests.title": "걸러진 알림",
"notifications.clear": "알림 비우기",
@ -803,11 +805,11 @@
"upload_button.label": "이미지, 영상, 오디오 파일 추가",
"upload_error.limit": "파일 업로드 제한에 도달했습니다.",
"upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
"upload_form.audio_description": "청각 장애인을 위한 설명",
"upload_form.audio_description": "청각장애인이나 저청각자를 위한 설명",
"upload_form.description": "시각장애인이나 저시력자를 위한 설명",
"upload_form.edit": "수정",
"upload_form.thumbnail": "썸네일 변경",
"upload_form.video_description": "청각, 시각 장애인을 위한 설명",
"upload_form.video_description": "청각장애인, 저청각자, 시각장애인, 저시력자를 위한 설명",
"upload_modal.analyzing_picture": "사진 분석 중…",
"upload_modal.apply": "적용",
"upload_modal.applying": "적용 중...",

1
app/javascript/mastodon/locales/ku.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Ev zanyarî li ser vê rajekarê nehatine peydakirin.",
"about.powered_by": "Medyaya civakî ya nenavendî bi hêzdariya {mastodon}",
"about.rules": "Rêbazên rajekar",
"account.account_note_header": "Nîşe",
"account.add_or_remove_from_list": "Li lîsteyan zêde bike yan jî rake",
"account.badges.bot": "Bot",
"account.badges.group": "Kom",

1
app/javascript/mastodon/locales/kw.json
View File

@ -1,6 +1,5 @@
{
"about.blocks": "Leurennow koswys",
"account.account_note_header": "Noten",
"account.add_or_remove_from_list": "Keworra po Dilea a rolyow",
"account.badges.bot": "Bot",
"account.badges.group": "Bagas",

1
app/javascript/mastodon/locales/la.json
View File

@ -2,7 +2,6 @@
"about.contact": "Ratio:",
"about.domain_blocks.no_reason_available": "Ratio abdere est",
"about.domain_blocks.silenced.explanation": "Tua profilia atque tuum contentum ab hac serve praecipue non videbis, nisi explōrēs expresse aut subsequeris et optēs.",
"account.account_note_header": "Annotatio",
"account.add_or_remove_from_list": "Adde aut ēripe ex tabellīs",
"account.badges.bot": "Robotum",
"account.badges.group": "Congregatio",

1
app/javascript/mastodon/locales/lad.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Esta enformasyon no esta desponivle en este sirvidor.",
"about.powered_by": "Redes sosyalas desentralizadas kon uzo de {mastodon}",
"about.rules": "Reglas del sirvidor",
"account.account_note_header": "Nota",
"account.add_or_remove_from_list": "Adjusta a o kita de listas",
"account.badges.bot": "Otomatizado",
"account.badges.group": "Grupo",

2
app/javascript/mastodon/locales/lt.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Ši informacija nebuvo pateikta šiame serveryje.",
"about.powered_by": "Decentralizuota socialinė medija, veikianti pagal „{mastodon}“",
"about.rules": "Serverio taisyklės",
"account.account_note_header": "Pastaba",
"account.account_note_header": "Asmeninė pastaba",
"account.add_or_remove_from_list": "Pridėti arba pašalinti iš sąrašų",
"account.badges.bot": "Automatizuotas",
"account.badges.group": "Grupė",

1
app/javascript/mastodon/locales/lv.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Šī informācija nav padarīta pieejama šajā serverī.",
"about.powered_by": "Decentralizētu sociālo tīklu nodrošina {mastodon}",
"about.rules": "Servera noteikumi",
"account.account_note_header": "Piezīme",
"account.add_or_remove_from_list": "Pievienot vai Noņemt no sarakstiem",
"account.badges.bot": "Automatizēts",
"account.badges.group": "Grupa",

1
app/javascript/mastodon/locales/mk.json
View File

@ -10,7 +10,6 @@
"about.not_available": "Оваа информација не е достапна на овој сервер.",
"about.powered_by": "Децентрализиран друштвен медиум овозможен од {mastodon}",
"about.rules": "Правила на серверот",
"account.account_note_header": "Белешка",
"account.add_or_remove_from_list": "Додади или одстрани од листа",
"account.badges.bot": "Бот",
"account.badges.group": "Група",

1
app/javascript/mastodon/locales/ml.json
View File

@ -5,7 +5,6 @@
"about.domain_blocks.silenced.title": "പരിമിതമായത്",
"about.domain_blocks.suspended.title": "താൽക്കാലികമായി നിർത്തിവെച്ചിരിക്കുന്നു",
"about.rules": "സെർവ്വർ നിയമങ്ങൾ",
"account.account_note_header": "കുറിപ്പ്",
"account.add_or_remove_from_list": "പട്ടികയിൽ ചേർക്കുകയോ/മാറ്റുകയോ ചെയ്യുക",
"account.badges.bot": "റോബോട്ട്",
"account.badges.group": "ഗ്രൂപ്പ്",

1
app/javascript/mastodon/locales/mr.json
View File

@ -11,7 +11,6 @@
"about.not_available": "ही माहिती या सर्व्हरवर उपलब्ध करून देण्यात आलेली नाही.",
"about.powered_by": "{mastodon} द्वारा समर्थित विकेंद्रित सोशल मीडिया",
"about.rules": "सर्व्हर नियम",
"account.account_note_header": "नोंद",
"account.add_or_remove_from_list": "यादीत घाला किंवा यादीतून काढून टाका",
"account.badges.bot": "स्वयंचलित खाते",
"account.badges.group": "गट",

1
app/javascript/mastodon/locales/ms.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Maklumat ini belum tersedia pada pelayan ini.",
"about.powered_by": "Media sosial terpencar yang dikuasakan oleh {mastodon}",
"about.rules": "Peraturan pelayan",
"account.account_note_header": "Catatan",
"account.add_or_remove_from_list": "Tambah atau Buang dari senarai",
"account.badges.bot": "Bot",
"account.badges.group": "Kumpulan",

1
app/javascript/mastodon/locales/my.json
View File

@ -11,7 +11,6 @@
"about.not_available": "ဤအချက်အလက်ကို ဤဆာဗာတွင် မရရှိနိုင်ပါ။",
"about.powered_by": "{mastodon} မှ ဗဟိုချုပ်ကိုင်မှုလျှော့ချထားသော ဆိုရှယ်မီဒီယာ",
"about.rules": "ဆာဗာစည်းမျဉ်းများ",
"account.account_note_header": "မှတ်ချက်",
"account.add_or_remove_from_list": "စာရင်းများမှ ထည့်ပါ သို့မဟုတ် ဖယ်ရှားပါ။",
"account.badges.bot": "စက်ရုပ်",
"account.badges.group": "အဖွဲ့",

2
app/javascript/mastodon/locales/nl.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Deze informatie is niet beschikbaar gemaakt op deze server.",
"about.powered_by": "Gedecentraliseerde sociale media mogelijk gemaakt door {mastodon}",
"about.rules": "Serverregels",
"account.account_note_header": "Opmerking",
"account.account_note_header": "Persoonlijke opmerking",
"account.add_or_remove_from_list": "Toevoegen aan of verwijderen uit lijsten",
"account.badges.bot": "Geautomatiseerd",
"account.badges.group": "Groep",

1
app/javascript/mastodon/locales/nn.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Denne informasjonen er ikkje gjort tilgjengeleg på denne tenaren.",
"about.powered_by": "Desentraliserte sosiale medium drive av {mastodon}",
"about.rules": "Tenarreglar",
"account.account_note_header": "Merknad",
"account.add_or_remove_from_list": "Legg til eller fjern frå lister",
"account.badges.bot": "Robot",
"account.badges.group": "Gruppe",

1
app/javascript/mastodon/locales/no.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Denne informasjonen er ikke gjort tilgjengelig på denne tjeneren.",
"about.powered_by": "Desentraliserte sosiale medier drevet av {mastodon}",
"about.rules": "Regler for serveren",
"account.account_note_header": "Notat",
"account.add_or_remove_from_list": "Legg til eller fjern fra lister",
"account.badges.bot": "Automatisert",
"account.badges.group": "Gruppe",

1
app/javascript/mastodon/locales/oc.json
View File

@ -8,7 +8,6 @@
"about.not_available": "Aquesta informacion foguèt pas renduda disponibla sus aqueste servidor.",
"about.powered_by": "Malhum social descentralizat propulsat per {mastodon}",
"about.rules": "Règlas del servidor",
"account.account_note_header": "Nòta",
"account.add_or_remove_from_list": "Ajustar o tirar de las listas",
"account.badges.bot": "Robòt",
"account.badges.group": "Grop",

1
app/javascript/mastodon/locales/pa.json
View File

@ -4,7 +4,6 @@
"about.domain_blocks.silenced.title": "ਸੀਮਿਤ",
"about.domain_blocks.suspended.title": "ਮੁਅੱਤਲ ਕੀਤੀ",
"about.rules": "ਸਰਵਰ ਨਿਯਮ",
"account.account_note_header": "ਨੋਟ",
"account.add_or_remove_from_list": "ਸੂਚੀ ਵਿੱਚ ਜੋੜੋ ਜਾਂ ਹਟਾਓ",
"account.badges.bot": "ਆਟੋਮੇਟ ਕੀਤਾ",
"account.badges.group": "ਗਰੁੱਪ",

2
app/javascript/mastodon/locales/pl.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Ta informacja nie została udostępniona na tym serwerze.",
"about.powered_by": "Zdecentralizowane media społecznościowe napędzane przez {mastodon}",
"about.rules": "Regulamin serwera",
"account.account_note_header": "Notatka",
"account.account_note_header": "Twoja notatka",
"account.add_or_remove_from_list": "Dodaj lub usuń z list",
"account.badges.bot": "Bot",
"account.badges.group": "Grupa",

1
app/javascript/mastodon/locales/pt-BR.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Esta informação não foi disponibilizada neste servidor.",
"about.powered_by": "Redes sociais descentralizadas alimentadas por {mastodon}",
"about.rules": "Regras do servidor",
"account.account_note_header": "Nota",
"account.add_or_remove_from_list": "Adicionar ou remover de listas",
"account.badges.bot": "Robô",
"account.badges.group": "Grupo",

2
app/javascript/mastodon/locales/pt-PT.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Esta informação não foi disponibilizada neste servidor.",
"about.powered_by": "Rede social descentralizada baseada no {mastodon}",
"about.rules": "Regras do servidor",
"account.account_note_header": "Nota",
"account.account_note_header": "Nota pessoal",
"account.add_or_remove_from_list": "Adicionar ou remover das listas",
"account.badges.bot": "Robô",
"account.badges.group": "Grupo",

1
app/javascript/mastodon/locales/ro.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Această informație nu a fost pusă la dispoziție pe acest server.",
"about.powered_by": "Media socială descentralizată furnizată de {mastodon}",
"about.rules": "Reguli server",
"account.account_note_header": "Notă",
"account.add_or_remove_from_list": "Adaugă sau elimină din liste",
"account.badges.bot": "Robot",
"account.badges.group": "Grup",

1
app/javascript/mastodon/locales/ru.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Эта информация не указана на данном сервере.",
"about.powered_by": "Децентрализованная социальная сеть на базе {mastodon}",
"about.rules": "Правила сервера",
"account.account_note_header": "Заметка",
"account.add_or_remove_from_list": "Управление списками",
"account.badges.bot": "Бот",
"account.badges.group": "Группа",

1
app/javascript/mastodon/locales/ry.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Ися інформація не была доступна на сюм сервері.",
"about.powered_by": "Децентралізована медіа основана на {mastodon}",
"about.rules": "Правила сервера",
"account.account_note_header": "Примітка",
"account.add_or_remove_from_list": "Дати авадь забрати из исписа",
"account.badges.bot": "Автоматічно",
"account.badges.group": "Ґрупа",

1
app/javascript/mastodon/locales/sa.json
View File

@ -11,7 +11,6 @@
"about.not_available": "अस्मिन्सर्वरि अस्यास्सूचनायाः उपलभ्यो न कृतः।",
"about.powered_by": "अकेन्द्रीयितसामाजिकजालकर्म {mastodon} द्वारा आधारितम्",
"about.rules": "सर्वरो नियमाः",
"account.account_note_header": "टीका",
"account.add_or_remove_from_list": "युज्यतां / नश्यतां सूच्याः",
"account.badges.bot": "यन्त्रम्",
"account.badges.group": "समूहः",

1
app/javascript/mastodon/locales/sc.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Custa informatzione no est istada posta a disponimentu in custu serbidore.",
"about.powered_by": "Rete sotziale detzentralizada impulsada dae {mastodon}",
"about.rules": "Règulas de su serbidore",
"account.account_note_header": "Nota",
"account.add_or_remove_from_list": "Agiunghe o boga dae is listas",
"account.badges.bot": "Automatizadu",
"account.badges.group": "Grupu",

1
app/javascript/mastodon/locales/sco.json
View File

@ -11,7 +11,6 @@
"about.not_available": "This information haesnae been made available on this server.",
"about.powered_by": "Decentralised social media pooert bi {mastodon}",
"about.rules": "Server rules",
"account.account_note_header": "Note",
"account.add_or_remove_from_list": "Add or Remuive frae lists",
"account.badges.bot": "Bot",
"account.badges.group": "Group",

1
app/javascript/mastodon/locales/si.json
View File

@ -4,7 +4,6 @@
"about.disclaimer": "මාස්ටඩන් යනු නිදහස් විවෘත මූලාශ්‍ර මෘදුකාංගයකි. එය මාස්ටඩන් gGmbH හි වෙළඳ නාමයකි.",
"about.domain_blocks.suspended.title": "අත්හිටුවා ඇත",
"about.rules": "සේවාදායකයේ නීති",
"account.account_note_header": "සටහන",
"account.add_or_remove_from_list": "ලැයිස්තු වලින් එකතු හෝ ඉවත් කරන්න",
"account.badges.bot": "ස්වයංක්‍රියයි",
"account.badges.group": "සමූහය",

1
app/javascript/mastodon/locales/sk.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Tieto informácie neboli sprístupnené na tomto serveri.",
"about.powered_by": "Decentralizovaná sociálna sieť na základe technológie {mastodon}",
"about.rules": "Pravidlá servera",
"account.account_note_header": "Poznámka",
"account.add_or_remove_from_list": "Pridať alebo odobrať zo zoznamov",
"account.badges.bot": "Bot",
"account.badges.group": "Skupina",

11
app/javascript/mastodon/locales/sl.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Ti podatki še niso na voljo na tem strežniku.",
"about.powered_by": "Decentraliziran družabni medij, ki ga poganja {mastodon}",
"about.rules": "Pravila strežnika",
"account.account_note_header": "Opombe",
"account.account_note_header": "Zasebna opomba",
"account.add_or_remove_from_list": "Dodaj ali odstrani s seznamov",
"account.badges.bot": "Robot",
"account.badges.group": "Skupina",
@ -171,21 +171,28 @@
"confirmations.block.confirm": "Blokiraj",
"confirmations.delete.confirm": "Izbriši",
"confirmations.delete.message": "Ali ste prepričani, da želite izbrisati to objavo?",
"confirmations.delete.title": "Želite izbrisati objavo?",
"confirmations.delete_list.confirm": "Izbriši",
"confirmations.delete_list.message": "Ali ste prepričani, da želite trajno izbrisati ta seznam?",
"confirmations.delete_list.title": "Želite izbrisati seznam?",
"confirmations.discard_edit_media.confirm": "Opusti",
"confirmations.discard_edit_media.message": "Imate ne shranjene spremembe za medijski opis ali predogled; jih želite kljub temu opustiti?",
"confirmations.edit.confirm": "Uredi",
"confirmations.edit.message": "Urejanje bo prepisalo sporočilo, ki ga trenutno sestavljate. Ali ste prepričani, da želite nadaljevati?",
"confirmations.edit.title": "Želite prepisati objavo?",
"confirmations.logout.confirm": "Odjava",
"confirmations.logout.message": "Ali ste prepričani, da se želite odjaviti?",
"confirmations.logout.title": "Se želite odjaviti?",
"confirmations.mute.confirm": "Utišanje",
"confirmations.redraft.confirm": "Izbriši in preoblikuj",
"confirmations.redraft.message": "Ali ste prepričani, da želite izbrisati ta status in ga preoblikovati? Vzljubi in izpostavitve bodo izgubljeni, odgovori na izvirno objavo pa bodo osiroteli.",
"confirmations.redraft.title": "Želite izbrisati in predelati objavo?",
"confirmations.reply.confirm": "Odgovori",
"confirmations.reply.message": "Odgovarjanje bo prepisalo sporočilo, ki ga trenutno sestavljate. Ali ste prepričani, da želite nadaljevati?",
"confirmations.reply.title": "Želite prepisati objavo?",
"confirmations.unfollow.confirm": "Ne sledi več",
"confirmations.unfollow.message": "Ali ste prepričani, da ne želite več slediti {name}?",
"confirmations.unfollow.title": "Želite nehati spremljati uporabnika?",
"conversation.delete": "Izbriši pogovor",
"conversation.mark_as_read": "Označi kot prebrano",
"conversation.open": "Pokaži pogovor",
@ -497,10 +504,12 @@
"notification.update": "{name} je uredil(a) objavo",
"notification_requests.accept": "Sprejmi",
"notification_requests.dismiss": "Zavrni",
"notification_requests.maximize": "Maksimiraj",
"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.clear_title": "Želite počistiti obvestila?",
"notifications.column_settings.admin.report": "Nove prijave:",
"notifications.column_settings.admin.sign_up": "Novi vpisi:",
"notifications.column_settings.alert": "Namizna obvestila",

2
app/javascript/mastodon/locales/sq.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Ky informacion, në këtë shërbyes, nuk jepet.",
"about.powered_by": "Media shoqërore e decentralizuar, bazuar në {mastodon}",
"about.rules": "Rregulla shërbyesi",
"account.account_note_header": "Shënim",
"account.account_note_header": "Shënim personal",
"account.add_or_remove_from_list": "Shtoni ose Hiqni prej listash",
"account.badges.bot": "Robot",
"account.badges.group": "Grup",

1
app/javascript/mastodon/locales/sr-Latn.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Ove informacije nisu dostupne na ovom serveru.",
"about.powered_by": "Decentralizovana društvena mreža koju pokreće {mastodon}",
"about.rules": "Pravila servera",
"account.account_note_header": "Napomena",
"account.add_or_remove_from_list": "Dodaj ili ukloni sa lista",
"account.badges.bot": "Automatizovano",
"account.badges.group": "Grupa",

1
app/javascript/mastodon/locales/sr.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Ове информације нису доступне на овом серверу.",
"about.powered_by": "Децентрализована друштвена мрежа коју покреће {mastodon}",
"about.rules": "Правила сервера",
"account.account_note_header": "Напомена",
"account.add_or_remove_from_list": "Додај или уклони са листа",
"account.badges.bot": "Аутоматизовано",
"account.badges.group": "Група",

2
app/javascript/mastodon/locales/sv.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Denna information har inte gjorts tillgänglig på denna server.",
"about.powered_by": "En decentraliserad plattform for sociala medier, drivet av {mastodon}",
"about.rules": "Serverregler",
"account.account_note_header": "Anteckning",
"account.account_note_header": "Personlig anteckning",
"account.add_or_remove_from_list": "Lägg till i eller ta bort från listor",
"account.badges.bot": "Bot",
"account.badges.group": "Grupp",

1
app/javascript/mastodon/locales/szl.json
View File

@ -10,7 +10,6 @@
"about.domain_blocks.suspended.title": "Zawiyszōne",
"about.not_available": "Ta informacyjŏ niy bōła udostympniōna na tym serwerze.",
"about.rules": "Zasady serwera",
"account.account_note_header": "Notatka",
"account.badges.bot": "Bot",
"account.badges.group": "Grupa",
"account.block": "Zablokuj @{name}",

1
app/javascript/mastodon/locales/ta.json
View File

@ -4,7 +4,6 @@
"about.disclaimer": "மாஸ்டோடன் இலவச, திறந்த மூல மென்பொருள் மற்றும் மாஸ்டோடன் gGmbH இன் வர்த்தக முத்திரை.",
"about.domain_blocks.no_reason_available": "காரணம் கிடைக்கவில்லை",
"about.domain_blocks.preamble": "மாஸ்டோடன் பொதுவாக நீங்கள் ஃபெடிவர்ஸில் உள்ள வேறு எந்தச் சர்வரிலிருந்தும் உள்ளடக்கத்தைப் பார்க்கவும், பயனர்களுடன் தொடர்பு கொள்ளவும் அனுமதிக்கிறது. இந்தக் குறிப்பிட்ட சர்வரில் செய்யப்பட்ட விதிவிலக்குகள் இவை.",
"account.account_note_header": "குறிப்பு",
"account.add_or_remove_from_list": "பட்டியல்களில் சேர்/நீக்கு",
"account.badges.bot": "பாட்",
"account.badges.group": "குழு",

1
app/javascript/mastodon/locales/th.json
View File

@ -11,7 +11,6 @@
"about.not_available": "ไม่ได้ทำให้ข้อมูลนี้พร้อมใช้งานในเซิร์ฟเวอร์นี้",
"about.powered_by": "สื่อสังคมแบบกระจายศูนย์ที่ขับเคลื่อนโดย {mastodon}",
"about.rules": "กฎของเซิร์ฟเวอร์",
"account.account_note_header": "หมายเหตุ",
"account.add_or_remove_from_list": "เพิ่มหรือเอาออกจากรายการ",
"account.badges.bot": "อัตโนมัติ",
"account.badges.group": "กลุ่ม",

1
app/javascript/mastodon/locales/tok.json
View File

@ -8,7 +8,6 @@
"about.domain_blocks.suspended.title": "weka",
"about.not_available": "lon kulupu ni la sina ken alasa ala e sona ni.",
"about.rules": "lawa kulupu",
"account.account_note_header": "sona awen",
"account.add_or_remove_from_list": "o ante e lipu jan",
"account.badges.bot": "ilo nanpa li lawa e ni",
"account.badges.group": "kulupu",

2
app/javascript/mastodon/locales/tr.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Bu sunucuda bu bilgi kullanıma sunulmadı.",
"about.powered_by": "{mastodon} destekli merkeziyetsiz sosyal ağ",
"about.rules": "Sunucu kuralları",
"account.account_note_header": "Not",
"account.account_note_header": "Kişisel not",
"account.add_or_remove_from_list": "Listelere ekle veya kaldır",
"account.badges.bot": "Bot",
"account.badges.group": "Grup",

1
app/javascript/mastodon/locales/tt.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Бу серверда бу мәгълүмат юк иде.",
"about.powered_by": "{mastodon} нигезендә үзәкчелеге бетерелгән социаль челтәр нигезендә",
"about.rules": "Сервер кагыйдәләре",
"account.account_note_header": "Язма",
"account.add_or_remove_from_list": "Исемлеккә кушу яки бетерү",
"account.badges.bot": "Бот",
"account.badges.group": "Төркем",

2
app/javascript/mastodon/locales/uk.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Ця інформація не доступна на цьому сервері.",
"about.powered_by": "Децентралізовані соціальні мережі від {mastodon}",
"about.rules": "Правила сервера",
"account.account_note_header": "Примітка",
"account.account_note_header": "Особиста нотатка",
"account.add_or_remove_from_list": "Додати або видалити зі списків",
"account.badges.bot": "Бот",
"account.badges.group": "Група",

1
app/javascript/mastodon/locales/ur.json
View File

@ -6,7 +6,6 @@
"about.domain_blocks.silenced.title": "محدود",
"about.domain_blocks.suspended.title": "معطل شدہ",
"about.rules": "سرور کے اصول",
"account.account_note_header": "نوٹ",
"account.add_or_remove_from_list": "فہرست میں شامل یا برطرف کریں",
"account.badges.bot": "روبوٹ",
"account.badges.group": "گروپ",

1
app/javascript/mastodon/locales/uz.json
View File

@ -11,7 +11,6 @@
"about.not_available": "Ushbu ma'lumot ushbu serverda mavjud emas.",
"about.powered_by": "{mastodon} tomonidan boshqariladigan markazlashtirilmagan ijtimoiy media",
"about.rules": "Server qoidalari",
"account.account_note_header": "Eslatma",
"account.add_or_remove_from_list": "Roʻyxatlarga qoʻshish yoki oʻchirish",
"account.badges.bot": "Bo't",
"account.badges.group": "Guruhlar",

2
app/javascript/mastodon/locales/vi.json
View File

@ -11,7 +11,7 @@
"about.not_available": "Máy chủ này chưa cung cấp thông tin.",
"about.powered_by": "Mạng xã hội liên hợp {mastodon}",
"about.rules": "Nội quy máy chủ",
"account.account_note_header": "Ghi chú",
"account.account_note_header": "Ghi chú cá nhân",
"account.add_or_remove_from_list": "Sửa danh sách",
"account.badges.bot": "Bot",
"account.badges.group": "Nhóm",

1
app/javascript/mastodon/locales/zgh.json
View File

@ -1,5 +1,4 @@
{
"account.account_note_header": "ⵍⵎⴷ ⵓⴳⴳⴰⵔ",
"account.add_or_remove_from_list": "ⵔⵏⵓ ⵏⵖ ⵙⵉⵜⵜⵢ ⵙⴳ ⵜⵍⴳⴰⵎⵜ",
"account.badges.bot": "ⴰⴱⵓⵜ",
"account.badges.group": "ⵜⴰⵔⴰⴱⴱⵓⵜ",

2
app/javascript/mastodon/locales/zh-CN.json
View File

@ -11,7 +11,7 @@
"about.not_available": "此信息在当前服务器尚不可用。",
"about.powered_by": "由 {mastodon} 驱动的去中心化社交媒体",
"about.rules": "站点规则",
"account.account_note_header": "备注",
"account.account_note_header": "个人备注",
"account.add_or_remove_from_list": "从列表中添加或移除",
"account.badges.bot": "机器人",
"account.badges.group": "群组",

1
app/javascript/mastodon/locales/zh-HK.json
View File

@ -11,7 +11,6 @@
"about.not_available": "本伺服器尚未提供這資訊。",
"about.powered_by": "由 {mastodon} 提供之去中心化社交媒體",
"about.rules": "伺服器規則",
"account.account_note_header": "備忘",
"account.add_or_remove_from_list": "從列表中新增或移除",
"account.badges.bot": "機械人",
"account.badges.group": "群組",

2
app/javascript/mastodon/locales/zh-TW.json
View File

@ -11,7 +11,7 @@
"about.not_available": "無法於本伺服器上使用此資訊。",
"about.powered_by": "由 {mastodon} 提供的去中心化社群媒體",
"about.rules": "伺服器規則",
"account.account_note_header": "備註",
"account.account_note_header": "個人備註",
"account.add_or_remove_from_list": "自列表中新增或移除",
"account.badges.bot": "機器人",
"account.badges.group": "群組",

13
app/javascript/mastodon/reducers/notification_groups.ts
View File

@ -48,6 +48,7 @@ interface NotificationGroupsState {
scrolledToTop: boolean;
isLoading: boolean;
lastReadId: string;
readMarkerId: string;
mounted: number;
isTabVisible: boolean;
}
@ -58,7 +59,8 @@ const initialState: NotificationGroupsState = {
scrolledToTop: false,
isLoading: false,
// The following properties are used to track unread notifications
lastReadId: '0', // used for unread notifications
lastReadId: '0', // used internally for unread notifications
readMarkerId: '0', // user-facing and updated when focus changes
mounted: 0, // number of mounted notification list components, usually 0 or 1
isTabVisible: true,
};
@ -284,6 +286,12 @@ function updateLastReadId(
}
}
function commitLastReadId(state: NotificationGroupsState) {
if (shouldMarkNewNotificationsAsRead(state)) {
state.readMarkerId = state.lastReadId;
}
}
export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
initialState,
(builder) => {
@ -457,6 +465,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
compareId(state.lastReadId, mostRecentGroup.page_max_id) < 0
)
state.lastReadId = mostRecentGroup.page_max_id;
commitLastReadId(state);
})
.addCase(fetchMarkers.fulfilled, (state, action) => {
if (
@ -470,6 +479,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
})
.addCase(mountNotifications, (state) => {
state.mounted += 1;
commitLastReadId(state);
updateLastReadId(state);
})
.addCase(unmountNotifications, (state) => {
@ -477,6 +487,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
})
.addCase(focusApp, (state) => {
state.isTabVisible = true;
commitLastReadId(state);
updateLastReadId(state);
})
.addCase(unfocusApp, (state) => {

16
app/javascript/mastodon/selectors/notifications.ts
View File

@ -27,6 +27,22 @@ export const selectUnreadNotificationGroupsCount = createSelector(
},
);
// Whether there is any unread notification according to the user-facing state
export const selectAnyPendingNotification = createSelector(
[
(s: RootState) => s.notificationGroups.readMarkerId,
(s: RootState) => s.notificationGroups.groups,
],
(notificationMarker, groups) => {
return groups.some(
(group) =>
group.type !== 'gap' &&
group.page_max_id &&
compareId(group.page_max_id, notificationMarker) > 0,
);
},
);
export const selectPendingNotificationGroupsCount = createSelector(
[(s: RootState) => s.notificationGroups.pendingGroups],
(pendingGroups) =>

Some files were not shown because too many files have changed in this diff Show More