+
+
+
+
+ {relationship?.followed_by && (
+ }
+ label={
+
+ }
+ />
+ )}
+
@{username}@{domain}
= ({ accountId }) => {
const account = useAccount(accountId);
const localDomain = useAppSelector(
@@ -53,7 +47,6 @@ export const AccountBadges: FC<{ accountId: string }> = ({ accountId }) => {
,
@@ -63,7 +56,6 @@ export const AccountBadges: FC<{ accountId: string }> = ({ accountId }) => {
,
@@ -72,25 +64,19 @@ export const AccountBadges: FC<{ accountId: string }> = ({ accountId }) => {
});
if (account.bot) {
- badges.push();
+ badges.push();
}
if (account.group) {
- badges.push();
+ badges.push();
}
if (relationship) {
if (relationship.blocking) {
- badges.push(
- ,
- );
+ badges.push();
}
if (relationship.domain_blocking) {
badges.push(
= ({ accountId }) => {
badges.push(
,
);
@@ -119,16 +104,6 @@ export const AccountBadges: FC<{ accountId: string }> = ({ accountId }) => {
return {badges}
;
};
-export const PinnedBadge: FC = () => (
- }
- label={
-
- }
- />
-);
-
function isAdminBadge(role: AccountRole) {
const name = role.name.toLowerCase();
return name === 'admin' || name === 'owner';
diff --git a/app/javascript/mastodon/features/account_timeline/components/redesign.module.scss b/app/javascript/mastodon/features/account_timeline/components/redesign.module.scss
index 97395bd1ed..84f102cf06 100644
--- a/app/javascript/mastodon/features/account_timeline/components/redesign.module.scss
+++ b/app/javascript/mastodon/features/account_timeline/components/redesign.module.scss
@@ -17,14 +17,20 @@
padding-top: 0;
}
-.nameWrapper {
+.displayNameWrapper {
display: flex;
align-items: start;
gap: 16px;
}
-.name {
+.nameWrapper {
flex-grow: 1;
+}
+
+.name {
+ display: flex;
+ gap: 2px;
+ align-items: baseline;
> h1 {
font-size: 22px;
@@ -33,6 +39,10 @@
}
}
+.followerBadgeIcon {
+ color: var(--color-text-secondary);
+}
+
.username {
display: flex;
font-size: 13px;
@@ -165,38 +175,6 @@ $button-fallback-breakpoint: $button-breakpoint + 55px;
font-size: 15px;
}
-.badge {
- background-color: var(--color-bg-secondary);
- border: none;
- color: var(--color-text-secondary);
- font-weight: 500;
- padding: 4px;
- font-size: 13px;
-
- :global(.account__header__badges) > & {
- line-height: 1;
- }
-
- > span {
- font-weight: unset;
- opacity: 1;
- }
-}
-
-.badgeMuted {
- background-color: var(--color-bg-inverted);
- color: var(--color-text-inverted);
-}
-
-.badgeBlocked {
- background-color: var(--color-bg-error-base);
- color: var(--color-text-on-error-base);
-}
-
-svg.badgeIcon {
- opacity: 1;
-}
-
.note {
margin-bottom: 16px;
}
diff --git a/app/javascript/mastodon/features/account_timeline/v2/pinned_statuses.tsx b/app/javascript/mastodon/features/account_timeline/v2/pinned_statuses.tsx
index 88503389c9..78dad72478 100644
--- a/app/javascript/mastodon/features/account_timeline/v2/pinned_statuses.tsx
+++ b/app/javascript/mastodon/features/account_timeline/v2/pinned_statuses.tsx
@@ -11,6 +11,7 @@ import {
expandTimelineByKey,
timelineKey,
} from '@/mastodon/actions/timelines_typed';
+import { Badge } from '@/mastodon/components/badge';
import { Button } from '@/mastodon/components/button';
import { Icon } from '@/mastodon/components/icon';
import { StatusHeader } from '@/mastodon/components/status/header';
@@ -18,8 +19,6 @@ import type { StatusHeaderRenderFn } from '@/mastodon/components/status/header';
import { selectTimelineByKey } from '@/mastodon/selectors/timelines';
import { useAppDispatch, useAppSelector } from '@/mastodon/store';
-import { PinnedBadge } from '../components/badges';
-
import { useAccountContext } from './context';
import classes from './styles.module.scss';
@@ -79,7 +78,16 @@ export const renderPinnedStatusHeader: StatusHeaderRenderFn = ({
}
return (
-
+ }
+ label={
+
+ }
+ />
);
};
diff --git a/app/javascript/mastodon/features/account_timeline/v2/styles.module.scss b/app/javascript/mastodon/features/account_timeline/v2/styles.module.scss
index a3629bf29b..f7dee496fb 100644
--- a/app/javascript/mastodon/features/account_timeline/v2/styles.module.scss
+++ b/app/javascript/mastodon/features/account_timeline/v2/styles.module.scss
@@ -118,8 +118,8 @@
> :global(.status__display-name) {
grid-row: span 2;
}
-
- > :global(.account-role) {
- justify-self: end;
- }
+}
+
+.pinnedBadge {
+ justify-self: end;
}
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index e7572b2e39..5535b09a39 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -22,8 +22,6 @@
"account.edit_profile": "Redigeer profiel",
"account.enable_notifications": "Laat weet my wanneer @{name} iets plaas",
"account.endorse": "Toon op profiel",
- "account.featured_tags.last_status_at": "Laaste plasing op {date}",
- "account.featured_tags.last_status_never": "Geen plasings nie",
"account.follow": "Volg",
"account.followers": "Volgers",
"account.followers.empty": "Hierdie gebruiker het nog nie volgers nie.",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index f5ca4718bd..6913197fff 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -22,8 +22,6 @@
"account.edit_profile": "Editar perfil",
"account.enable_notifications": "Notificar-me quan @{name} publique bella cosa",
"account.endorse": "Amostrar en perfil",
- "account.featured_tags.last_status_at": "Zaguera publicación lo {date}",
- "account.featured_tags.last_status_never": "Sin publicacions",
"account.follow": "Seguir",
"account.followers": "Seguidores",
"account.followers.empty": "Encara no sigue dengún a este usuario.",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 53489d9317..937422547d 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -38,9 +38,6 @@
"account.familiar_followers_two": "يتبعه {name1} و {name2}",
"account.featured": "معروض",
"account.featured.accounts": "ملفات شخصية",
- "account.featured.hashtags": "هاشتاقات",
- "account.featured_tags.last_status_at": "آخر منشور في {date}",
- "account.featured_tags.last_status_never": "لا توجد رسائل",
"account.filters.all": "جميع الأنشطة",
"account.filters.posts_only": "منشورات",
"account.filters.posts_replies": "المنشورات والردود",
@@ -327,9 +324,7 @@
"emoji_button.search_results": "نتائج البحث",
"emoji_button.symbols": "رموز",
"emoji_button.travel": "الأماكن والسفر",
- "empty_column.account_featured.me": "لم تعرض أي شيء حتى الآن. هل تعلم أنه يمكنك عرض الهاشتاقات التي تستخدمها، وحتى حسابات أصدقاءك على ملفك الشخصي؟",
"empty_column.account_featured.other": "{acct} لم يعرض أي شيء حتى الآن. هل تعلم أنه يمكنك عرض الهاشتاقات التي تستخدمها، وحتى حسابات أصدقاءك على ملفك الشخصي؟",
- "empty_column.account_featured_other.unknown": "هذا الحساب لم يعرض أي شيء حتى الآن.",
"empty_column.account_hides_collections": "اختار هذا المستخدم عدم إتاحة هذه المعلومات للعامة",
"empty_column.account_suspended": "حساب معلق",
"empty_column.account_timeline": "لا توجد منشورات هنا!",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 2ed84f2fc4..444b40aabb 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -25,7 +25,6 @@
"account.edit_profile": "Editar el perfil",
"account.enable_notifications": "Avisame cuando @{name} espublice artículos",
"account.endorse": "Destacar nel perfil",
- "account.featured_tags.last_status_never": "Nun hai nenguna publicación",
"account.follow": "Siguir",
"account.follow_back": "Siguir tamién",
"account.follow_request_short": "Solicitú",
diff --git a/app/javascript/mastodon/locales/az.json b/app/javascript/mastodon/locales/az.json
index 12932140e9..88e27d38e3 100644
--- a/app/javascript/mastodon/locales/az.json
+++ b/app/javascript/mastodon/locales/az.json
@@ -35,9 +35,6 @@
"account.familiar_followers_two": "{name1} və {name2} izləyir",
"account.featured": "Seçilmiş",
"account.featured.accounts": "Profillər",
- "account.featured.hashtags": "Etiketler",
- "account.featured_tags.last_status_at": "Son paylaşım {date} tarixində olub",
- "account.featured_tags.last_status_never": "Paylaşım yoxdur",
"account.follow": "İzlə",
"account.follow_back": "Sən də izlə",
"account.followers": "İzləyicilər",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 59dbf2171e..60bb9cabae 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -45,9 +45,6 @@
"account.featured": "Рэкамендаванае",
"account.featured.accounts": "Профілі",
"account.featured.collections": "Калекцыі",
- "account.featured.hashtags": "Хэштэгі",
- "account.featured_tags.last_status_at": "Апошні допіс ад {date}",
- "account.featured_tags.last_status_never": "Няма допісаў",
"account.field_overflow": "Паказаць усё змесціва",
"account.filters.all": "Уся актыўнасць",
"account.filters.boosts_toggle": "Паказваць пашырэнні",
@@ -75,6 +72,7 @@
"account.in_memoriam": "У памяць.",
"account.joined_short": "Далучыўся",
"account.languages": "Змяніць выбраныя мовы",
+ "account.last_active": "Апошняя актыўнасць",
"account.link_verified_on": "Права ўласнасці на гэтую спасылку праверана {date}",
"account.locked_info": "Гэты ўліковы запіс пазначаны як схаваны. Уладальнік сам вырашае, хто можа падпісвацца на яго.",
"account.media": "Медыя",
@@ -375,15 +373,14 @@
"collections.create_collection": "Стварыць калекцыю",
"collections.delete_collection": "Выдаліць калекцыю",
"collections.description_length_hint": "Максімум 100 сімвалаў",
- "collections.detail.accept_inclusion": "Добра",
"collections.detail.accounts_heading": "Уліковыя запісы",
+ "collections.detail.author_added_you_on_date": "{author} дадаў(-ла) Вас {date}",
"collections.detail.loading": "Загружаецца калекцыя…",
- "collections.detail.other_accounts_count": "{count, plural,one {# іншы ўліковы запіс} few {# іншыя ўліковыя запісы} other {# іншых уліковых запісаў}}",
"collections.detail.revoke_inclusion": "Прыбраць сябе",
"collections.detail.sensitive_content": "Адчувальнае змесціва",
"collections.detail.sensitive_note": "У гэтай калекцыі прысутнічаюць уліковыя запісы і кантэнт, змесціва якіх можа падацца адчувальным для некаторых карыстальнікаў.",
"collections.detail.share": "Падзяліцца гэтай калекцыяй",
- "collections.detail.you_were_added_to_this_collection": "Вас дадалі ў гэтую калекцыю",
+ "collections.detail.you_are_in_this_collection": "Вас уключылі ў гэтую калекцыю",
"collections.edit_details": "Рэдагаваць падрабязнасці",
"collections.error_loading_collections": "Адбылася памылка падчас загрузкі Вашых калекцый.",
"collections.hints.accounts_counter": "{count} / {max} уліковых запісаў",
@@ -606,9 +603,15 @@
"emoji_button.search_results": "Вынікі пошуку",
"emoji_button.symbols": "Сімвалы",
"emoji_button.travel": "Падарожжы і месцы",
- "empty_column.account_featured.me": "Вы яшчэ нічога не паказалі. Ці ведалі Вы, што ў сваім профілі Вы можаце паказаць свае хэштэгі, якімі найбольш карыстаецеся, і нават профілі сваіх сяброў?",
"empty_column.account_featured.other": "{acct} яшчэ нічога не паказаў. Ці ведалі Вы, што ў сваім профілі Вы можаце паказаць свае хэштэгі, якімі найбольш карыстаецеся, і нават профілі сваіх сяброў?",
- "empty_column.account_featured_other.unknown": "Гэты ўліковы запіс яшчэ нічога не паказаў.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} пакуль не стварыў(-ла) аніводнай калекцыі.",
+ "empty_column.account_featured_other.title": "Тут нічога няма",
+ "empty_column.account_featured_self.no_collections": "Пакуль няма калекцый",
+ "empty_column.account_featured_self.no_collections_button": "Стварыць калекцыю",
+ "empty_column.account_featured_self.pre_collections": "Рыхтуйцеся да Калекцый",
+ "empty_column.account_featured_self.pre_collections_desc": "Калекцыі (новая функцыя Mastodon 4.6) дазволяць Вам ствараць свае ўласныя спісы ўліковых запісаў, каб раіць іх іншым.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Гэты ўліковы запіс пакуль не стварыў аніводнай калекцыі.",
+ "empty_column.account_featured_unknown.other": "Гэты ўліковы запіс пакуль нічога не рэкамендаваў.",
"empty_column.account_hides_collections": "Гэты карыстальнік вырашыў схаваць гэтую інфармацыю",
"empty_column.account_suspended": "Уліковы запіс прыпынены",
"empty_column.account_timeline": "Тут няма допісаў!",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 4ddad0c28c..750c54459d 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -36,9 +36,6 @@
"account.familiar_followers_two": "Последвано от {name1} и {name2}",
"account.featured": "Препоръчано",
"account.featured.accounts": "Профили",
- "account.featured.hashtags": "Хаштагове",
- "account.featured_tags.last_status_at": "Последна публикация на {date}",
- "account.featured_tags.last_status_never": "Няма публикации",
"account.follow": "Последване",
"account.follow_back": "Последване взаимно",
"account.follow_request_cancel": "Отказване на заявката",
@@ -307,7 +304,6 @@
"emoji_button.search_results": "Резултати от търсене",
"emoji_button.symbols": "Символи",
"emoji_button.travel": "Пътуване и места",
- "empty_column.account_featured_other.unknown": "Този акаунт още не е отличил нищо.",
"empty_column.account_hides_collections": "Този потребител е избрал да не дава тази информация",
"empty_column.account_suspended": "Спрян акаунт",
"empty_column.account_timeline": "Тук няма публикации!",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 11b553e4bc..ea4c3e9eaf 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -26,8 +26,6 @@
"account.edit_profile": "প্রোফাইল সম্পাদনা করুন",
"account.enable_notifications": "আমাকে জানাবে যখন @{name} পোস্ট করবে",
"account.endorse": "প্রোফাইলে ফিচার করুন",
- "account.featured_tags.last_status_at": "{date} এ সর্বশেষ পোস্ট",
- "account.featured_tags.last_status_never": "কোনো পোস্ট নেই",
"account.follow": "অনুসরণ",
"account.follow_back": "তাকে অনুসরণ করো",
"account.followers": "অনুসরণকারী",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 37c35b0b4d..6dbfeb291c 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -35,9 +35,6 @@
"account.familiar_followers_two": "Heuliet gant {name1} ha {name2}",
"account.featured": "En a-raok",
"account.featured.accounts": "Profiloù",
- "account.featured.hashtags": "Gerioù-klik",
- "account.featured_tags.last_status_at": "Embann diwezhañ: {date}",
- "account.featured_tags.last_status_never": "Embann ebet",
"account.follow": "Heuliañ",
"account.follow_back": "Heuliañ d'ho tro",
"account.follow_back_short": "Heuliañ d'ho tro",
@@ -266,7 +263,6 @@
"emoji_button.search_results": "Disoc'hoù an enklask",
"emoji_button.symbols": "Arouezioù",
"emoji_button.travel": "Beajiñ & Lec'hioù",
- "empty_column.account_featured_other.unknown": "N'eo ket bet lakaet netra en a-raok gant ar gont-mañ.",
"empty_column.account_suspended": "Kont astalet",
"empty_column.account_timeline": "Embannadur ebet amañ!",
"empty_column.account_unavailable": "Profil dihegerz",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index f60a30be99..506be6c9a3 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -43,9 +43,6 @@
"account.familiar_followers_two": "Seguit per {name1} i {name2}",
"account.featured": "Destacat",
"account.featured.accounts": "Perfils",
- "account.featured.hashtags": "Etiquetes",
- "account.featured_tags.last_status_at": "Darrer tut el {date}",
- "account.featured_tags.last_status_never": "No hi ha tuts",
"account.filters.all": "Tota l'activitat",
"account.filters.boosts_toggle": "Mostra els impulsos",
"account.filters.posts_boosts": "Publicacions i impulsos",
@@ -391,9 +388,7 @@
"emoji_button.search_results": "Resultats de la cerca",
"emoji_button.symbols": "Símbols",
"emoji_button.travel": "Viatges i llocs",
- "empty_column.account_featured.me": "Encara no heu destacat res. Sabeu que podeu destacar les etiquetes que més feu servir i fins i tot els comptes dels vostres amics al vostre perfil?",
"empty_column.account_featured.other": "{acct} encara no ha destacat res. Sabeu que podeu destacar les etiquetes que més feu servir i fins i tot els comptes dels vostres amics al vostre perfil?",
- "empty_column.account_featured_other.unknown": "Aquest compte no ha destacat encara res.",
"empty_column.account_hides_collections": "Aquest usuari ha decidit no mostrar aquesta informació",
"empty_column.account_suspended": "Compte suspès",
"empty_column.account_timeline": "No hi ha tuts aquí!",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 3ae13242ba..a58ae647de 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -25,8 +25,6 @@
"account.edit_profile": "دەستکاری پرۆفایل",
"account.enable_notifications": "ئاگادارم بکەوە کاتێک @{name} بابەتەکان",
"account.endorse": "ناساندن لە پرۆفایل",
- "account.featured_tags.last_status_at": "دوایین پۆست لە {date}",
- "account.featured_tags.last_status_never": "هیچ پۆستێک نییە",
"account.follow": "بەدواداچوون",
"account.follow_back": "فۆڵۆو بکەنەوە",
"account.followers": "شوێنکەوتووان",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 5b8345a3dd..b595af7f1d 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -44,9 +44,6 @@
"account.familiar_followers_two": "Sleduje je {name1} a {name2}",
"account.featured": "Zvýrazněné",
"account.featured.accounts": "Profily",
- "account.featured.hashtags": "Hashtagy",
- "account.featured_tags.last_status_at": "Poslední příspěvek {date}",
- "account.featured_tags.last_status_never": "Žádné příspěvky",
"account.filters.all": "Veškerá aktivita",
"account.filters.boosts_toggle": "Zobrazit boosty",
"account.filters.posts_boosts": "Příspěvky a boosty",
@@ -442,9 +439,7 @@
"emoji_button.search_results": "Výsledky hledání",
"emoji_button.symbols": "Symboly",
"emoji_button.travel": "Cestování a místa",
- "empty_column.account_featured.me": "Zatím jste nic nezvýraznili. Věděli jste, že na svém profilu můžete zvýraznit hashtagy, které používáte nejvíce, a dokonce účty vašich přátel?",
"empty_column.account_featured.other": "{acct} zatím nic nezvýraznili. Věděli jste, že na svém profilu můžete zvýraznit hashtagy, které používáte nejvíce, a dokonce účty vašich přátel?",
- "empty_column.account_featured_other.unknown": "Tento účet zatím nemá nic zvýrazněného.",
"empty_column.account_hides_collections": "Tento uživatel se rozhodl tuto informaci nezveřejňovat",
"empty_column.account_suspended": "Účet je pozastaven",
"empty_column.account_timeline": "Nejsou tu žádné příspěvky!",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 251fcc3bab..9923fe83e2 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -45,9 +45,6 @@
"account.featured": "Nodwedd",
"account.featured.accounts": "Proffilau",
"account.featured.collections": "Casgliadau",
- "account.featured.hashtags": "Hashnodau",
- "account.featured_tags.last_status_at": "Y postiad olaf ar {date}",
- "account.featured_tags.last_status_never": "Dim postiadau",
"account.field_overflow": "Dangos cynnwys llawn",
"account.filters.all": "Pob gweithgaredd",
"account.filters.boosts_toggle": "Dangos hybiau",
@@ -350,7 +347,6 @@
"collections.create_collection": "Creu casgliad",
"collections.delete_collection": "Dileu casgliad",
"collections.description_length_hint": "Terfyn o 100 nod",
- "collections.detail.accept_inclusion": "Iawn",
"collections.detail.accounts_heading": "Cyfrifon",
"collections.detail.loading": "Yn llwytho casgliad…",
"collections.detail.revoke_inclusion": "Tynnu fi",
@@ -568,9 +564,7 @@
"emoji_button.search_results": "Canlyniadau chwilio",
"emoji_button.symbols": "Symbolau",
"emoji_button.travel": "Teithio a Llefydd",
- "empty_column.account_featured.me": "Dydych chi ddim wedi cynnwys unrhyw beth eto. Oeddech chi'n gwybod y gallwch chi gynnwys yr hashnodau rydych chi'n eu defnyddio fwyaf, a hyd yn oed cyfrifon eich ffrindiau ar eich proffil?",
"empty_column.account_featured.other": "Dyw {acct} heb gynnwys unrhyw beth eto. Oeddech chi'n gwybod y gallwch chi gynnwys yr hashnodau rydych chi'n eu defnyddio fwyaf, a hyd yn oed cyfrifon eich ffrindiau ar eich proffil?",
- "empty_column.account_featured_other.unknown": "Dyw'r cyfrif hwn heb gynnwys dim eto.",
"empty_column.account_hides_collections": "Mae'r defnyddiwr wedi dewis i beidio rhannu'r wybodaeth yma",
"empty_column.account_suspended": "Cyfrif wedi'i atal",
"empty_column.account_timeline": "Dim postiadau yma!",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 43178970ef..8e1420371d 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -45,9 +45,6 @@
"account.featured": "Fremhævet",
"account.featured.accounts": "Profiler",
"account.featured.collections": "Samlinger",
- "account.featured.hashtags": "Hashtags",
- "account.featured_tags.last_status_at": "Seneste indlæg {date}",
- "account.featured_tags.last_status_never": "Ingen indlæg",
"account.field_overflow": "Vis fuldt indhold",
"account.filters.all": "Al aktivitet",
"account.filters.boosts_toggle": "Vis fremhævelser",
@@ -75,6 +72,7 @@
"account.in_memoriam": "Til minde om.",
"account.joined_short": "Oprettet",
"account.languages": "Skift abonnementssprog",
+ "account.last_active": "Senest aktiv",
"account.link_verified_on": "Ejerskab af dette link blev tjekket {date}",
"account.locked_info": "Denne kontos fortrolighedsstatus er sat til låst. Ejeren bedømmer manuelt, hvem der kan følge vedkommende.",
"account.media": "Medier",
@@ -375,15 +373,14 @@
"collections.create_collection": "Opret samling",
"collections.delete_collection": "Slet samling",
"collections.description_length_hint": "Begrænset til 100 tegn",
- "collections.detail.accept_inclusion": "Okay",
"collections.detail.accounts_heading": "Konti",
+ "collections.detail.author_added_you_on_date": "{author} tilføjede dig {date}",
"collections.detail.loading": "Indlæser samling…",
- "collections.detail.other_accounts_count": "{count, plural, one {# andre konto} other {# andre konti}}",
"collections.detail.revoke_inclusion": "Fjern mig",
"collections.detail.sensitive_content": "Følsomt indhold",
"collections.detail.sensitive_note": "Denne samling indeholder konti og indhold, der kan være følsomt for nogle brugere.",
"collections.detail.share": "Del denne samling",
- "collections.detail.you_were_added_to_this_collection": "Du er blevet føjet til denne samling",
+ "collections.detail.you_are_in_this_collection": "Du er med i denne samling",
"collections.edit_details": "Rediger detaljer",
"collections.error_loading_collections": "Der opstod en fejl under indlæsning af dine samlinger.",
"collections.hints.accounts_counter": "{count} / {max} konti",
@@ -606,9 +603,15 @@
"emoji_button.search_results": "Søgeresultater",
"emoji_button.symbols": "Symboler",
"emoji_button.travel": "Rejser og steder",
- "empty_column.account_featured.me": "Intet fremhævet endnu. Vidste du, at du kan fremhæve dine mest brugte hashtags og endda din vens konti på din profil?",
"empty_column.account_featured.other": "{acct} har ikke fremhævet noget endnu. Vidste du, at du kan fremhæve dine mest brugte hashtags og endda din vens konti på din profil?",
- "empty_column.account_featured_other.unknown": "Denne konto har ikke fremhævet noget endnu.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} har endnu ikke oprettet nogen samlinger.",
+ "empty_column.account_featured_other.title": "Intet at se her",
+ "empty_column.account_featured_self.no_collections": "Ingen samlinger endnu",
+ "empty_column.account_featured_self.no_collections_button": "Opret en samling",
+ "empty_column.account_featured_self.pre_collections": "Hold udkig efter Samlinger",
+ "empty_column.account_featured_self.pre_collections_desc": "Med samlinger (kommer i Mastodon 4.6) kan du oprette dine egne kuraterede lister over konti, som du kan anbefale til andre.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Denne konto har endnu ikke oprettet nogen samlinger.",
+ "empty_column.account_featured_unknown.other": "Denne konto har ikke fremhævet noget endnu.",
"empty_column.account_hides_collections": "Brugeren har valgt ikke at gøre denne information tilgængelig",
"empty_column.account_suspended": "Konto suspenderet",
"empty_column.account_timeline": "Ingen indlæg her!",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 161138483e..15858f7898 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -45,9 +45,6 @@
"account.featured": "Vorgestellt",
"account.featured.accounts": "Profile",
"account.featured.collections": "Sammlungen",
- "account.featured.hashtags": "Hashtags",
- "account.featured_tags.last_status_at": "Neuester Beitrag vom {date}",
- "account.featured_tags.last_status_never": "Keine Beiträge",
"account.field_overflow": "Vollständigen Inhalt anzeigen",
"account.filters.all": "Alle Aktivitäten",
"account.filters.boosts_toggle": "Geteilte Beiträge anzeigen",
@@ -75,6 +72,7 @@
"account.in_memoriam": "Zum Andenken.",
"account.joined_short": "Dabei seit",
"account.languages": "Sprachen verwalten",
+ "account.last_active": "Zuletzt aktiv",
"account.link_verified_on": "Dieser Link wurde am {date} Uhr verifiziert",
"account.locked_info": "Die Privatsphäre dieses Kontos wurde auf „geschützt“ gesetzt. Die Person bestimmt manuell, wer ihrem Profil folgen darf.",
"account.media": "Medien",
@@ -375,15 +373,14 @@
"collections.create_collection": "Sammlung erstellen",
"collections.delete_collection": "Sammlung löschen",
"collections.description_length_hint": "Maximal 100 Zeichen",
- "collections.detail.accept_inclusion": "Einverstanden",
"collections.detail.accounts_heading": "Konten",
+ "collections.detail.author_added_you_on_date": "{author} fügte dich am {date} hinzu",
"collections.detail.loading": "Sammlung wird geladen …",
- "collections.detail.other_accounts_count": "{count, plural, one {# weiteres Konto} other {# weitere Konten}}",
"collections.detail.revoke_inclusion": "Mich entfernen",
"collections.detail.sensitive_content": "Inhaltswarnung",
"collections.detail.sensitive_note": "Diese Sammlung enthält Profile und Inhalte, die manche als anstößig empfinden.",
"collections.detail.share": "Sammlung teilen",
- "collections.detail.you_were_added_to_this_collection": "Du wurdest dieser Sammlung hinzugefügt",
+ "collections.detail.you_are_in_this_collection": "Du bist ein Teil dieser Sammlung",
"collections.edit_details": "Details bearbeiten",
"collections.error_loading_collections": "Beim Laden deiner Sammlungen ist ein Fehler aufgetreten.",
"collections.hints.accounts_counter": "{count}/{max} Konten",
@@ -606,9 +603,15 @@
"emoji_button.search_results": "Suchergebnisse",
"emoji_button.symbols": "Symbole",
"emoji_button.travel": "Reisen & Orte",
- "empty_column.account_featured.me": "Du hast bisher noch nichts vorgestellt. Wusstest du, dass du deine häufig verwendeten Hashtags und sogar Profile von Freund*innen vorstellen kannst?",
"empty_column.account_featured.other": "{acct} hat bisher noch nichts vorgestellt. Wusstest du, dass du deine häufig verwendeten Hashtags und sogar Profile von Freund*innen vorstellen kannst?",
- "empty_column.account_featured_other.unknown": "Dieses Profil hat bisher noch nichts vorgestellt.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} hat noch keine Sammlungen erstellt.",
+ "empty_column.account_featured_other.title": "Hier gibt es nichts zu sehen",
+ "empty_column.account_featured_self.no_collections": "Noch keine Sammlungen",
+ "empty_column.account_featured_self.no_collections_button": "Sammlung erstellen",
+ "empty_column.account_featured_self.pre_collections": "Sammlungen sind bald verfügbar",
+ "empty_column.account_featured_self.pre_collections_desc": "Mit Sammlungen (neue Funktion in Mastodon 4.6) kannst du deine eigenen kuratierten Listen erstellen, um ausgewählte Konten zu empfehlen.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Dieser Account hat noch keine Sammlungen erstellt.",
+ "empty_column.account_featured_unknown.other": "Dieser Account hat noch nichts vorgestellt.",
"empty_column.account_hides_collections": "Das Profil hat sich entschieden, diese Information nicht zu veröffentlichen",
"empty_column.account_suspended": "Konto dauerhaft gesperrt",
"empty_column.account_timeline": "Keine Beiträge vorhanden!",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 6ac8c8fbff..b29ac5f713 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -45,9 +45,6 @@
"account.featured": "Αναδεδειγμένα",
"account.featured.accounts": "Προφίλ",
"account.featured.collections": "Συλλογές",
- "account.featured.hashtags": "Ετικέτες",
- "account.featured_tags.last_status_at": "Τελευταία ανάρτηση στις {date}",
- "account.featured_tags.last_status_never": "Καμία ανάρτηση",
"account.field_overflow": "Εμφάνιση πλήρους περιεχομένου",
"account.filters.all": "Όλη η δραστηριότητα",
"account.filters.boosts_toggle": "Εμφάνιση ενισχύσεων",
@@ -75,6 +72,7 @@
"account.in_memoriam": "Εις μνήμην.",
"account.joined_short": "Έγινε μέλος",
"account.languages": "Αλλαγή εγγεγραμμένων γλωσσών",
+ "account.last_active": "Τελευταία ενεργός",
"account.link_verified_on": "Η ιδιοκτησία αυτού του συνδέσμου ελέγχθηκε στις {date}",
"account.locked_info": "Η κατάσταση απορρήτου αυτού του λογαριασμού έχει ρυθμιστεί σε κλειδωμένη. Ο ιδιοκτήτης αξιολογεί χειροκίνητα ποιος μπορεί να τον ακολουθήσει.",
"account.media": "Πολυμέσα",
@@ -375,15 +373,14 @@
"collections.create_collection": "Δημιουργία συλλογής",
"collections.delete_collection": "Διαγραφή συλλογής",
"collections.description_length_hint": "Όριο 100 χαρακτήρων",
- "collections.detail.accept_inclusion": "Εντάξει",
"collections.detail.accounts_heading": "Λογαριασμοί",
+ "collections.detail.author_added_you_on_date": "Ο χρήστης {author} σας πρόσθεσε στις {date}",
"collections.detail.loading": "Γίνεται φόρτωση της συλλογής…",
- "collections.detail.other_accounts_count": "{count, plural, one {# άλλος λογαριασμός} other {# άλλοι λογαριασμοί}}",
"collections.detail.revoke_inclusion": "Αφαίρεσε με",
"collections.detail.sensitive_content": "Ευαίσθητο περιεχόμενο",
"collections.detail.sensitive_note": "Αυτή η συλλογή περιέχει λογαριασμούς και περιεχόμενο που μπορεί να είναι ευαίσθητα σε ορισμένους χρήστες.",
"collections.detail.share": "Κοινοποιήστε αυτήν τη συλλογή",
- "collections.detail.you_were_added_to_this_collection": "Έχετε προστεθεί σε αυτήν τη συλλογή",
+ "collections.detail.you_are_in_this_collection": "Είστε αναδεδειγμένοι σε αυτήν τη συλλογή",
"collections.edit_details": "Επεξεργασία λεπτομερειών",
"collections.error_loading_collections": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια φόρτωσης των συλλογών σας.",
"collections.hints.accounts_counter": "{count} / {max} λογαριασμοί",
@@ -606,9 +603,15 @@
"emoji_button.search_results": "Αποτελέσματα αναζήτησης",
"emoji_button.symbols": "Σύμβολα",
"emoji_button.travel": "Ταξίδια & Τοποθεσίες",
- "empty_column.account_featured.me": "Δεν έχεις αναδείξει τίποτα ακόμη. Γνώριζες ότι μπορείς να αναδείξεις τις ετικέτες που χρησιμοποιείς περισσότερο, ακόμη και τους λογαριασμούς των φίλων σου στο προφίλ σου;",
"empty_column.account_featured.other": "Ο/Η {acct} δεν έχει αναδείξει τίποτα ακόμη. Γνώριζες ότι μπορείς να αναδείξεις τις ετικέτες που χρησιμοποιείς περισσότερο, ακόμη και τους λογαριασμούς των φίλων σου στο προφίλ σου;",
- "empty_column.account_featured_other.unknown": "Αυτός ο λογαριασμός δεν έχει αναδείξει τίποτα ακόμη.",
+ "empty_column.account_featured_other.no_collections_desc": "Ο χρήστης {acct} δεν έχει δημιουργήσει ακόμη καμία συλλογή.",
+ "empty_column.account_featured_other.title": "Δεν υπάρχει τίποτα να δείτε εδώ",
+ "empty_column.account_featured_self.no_collections": "Καμία συλλογή ακόμη",
+ "empty_column.account_featured_self.no_collections_button": "Δημιουργήστε μια συλλογή",
+ "empty_column.account_featured_self.pre_collections": "Μείνετε συντονισμένοι για τις Συλλογές",
+ "empty_column.account_featured_self.pre_collections_desc": "Οι Συλλογές (που έρχονται στο Mastodon 4.6) σας επιτρέπουν να δημιουργήσετε τις δικές σας επιμελημένες λίστες λογαριασμών για να συστήσετε σε άλλους.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Αυτός ο λογαριασμός δεν έχει δημιουργήσει ακόμη καμία συλλογή.",
+ "empty_column.account_featured_unknown.other": "Αυτός ο λογαριασμός δεν έχει αναδείξει τίποτα ακόμη.",
"empty_column.account_hides_collections": "Αυτός ο χρήστης έχει επιλέξει να μην καταστήσει αυτές τις πληροφορίες διαθέσιμες",
"empty_column.account_suspended": "Λογαριασμός σε αναστολή",
"empty_column.account_timeline": "Δεν έχει αναρτήσεις εδώ!",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 8636fdef27..ad230de508 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -45,9 +45,6 @@
"account.featured": "Featured",
"account.featured.accounts": "Profiles",
"account.featured.collections": "Collections",
- "account.featured.hashtags": "Hashtags",
- "account.featured_tags.last_status_at": "Last post on {date}",
- "account.featured_tags.last_status_never": "No posts",
"account.field_overflow": "Show full content",
"account.filters.all": "All activity",
"account.filters.boosts_toggle": "Show boosts",
@@ -350,7 +347,6 @@
"collections.create_collection": "Create collection",
"collections.delete_collection": "Delete collection",
"collections.description_length_hint": "100 characters limit",
- "collections.detail.accept_inclusion": "OK",
"collections.detail.accounts_heading": "Accounts",
"collections.detail.loading": "Loading collection…",
"collections.detail.revoke_inclusion": "Remove me",
@@ -568,9 +564,7 @@
"emoji_button.search_results": "Search results",
"emoji_button.symbols": "Symbols",
"emoji_button.travel": "Travel & Places",
- "empty_column.account_featured.me": "You have not featured anything yet. Did you know that you can feature your hashtags you use the most, and even your friend’s accounts on your profile?",
"empty_column.account_featured.other": "{acct} has not featured anything yet. Did you know that you can feature your hashtags you use the most, and even your friend’s accounts on your profile?",
- "empty_column.account_featured_other.unknown": "This account has not featured anything yet.",
"empty_column.account_hides_collections": "This user has chosen not to make this information available",
"empty_column.account_suspended": "Account suspended",
"empty_column.account_timeline": "No posts here!",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 1a67aabf83..97ab396897 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -36,9 +36,6 @@
"account.familiar_followers_two": "Sekvita de {name1} kaj {name2}",
"account.featured": "Elstarigitaj",
"account.featured.accounts": "Profiloj",
- "account.featured.hashtags": "Kradvortoj",
- "account.featured_tags.last_status_at": "Lasta afîŝo je {date}",
- "account.featured_tags.last_status_never": "Neniu afiŝo",
"account.follow": "Sekvi",
"account.follow_back": "Sekvu reen",
"account.follow_back_short": "Sekvu reen",
@@ -316,8 +313,6 @@
"emoji_button.search_results": "Serĉaj rezultoj",
"emoji_button.symbols": "Simboloj",
"emoji_button.travel": "Vojaĝoj kaj lokoj",
- "empty_column.account_featured.me": "Vi ankoraŭ elstarigis nenion. Ĉu vi sciis, ke vi povas elstarigi viajn plej ofte uzatajn kradvortojn, kaj eĉ la kontojn de viaj amikoj sur via profilo?",
- "empty_column.account_featured_other.unknown": "Ĉi tiu konto ankoraŭ ne elstarigis ion ajn.",
"empty_column.account_hides_collections": "Ĉi tiu uzanto elektis ne disponebligi ĉi tiu informon",
"empty_column.account_suspended": "Konto suspendita",
"empty_column.account_timeline": "Neniuj afiŝoj ĉi tie!",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 15a1c7df59..62b046326f 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -45,9 +45,6 @@
"account.featured": "Destacados",
"account.featured.accounts": "Perfiles",
"account.featured.collections": "Colecciones",
- "account.featured.hashtags": "Etiquetas",
- "account.featured_tags.last_status_at": "Último mensaje: {date}",
- "account.featured_tags.last_status_never": "Sin mensajes",
"account.field_overflow": "Mostrar contenido completo",
"account.filters.all": "Toda la actividad",
"account.filters.boosts_toggle": "Mostrar adhesiones",
@@ -75,6 +72,7 @@
"account.in_memoriam": "Cuenta conmemorativa.",
"account.joined_short": "En este servidor desde el",
"account.languages": "Cambiar idiomas suscritos",
+ "account.last_active": "Última actividad",
"account.link_verified_on": "La propiedad de este enlace fue verificada el {date}",
"account.locked_info": "Esta cuenta es privada. El propietario manualmente revisa quién puede seguirle.",
"account.media": "Medios",
@@ -375,15 +373,14 @@
"collections.create_collection": "Crear colección",
"collections.delete_collection": "Eliminar colección",
"collections.description_length_hint": "Límite de 100 caracteres",
- "collections.detail.accept_inclusion": "Aceptar",
"collections.detail.accounts_heading": "Cuentas",
+ "collections.detail.author_added_you_on_date": "{author} te agregó el {date}",
"collections.detail.loading": "Cargando colección…",
- "collections.detail.other_accounts_count": "{count, plural, one {# hora} other {# horas}}",
"collections.detail.revoke_inclusion": "Quitarme",
"collections.detail.sensitive_content": "Contenido sensible",
"collections.detail.sensitive_note": "Esta colección contiene cuentas y contenido que pueden ser sensibles a algunos usuarios.",
"collections.detail.share": "Compartir esta colección",
- "collections.detail.you_were_added_to_this_collection": "Te agregaron a esta colección",
+ "collections.detail.you_are_in_this_collection": "Te destacaron en esta colección",
"collections.edit_details": "Editar detalles",
"collections.error_loading_collections": "Hubo un error al intentar cargar tus colecciones.",
"collections.hints.accounts_counter": "{count} / {max} cuentas",
@@ -606,9 +603,15 @@
"emoji_button.search_results": "Resultados de búsqueda",
"emoji_button.symbols": "Símbolos",
"emoji_button.travel": "Viajes y lugares",
- "empty_column.account_featured.me": "Todavía no destacaste nada. ¿Sabías que en tu perfil podés destacar tus etiquetas que más usás e incluso las cuentas de tus contactos?",
"empty_column.account_featured.other": "{acct} todavía no destacó nada. ¿Sabías que en tu perfil podés destacar tus etiquetas que más usás e incluso las cuentas de tus contactos?",
- "empty_column.account_featured_other.unknown": "Esta cuenta todavía no destacó nada.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} todavía no creó ninguna colección.",
+ "empty_column.account_featured_other.title": "No hay nada por acá",
+ "empty_column.account_featured_self.no_collections": "No hay colecciones aún",
+ "empty_column.account_featured_self.no_collections_button": "Crear colección",
+ "empty_column.account_featured_self.pre_collections": "Mantenete pendiente de las colecciones",
+ "empty_column.account_featured_self.pre_collections_desc": "Las colecciones (que vendrán en Mastodon 4.6) te permite crear tus propias listas de cuentas seleccionadas para recomendar a otras personas.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Esta cuenta todavía no creó ninguna colección.",
+ "empty_column.account_featured_unknown.other": "Esta cuenta todavía no destacó nada.",
"empty_column.account_hides_collections": "Este usuario eligió no publicar esta información",
"empty_column.account_suspended": "Cuenta suspendida",
"empty_column.account_timeline": "¡No hay mensajes acá!",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 8acc320358..7fcffc98f7 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -45,9 +45,6 @@
"account.featured": "Destacado",
"account.featured.accounts": "Perfiles",
"account.featured.collections": "Colecciones",
- "account.featured.hashtags": "Etiquetas",
- "account.featured_tags.last_status_at": "Última publicación el {date}",
- "account.featured_tags.last_status_never": "Sin publicaciones",
"account.field_overflow": "Mostrar contenido completo",
"account.filters.all": "Toda la actividad",
"account.filters.boosts_toggle": "Mostrar impulsos",
@@ -75,6 +72,7 @@
"account.in_memoriam": "En memoria.",
"account.joined_short": "Se unió",
"account.languages": "Cambiar idiomas suscritos",
+ "account.last_active": "Última actividad",
"account.link_verified_on": "Se verificó la propiedad de este enlace el {date}",
"account.locked_info": "El estado de privacidad de esta cuenta está configurado como bloqueado. El propietario revisa manualmente quién puede seguirlo.",
"account.media": "Multimedia",
@@ -375,15 +373,14 @@
"collections.create_collection": "Crear colección",
"collections.delete_collection": "Eliminar colección",
"collections.description_length_hint": "Limitado a 100 caracteres",
- "collections.detail.accept_inclusion": "Aceptar",
"collections.detail.accounts_heading": "Cuentas",
+ "collections.detail.author_added_you_on_date": "{author} te agregó el {date}",
"collections.detail.loading": "Cargando colección…",
- "collections.detail.other_accounts_count": "{count, plural,one {# otra cuenta} other {# otras cuentas}}",
"collections.detail.revoke_inclusion": "Excluirme",
"collections.detail.sensitive_content": "Contenido sensible",
"collections.detail.sensitive_note": "Esta colección contiene cuentas y contenido que pueden resultar sensibles para algunos usuarios.",
"collections.detail.share": "Compartir esta colección",
- "collections.detail.you_were_added_to_this_collection": "Se te ha añadido a esta colección",
+ "collections.detail.you_are_in_this_collection": "Apareces en esta colección",
"collections.edit_details": "Editar detalles",
"collections.error_loading_collections": "Se produjo un error al intentar cargar tus colecciones.",
"collections.hints.accounts_counter": "{count} / {max} cuentas",
@@ -582,12 +579,12 @@
"dropdown.empty": "Elige una opción",
"email_subscriptions.email": "Dirección de correo electrónico",
"email_subscriptions.form.action": "Suscribirse",
- "email_subscriptions.form.disclaimer": "Puedes darte de baja en cualquier momento. Para obtener más información, consulta la Política de Privacidad.",
- "email_subscriptions.form.lead": "Obtén mensajes en tu bandeja de entrada sin crear una cuenta de Mastodon.",
+ "email_subscriptions.form.disclaimer": "Puedes darte de baja en cualquier momento. Para obtener más información, consulta la Política de privacidad.",
+ "email_subscriptions.form.lead": "Recibe publicaciones en tu bandeja de entrada sin necesidad de crear una cuenta de Mastodon.",
"email_subscriptions.form.title": "Suscríbete para recibir actualizaciones por correo electrónico de {name}",
- "email_subscriptions.submitted.lead": "Revisa tu bandeja de entrada para terminar de susbcribirte y recibir actualizaciones por correo electrónico.",
+ "email_subscriptions.submitted.lead": "Revisa tu bandeja de entrada para encontrar el correo electrónico que te permitirá completar tu suscripción a las actualizaciones por correo electrónico.",
"email_subscriptions.submitted.title": "Un paso más",
- "email_subscriptions.validation.email.blocked": "Proveedor de correo bloqueado",
+ "email_subscriptions.validation.email.blocked": "Proveedor de correo electrónico bloqueado",
"email_subscriptions.validation.email.invalid": "Dirección de correo electrónico no válida",
"embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.",
"embed.preview": "Así es como se verá:",
@@ -606,9 +603,15 @@
"emoji_button.search_results": "Resultados de búsqueda",
"emoji_button.symbols": "Símbolos",
"emoji_button.travel": "Viajes y lugares",
- "empty_column.account_featured.me": "Aún no has destacado nada. ¿Sabías que puedes destacar las etiquetas que más usas e incluso las cuentas de tus amigos en tu perfil?",
"empty_column.account_featured.other": "{acct} no ha destacado nada todavía. ¿Sabías que puedes destacar las etiquetas que más usas e incluso las cuentas de tus amigos en tu perfil?",
- "empty_column.account_featured_other.unknown": "Esta cuenta no ha destacado nada todavía.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} aún no ha creado ninguna colección.",
+ "empty_column.account_featured_other.title": "Aquí no hay nada que ver",
+ "empty_column.account_featured_self.no_collections": "Aún no hay colecciones",
+ "empty_column.account_featured_self.no_collections_button": "Crear una colección",
+ "empty_column.account_featured_self.pre_collections": "No te pierdas las colecciones",
+ "empty_column.account_featured_self.pre_collections_desc": "Las colecciones (disponibles en Mastodon 4.6) te permiten crear tus propias listas seleccionadas de cuentas para recomendarlas a otras personas.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Esta cuenta aún no ha creado ninguna colección.",
+ "empty_column.account_featured_unknown.other": "Esta cuenta no ha destacado nada todavía.",
"empty_column.account_hides_collections": "Este usuario ha elegido no hacer disponible esta información",
"empty_column.account_suspended": "Cuenta suspendida",
"empty_column.account_timeline": "¡No hay publicaciones aquí!",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 9581142c86..d7d0c3e8b1 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -45,9 +45,6 @@
"account.featured": "Destacado",
"account.featured.accounts": "Perfiles",
"account.featured.collections": "Colecciones",
- "account.featured.hashtags": "Etiquetas",
- "account.featured_tags.last_status_at": "Última publicación el {date}",
- "account.featured_tags.last_status_never": "Sin publicaciones",
"account.field_overflow": "Mostrar contenido completo",
"account.filters.all": "Toda la actividad",
"account.filters.boosts_toggle": "Mostrar impulsos",
@@ -75,6 +72,7 @@
"account.in_memoriam": "Cuenta conmemorativa.",
"account.joined_short": "Se unió",
"account.languages": "Cambiar idiomas suscritos",
+ "account.last_active": "Última conexión",
"account.link_verified_on": "La propiedad de este enlace fue verificada el {date}",
"account.locked_info": "El estado de privacidad de esta cuenta está configurado como bloqueado. El proprietario debe revisar manualmente quien puede seguirle.",
"account.media": "Multimedia",
@@ -375,15 +373,14 @@
"collections.create_collection": "Crear colección",
"collections.delete_collection": "Eliminar colección",
"collections.description_length_hint": "Limitado a 100 caracteres",
- "collections.detail.accept_inclusion": "De acuerdo",
"collections.detail.accounts_heading": "Cuentas",
+ "collections.detail.author_added_you_on_date": "{author} te agregó el {date}",
"collections.detail.loading": "Cargando colección…",
- "collections.detail.other_accounts_count": "{count, plural, one {# otra cuenta} other {# otras cuentas}}",
"collections.detail.revoke_inclusion": "Sácame de aquí",
"collections.detail.sensitive_content": "Contenido sensible",
"collections.detail.sensitive_note": "Esta colección contiene cuentas y contenido que puede ser sensible para algunos usuarios.",
"collections.detail.share": "Compartir esta colección",
- "collections.detail.you_were_added_to_this_collection": "Has sido añadido a esta colección",
+ "collections.detail.you_are_in_this_collection": "Apareces en esta colección",
"collections.edit_details": "Editar detalles",
"collections.error_loading_collections": "Se ha producido un error al intentar cargar tus colecciones.",
"collections.hints.accounts_counter": "{count} / {max} cuentas",
@@ -606,9 +603,15 @@
"emoji_button.search_results": "Resultados de búsqueda",
"emoji_button.symbols": "Símbolos",
"emoji_button.travel": "Viajes y lugares",
- "empty_column.account_featured.me": "Aún no has destacado nada. ¿Sabías que puedes destacar las etiquetas que más usas e incluso las cuentas de tus amigos en tu perfil?",
"empty_column.account_featured.other": "{acct} aún no ha destacado nada. ¿Sabías que puedes destacar las etiquetas que más usas e incluso las cuentas de tus amigos en tu perfil?",
- "empty_column.account_featured_other.unknown": "Esta cuenta aún no ha destacado nada.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} aún no ha creado ninguna colección.",
+ "empty_column.account_featured_other.title": "Nada que ver aquí",
+ "empty_column.account_featured_self.no_collections": "Aún no hay colecciones",
+ "empty_column.account_featured_self.no_collections_button": "Crear una colección",
+ "empty_column.account_featured_self.pre_collections": "No te pierdas las Colecciones",
+ "empty_column.account_featured_self.pre_collections_desc": "Las colecciones (disponibles en Mastodon 4.6) te permiten crear tus propias listas seleccionadas de cuentas para recomendarlas a otras personas.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Esta cuenta aún no ha creado ninguna colección.",
+ "empty_column.account_featured_unknown.other": "Esta cuenta no ha destacado nada todavía.",
"empty_column.account_hides_collections": "Este usuario ha decidido no mostrar esta información",
"empty_column.account_suspended": "Cuenta suspendida",
"empty_column.account_timeline": "¡No hay publicaciones aquí!",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 9348f06aaf..23fd0f0853 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -45,9 +45,6 @@
"account.featured": "Esiletõstetud",
"account.featured.accounts": "Profiilid",
"account.featured.collections": "Kogud",
- "account.featured.hashtags": "Teemaviited",
- "account.featured_tags.last_status_at": "Viimane postitus: {date}",
- "account.featured_tags.last_status_never": "Postitusi pole",
"account.field_overflow": "Näita kogu sisu",
"account.filters.all": "Kõik tegevused",
"account.filters.boosts_toggle": "Näita hooandmisi",
@@ -447,9 +444,7 @@
"emoji_button.search_results": "Otsitulemused",
"emoji_button.symbols": "Sümbolid",
"emoji_button.travel": "Reisimine & kohad",
- "empty_column.account_featured.me": "Sa pole veel midagi esile tõstnud. Kas sa teadsid, et oma profiilis saad esile tõsta enamkasutatavaid teemaviiteid või sõbra kasutajakontot?",
"empty_column.account_featured.other": "{acct} pole veel midagi esile tõstnud. Kas sa teadsid, et oma profiilis saad esile tõsta enamkasutatavaid teemaviiteid või sõbra kasutajakontot?",
- "empty_column.account_featured_other.unknown": "See kasutajakonto pole veel midagi esile tõstnud.",
"empty_column.account_hides_collections": "See kasutaja otsustas mitte teha seda infot saadavaks",
"empty_column.account_suspended": "Konto kustutatud",
"empty_column.account_timeline": "Siin postitusi ei ole!",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index fdc27f5f34..576297b5ee 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -36,9 +36,6 @@
"account.familiar_followers_two": "{name1}-k eta {name2}-k jarraitzen dute",
"account.featured": "Gailenak",
"account.featured.accounts": "Profilak",
- "account.featured.hashtags": "Traolak",
- "account.featured_tags.last_status_at": "Azken bidalketa {date} datan",
- "account.featured_tags.last_status_never": "Bidalketarik ez",
"account.follow": "Jarraitu",
"account.follow_back": "Jarraitu bueltan",
"account.follow_back_short": "Jarraitu bueltan",
@@ -358,9 +355,7 @@
"emoji_button.search_results": "Bilaketaren emaitzak",
"emoji_button.symbols": "Sinboloak",
"emoji_button.travel": "Bidaiak eta tokiak",
- "empty_column.account_featured.me": "Oraindik ez duzu ezer nabarmendu. Ba al zenekien gehien erabiltzen dituzun traolak eta baita zure lagunen kontuak ere zure profilean nabarmendu ditzakezula?",
"empty_column.account_featured.other": "{acct}-ek ez du ezer nabarmendu oraindik. Ba al zenekien gehien erabiltzen dituzun traolak eta baita zure lagunen kontuak ere zure profilean nabarmendu ditzakezula?",
- "empty_column.account_featured_other.unknown": "Kontu honek ez du ezer nabarmendu oraindik.",
"empty_column.account_hides_collections": "Erabiltzaile honek informazio hau erabilgarri ez egotea aukeratu du.",
"empty_column.account_suspended": "Kanporatutako kontua",
"empty_column.account_timeline": "Ez dago bidalketarik hemen!",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 448b0b0de7..a4caa072f5 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -36,9 +36,6 @@
"account.familiar_followers_two": "پیگرفته از سوی {name1} و {name2}",
"account.featured": "پیشنهادی",
"account.featured.accounts": "نمایهها",
- "account.featured.hashtags": "برچسبها",
- "account.featured_tags.last_status_at": "آخرین فرسته در {date}",
- "account.featured_tags.last_status_never": "بدون فرسته",
"account.follow": "پیگرفتن",
"account.follow_back": "پیگیری متقابل",
"account.follow_back_short": "پیگیری متقابل",
@@ -358,9 +355,7 @@
"emoji_button.search_results": "نتایج جستوجو",
"emoji_button.symbols": "نمادها",
"emoji_button.travel": "سفر و مکان",
- "empty_column.account_featured.me": "شما هنوز هیچ چیزی را پیشنهاد نکردهاید. میدانستید که میتوانید برچسبهایی که بیشتر استفاده میکنید و حتی حسابهای کاربری دوستانتان را در نمایه خودتان پیشنهاد کنید؟",
"empty_column.account_featured.other": "{acct} هنوز هیچ چیزی را پیشنهاد نکرده است. آیا میدانستید که میتوانید برچسبهایی را که بیشتر استفاده میکنید و حتی حسابهای کاربری دوستانتان را در نمایه خود پیشنهاد کنید؟",
- "empty_column.account_featured_other.unknown": "این حساب هنوز چیزی را پیشنهاد نکرده.",
"empty_column.account_hides_collections": "کاربر خواسته که این اطّلاعات در دسترس نباشند",
"empty_column.account_suspended": "حساب معلق شد",
"empty_column.account_timeline": "هیچ فرستهای اینجا نیست!",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index c11404f0ca..4ff131f19e 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -45,9 +45,6 @@
"account.featured": "Esittelyssä",
"account.featured.accounts": "Profiilit",
"account.featured.collections": "Kokoelmat",
- "account.featured.hashtags": "Aihetunnisteet",
- "account.featured_tags.last_status_at": "Viimeisin julkaisu {date}",
- "account.featured_tags.last_status_never": "Ei julkaisuja",
"account.field_overflow": "Näytä koko sisältö",
"account.filters.all": "Kaikki toiminta",
"account.filters.boosts_toggle": "Näytä tehostukset",
@@ -75,6 +72,7 @@
"account.in_memoriam": "Muistoissamme.",
"account.joined_short": "Liittynyt",
"account.languages": "Vaihda tilattuja kieliä",
+ "account.last_active": "Viimeksi aktiivisena",
"account.link_verified_on": "Linkin omistus tarkistettiin {date}",
"account.locked_info": "Tilin yksityisyystilaksi on määritetty lukittu. Tilin omistaja arvioi erikseen, kuka voi seurata häntä.",
"account.media": "Media",
@@ -375,15 +373,14 @@
"collections.create_collection": "Luo kokoelma",
"collections.delete_collection": "Poista kokoelma",
"collections.description_length_hint": "100 merkin rajoitus",
- "collections.detail.accept_inclusion": "Selvä",
"collections.detail.accounts_heading": "Tilit",
+ "collections.detail.author_added_you_on_date": "{author} lisäsi sinut {date}",
"collections.detail.loading": "Ladataan kokoelmaa…",
- "collections.detail.other_accounts_count": "{count, plural, one {# muu tili} other {# muuta tiliä}}",
"collections.detail.revoke_inclusion": "Poista minut",
"collections.detail.sensitive_content": "Arkaluonteista sisältöä",
"collections.detail.sensitive_note": "Tämä kokoelma sisältää tilejä ja sisältöä, jotka saattavat olla arkaluonteisia joillekin käyttäjille.",
"collections.detail.share": "Jaa tämä kokoelma",
- "collections.detail.you_were_added_to_this_collection": "Sinut lisättiin tähän kokoelmaan",
+ "collections.detail.you_are_in_this_collection": "Esiinnyt tässä kokoelmassa",
"collections.edit_details": "Muokkaa tietoja",
"collections.error_loading_collections": "Kokoelmien latauksessa tapahtui virhe.",
"collections.hints.accounts_counter": "{count} / {max} tiliä",
@@ -606,9 +603,15 @@
"emoji_button.search_results": "Hakutulokset",
"emoji_button.symbols": "Symbolit",
"emoji_button.travel": "Matkailu ja paikat",
- "empty_column.account_featured.me": "Et esittele vielä mitään. Tiesitkö, että voit esitellä profiilissasi eniten käyttämiäsi aihetunnisteita ja jopa ystäviesi tilejä?",
"empty_column.account_featured.other": "{acct} ei esittele vielä mitään. Tiesitkö, että voit esitellä profiilissasi eniten käyttämiäsi aihetunnisteita ja jopa ystäviesi tilejä?",
- "empty_column.account_featured_other.unknown": "Tämä tili ei esittele vielä mitään.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} ei ole luonut vielä yhtään kokoelmaa.",
+ "empty_column.account_featured_other.title": "Täällä ei mitään nähtävää",
+ "empty_column.account_featured_self.no_collections": "Ei vielä kokoelmia",
+ "empty_column.account_featured_self.no_collections_button": "Luo kokoelma",
+ "empty_column.account_featured_self.pre_collections": "Ole valmiina kokoelmiin",
+ "empty_column.account_featured_self.pre_collections_desc": "Kokoelmien (tulossa Mastodon 4.6:ssa) avulla voit luoda valikoidun listan muille suosittelemiasi tilejä.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Tämä tili ei ole luonut vielä yhtään kokoelmaa.",
+ "empty_column.account_featured_unknown.other": "Tämä tili ei esittele vielä mitään.",
"empty_column.account_hides_collections": "Käyttäjä on päättänyt pitää nämä tiedot yksityisinä",
"empty_column.account_suspended": "Tili jäädytetty",
"empty_column.account_timeline": "Ei julkaisuja täällä!",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 688fe4140b..44b6500fce 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -36,9 +36,6 @@
"account.familiar_followers_two": "Sinusindan nina {name1} at {name2}",
"account.featured": "Itinatampok",
"account.featured.accounts": "Mga Profile",
- "account.featured.hashtags": "Mga Hashtag",
- "account.featured_tags.last_status_at": "Huling post noong {date}",
- "account.featured_tags.last_status_never": "Walang mga post",
"account.follow": "Sundan",
"account.follow_back": "Sundan pabalik",
"account.follow_back_short": "I-follow back",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 8e921c58bf..98eca98c80 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -45,9 +45,6 @@
"account.featured": "Sermerkt",
"account.featured.accounts": "Vangar",
"account.featured.collections": "Søvn",
- "account.featured.hashtags": "Frámerki",
- "account.featured_tags.last_status_at": "Seinasta strongur skrivaður {date}",
- "account.featured_tags.last_status_never": "Einki uppslag",
"account.field_overflow": "Vís alt innihaldið",
"account.filters.all": "Alt virksemi",
"account.filters.boosts_toggle": "Vís stimbranir",
@@ -507,9 +504,7 @@
"emoji_button.search_results": "Leitiúrslit",
"emoji_button.symbols": "Ímyndir",
"emoji_button.travel": "Ferðing og støð",
- "empty_column.account_featured.me": "Tú hevur ikki tikið nakað fram enn. Visti tú, at tú kanst taka fram tey frámerki, tú brúkar mest, og sjálvt kontur hjá vinum tínum á vangan hjá tær?",
"empty_column.account_featured.other": "{acct} hevur ikki tikið nakað fram enn. Visti tú, at tú kanst taka fram tey frámerki, tú brúkar mest, og sjálvt kontur hjá vinum tínum á vangan hjá tær?",
- "empty_column.account_featured_other.unknown": "Hendan kontan hevur ikki tikið nakað fram enn.",
"empty_column.account_hides_collections": "Hesin brúkarin hevur valt, at hesar upplýsingarnar ikki skulu vera tøkar",
"empty_column.account_suspended": "Kontan gjørd óvirkin",
"empty_column.account_timeline": "Einki uppslag her!",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index a220f4af49..d084cfbd42 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -45,9 +45,6 @@
"account.featured": "En vedette",
"account.featured.accounts": "Profils",
"account.featured.collections": "Collections",
- "account.featured.hashtags": "Hashtags",
- "account.featured_tags.last_status_at": "Dernière publication {date}",
- "account.featured_tags.last_status_never": "Aucune publication",
"account.field_overflow": "Voir tout",
"account.filters.all": "Toutes les activités",
"account.filters.boosts_toggle": "Afficher les partages",
@@ -375,10 +372,10 @@
"collections.create_collection": "Créer une collection",
"collections.delete_collection": "Supprimer la collection",
"collections.description_length_hint": "Maximum 100 caractères",
- "collections.detail.accept_inclusion": "D'accord",
"collections.detail.accounts_heading": "Comptes",
"collections.detail.loading": "Chargement de la collection…",
"collections.detail.revoke_inclusion": "Me retirer",
+ "collections.detail.sensitive_content": "Contenu sensible",
"collections.detail.sensitive_note": "Cette collection contient des comptes et du contenu qui peut être sensibles.",
"collections.detail.share": "Partager la collection",
"collections.edit_details": "Modifier les détails",
@@ -536,6 +533,7 @@
"content_warning.hide": "Masquer le message",
"content_warning.show": "Montrer quand même",
"content_warning.show_more": "Montrer plus",
+ "content_warning.show_short": "Afficher",
"conversation.delete": "Supprimer cette conversation",
"conversation.mark_as_read": "Marquer comme lu",
"conversation.open": "Afficher cette conversation",
@@ -576,6 +574,15 @@
"domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.",
"domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de rencontrer des utilisateur·rice·s ayant le même nom d'utilisateur sur différents serveurs.",
"dropdown.empty": "Sélectionner une option",
+ "email_subscriptions.email": "Adresse e-mail",
+ "email_subscriptions.form.action": "S’abonner",
+ "email_subscriptions.form.disclaimer": "Vous pouvez vous désabonner à tout moment. Pour plus d'informations, référez-vous à la politique de confidentialité.",
+ "email_subscriptions.form.lead": "Recevez les publications dans votre boîte de réception sans créer de compte Mastodon.",
+ "email_subscriptions.form.title": "Inscrivez-vous pour recevoir les mises à jour de {name} par e-mail",
+ "email_subscriptions.submitted.lead": "Vérifiez votre boîte de réception pour trouver l'e-mail de finalisation de votre inscription aux mises à jour par e-mails.",
+ "email_subscriptions.submitted.title": "Une dernière chose",
+ "email_subscriptions.validation.email.blocked": "Fournisseur de messagerie bloqué",
+ "email_subscriptions.validation.email.invalid": "Adresse email invalide",
"embed.instructions": "Intégrez cette publication à votre site en copiant le code ci-dessous.",
"embed.preview": "Voici comment il apparaîtra:",
"emoji_button.activity": "Activité",
@@ -593,9 +600,7 @@
"emoji_button.search_results": "Résultats",
"emoji_button.symbols": "Symboles",
"emoji_button.travel": "Voyage et lieux",
- "empty_column.account_featured.me": "Vous n'avez pas encore mis de contenu en avant. Saviez-vous que vous pouviez mettre en avant les hashtags que vous utilisez le plus, et même les comptes de vos amis sur votre profil ?",
"empty_column.account_featured.other": "{acct} n'a pas encore mis de contenu en avant. Saviez-vous que vous pouviez mettre en avant les hashtags que vous utilisez le plus, et même les comptes de vos amis sur votre profil ?",
- "empty_column.account_featured_other.unknown": "Ce compte n'a mis aucun contenu en avant pour l'instant.",
"empty_column.account_hides_collections": "Cet utilisateur·ice préfère ne pas rendre publiques ces informations",
"empty_column.account_suspended": "Compte suspendu",
"empty_column.account_timeline": "Aucune publication ici!",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index f7efa068b2..4c1c0ee43b 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -45,9 +45,6 @@
"account.featured": "En vedette",
"account.featured.accounts": "Profils",
"account.featured.collections": "Collections",
- "account.featured.hashtags": "Hashtags",
- "account.featured_tags.last_status_at": "Dernier message le {date}",
- "account.featured_tags.last_status_never": "Aucun message",
"account.field_overflow": "Voir tout",
"account.filters.all": "Toutes les activités",
"account.filters.boosts_toggle": "Afficher les partages",
@@ -375,10 +372,10 @@
"collections.create_collection": "Créer une collection",
"collections.delete_collection": "Supprimer la collection",
"collections.description_length_hint": "Maximum 100 caractères",
- "collections.detail.accept_inclusion": "D'accord",
"collections.detail.accounts_heading": "Comptes",
"collections.detail.loading": "Chargement de la collection…",
"collections.detail.revoke_inclusion": "Me retirer",
+ "collections.detail.sensitive_content": "Contenu sensible",
"collections.detail.sensitive_note": "Cette collection contient des comptes et du contenu qui peut être sensibles.",
"collections.detail.share": "Partager la collection",
"collections.edit_details": "Modifier les détails",
@@ -536,6 +533,7 @@
"content_warning.hide": "Masquer le message",
"content_warning.show": "Montrer quand même",
"content_warning.show_more": "Montrer plus",
+ "content_warning.show_short": "Afficher",
"conversation.delete": "Supprimer la conversation",
"conversation.mark_as_read": "Marquer comme lu",
"conversation.open": "Afficher la conversation",
@@ -576,6 +574,15 @@
"domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.",
"domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de rencontrer des utilisateur·rice·s ayant le même nom d'utilisateur sur différents serveurs.",
"dropdown.empty": "Sélectionner une option",
+ "email_subscriptions.email": "Adresse e-mail",
+ "email_subscriptions.form.action": "S’abonner",
+ "email_subscriptions.form.disclaimer": "Vous pouvez vous désabonner à tout moment. Pour plus d'informations, référez-vous à la politique de confidentialité.",
+ "email_subscriptions.form.lead": "Recevez les publications dans votre boîte de réception sans créer de compte Mastodon.",
+ "email_subscriptions.form.title": "Inscrivez-vous pour recevoir les mises à jour de {name} par e-mail",
+ "email_subscriptions.submitted.lead": "Vérifiez votre boîte de réception pour trouver l'e-mail de finalisation de votre inscription aux mises à jour par e-mails.",
+ "email_subscriptions.submitted.title": "Une dernière chose",
+ "email_subscriptions.validation.email.blocked": "Fournisseur de messagerie bloqué",
+ "email_subscriptions.validation.email.invalid": "Adresse email invalide",
"embed.instructions": "Intégrer ce message à votre site en copiant le code ci-dessous.",
"embed.preview": "Il apparaîtra comme cela :",
"emoji_button.activity": "Activités",
@@ -593,9 +600,7 @@
"emoji_button.search_results": "Résultats de la recherche",
"emoji_button.symbols": "Symboles",
"emoji_button.travel": "Voyage et lieux",
- "empty_column.account_featured.me": "Vous n'avez pas encore mis de contenu en avant. Saviez-vous que vous pouviez mettre en avant les hashtags que vous utilisez le plus, et même les comptes de vos amis sur votre profil ?",
"empty_column.account_featured.other": "{acct} n'a pas encore mis de contenu en avant. Saviez-vous que vous pouviez mettre en avant les hashtags que vous utilisez le plus, et même les comptes de vos amis sur votre profil ?",
- "empty_column.account_featured_other.unknown": "Ce compte n'a mis aucun contenu en avant pour l'instant.",
"empty_column.account_hides_collections": "Cet utilisateur·ice préfère ne pas rendre publiques ces informations",
"empty_column.account_suspended": "Compte suspendu",
"empty_column.account_timeline": "Aucun message ici !",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index edc972afbc..49aa8c3db5 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -35,9 +35,6 @@
"account.familiar_followers_two": "Folge troch {name1} en {name2}",
"account.featured": "Foarsteld",
"account.featured.accounts": "Profilen",
- "account.featured.hashtags": "Hashtags",
- "account.featured_tags.last_status_at": "Lêste berjocht op {date}",
- "account.featured_tags.last_status_never": "Gjin berjochten",
"account.follow": "Folgje",
"account.follow_back": "Weromfolgje",
"account.followers": "Folgers",
@@ -288,9 +285,7 @@
"emoji_button.search_results": "Sykresultaten",
"emoji_button.symbols": "Symboalen",
"emoji_button.travel": "Reizgje en lokaasjes",
- "empty_column.account_featured.me": "Jo hawwe noch neat útljochte. Wisten jo dat jo jo hashtags dy’t jo it meast brûke, en sels de accounts fan dyn freonen fermelde kinne op jo profyl?",
"empty_column.account_featured.other": "{acct} hat noch neat útljochte. Wisten jo dat jo jo hashtags dy’t jo it meast brûke, en sels de accounts fan dyn freonen fermelde kinne op jo profyl?",
- "empty_column.account_featured_other.unknown": "Dizze account hat noch neat útljochte.",
"empty_column.account_hides_collections": "Dizze brûker hat derfoar keazen dizze ynformaasje net beskikber te meitsjen",
"empty_column.account_suspended": "Account beskoattele",
"empty_column.account_timeline": "Hjir binne gjin berjochten!",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 2b4132f8dd..b71ecbd17b 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -45,9 +45,6 @@
"account.featured": "Faoi thrácht",
"account.featured.accounts": "Próifílí",
"account.featured.collections": "Bailiúcháin",
- "account.featured.hashtags": "Haischlibeanna",
- "account.featured_tags.last_status_at": "Postáil is déanaí ar {date}",
- "account.featured_tags.last_status_never": "Gan aon phoist",
"account.field_overflow": "Taispeáin an t-ábhar iomlán",
"account.filters.all": "Gach gníomhaíocht",
"account.filters.boosts_toggle": "Taispeáin borradh",
@@ -75,6 +72,7 @@
"account.in_memoriam": "Ón tseanaimsir.",
"account.joined_short": "Cláraithe",
"account.languages": "Athraigh teangacha foscríofa",
+ "account.last_active": "Gníomhach deireanach",
"account.link_verified_on": "Seiceáladh úinéireacht an naisc seo ar {date}",
"account.locked_info": "Tá an socrú príobháideachais don cuntas seo curtha go 'faoi ghlas'. Déanann an t-úinéir léirmheas ar cén daoine atá ceadaithe an cuntas leanúint.",
"account.media": "Meáin",
@@ -375,15 +373,14 @@
"collections.create_collection": "Cruthaigh bailiúchán",
"collections.delete_collection": "Scrios bailiúchán",
"collections.description_length_hint": "Teorainn 100 carachtar",
- "collections.detail.accept_inclusion": "Ceart go leor",
"collections.detail.accounts_heading": "Cuntais",
+ "collections.detail.author_added_you_on_date": "Chuir {author} leis thú ar {date}",
"collections.detail.loading": "Ag lódáil an bhailiúcháin…",
- "collections.detail.other_accounts_count": "{count, plural, one {# cuntas eile} two {# cuntais eile} few {# cuntais eile} many {# cuntais eile} other {# cuntais eile}}",
"collections.detail.revoke_inclusion": "Bain mé",
"collections.detail.sensitive_content": "Ábhar íogair",
"collections.detail.sensitive_note": "Tá cuntais agus ábhar sa bhailiúchán seo a d'fhéadfadh a bheith íogair do roinnt úsáideoirí.",
"collections.detail.share": "Comhroinn an bailiúchán seo",
- "collections.detail.you_were_added_to_this_collection": "Cuireadh leis an mbailiúchán seo thú",
+ "collections.detail.you_are_in_this_collection": "Tá tú le feiceáil sa bhailiúchán seo",
"collections.edit_details": "Cuir sonraí in eagar",
"collections.error_loading_collections": "Tharla earráid agus iarracht á déanamh do bhailiúcháin a luchtú.",
"collections.hints.accounts_counter": "{count} / {max} cuntais",
@@ -580,6 +577,15 @@
"domain_pill.your_server": "Do theach digiteach, áit a bhfuil do phoist go léir ina gcónaí. Nach maith leat an ceann seo? Aistrigh freastalaithe am ar bith agus tabhair leat do leantóirí freisin.",
"domain_pill.your_username": "D'aitheantóir uathúil ar an bhfreastalaí seo. Is féidir teacht ar úsáideoirí leis an ainm úsáideora céanna ar fhreastalaithe éagsúla.",
"dropdown.empty": "Roghnaigh rogha",
+ "email_subscriptions.email": "Seoladh ríomhphoist",
+ "email_subscriptions.form.action": "Liostáil",
+ "email_subscriptions.form.disclaimer": "Is féidir leat díliostáil ag am ar bith. Le haghaidh tuilleadh eolais, féach ar an Polasaí Príobháideachais.",
+ "email_subscriptions.form.lead": "Faigh poist i do bhosca isteach gan cuntas Mastodon a chruthú.",
+ "email_subscriptions.form.title": "Cláraigh le haghaidh nuashonruithe ríomhphoist ó {name}",
+ "email_subscriptions.submitted.lead": "Seiceáil do bhosca isteach le haghaidh ríomhphoist chun clárú le haghaidh nuashonruithe ríomhphoist a chríochnú.",
+ "email_subscriptions.submitted.title": "Céim amháin eile",
+ "email_subscriptions.validation.email.blocked": "Soláthraí ríomhphoist blocáilte",
+ "email_subscriptions.validation.email.invalid": "Seoladh ríomhphoist neamhbhailí",
"embed.instructions": "Embed this status on your website by copying the code below.",
"embed.preview": "Seo an chuma a bheidh air:",
"emoji_button.activity": "Gníomhaíocht",
@@ -597,9 +603,15 @@
"emoji_button.search_results": "Torthaí cuardaigh",
"emoji_button.symbols": "Comharthaí",
"emoji_button.travel": "Taisteal ⁊ Áiteanna",
- "empty_column.account_featured.me": "Níl aon rud curtha i láthair agat go fóill. An raibh a fhios agat gur féidir leat na haischlibeanna is mó a úsáideann tú, agus fiú cuntais do chairde, a chur i láthair ar do phróifíl?",
"empty_column.account_featured.other": "Níl aon rud feicthe ag {acct} go fóill. An raibh a fhios agat gur féidir leat na hashtags is mó a úsáideann tú, agus fiú cuntais do chairde, a chur ar do phróifíl?",
- "empty_column.account_featured_other.unknown": "Níl aon rud le feiceáil sa chuntas seo go fóill.",
+ "empty_column.account_featured_other.no_collections_desc": "Níl aon bhailiúcháin cruthaithe ag {acct} go fóill.",
+ "empty_column.account_featured_other.title": "Níl aon rud le feiceáil anseo",
+ "empty_column.account_featured_self.no_collections": "Gan aon bhailiúcháin fós",
+ "empty_column.account_featured_self.no_collections_button": "Cruthaigh bailiúchán",
+ "empty_column.account_featured_self.pre_collections": "Fan tiúnta le haghaidh bailiúcháin",
+ "empty_column.account_featured_self.pre_collections_desc": "Le bailiúcháin (atá ag teacht i Mastodon 4.6) is féidir leat do liostaí cuntas féin a chruthú le moladh do dhaoine eile.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Níl aon bhailiúcháin cruthaithe ag an gcuntas seo go fóill.",
+ "empty_column.account_featured_unknown.other": "Níl aon rud le feiceáil ar an gcuntas seo go fóill.",
"empty_column.account_hides_collections": "Roghnaigh an t-úsáideoir seo gan an fhaisnéis seo a chur ar fáil",
"empty_column.account_suspended": "Cuntas ar fionraí",
"empty_column.account_timeline": "Níl postálacha ar bith anseo!",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index db3325c3ad..dff4868dc2 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -45,9 +45,6 @@
"account.featured": "’Ga bhrosnachadh",
"account.featured.accounts": "Pròifilean",
"account.featured.collections": "Cruinneachaidhean",
- "account.featured.hashtags": "Tagaichean hais",
- "account.featured_tags.last_status_at": "Am post mu dheireadh {date}",
- "account.featured_tags.last_status_never": "Gun phost",
"account.field_overflow": "Seall an t-susbaint shlàn",
"account.filters.all": "A’ ghnìomhachd air fad",
"account.filters.boosts_toggle": "Seall na brosnachaidhean",
@@ -375,7 +372,6 @@
"collections.create_collection": "Cruthaich cruinneachadh",
"collections.delete_collection": "Sguab an cruinneachadh às",
"collections.description_length_hint": "Crìoch de 100 caractar",
- "collections.detail.accept_inclusion": "Taghta",
"collections.detail.accounts_heading": "Cunntasan",
"collections.detail.loading": "A’ luchdadh a’ chruinneachaidh…",
"collections.detail.revoke_inclusion": "Thoir air falbh mi",
@@ -593,9 +589,7 @@
"emoji_button.search_results": "Toraidhean an luirg",
"emoji_button.symbols": "Samhlaidhean",
"emoji_button.travel": "Siubhal ⁊ àitichean",
- "empty_column.account_featured.me": "Chan eil thu a’ brosnachadh dad fhathast. An robh fios agad gur urrainn dhut na tagaichean hais a chleachdas tu as trice agus fiù ’s cunntasan do charaidean a bhrosnachadh air a’ phròifil agad?",
"empty_column.account_featured.other": "Chan eil {acct} a’ brosnachadh dad fhathast. An robh fios agad gur urrainn dhut na tagaichean hais a chleachdas tu as trice agus fiù ’s cunntasan do charaidean a bhrosnachadh air a’ phròifil agad?",
- "empty_column.account_featured_other.unknown": "Chan eil an cunntas seo a’ brosnachadh dad fhathast.",
"empty_column.account_hides_collections": "Chuir an cleachdaiche seo roimhe nach eil am fiosrachadh seo ri fhaighinn",
"empty_column.account_suspended": "Chaidh an cunntas a chur à rèim",
"empty_column.account_timeline": "Chan eil post an-seo!",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index dc76fc3364..089a822de6 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -45,9 +45,6 @@
"account.featured": "Destacado",
"account.featured.accounts": "Perfís",
"account.featured.collections": "Coleccións",
- "account.featured.hashtags": "Cancelos",
- "account.featured_tags.last_status_at": "Última publicación o {date}",
- "account.featured_tags.last_status_never": "Sen publicacións",
"account.field_overflow": "Mostrar contido completo",
"account.filters.all": "Toda actividade",
"account.filters.boosts_toggle": "Mostrar promocións",
@@ -75,6 +72,7 @@
"account.in_memoriam": "Lembranzas.",
"account.joined_short": "Uniuse",
"account.languages": "Modificar os idiomas subscritos",
+ "account.last_active": "Última actividade",
"account.link_verified_on": "A propiedade desta ligazón foi verificada o {date}",
"account.locked_info": "Esta é unha conta privada. A propietaria revisa de xeito manual quen pode seguila.",
"account.media": "Multimedia",
@@ -375,12 +373,14 @@
"collections.create_collection": "Crear colección",
"collections.delete_collection": "Eliminar colección",
"collections.description_length_hint": "Límite de 100 caracteres",
- "collections.detail.accept_inclusion": "Vale",
"collections.detail.accounts_heading": "Contas",
+ "collections.detail.author_added_you_on_date": "{author} engadiute o {date}",
"collections.detail.loading": "Cargando colección…",
"collections.detail.revoke_inclusion": "Non quero",
+ "collections.detail.sensitive_content": "Contido sensible",
"collections.detail.sensitive_note": "Esta colección presenta contas e contido que poderían ser sensibles para algunhas persoas.",
"collections.detail.share": "Compartir esta colección",
+ "collections.detail.you_are_in_this_collection": "Engadíronte a esta colección",
"collections.edit_details": "Editar detalles",
"collections.error_loading_collections": "Houbo un erro ao intentar cargar as túas coleccións.",
"collections.hints.accounts_counter": "{count} / {max} contas",
@@ -536,6 +536,7 @@
"content_warning.hide": "Agochar publicación",
"content_warning.show": "Mostrar igualmente",
"content_warning.show_more": "Mostrar máis",
+ "content_warning.show_short": "Mostrar",
"conversation.delete": "Eliminar conversa",
"conversation.mark_as_read": "Marcar como lido",
"conversation.open": "Ver conversa",
@@ -576,6 +577,15 @@
"domain_pill.your_server": "O teu fogar dixital, onde están as túas publicacións. Non é do teu agrado? Podes cambiar de servidor cando queiras levando as túas seguidoras contigo.",
"domain_pill.your_username": "O teu identificador único neste servidor. É posible que atopes usuarias co mesmo nome de usuaria en outros servidores.",
"dropdown.empty": "Escolle unha opción",
+ "email_subscriptions.email": "Enderezos de correo",
+ "email_subscriptions.form.action": "Subscribirse",
+ "email_subscriptions.form.disclaimer": "Pódeste dar de baixa cando queiras. Para máis información le a Directiva de Privacidade.",
+ "email_subscriptions.form.lead": "Recibe as publicacións na caixa de correo sen precisar unha conta de Mastodon.",
+ "email_subscriptions.form.title": "Subscríbete para recibir actualizacións por correo de {name}",
+ "email_subscriptions.submitted.lead": "Comproba a túa caixa de correo para completar a subscrición ás actualizacións por correo.",
+ "email_subscriptions.submitted.title": "Un último paso",
+ "email_subscriptions.validation.email.blocked": "Provedor de correo bloqueado",
+ "email_subscriptions.validation.email.invalid": "Enderezo de correo non válido",
"embed.instructions": "Inclúe esta publicación no teu sitio web copiando o seguinte código.",
"embed.preview": "Vaise ver así:",
"emoji_button.activity": "Actividade",
@@ -593,9 +603,15 @@
"emoji_button.search_results": "Resultados da procura",
"emoji_button.symbols": "Símbolos",
"emoji_button.travel": "Viaxes e Lugares",
- "empty_column.account_featured.me": "Aínda non destacaches nada. Sabías que podes facer destacar no teu perfil os cancelos que máis usas, incluso as contas das túas amizades?",
"empty_column.account_featured.other": "{acct} aínda non escolleu nada para destacar. Sabías que podes facer destacatar no teu perfil os cancelos que máis usas, incluso os perfís das túas amizades?",
- "empty_column.account_featured_other.unknown": "Esta conta aínda non destacou nada.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} aínda non creou ningunha colección.",
+ "empty_column.account_featured_other.title": "Non hai nada que ver aquí",
+ "empty_column.account_featured_self.no_collections": "Aínda non tes coleccións",
+ "empty_column.account_featured_self.no_collections_button": "Crea unha colección",
+ "empty_column.account_featured_self.pre_collections": "Van chegar as Coleccións",
+ "empty_column.account_featured_self.pre_collections_desc": "Coas Coleccións (a partir de Mastodon 4.6) podes crear as túas listas persoais de contas para recomendar a outras persoas.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Esta conta aínda non creou ningunha colección.",
+ "empty_column.account_featured_unknown.other": "Esta conta aínda non destacou nada.",
"empty_column.account_hides_collections": "A usuaria decideu non facer pública esta información",
"empty_column.account_suspended": "Conta suspendida",
"empty_column.account_timeline": "Non hai publicacións aquí!",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 0c0c91eac9..2eaa7c7eb8 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -45,9 +45,6 @@
"account.featured": "מומלץ",
"account.featured.accounts": "פרופילים",
"account.featured.collections": "אוספים",
- "account.featured.hashtags": "תגיות",
- "account.featured_tags.last_status_at": "חצרוץ אחרון בתאריך {date}",
- "account.featured_tags.last_status_never": "אין חצרוצים",
"account.field_overflow": "הצג תוכן מלא",
"account.filters.all": "כל הפעילות",
"account.filters.boosts_toggle": "הצגת הדהודים",
@@ -375,7 +372,6 @@
"collections.create_collection": "יצירת אוסף",
"collections.delete_collection": "מחיקת האוסף",
"collections.description_length_hint": "מגבלה של 100 תווים",
- "collections.detail.accept_inclusion": "אישור",
"collections.detail.accounts_heading": "חשבונות",
"collections.detail.loading": "טוען אוסף…",
"collections.detail.revoke_inclusion": "הסירוני",
@@ -593,9 +589,7 @@
"emoji_button.search_results": "תוצאות חיפוש",
"emoji_button.symbols": "סמלים",
"emoji_button.travel": "טיולים ואתרים",
- "empty_column.account_featured.me": "עוד לא קידמת תכנים. הידעת שניתן לקדם תגיות שבשימושך התדיר או אפילו את החשבונות של חבריםות בפרופיל שלך?",
"empty_column.account_featured.other": "{acct} עוד לא קידם תכנים. הידעת שניתן לקדם תגיות שבשימושך התדיר או אפילו את החשבונות של חבריםות בפרופיל שלך?",
- "empty_column.account_featured_other.unknown": "חשבון זה עוד לא קידם תכנים.",
"empty_column.account_hides_collections": "המשתמש.ת בחר.ה להסתיר מידע זה",
"empty_column.account_suspended": "חשבון מושעה",
"empty_column.account_timeline": "אין עדיין אף הודעה!",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index b07b319a97..55780f03f5 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -36,9 +36,6 @@
"account.familiar_followers_two": "{name1} और {name2} ने अनुसरण किया है",
"account.featured": "प्रचलित",
"account.featured.accounts": "प्रोफ़ाइल",
- "account.featured.hashtags": "हैशटैग्स",
- "account.featured_tags.last_status_at": "{date} का अंतिम पोस्ट",
- "account.featured_tags.last_status_never": "कोई पोस्ट नहीं है",
"account.follow": "फॉलो करें",
"account.follow_back": "फॉलो करें",
"account.follow_back_short": "वापस अनुसरण करें",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 21f4057fea..93901adc5a 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -29,8 +29,6 @@
"account.edit_profile_short": "Uredi",
"account.enable_notifications": "Obavjesti me kada @{name} napravi objavu",
"account.endorse": "Istakni na profilu",
- "account.featured_tags.last_status_at": "Zadnji post {date}",
- "account.featured_tags.last_status_never": "Nema postova",
"account.follow": "Prati",
"account.follow_back": "Slijedi natrag",
"account.follow_request_cancel": "Poništi zahtjev",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 80a9776f8d..326c0621ea 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -45,9 +45,6 @@
"account.featured": "Kiemelt",
"account.featured.accounts": "Profilok",
"account.featured.collections": "Gyűjtemények",
- "account.featured.hashtags": "Hashtagek",
- "account.featured_tags.last_status_at": "Legutolsó bejegyzés ideje: {date}",
- "account.featured_tags.last_status_never": "Nincs bejegyzés",
"account.field_overflow": "Teljes tartalom megjelenítése",
"account.filters.all": "Összes tevékenység",
"account.filters.boosts_toggle": "Megtolások megjelenítése",
@@ -375,15 +372,12 @@
"collections.create_collection": "Gyűjtemény létrehozása",
"collections.delete_collection": "Gyűjtemény törlése",
"collections.description_length_hint": "100 karakteres korlát",
- "collections.detail.accept_inclusion": "Rendben",
"collections.detail.accounts_heading": "Fiókok",
"collections.detail.loading": "Gyűjtemény betöltése…",
- "collections.detail.other_accounts_count": "{count, plural, one {# egyéb fiók} other {# egyéb fiók}}",
"collections.detail.revoke_inclusion": "Saját magam eltávolítása",
"collections.detail.sensitive_content": "Kényes tartalom",
"collections.detail.sensitive_note": "Ebben a gyűjteményben egyesek számára érzékeny fiókok és tartalmak vannak.",
"collections.detail.share": "Gyűjtemény megosztása",
- "collections.detail.you_were_added_to_this_collection": "Hozzáadtak ehhez a gyűjteményhez",
"collections.edit_details": "Részletek szerkesztése",
"collections.error_loading_collections": "Hiba történt a gyűjtemények betöltése során.",
"collections.hints.accounts_counter": "{count} / {max} fiók",
@@ -606,9 +600,15 @@
"emoji_button.search_results": "Keresési találatok",
"emoji_button.symbols": "Szimbólumok",
"emoji_button.travel": "Utazás és helyek",
- "empty_column.account_featured.me": "Még semmit sem emeltél ki. Tudtad, hogy kiemelheted a profilodon a legtöbbet használt hashtageidet, és még a barátaid fiókját is?",
"empty_column.account_featured.other": "{acct} még semmit sem emelt ki. Tudtad, hogy kiemelheted a profilodon a legtöbbet használt hashtageidet, és még a barátaid fiókját is?",
- "empty_column.account_featured_other.unknown": "Ez a fiók még semmit sem emelt ki.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} még nem hozott létre gyűjteményt.",
+ "empty_column.account_featured_other.title": "Nincs itt semmi látnivaló",
+ "empty_column.account_featured_self.no_collections": "Még nincsenek gyűjtemények",
+ "empty_column.account_featured_self.no_collections_button": "Gyűjtemény létrehozása",
+ "empty_column.account_featured_self.pre_collections": "Készülj fel a gyűjteményekre",
+ "empty_column.account_featured_self.pre_collections_desc": "A gyűjtemények (a Mastodon 4.6-ban érkezik) lehetővé teszik, hogy létrehozd a saját válogatott fióklistáidat, és ajánld másoknak.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Ez a fiók még nem hozott létre gyűjteményt.",
+ "empty_column.account_featured_unknown.other": "Ez a fiók még nem emelt ki semmit.",
"empty_column.account_hides_collections": "Ez a felhasználó úgy döntött, hogy nem teszi elérhetővé ezt az információt.",
"empty_column.account_suspended": "Fiók felfüggesztve",
"empty_column.account_timeline": "Itt nincs bejegyzés!",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index e00183810b..5ad9339564 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -20,8 +20,6 @@
"account.edit_profile": "Խմբագրել հաշիւը",
"account.enable_notifications": "Ծանուցել ինձ @{name} գրառումների մասին",
"account.endorse": "Ցուցադրել անձնական էջում",
- "account.featured_tags.last_status_at": "Վերջին գրառումը եղել է՝ {date}",
- "account.featured_tags.last_status_never": "Գրառումներ չկան",
"account.follow": "Հետեւել",
"account.followers": "Հետեւողներ",
"account.followers.empty": "Այս օգտատիրոջը դեռ ոչ մէկ չի հետեւում։",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 3cb1a01004..c1f4e61002 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -36,9 +36,6 @@
"account.familiar_followers_two": "Sequite per {name1} e {name2}",
"account.featured": "In evidentia",
"account.featured.accounts": "Profilos",
- "account.featured.hashtags": "Hashtags",
- "account.featured_tags.last_status_at": "Ultime message publicate le {date}",
- "account.featured_tags.last_status_never": "Necun message",
"account.follow": "Sequer",
"account.follow_back": "Sequer in retorno",
"account.follow_back_short": "Sequer in retorno",
@@ -317,9 +314,7 @@
"emoji_button.search_results": "Resultatos de recerca",
"emoji_button.symbols": "Symbolos",
"emoji_button.travel": "Viages e locos",
- "empty_column.account_featured.me": "Tu non ha ancora mittite alcun cosa in evidentia. Sapeva tu que tu pote mitter in evidentia sur tu profilo le hashtags que tu usa le plus e mesmo le contos de tu amicos?",
"empty_column.account_featured.other": "{acct} non ha ancora mittite alcun cosa in evidentia. Sapeva tu que tu pote mitter in evidentia sur tu profilo le hashtags que tu usa le plus e mesmo le contos de tu amicos?",
- "empty_column.account_featured_other.unknown": "Iste conto non ha ancora mittite alcun cosa in evidentia.",
"empty_column.account_hides_collections": "Le usator non ha rendite iste information disponibile",
"empty_column.account_suspended": "Conto suspendite",
"empty_column.account_timeline": "Nulle messages hic!",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index e181713862..c803187088 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -34,8 +34,6 @@
"account.familiar_followers_two": "Diikuti oleh {name1} dan {name2}",
"account.featured": "Unggulan",
"account.featured.accounts": "Profil",
- "account.featured_tags.last_status_at": "Kiriman terakhir pada {date}",
- "account.featured_tags.last_status_never": "Tidak ada kiriman",
"account.follow": "Ikuti",
"account.follow_back": "Ikuti balik",
"account.followers": "Pengikut",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 9fa27dd5a8..45b4a8f8d1 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -25,8 +25,6 @@
"account.edit_profile": "Redacter profil",
"account.enable_notifications": "Notificar me quande @{name} posta",
"account.endorse": "Recomandar sur profil",
- "account.featured_tags.last_status_at": "Ultim posta ye {date}",
- "account.featured_tags.last_status_never": "Null postas",
"account.follow": "Sequer",
"account.follow_back": "Sequer reciprocmen",
"account.followers": "Sequitores",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 18e3dda8d9..bf58808185 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -42,9 +42,6 @@
"account.featured": "Estalita",
"account.featured.accounts": "Profili",
"account.featured.collections": "Kolektaji",
- "account.featured.hashtags": "Gretvorti",
- "account.featured_tags.last_status_at": "Antea posto ye {date}",
- "account.featured_tags.last_status_never": "Nula posti",
"account.filters.all": "Omna ago",
"account.filters.boosts_toggle": "Montrez diskonoci",
"account.filters.posts_boosts": "Afishi e diskonoci",
@@ -369,9 +366,7 @@
"emoji_button.search_results": "Trovuri",
"emoji_button.symbols": "Simboli",
"emoji_button.travel": "Vizito & Plasi",
- "empty_column.account_featured.me": "Vu ne estalas irga ankore. Ka vu savas?",
"empty_column.account_featured.other": "{acct} ne estalas irga ankore. Ka vu savas?",
- "empty_column.account_featured_other.unknown": "Ca konto ne estalas irga ankore.",
"empty_column.account_hides_collections": "Ca uzanto selektis ne publikigar ca informo",
"empty_column.account_suspended": "Konto restriktesis",
"empty_column.account_timeline": "No toots here!",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index f1e4eca49f..c662146a2e 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -45,9 +45,6 @@
"account.featured": "Með aukið vægi",
"account.featured.accounts": "Notendasnið",
"account.featured.collections": "Söfn",
- "account.featured.hashtags": "Myllumerki",
- "account.featured_tags.last_status_at": "Síðasta færsla þann {date}",
- "account.featured_tags.last_status_never": "Engar færslur",
"account.field_overflow": "Birta allt efnið",
"account.filters.all": "Öll virkni",
"account.filters.boosts_toggle": "Sýna endurbirtingar",
@@ -75,6 +72,7 @@
"account.in_memoriam": "Minning.",
"account.joined_short": "Gerðist þátttakandi",
"account.languages": "Breyta tungumálum í áskrift",
+ "account.last_active": "Síðasta virkni",
"account.link_verified_on": "Eignarhald á þessum tengli var athugað þann {date}",
"account.locked_info": "Staða gagnaleyndar á þessum aðgangi er stillt á læsingu. Eigandinn yfirfer handvirkt hverjir geti fylgst með honum.",
"account.media": "Myndefni",
@@ -375,15 +373,14 @@
"collections.create_collection": "Búa til safn",
"collections.delete_collection": "Eyða safni",
"collections.description_length_hint": "100 stafa takmörk",
- "collections.detail.accept_inclusion": "Í lagi",
"collections.detail.accounts_heading": "Aðgangar",
+ "collections.detail.author_added_you_on_date": "{author} bætti þér við þann {date}",
"collections.detail.loading": "Hleð inn safni…",
- "collections.detail.other_accounts_count": "{count, plural, one {# annar aðgangur} other {# aðrir aðgangar}}",
"collections.detail.revoke_inclusion": "Fjarlægja mig",
"collections.detail.sensitive_content": "Viðkvæmt efni",
"collections.detail.sensitive_note": "Þetta safn inniheldur aðganga og efni sem sumir notendur gætu verið viðkvæmir fyrir.",
"collections.detail.share": "Deila þessu safni",
- "collections.detail.you_were_added_to_this_collection": "Þér var bætt í þetta safn",
+ "collections.detail.you_are_in_this_collection": "Þú kemur fyrir í þessu safni",
"collections.edit_details": "Breyta ítarupplýsingum",
"collections.error_loading_collections": "Villa kom upp þegar reynt var að hlaða inn söfnunum þínum.",
"collections.hints.accounts_counter": "{count} / {max} aðgangar",
@@ -606,9 +603,15 @@
"emoji_button.search_results": "Leitarniðurstöður",
"emoji_button.symbols": "Tákn",
"emoji_button.travel": "Ferðalög og staðir",
- "empty_column.account_featured.me": "Þú hefur enn ekki sett neitt sem áberandi. Vissirðu að þú getur gefið meira vægi á notandasniðinu þínu ýmsum myllumerkjum sem þú notar oft og jafnvel aðgöngum vina þinna?",
"empty_column.account_featured.other": "{acct} hefur enn ekki sett neitt sem áberandi. Vissirðu að þú getur gefið meira vægi á notandasniðinu þínu ýmsum myllumerkjum sem þú notar oft og jafnvel aðgöngum vina þinna?",
- "empty_column.account_featured_other.unknown": "Þessi notandi hefur enn ekki sett neitt sem áberandi.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} hefur enn ekki útbúið nein söfn.",
+ "empty_column.account_featured_other.title": "Ekkert að sjá hér",
+ "empty_column.account_featured_self.no_collections": "Engin söfn ennþá",
+ "empty_column.account_featured_self.no_collections_button": "Búa til safn",
+ "empty_column.account_featured_self.pre_collections": "Kynntu þér hvað séu söfn",
+ "empty_column.account_featured_self.pre_collections_desc": "Söfn (sem koma fram í Mastodon 4.6) gera þér kleift að búa til þina eigin ritstýrðu lista yfir þá aðganga sem þú vilt mæla með við aðra.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Þessi notandi hefur enn ekki útbúið nein söfn.",
+ "empty_column.account_featured_unknown.other": "Þessi notandi hefur enn ekki sett neitt með meira vægi.",
"empty_column.account_hides_collections": "Notandinn hefur valið að gera ekki tiltækar þessar upplýsingar",
"empty_column.account_suspended": "Notandaaðgangur í frysti",
"empty_column.account_timeline": "Engar færslur hér!",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index efca1c9740..2ffaba0de5 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -45,9 +45,6 @@
"account.featured": "In evidenza",
"account.featured.accounts": "Profili",
"account.featured.collections": "Collezioni",
- "account.featured.hashtags": "Hashtag",
- "account.featured_tags.last_status_at": "Ultimo post il {date}",
- "account.featured_tags.last_status_never": "Nessun post",
"account.field_overflow": "Mostra il contenuto completo",
"account.filters.all": "Tutte le attività",
"account.filters.boosts_toggle": "Mostra le condivisioni",
@@ -75,6 +72,7 @@
"account.in_memoriam": "In memoria.",
"account.joined_short": "Iscritto",
"account.languages": "Modifica le lingue d'iscrizione",
+ "account.last_active": "Ultima attività",
"account.link_verified_on": "La proprietà di questo link è stata controllata il {date}",
"account.locked_info": "Lo stato della privacy di questo profilo è impostato a bloccato. Il proprietario revisiona manualmente chi può seguirlo.",
"account.media": "Media",
@@ -375,15 +373,14 @@
"collections.create_collection": "Crea la collezione",
"collections.delete_collection": "Cancella la collezione",
"collections.description_length_hint": "Limite di 100 caratteri",
- "collections.detail.accept_inclusion": "Va bene",
"collections.detail.accounts_heading": "Account",
+ "collections.detail.author_added_you_on_date": "{author} ti ha aggiunto/a in data: {date}",
"collections.detail.loading": "Caricamento della collezione…",
- "collections.detail.other_accounts_count": "{count, plural, one {# altro account} other {# altri account}}",
"collections.detail.revoke_inclusion": "Rimuovimi",
"collections.detail.sensitive_content": "Contenuto sensibile",
"collections.detail.sensitive_note": "Questa collezione contiene account e contenuto che potrebbero essere sensibili ad alcuni utenti.",
"collections.detail.share": "Condividi questa collezione",
- "collections.detail.you_were_added_to_this_collection": "Sei stato/a aggiunto/a a questa collezione",
+ "collections.detail.you_are_in_this_collection": "Sei presente in questa collezione",
"collections.edit_details": "Modifica i dettagli",
"collections.error_loading_collections": "Si è verificato un errore durante il tentativo di caricare le tue collezioni.",
"collections.hints.accounts_counter": "{count} / {max} account",
@@ -606,9 +603,15 @@
"emoji_button.search_results": "Risultati della ricerca",
"emoji_button.symbols": "Simboli",
"emoji_button.travel": "Viaggi & Luoghi",
- "empty_column.account_featured.me": "Non hai ancora messo in evidenza nulla. Sapevi che puoi mettere in evidenza gli hashtag che usi più spesso e persino gli account dei tuoi amici sul tuo profilo?",
"empty_column.account_featured.other": "{acct} non ha ancora messo in evidenza nulla. Sapevi che puoi mettere in evidenza gli hashtag che usi più spesso e persino gli account dei tuoi amici sul tuo profilo?",
- "empty_column.account_featured_other.unknown": "Questo account non ha ancora messo nulla in evidenza.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} non ha ancora creato alcuna collezione.",
+ "empty_column.account_featured_other.title": "Niente da vedere qui",
+ "empty_column.account_featured_self.no_collections": "Nessuna collezione ancora",
+ "empty_column.account_featured_self.no_collections_button": "Crea una collezione",
+ "empty_column.account_featured_self.pre_collections": "Resta sintonizzato/a per le collezioni",
+ "empty_column.account_featured_self.pre_collections_desc": "Le collezioni (in arrivo su Mastodon 4.6) ti consentono di creare i tuoi elenchi curati di account da consigliare ad altri.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Questo account non ha ancora creato alcuna collezione.",
+ "empty_column.account_featured_unknown.other": "Questo account non ha ancora presentato nulla.",
"empty_column.account_hides_collections": "Questo utente ha scelto di non rendere disponibili queste informazioni",
"empty_column.account_suspended": "Profilo sospeso",
"empty_column.account_timeline": "Nessun post qui!",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index f555369b41..3001c253c0 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -44,9 +44,12 @@
"account.familiar_followers_two": "{name1} さんと {name2} さんもフォローしています",
"account.featured": "注目",
"account.featured.accounts": "プロフィール",
- "account.featured.hashtags": "ハッシュタグ",
- "account.featured_tags.last_status_at": "最終投稿 {date}",
- "account.featured_tags.last_status_never": "投稿がありません",
+ "account.filters.all": "全てのアクティビティ",
+ "account.filters.boosts_toggle": "ブーストを表示",
+ "account.filters.posts_boosts": "投稿とブースト",
+ "account.filters.posts_only": "投稿",
+ "account.filters.posts_replies": "投稿と返信",
+ "account.filters.replies_toggle": "返信を表示",
"account.follow": "フォロー",
"account.follow_back": "フォローバック",
"account.follow_back_short": "フォローバック",
@@ -71,6 +74,9 @@
"account.locked_info": "このアカウントは承認制アカウントです。相手が承認するまでフォローは完了しません。",
"account.media": "メディア",
"account.mention": "@{name}さんにメンション",
+ "account.menu.add_to_list": "リストに追加…",
+ "account.menu.block": "アカウントをブロックする",
+ "account.menu.block_domain": "{domain} をブロックする",
"account.menu.copy": "リンクをコピーする",
"account.menu.direct": "非公開でメンションする",
"account.menu.hide_reblogs": "タイムラインでブーストを隠す",
@@ -78,6 +84,11 @@
"account.menu.mute": "アカウントをミュートする",
"account.menu.note.description": "あなただけが見られます",
"account.menu.open_original_page": "{domain} で表示する",
+ "account.menu.remove_follower": "フォロワーを削除する",
+ "account.menu.report": "アカウントを報告する",
+ "account.menu.unblock": "アカウントのブロックを解除する",
+ "account.menu.unblock_domain": "{domain} のブロックを解除する",
+ "account.menu.unmute": "アカウントのミュートを解除する",
"account.moved_to": "{name}さんはこちらのアカウントに引っ越しました:",
"account.mute": "@{name}さんをミュート",
"account.mute_notifications_short": "通知をオフにする",
@@ -330,9 +341,7 @@
"emoji_button.search_results": "検索結果",
"emoji_button.symbols": "記号",
"emoji_button.travel": "旅行と場所",
- "empty_column.account_featured.me": "まだ何もフィーチャーしていません。最もよく使うハッシュタグや、更には友達のアカウントまでプロフィール上でフィーチャーできると知っていましたか?",
"empty_column.account_featured.other": "{acct}ではまだ何もフィーチャーされていません。最もよく使うハッシュタグや、更には友達のアカウントまでプロフィール上でフィーチャーできると知っていましたか?",
- "empty_column.account_featured_other.unknown": "このアカウントにはまだ何も投稿されていません。",
"empty_column.account_hides_collections": "このユーザーはこの情報を開示しないことにしています。",
"empty_column.account_suspended": "アカウントは停止されています",
"empty_column.account_timeline": "投稿がありません!",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 9337bbb71c..c6a56055b6 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -10,7 +10,6 @@
"account.cancel_follow_request": "Withdraw follow request",
"account.edit_profile": "პროფილის ცვლილება",
"account.endorse": "გამორჩევა პროფილზე",
- "account.featured_tags.last_status_never": "პოსტების გარეშე",
"account.follow": "გაყოლა",
"account.followers": "მიმდევრები",
"account.hide_reblogs": "დაიმალოს ბუსტები @{name}-სგან",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 28cdb9c615..b1711c7c6f 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -36,9 +36,6 @@
"account.familiar_followers_one": "Yeṭṭafar-it {name1}",
"account.familiar_followers_two": "Yeṭṭafar-it {name1} akked {name2}",
"account.featured.accounts": "Imeɣna",
- "account.featured.hashtags": "Ihacṭagen",
- "account.featured_tags.last_status_at": "Tasuffeɣt taneggarut ass n {date}",
- "account.featured_tags.last_status_never": "Ulac tisuffaɣ",
"account.filters.posts_only": "Tisuffaɣ",
"account.filters.posts_replies": "Tisuffaɣ d tririyin",
"account.filters.replies_toggle": "Sken-d tiririyin",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 9f6b0f4ca8..7e1a7aadee 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -34,9 +34,6 @@
"account.familiar_followers_two": "{name1} мен {name2} жазылған",
"account.featured": "Ерекшеленген",
"account.featured.accounts": "Профильдер",
- "account.featured.hashtags": "Хэштегтер",
- "account.featured_tags.last_status_at": "Соңғы жазба {date} күні",
- "account.featured_tags.last_status_never": "Пост жоқ",
"account.follow": "Жазылу",
"account.follow_back": "Кері жазылу",
"account.followers": "Жазылушы",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index fe55d4195e..72b44614e0 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -44,9 +44,6 @@
"account.familiar_followers_two": "{name1}, {name2} 님이 팔로우함",
"account.featured": "추천",
"account.featured.accounts": "프로필",
- "account.featured.hashtags": "해시태그",
- "account.featured_tags.last_status_at": "{date}에 마지막으로 게시",
- "account.featured_tags.last_status_never": "게시물 없음",
"account.field_overflow": "내용 전체 보기",
"account.filters.all": "모든 활동",
"account.filters.boosts_toggle": "부스트 보기",
@@ -400,9 +397,7 @@
"emoji_button.search_results": "검색 결과",
"emoji_button.symbols": "기호",
"emoji_button.travel": "여행과 장소",
- "empty_column.account_featured.me": "아직 아무 것도 추천하지 않았습니다. 자주 사용하는 해시태그, 친구의 계정까지 내 계정에서 추천할 수 있다는 것을 알고 계셨나요?",
"empty_column.account_featured.other": "{acct} 님은 아직 아무 것도 추천하지 않았습니다. 자주 사용하는 해시태그, 친구의 계정까지 내 계정에서 추천할 수 있다는 것을 알고 계셨나요?",
- "empty_column.account_featured_other.unknown": "이 계정은 아직 아무 것도 추천하지 않았습니다.",
"empty_column.account_hides_collections": "이 사용자는 이 정보를 사용할 수 없도록 설정했습니다",
"empty_column.account_suspended": "계정 정지됨",
"empty_column.account_timeline": "이곳에는 게시물이 없습니다!",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 6ed46d102b..5ffe118fef 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -14,6 +14,7 @@
"about.powered_by": "Medyaya civakî ya nenavendî bi hêzdariya {mastodon}",
"about.rules": "Rêbazên rajekar",
"account.account_note_header": "Nîşeyên kesane",
+ "account.activity": "Çalakî",
"account.add_or_remove_from_list": "Li lîsteyan zêde bike yan jî rake",
"account.badges.bot": "Bot",
"account.badges.group": "Kom",
@@ -31,11 +32,12 @@
"account.enable_notifications": "Min agahdar bike gava @{name} diweşîne",
"account.endorse": "Taybetiyên li ser profîl",
"account.featured.accounts": "Profîl",
- "account.featured.hashtags": "Hashtag",
- "account.featured_tags.last_status_at": "Şandiya dawî di {date} de",
- "account.featured_tags.last_status_never": "Şandî tune ne",
+ "account.filters.posts_only": "Şandî",
+ "account.filters.posts_replies": "Şandî û bersiv",
+ "account.filters.replies_toggle": "Bersivan nîşan bide",
"account.follow": "Bişopîne",
"account.follow_back": "Bişopîne",
+ "account.follow_back_short": "Bişopîne",
"account.follow_request": "Bo şopandinê daxwaz bike",
"account.follow_request_cancel": "Daxwazê têk bibe",
"account.follow_request_cancel_short": "Têk bibe",
@@ -43,6 +45,7 @@
"account.followers": "Şopîner",
"account.followers.empty": "Kesekî hin ev bikarhêner neşopandiye.",
"account.followers_counter": "{count, plural, one {{counter} şopîner} other {{counter} şopîner}}",
+ "account.followers_you_know_counter": "{counter} tu nas dikî",
"account.following": "Dişopîne",
"account.following_counter": "{count, plural, one {{counter} dişopîne} other {{counter} dişopîne}}",
"account.follows.empty": "Ev bikarhêner hin kesekî heya niha neşopandiye.",
@@ -52,10 +55,16 @@
"account.in_memoriam": "Di bîranînê de.",
"account.joined_short": "Dîroka tevlîbûnê",
"account.languages": "Zimanên beşdarbûyî biguherîne",
+ "account.last_active": "Çalakiya dawî",
"account.link_verified_on": "Xwedaniya li vê girêdanê di {date} de hatiye kontrolkirin",
"account.locked_info": "Rewşa vê ajimêrê wek kilîtkirî hatiye sazkirin. Xwediyê ajimêrê, bi destan dinirxîne şopandinê dinirxîne.",
"account.media": "Medya",
"account.mention": "Qal @{name} bike",
+ "account.menu.add_to_list": "Tevlî lîsteyê bike…",
+ "account.menu.block": "Jimarê asteng bike",
+ "account.menu.block_domain": "{domain} asteng bike",
+ "account.menu.share": "Parve bike…",
+ "account.menu.show_reblogs": "Di demnameyê de şandiyên bilindkirî nîşan bide",
"account.moved_to": "{name} diyar kir ku ajimêra nû ya wan niha ev e:",
"account.mute": "@{name} bêdeng bike",
"account.mute_notifications_short": "Agahdariyan bêdeng bike",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 4156f151f3..78d1cd359d 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -35,9 +35,6 @@
"account.familiar_followers_two": "Sequitur {name1} et {name2}",
"account.featured": "Praeclara",
"account.featured.accounts": "Profilia",
- "account.featured.hashtags": "Hashtags",
- "account.featured_tags.last_status_at": "Ultimum nuntium die {date}",
- "account.featured_tags.last_status_never": "Nulla contributa",
"account.follow": "Sequere",
"account.follow_back": "Sequere retro",
"account.followers": "Sectatores",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 2b787555f2..ea3bfaeb23 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -35,9 +35,6 @@
"account.familiar_followers_two": "Segido por {name1} i {name2}",
"account.featured": "Avaliado",
"account.featured.accounts": "Profiles",
- "account.featured.hashtags": "Etiketas",
- "account.featured_tags.last_status_at": "Ultima publikasyon de {date}",
- "account.featured_tags.last_status_never": "No ay publikasyones",
"account.follow": "Sige",
"account.follow_back": "Sige tamyen",
"account.follow_back_short": "Sige tambyen",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 4f9f218543..57804915c6 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -43,9 +43,6 @@
"account.familiar_followers_two": "{name1} ir {name2} seka",
"account.featured": "Rodomi",
"account.featured.accounts": "Profiliai",
- "account.featured.hashtags": "Grotažymės",
- "account.featured_tags.last_status_at": "Paskutinis įrašas {date}",
- "account.featured_tags.last_status_never": "Nėra įrašų",
"account.filters.all": "Visa veikla",
"account.filters.boosts_toggle": "Rodyti pasidalinimus",
"account.filters.posts_boosts": "Įrašai ir pasidalinimai",
@@ -353,9 +350,7 @@
"emoji_button.search_results": "Paieškos rezultatai",
"emoji_button.symbols": "Simboliai",
"emoji_button.travel": "Kelionės ir vietos",
- "empty_column.account_featured.me": "Jūs dar nieko neparyškinote. Ar žinojote, kad savo profilyje galite parodyti dažniausiai naudojamas grotažymes ir netgi savo draugų paskyras?",
"empty_column.account_featured.other": "{acct} dar nieko neparyškino. Ar žinojote, kad savo profilyje galite pateikti dažniausiai naudojamus grotžymes ir netgi savo draugų paskyras?",
- "empty_column.account_featured_other.unknown": "Ši paskyra dar nieko neparodė.",
"empty_column.account_hides_collections": "Šis (-i) naudotojas (-a) pasirinko nepadaryti šią informaciją prieinamą.",
"empty_column.account_suspended": "Paskyra pristabdyta.",
"empty_column.account_timeline": "Nėra čia įrašų.",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index c93f2706e3..96b3037285 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -36,9 +36,6 @@
"account.familiar_followers_two": "Kam seko {name1} un {name2}",
"account.featured": "Izcelts",
"account.featured.accounts": "Profili",
- "account.featured.hashtags": "Tēmturi",
- "account.featured_tags.last_status_at": "Pēdējais ieraksts {date}",
- "account.featured_tags.last_status_never": "Nav ierakstu",
"account.follow": "Sekot",
"account.follow_back": "Sekot atpakaļ",
"account.follow_back_short": "Sekot atpakaļ",
@@ -302,7 +299,6 @@
"emoji_button.search_results": "Meklēšanas rezultāti",
"emoji_button.symbols": "Simboli",
"emoji_button.travel": "Ceļošana un vietas",
- "empty_column.account_featured_other.unknown": "Šis lietotājs vēl neko nav licis attēlot savā profilā.",
"empty_column.account_hides_collections": "Šis lietotājs ir izvēlējies nedarīt šo informāciju pieejamu",
"empty_column.account_suspended": "Konta darbība ir apturēta",
"empty_column.account_timeline": "Šeit nav ierakstu.",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 75bdff6d4f..7734e072c1 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -20,7 +20,6 @@
"account.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക",
"account.enable_notifications": "@{name} പോസ്റ്റ് ചെയ്യുമ്പോൾ എന്നെ അറിയിക്കുക",
"account.endorse": "പ്രൊഫൈലിൽ പ്രകടമാക്കുക",
- "account.featured_tags.last_status_never": "എഴുത്തുകളില്ല",
"account.follow": "പിന്തുടരുക",
"account.follow_back": "തിരിച്ചു പിന്തുടരുക",
"account.followers": "പിന്തുടരുന്നവർ",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index b64e56e4e2..6f0e927f12 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -25,8 +25,6 @@
"account.edit_profile": "प्रोफाइल एडिट करा",
"account.enable_notifications": "जेव्हा @{name} पोस्ट करते तेव्हा मला सूचित करा",
"account.endorse": "प्रोफाइलवरील वैशिष्ट्य",
- "account.featured_tags.last_status_at": "शेवटचे पोस्ट {date} रोजी",
- "account.featured_tags.last_status_never": "पोस्ट नाहीत",
"account.follow": "अनुयायी व्हा",
"account.follow_back": "आपणही अनुसरण करा",
"account.followers": "अनुयायी",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 75e95de17c..352d52bf5c 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -32,8 +32,6 @@
"account.enable_notifications": "Maklumi saya apabila @{name} mengirim hantaran",
"account.endorse": "Tampilkan di profil",
"account.familiar_followers_one": "melayuikutikut{name1}",
- "account.featured_tags.last_status_at": "Hantaran terakhir pada {date}",
- "account.featured_tags.last_status_never": "Tiada hantaran",
"account.follow": "Ikuti",
"account.follow_back": "Ikut balik",
"account.followers": "Pengikut",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 909b0b611a..87604e5912 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -25,8 +25,6 @@
"account.edit_profile": "ကိုယ်ရေးမှတ်တမ်းပြင်ဆင်မည်",
"account.enable_notifications": "@{name} ပို့စ်တင်သည့်အခါ ကျွန်ုပ်ကို အကြောင်းကြားပါ။",
"account.endorse": "အကောင့်ပရိုဖိုင်တွင်ဖော်ပြပါ",
- "account.featured_tags.last_status_at": "နောက်ဆုံးပို့စ်ကို {date} တွင် တင်ခဲ့သည်။",
- "account.featured_tags.last_status_never": "ပို့စ်တင်ထားခြင်းမရှိပါ",
"account.follow": "စောင့်ကြည့်",
"account.followers": "စောင့်ကြည့်သူများ",
"account.followers.empty": "ဤသူကို စောင့်ကြည့်သူ မရှိသေးပါ။",
diff --git a/app/javascript/mastodon/locales/nan-TW.json b/app/javascript/mastodon/locales/nan-TW.json
index db3ac5c0e2..4628cfaa23 100644
--- a/app/javascript/mastodon/locales/nan-TW.json
+++ b/app/javascript/mastodon/locales/nan-TW.json
@@ -45,9 +45,6 @@
"account.featured": "精選ê",
"account.featured.accounts": "個人資料",
"account.featured.collections": "收藏",
- "account.featured.hashtags": "Hashtag",
- "account.featured_tags.last_status_at": "頂kái tī {date} Po文",
- "account.featured_tags.last_status_never": "無PO文",
"account.field_overflow": "展示規篇內容",
"account.filters.all": "逐ē活動",
"account.filters.boosts_toggle": "顯示轉PO",
@@ -375,7 +372,6 @@
"collections.create_collection": "建立收藏",
"collections.delete_collection": "Thâi掉收藏",
"collections.description_length_hint": "限制 100 字",
- "collections.detail.accept_inclusion": "OK",
"collections.detail.accounts_heading": "口座",
"collections.detail.loading": "載入收藏……",
"collections.detail.revoke_inclusion": "Kā我suá掉",
@@ -593,9 +589,7 @@
"emoji_button.search_results": "Tshiau-tshuē ê結果",
"emoji_button.symbols": "符號",
"emoji_button.travel": "旅行kap地點",
- "empty_column.account_featured.me": "Lí iáu無任何ê特色內容。Lí kám知影lí ē當kā lí tsia̍p-tsia̍p用ê hashtag,甚至是朋友ê口座揀做特色ê內容,khǹg佇lí ê個人資料內底?",
"empty_column.account_featured.other": "{acct} iáu無任何ê特色內容。Lí kám知影lí ē當kā lí tsia̍p-tsia̍p用ê hashtag,甚至是朋友ê口座揀做特色ê內容,khǹg佇lí ê個人資料內底?",
- "empty_column.account_featured_other.unknown": "Tsit ê口座iáu無任何ê特色內容。",
"empty_column.account_hides_collections": "Tsit位用者選擇無愛公開tsit ê資訊",
"empty_column.account_suspended": "口座已經受停止",
"empty_column.account_timeline": "Tsia無PO文!",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 49233a9ef8..2be766ef84 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -29,8 +29,6 @@
"account.endorse": "प्रोफाइलमा फिचर गर्नुहोस्",
"account.featured": "फिचर गरिएको",
"account.featured.accounts": "प्रोफाइलहरू",
- "account.featured.hashtags": "ह्यासट्यागहरू",
- "account.featured_tags.last_status_never": "कुनै पोस्ट छैन",
"account.follow": "फलो गर्नुहोस",
"account.follow_back": "फलो ब्याक गर्नुहोस्",
"account.followers": "फलोअरहरु",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index b14465f4e2..d0d3d1a4c4 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -45,9 +45,6 @@
"account.featured": "Uitgelicht",
"account.featured.accounts": "Profielen",
"account.featured.collections": "Verzamelingen",
- "account.featured.hashtags": "Hashtags",
- "account.featured_tags.last_status_at": "Laatste bericht op {date}",
- "account.featured_tags.last_status_never": "Geen berichten",
"account.field_overflow": "Volledige inhoud tonen",
"account.filters.all": "Alle activiteit",
"account.filters.boosts_toggle": "Boosts tonen",
@@ -375,15 +372,12 @@
"collections.create_collection": "Verzameling aanmaken",
"collections.delete_collection": "Verzameling verwijderen",
"collections.description_length_hint": "Maximaal 100 karakters",
- "collections.detail.accept_inclusion": "Oké",
"collections.detail.accounts_heading": "Accounts",
"collections.detail.loading": "Verzameling laden…",
- "collections.detail.other_accounts_count": "{count, plural, one {# ander account} other {# andere accounts}}",
"collections.detail.revoke_inclusion": "Verwijder mij",
"collections.detail.sensitive_content": "Gevoelige inhoud",
"collections.detail.sensitive_note": "Deze verzameling bevat accounts en inhoud die mogelijk gevoelig zijn voor sommige gebruikers.",
"collections.detail.share": "Deze verzameling delen",
- "collections.detail.you_were_added_to_this_collection": "Je bent aan deze verzameling toegevoegd",
"collections.edit_details": "Gegevens bewerken",
"collections.error_loading_collections": "Er is een fout opgetreden bij het laden van je verzamelingen.",
"collections.hints.accounts_counter": "{count} / {max} accounts",
@@ -606,9 +600,7 @@
"emoji_button.search_results": "Zoekresultaten",
"emoji_button.symbols": "Symbolen",
"emoji_button.travel": "Reizen en locaties",
- "empty_column.account_featured.me": "Je hebt nog niets uitgelicht. Wist je dat je een aantal van jouw berichten, jouw meest gebruikte hashtags en zelfs accounts van je vrienden op je profiel kunt uitlichten?",
"empty_column.account_featured.other": "{acct} heeft nog niets uitgelicht. Wist je dat je een aantal van jouw berichten, jouw meest gebruikte hashtags en zelfs accounts van je vrienden op je profiel kunt uitlichten?",
- "empty_column.account_featured_other.unknown": "Dit account heeft nog niets uitgelicht.",
"empty_column.account_hides_collections": "Deze gebruiker heeft ervoor gekozen deze informatie niet beschikbaar te maken",
"empty_column.account_suspended": "Account opgeschort",
"empty_column.account_timeline": "Hier zijn geen berichten!",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index e199d6ebe4..23e2f6c156 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -45,9 +45,6 @@
"account.featured": "Utvald",
"account.featured.accounts": "Profilar",
"account.featured.collections": "Samlingar",
- "account.featured.hashtags": "Emneknaggar",
- "account.featured_tags.last_status_at": "Sist nytta {date}",
- "account.featured_tags.last_status_never": "Ingen innlegg",
"account.field_overflow": "Vis heile innhaldet",
"account.filters.all": "All aktivitet",
"account.filters.boosts_toggle": "Vis framhevingar",
@@ -351,7 +348,6 @@
"collections.create_collection": "Lag ei samling",
"collections.delete_collection": "Slett samlinga",
"collections.description_length_hint": "Maks 100 teikn",
- "collections.detail.accept_inclusion": "Ok",
"collections.detail.accounts_heading": "Kontoar",
"collections.detail.loading": "Lastar inn samling…",
"collections.detail.revoke_inclusion": "Fjern meg",
@@ -569,9 +565,7 @@
"emoji_button.search_results": "Søkeresultat",
"emoji_button.symbols": "Symbol",
"emoji_button.travel": "Reise & stader",
- "empty_column.account_featured.me": "Du har ikkje valt ut noko enno. Visste du at du kan velja ut emneknaggar du bruker mykje, og til og med venekontoar på profilen din?",
"empty_column.account_featured.other": "{acct} har ikkje valt ut noko enno. Visste du at du kan velja ut emneknaggar du bruker mykje, og til og med venekontoar på profilen din?",
- "empty_column.account_featured_other.unknown": "Denne kontoen har ikkje valt ut noko enno.",
"empty_column.account_hides_collections": "Denne brukaren har valt å ikkje gjere denne informasjonen tilgjengeleg",
"empty_column.account_suspended": "Kontoen er utestengd",
"empty_column.account_timeline": "Ingen tut her!",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 9b40cf2084..46a15cc742 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -45,9 +45,6 @@
"account.featured": "Utvalgt",
"account.featured.accounts": "Profiler",
"account.featured.collections": "Samlinger",
- "account.featured.hashtags": "Emneknagger",
- "account.featured_tags.last_status_at": "Siste innlegg {date}",
- "account.featured_tags.last_status_never": "Ingen Innlegg",
"account.field_overflow": "Vis fullt innhold",
"account.filters.all": "All aktivitet",
"account.filters.boosts_toggle": "Vis fremhevinger",
@@ -375,9 +372,7 @@
"emoji_button.search_results": "Søkeresultat",
"emoji_button.symbols": "Symboler",
"emoji_button.travel": "Reise & steder",
- "empty_column.account_featured.me": "Du har ikke fremhevet noe ennå. Visste du at du kan fremheve emneknaggene du bruker mest, eller til og med dine venners profilsider?",
"empty_column.account_featured.other": "{acct} har ikke fremhevet noe ennå. Visste du at du kan fremheve emneknaggene du bruker mest, eller til og med dine venners profilsider?",
- "empty_column.account_featured_other.unknown": "Denne kontoen har ikke fremhevet noe ennå.",
"empty_column.account_hides_collections": "Denne brukeren har valgt å ikke gjøre denne informasjonen tilgjengelig",
"empty_column.account_suspended": "Kontoen er suspendert",
"empty_column.account_timeline": "Ingen innlegg her!",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 530fb3999a..aa3c46b94a 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -33,9 +33,6 @@
"account.familiar_followers_one": "Seguit per {name1}",
"account.familiar_followers_two": "Seguit per {name1} e {name2}",
"account.featured.accounts": "Perfils",
- "account.featured.hashtags": "Etiquetas",
- "account.featured_tags.last_status_at": "Darrièra publicacion lo {date}",
- "account.featured_tags.last_status_never": "Cap de publicacion",
"account.follow": "Sègre",
"account.follow_back": "Sègre en retorn",
"account.follow_request_cancel": "Anullar la demanda",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index e77782cae2..efbdef17b0 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -38,9 +38,6 @@
"account.familiar_followers_two": "{name1} ਅਤੇ {name2} ਵਲੋਂ ਫ਼ਾਲੋ ਕੀਤਾ",
"account.featured": "ਫ਼ੀਚਰ",
"account.featured.accounts": "ਪਰੋਫਾਈਲ",
- "account.featured.hashtags": "ਹੈਸ਼ਟੈਗ",
- "account.featured_tags.last_status_at": "{date} ਨੂੰ ਆਖਰੀ ਪੋਸਟ",
- "account.featured_tags.last_status_never": "ਕੋਈ ਪੋਸਟ ਨਹੀਂ",
"account.filters.all": "ਸਾਰੀਆਂ ਸਰਗਰਮੀਆਂ",
"account.filters.posts_only": "ਪੋਸਟਾਂ",
"account.filters.posts_replies": "ਪੋਸਟਾਂ ਅਤੇ ਜਵਾਬ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 35868e9c08..2faffed2f8 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -45,9 +45,6 @@
"account.featured": "Wyróżnione",
"account.featured.accounts": "Profile",
"account.featured.collections": "Kolekcje",
- "account.featured.hashtags": "Tagi",
- "account.featured_tags.last_status_at": "Ostatni post {date}",
- "account.featured_tags.last_status_never": "Brak postów",
"account.field_overflow": "Pokaż całą zawartość",
"account.filters.all": "Wszystkie aktywności",
"account.filters.boosts_toggle": "Pokaż ulepszenia",
@@ -437,9 +434,7 @@
"emoji_button.search_results": "Wyniki wyszukiwania",
"emoji_button.symbols": "Symbole",
"emoji_button.travel": "Podróże i miejsca",
- "empty_column.account_featured.me": "Nie dodano jeszcze żadnych polecanych treści. Czy wiesz, że możesz wyróżnić najczęściej używane hashtagi, a nawet konta znajomych na swoim profilu?",
"empty_column.account_featured.other": "Konto {acct} nie wyróżniło jeszcze żadnych treści. Czy wiesz, że możesz wyróżnić najczęściej używane hashtagi, a nawet konta znajomych w swoim profilu?",
- "empty_column.account_featured_other.unknown": "To konto nie zostało jeszcze wyróżnione.",
"empty_column.account_hides_collections": "Ta osoba postanowiła nie udostępniać tych informacji",
"empty_column.account_suspended": "Konto zawieszone",
"empty_column.account_timeline": "Brak wpisów!",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 211319b673..8a7956cdad 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -45,9 +45,6 @@
"account.featured": "Em destaque",
"account.featured.accounts": "Perfis",
"account.featured.collections": "Coleções",
- "account.featured.hashtags": "Hashtags",
- "account.featured_tags.last_status_at": "Última publicação em {date}",
- "account.featured_tags.last_status_never": "Sem publicações",
"account.field_overflow": "Mostrar todo conteúdo",
"account.filters.all": "Todas atividades",
"account.filters.boosts_toggle": "Mostrar impulsos",
@@ -375,7 +372,6 @@
"collections.create_collection": "Criar coleção",
"collections.delete_collection": "Eliminar coleção",
"collections.description_length_hint": "Limite de 100 caracteres",
- "collections.detail.accept_inclusion": "OK",
"collections.detail.accounts_heading": "Contas",
"collections.detail.loading": "Carregando coleção…",
"collections.detail.revoke_inclusion": "Remover-me",
@@ -593,9 +589,7 @@
"emoji_button.search_results": "Resultado da pesquisa",
"emoji_button.symbols": "Símbolos",
"emoji_button.travel": "Viagem e Lugares",
- "empty_column.account_featured.me": "Você ainda não destacou nada. Você sabia que pode destacar seus posts, hashtags que você mais usa e até mesmo contas de seus amigos no seu perfil?",
"empty_column.account_featured.other": "{acct} Ainda não destacou nada. Você sabia que pode destacar suas publicações, hashtags que você mais usa e até mesmo contas de seus amigos no seu perfil?",
- "empty_column.account_featured_other.unknown": "Esta conta ainda não destacou nada.",
"empty_column.account_hides_collections": "A pessoa optou por não disponibilizar esta informação",
"empty_column.account_suspended": "Conta suspensa",
"empty_column.account_timeline": "Nada aqui.",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index c0fcb6237c..261ebe6b72 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -45,9 +45,6 @@
"account.featured": "Destaques",
"account.featured.accounts": "Perfis",
"account.featured.collections": "Coleções",
- "account.featured.hashtags": "Etiquetas",
- "account.featured_tags.last_status_at": "Última publicação em {date}",
- "account.featured_tags.last_status_never": "Sem publicações",
"account.field_overflow": "Mostrar todo o conteúdo",
"account.filters.all": "Toda a atividade",
"account.filters.boosts_toggle": "Mostrar partilhas",
@@ -353,7 +350,6 @@
"collections.create_collection": "Criar coleção",
"collections.delete_collection": "Eliminar coleção",
"collections.description_length_hint": "Limite de 100 caracteres",
- "collections.detail.accept_inclusion": "OK / Aceitar",
"collections.detail.accounts_heading": "Contas",
"collections.detail.loading": "A carregar a coleção…",
"collections.detail.revoke_inclusion": "Remover-me",
@@ -571,9 +567,7 @@
"emoji_button.search_results": "Resultados da pesquisa",
"emoji_button.symbols": "Símbolos",
"emoji_button.travel": "Viagens e lugares",
- "empty_column.account_featured.me": "Ainda não colocou nada em destaque. Sabia que pode destacar as etiquetas que mais utiliza e até as contas dos seus amigos no seu perfil?",
"empty_column.account_featured.other": "{acct} ainda não colocou nada em destaque. Sabia que pode destacar as etiquetas que mais utiliza e até as contas dos seus amigos no seu perfil?",
- "empty_column.account_featured_other.unknown": "Esta conta ainda não colocou nada em destaque.",
"empty_column.account_hides_collections": "Este utilizador escolheu não disponibilizar esta informação",
"empty_column.account_suspended": "Conta suspensa",
"empty_column.account_timeline": "Sem publicações por aqui!",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 92036df1da..e60fd6f372 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -38,8 +38,6 @@
"account.edit_profile_short": "Editare",
"account.enable_notifications": "Trimite-mi o notificare când postează @{name}",
"account.endorse": "Promovează pe profil",
- "account.featured_tags.last_status_at": "Ultima postare pe {date}",
- "account.featured_tags.last_status_never": "Fără postări",
"account.follow": "Urmărește",
"account.follow_back": "Urmăreşte înapoi",
"account.followers": "Urmăritori",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index d6208e79f9..21a89bab45 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -45,9 +45,6 @@
"account.featured": "Рекомендации",
"account.featured.accounts": "Профили",
"account.featured.collections": "Подборки",
- "account.featured.hashtags": "Хештеги",
- "account.featured_tags.last_status_at": "Последний пост опубликован {date}",
- "account.featured_tags.last_status_never": "Нет постов",
"account.field_overflow": "Показать полностью",
"account.filters.all": "Всё вместе",
"account.filters.boosts_toggle": "Показывать продвижения",
@@ -482,9 +479,7 @@
"emoji_button.search_results": "Результаты поиска",
"emoji_button.symbols": "Символы",
"emoji_button.travel": "Путешествия и места",
- "empty_column.account_featured.me": "Вы ещё ничего не рекомендовали в своём профиле. Знаете ли вы, что вы можете рекомендовать в своём профиле часто используемые вами хештеги и даже профили друзей?",
"empty_column.account_featured.other": "{acct} ещё ничего не рекомендовал(а) в своём профиле. Знаете ли вы, что вы можете рекомендовать в своём профиле часто используемые вами хештеги и даже профили друзей?",
- "empty_column.account_featured_other.unknown": "Этот пользователь ещё ничего не рекомендовал в своём профиле.",
"empty_column.account_hides_collections": "Пользователь предпочёл не раскрывать эту информацию",
"empty_column.account_suspended": "Учётная запись заблокирована",
"empty_column.account_timeline": "Здесь нет постов!",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index 40a83f6fb7..dbaf6f7136 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -25,8 +25,6 @@
"account.edit_profile": "Управити профіл",
"account.enable_notifications": "Уповістити ня, кой {name} пише",
"account.endorse": "Указовати на профілови",
- "account.featured_tags.last_status_at": "Датум послідньої публикації {date}",
- "account.featured_tags.last_status_never": "Ниє публикацій",
"account.follow": "Пудписати ся",
"account.follow_back": "Пудписати ся тоже",
"account.followers": "Пудписникы",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 3e23ac76b5..d4d93e292c 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -23,8 +23,6 @@
"account.edit_profile": "सम्पाद्यताम्",
"account.enable_notifications": "यदा @{name} स्थापयति तदा मां ज्ञापय",
"account.endorse": "व्यक्तिगतविवरणे वैशिष्ट्यम्",
- "account.featured_tags.last_status_at": "{date} दिने गतस्थापनम्",
- "account.featured_tags.last_status_never": "न पत्रम्",
"account.follow": "अनुस्रियताम्",
"account.followers": "अनुसर्तारः",
"account.followers.empty": "नाऽनुसर्तारो वर्तन्ते",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 74317c1378..20e7a8bea4 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -35,9 +35,6 @@
"account.familiar_followers_two": "Sighidu dae {name1} e {name2}",
"account.featured": "In evidèntzia",
"account.featured.accounts": "Profilos",
- "account.featured.hashtags": "Etichetas",
- "account.featured_tags.last_status_at": "Ùrtima publicatzione in su {date}",
- "account.featured_tags.last_status_never": "Peruna publicatzione",
"account.follow": "Sighi",
"account.follow_back": "Sighi tue puru",
"account.followers": "Sighiduras",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index e5f8c58613..73fd821101 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -22,8 +22,6 @@
"account.edit_profile": "Edit profile",
"account.enable_notifications": "Notify me whan @{name} posts",
"account.endorse": "Shaw oan profile",
- "account.featured_tags.last_status_at": "Last post oan {date}",
- "account.featured_tags.last_status_never": "Nae posts",
"account.follow": "Follae",
"account.followers": "Follaers",
"account.followers.empty": "Naebody follaes this uiser yit.",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 8f50cffb90..a21fca3283 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -34,9 +34,6 @@
"account.familiar_followers_two": "පසුව {name1} සහ {name2}",
"account.featured": "විශේෂාංග සහිත",
"account.featured.accounts": "පැතිකඩ",
- "account.featured.hashtags": "හැෂ් ටැග්",
- "account.featured_tags.last_status_at": "අවසාන ලිපිය: {date}",
- "account.featured_tags.last_status_never": "ලිපි නැත",
"account.follow": "අනුගමනය",
"account.follow_back": "ආපසු අනුගමනය කරන්න",
"account.followers": "අනුගාමිකයින්",
@@ -279,7 +276,6 @@
"emoji_button.search_results": "සෙවුම් ප්රතිඵල",
"emoji_button.symbols": "සංකේත",
"emoji_button.travel": "චාරිකා සහ ස්ථාන",
- "empty_column.account_featured_other.unknown": "මෙම ගිණුමේ තවමත් කිසිවක් විශේෂාංගගත කර නොමැත.",
"empty_column.account_hides_collections": "මෙම පරිශීලකයා මෙම තොරතුරු ලබා ගත නොහැකි ලෙස සකස් කර ඇත.",
"empty_column.account_suspended": "ගිණුම අත්හිටුවා ඇත",
"empty_column.account_timeline": "මෙහි ලිපි නැත!",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 882913222d..5c699d382e 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -37,9 +37,6 @@
"account.familiar_followers_two": "Nasledovanie od {name1} a {name2}",
"account.featured": "Zviditeľnené",
"account.featured.accounts": "Profily",
- "account.featured.hashtags": "Hashtagy",
- "account.featured_tags.last_status_at": "Posledný príspevok dňa {date}",
- "account.featured_tags.last_status_never": "Žiadne príspevky",
"account.filters.posts_only": "Príspevky",
"account.filters.posts_replies": "Príspevky a odpovede",
"account.follow": "Sledovať",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 063e30b939..67df749711 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -34,9 +34,6 @@
"account.familiar_followers_one": "Sledi {name1}",
"account.featured": "Izpostavljeni",
"account.featured.accounts": "Profili",
- "account.featured.hashtags": "Ključniki",
- "account.featured_tags.last_status_at": "Zadnja objava {date}",
- "account.featured_tags.last_status_never": "Ni objav",
"account.follow": "Sledi",
"account.follow_back": "Sledi nazaj",
"account.follow_back_short": "Sledi nazaj",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 84fb10a696..e892c3a25f 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -45,9 +45,6 @@
"account.featured": "Të zgjedhur",
"account.featured.accounts": "Profile",
"account.featured.collections": "Koleksione",
- "account.featured.hashtags": "Hashtag-ë",
- "account.featured_tags.last_status_at": "Postimi i fundit më {date}",
- "account.featured_tags.last_status_never": "Pa postime",
"account.field_overflow": "Shfaq lëndë të plotë",
"account.filters.all": "Krejt veprimtarinë",
"account.filters.boosts_toggle": "Shfaq përforcime",
@@ -75,6 +72,7 @@
"account.in_memoriam": "In Memoriam.",
"account.joined_short": "U bë pjesë",
"account.languages": "Ndryshoni gjuhë pajtimesh",
+ "account.last_active": "Aktiv së fundi më",
"account.link_verified_on": "Pronësia e kësaj lidhjeje qe kontrolluar më {date}",
"account.locked_info": "Gjendja e privatësisë së kësaj llogarie është caktuar si e kyçur. I zoti merr dorazi në shqyrtim cilët mund ta ndjekin.",
"account.media": "Media",
@@ -352,6 +350,7 @@
"collection.share_template_other": "Shihni këtë koleksion të hijshëm: {link}",
"collection.share_template_own": "Shihni koleksionin tim të ri: {link}",
"collections.account_count": "{count, plural, one {# llogari} other {# llogari}}",
+ "collections.accounts.empty_description": "Shtoni deri në {count} llogari që ndiqni",
"collections.accounts.empty_title": "Ky koleksion është i zbrazët",
"collections.by_account": "nga {account_handle}",
"collections.collection_description": "Përshkrim",
@@ -371,13 +370,13 @@
"collections.delete_collection": "Fshije koleksionin",
"collections.description_length_hint": "Kufi prej 100 shenjash",
"collections.detail.accounts_heading": "Llogari",
+ "collections.detail.author_added_you_on_date": "{author} ju shtoi më {date}",
"collections.detail.loading": "Po ngarkohet koleksion…",
- "collections.detail.other_accounts_count": "{count, plural, one {# llogari tjetër} other {# llogari të tjera}}",
"collections.detail.revoke_inclusion": "Hiqmëni",
"collections.detail.sensitive_content": "Lëndë rezervat",
"collections.detail.sensitive_note": "Ky koleksion përmban llogari dhe lëndë që mund të jetë me spec për disa përdorues.",
"collections.detail.share": "Ndajeni këtë koleksion me të tjerë",
- "collections.detail.you_were_added_to_this_collection": "U shtuat te ky koleksion",
+ "collections.detail.you_are_in_this_collection": "Shfaqeni te ky koleksion",
"collections.edit_details": "Përpunoni hollësi",
"collections.error_loading_collections": "Pati një gabim teksa provohej të ngarkoheshin koleksionet tuaj.",
"collections.hints.accounts_counter": "{count} / {max} llogari",
@@ -600,9 +599,15 @@
"emoji_button.search_results": "Përfundime kërkimi",
"emoji_button.symbols": "Simbole",
"emoji_button.travel": "Udhëtime & Vende",
- "empty_column.account_featured.me": "S’keni ende të zgjedhur diçka. E dini se në profilin tuaj mund të shfaqni si të zgjedhura hashtag-ët që përdorni më tepër dhe madje edhe llogaritë e shokëve tuaj?",
"empty_column.account_featured.other": "{acct} s’ka të zgjedhur ende ndonjë gjë. E dini se në profilin tuaj mund të shfaqni si të zgjedhura hashtag-ët që përdorni më tepër dhe madje edhe llogaritë e shokëve tuaj?",
- "empty_column.account_featured_other.unknown": "Kjo llogari s’ka ende gjë të zgjedhur.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} s’ka krijuar ende ndonjë koleksion.",
+ "empty_column.account_featured_other.title": "S’ka ç’shihet këtu",
+ "empty_column.account_featured_self.no_collections": "Ende pa koleksione",
+ "empty_column.account_featured_self.no_collections_button": "Krijoni një koleksion",
+ "empty_column.account_featured_self.pre_collections": "Ndiqeni për Koleksione",
+ "empty_column.account_featured_self.pre_collections_desc": "Koleksionet (që vijnë me Mastodon 4.6) ju lejojnë të krijoni lista tuajat llogarish për t’ua rekomanduar të tjerëve.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Kjo llogari s’ka krijuar ende ndonjë koleksion.",
+ "empty_column.account_featured_unknown.other": "Kjo llogari s’ka zgjedhur gjë ende.",
"empty_column.account_hides_collections": "Ky përdorues ka zgjedhur të mos e japë këtë informacion",
"empty_column.account_suspended": "Llogaria u pezullua",
"empty_column.account_timeline": "S’ka mesazhe këtu!",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index d556f9f1d3..2b517b4209 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -31,8 +31,6 @@
"account.enable_notifications": "Obavesti me kada @{name} objavi",
"account.endorse": "Istakni na profilu",
"account.featured.accounts": "Profili",
- "account.featured_tags.last_status_at": "Poslednja objava {date}",
- "account.featured_tags.last_status_never": "Nema objava",
"account.filters.all": "Sve aktivnosti",
"account.filters.posts_only": "Objave",
"account.filters.posts_replies": "Objave i odgovori",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 2c36aca885..ee12b86e13 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -25,8 +25,6 @@
"account.edit_profile": "Уреди профил",
"account.enable_notifications": "Обавести ме када @{name} објави",
"account.endorse": "Истакни на профилу",
- "account.featured_tags.last_status_at": "Последња објава {date}",
- "account.featured_tags.last_status_never": "Нема објава",
"account.follow": "Прати",
"account.follow_back": "Узврати праћење",
"account.followers": "Пратиоци",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index d2439656c5..0e65e5d64d 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -45,9 +45,6 @@
"account.featured": "Utvalda",
"account.featured.accounts": "Profiler",
"account.featured.collections": "Samlingar",
- "account.featured.hashtags": "Fyrkantstaggar",
- "account.featured_tags.last_status_at": "Senaste inlägg den {date}",
- "account.featured_tags.last_status_never": "Inga inlägg",
"account.field_overflow": "Visa hela innehållet",
"account.filters.all": "All aktivitet",
"account.filters.boosts_toggle": "Visa förstärkningar",
@@ -278,9 +275,7 @@
"collections.create_a_collection_hint": "Skapa en samling för att rekommendera eller dela dina favoritkonton med andra.",
"collections.create_collection": "Skapa samling",
"collections.delete_collection": "Radera samling",
- "collections.detail.accept_inclusion": "Okej",
"collections.detail.accounts_heading": "Konton",
- "collections.detail.other_accounts_count": "{count, plural, one {# annat konto} other {# andra konton}}",
"collections.detail.revoke_inclusion": "Ta bort mig",
"collections.detail.sensitive_content": "Känsligt innehåll",
"collections.error_loading_collections": "Det uppstod ett fel när dina samlingar skulle laddas.",
@@ -468,9 +463,7 @@
"emoji_button.search_results": "Sökresultat",
"emoji_button.symbols": "Symboler",
"emoji_button.travel": "Resor & platser",
- "empty_column.account_featured.me": "Du har inte presenterat något ännu. Visste du att du kan markera de fyrkantstaggar du använder mest och även din väns konton på din profil?",
"empty_column.account_featured.other": "{acct} har inte presenterat något ännu. Visste du att du kan markera de fyrkantstaggar som du använder mest och även din väns konton på din profil?",
- "empty_column.account_featured_other.unknown": "Detta konto har inte presenterat något ännu.",
"empty_column.account_hides_collections": "Användaren har valt att inte göra denna information tillgänglig",
"empty_column.account_suspended": "Kontot är avstängt",
"empty_column.account_timeline": "Inga inlägg här!",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 1cc392d000..d55dc90166 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -16,7 +16,6 @@
"account.edit_profile": "சுயவிவரத்தை மாற்று",
"account.enable_notifications": "@{name} பதிவிட்டல் எனக்குத் தெரியப்படுத்தவும்",
"account.endorse": "சுயவிவரத்தில் வெளிப்படுத்து",
- "account.featured_tags.last_status_never": "இடுகைகள் இல்லை",
"account.follow": "பின்தொடர்",
"account.follow_back": "பின்தொடரு",
"account.followers": "பின்தொடர்பவர்கள்",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 479b30f532..0981a878ff 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -8,7 +8,6 @@
"account.cancel_follow_request": "Withdraw follow request",
"account.edit_profile": "ప్రొఫైల్ని సవరించండి",
"account.endorse": "ప్రొఫైల్లో చూపించు",
- "account.featured.hashtags": "హ్యాష్ట్యాగ్లు",
"account.follow": "అనుసరించు",
"account.followers": "అనుచరులు",
"account.followers.empty": "ఈ వినియోగదారుడిని ఇంకా ఎవరూ అనుసరించడంలేదు.",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 13891ac18e..e2450305c0 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -43,9 +43,6 @@
"account.familiar_followers_two": "ติดตามโดย {name1} และ {name2}",
"account.featured": "น่าสนใจ",
"account.featured.accounts": "โปรไฟล์",
- "account.featured.hashtags": "แฮชแท็ก",
- "account.featured_tags.last_status_at": "โพสต์ล่าสุดเมื่อ {date}",
- "account.featured_tags.last_status_never": "ไม่มีโพสต์",
"account.follow": "ติดตาม",
"account.follow_back": "ติดตามกลับ",
"account.follow_back_short": "ติดตามกลับ",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 83d2b5cc94..b585791cfc 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -36,9 +36,6 @@
"account.familiar_followers_two": "{name1} en {name2} li kute e jan ni",
"account.featured": "suli",
"account.featured.accounts": "lipu jan",
- "account.featured.hashtags": "kulupu lipu",
- "account.featured_tags.last_status_at": "sitelen pini pi jan ni li tan {date}",
- "account.featured_tags.last_status_never": "toki ala li lon",
"account.follow": "o kute",
"account.follow_back": "jan ni li kute e sina. o kute",
"account.follow_back_short": "o kute",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index f77840489f..27f9f2839c 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -45,9 +45,6 @@
"account.featured": "Öne çıkan",
"account.featured.accounts": "Profiller",
"account.featured.collections": "Koleksiyonlar",
- "account.featured.hashtags": "Etiketler",
- "account.featured_tags.last_status_at": "Son gönderinin tarihi {date}",
- "account.featured_tags.last_status_never": "Gönderi yok",
"account.field_overflow": "Tüm içeriği göster",
"account.filters.all": "Tüm aktiviteler",
"account.filters.boosts_toggle": "Yeniden paylaşımları göster",
@@ -75,6 +72,7 @@
"account.in_memoriam": "Hatırasına.",
"account.joined_short": "Katıldı",
"account.languages": "Abone olunan dilleri değiştir",
+ "account.last_active": "Son etkin",
"account.link_verified_on": "Bu bağlantının sahipliği {date} tarihinde denetlendi",
"account.locked_info": "Bu hesabın gizlilik durumu gizli olarak ayarlanmış. Sahibi, onu kimin takip edebileceğini elle onaylıyor.",
"account.media": "Medya",
@@ -375,15 +373,14 @@
"collections.create_collection": "Koleksiyon oluştur",
"collections.delete_collection": "Koleksiyonu sil",
"collections.description_length_hint": "100 karakterle sınırlı",
- "collections.detail.accept_inclusion": "Tamam",
"collections.detail.accounts_heading": "Hesaplar",
+ "collections.detail.author_added_you_on_date": "{author}, sizi {date} tarihinde ekledi",
"collections.detail.loading": "Koleksiyon yükleniyor…",
- "collections.detail.other_accounts_count": "{count, plural, one {# diğer hesap} other {# diğer hesap}}",
"collections.detail.revoke_inclusion": "Beni çıkar",
"collections.detail.sensitive_content": "Hassas içerik",
"collections.detail.sensitive_note": "Bu koleksiyon bazı kullanıcılar için hassas olabilecek hesap ve içerik içerebilir.",
"collections.detail.share": "Bu koleksiyonu paylaş",
- "collections.detail.you_were_added_to_this_collection": "Bu koleksiyona eklendiniz",
+ "collections.detail.you_are_in_this_collection": "Bu koleksiyonda öne çıkanlardasınız",
"collections.edit_details": "Ayrıntıları düzenle",
"collections.error_loading_collections": "Koleksiyonlarınızı yüklemeye çalışırken bir hata oluştu.",
"collections.hints.accounts_counter": "{count} / {max} hesap",
@@ -580,6 +577,15 @@
"domain_pill.your_server": "Dijital anasayfanız, tüm gönderilerinizin yaşadığı yerdir. Bunu beğenmediniz mi? İstediğiniz zaman sunucularınızı değiştirin ve takipçilerinizi de getirin.",
"domain_pill.your_username": "Bu sunucudaki tekil tanımlayıcınız. Farklı sunucularda aynı kullanıcı adına sahip kullanıcıları bulmak mümkündür.",
"dropdown.empty": "Bir seçenek seçin",
+ "email_subscriptions.email": "E-posta adresi",
+ "email_subscriptions.form.action": "Abone ol",
+ "email_subscriptions.form.disclaimer": "İstediğiniz zaman abonelikten çıkabilirsiniz. Daha fazla bilgi için Gizlilik Politikası sayfasına bakabilirsiniz.",
+ "email_subscriptions.form.lead": "Gönderiler gelen kutunuza Mastodon hesabı oluşturmadan gelsin.",
+ "email_subscriptions.form.title": "{name} kişisinin e-posta güncellemelerine kaydolun",
+ "email_subscriptions.submitted.lead": "E-posta güncellemelerine kaydolma işlemini tamamlamak için gelen kutunuzu kontrol edin.",
+ "email_subscriptions.submitted.title": "Bir adım daha",
+ "email_subscriptions.validation.email.blocked": "Engellenmiş e-posta sağlayıcı",
+ "email_subscriptions.validation.email.invalid": "Geçersiz eposta adresi",
"embed.instructions": "Aşağıdaki kodu kopyalayarak bu durumu sitenize gömün.",
"embed.preview": "İşte böyle görünecek:",
"emoji_button.activity": "Aktivite",
@@ -597,9 +603,15 @@
"emoji_button.search_results": "Arama sonuçları",
"emoji_button.symbols": "Semboller",
"emoji_button.travel": "Seyahat ve Yerler",
- "empty_column.account_featured.me": "Henüz hiçbir şeyi öne çıkarmadınız. En çok kullandığınız etiketleri ve hatta arkadaşlarınızın hesaplarını profilinizde öne çıkarabileceğinizi biliyor muydunuz?",
"empty_column.account_featured.other": "{acct} henüz hiçbir şeyi öne çıkarmadı. En çok kullandığınız etiketleri ve hatta arkadaşlarınızın hesaplarını profilinizde öne çıkarabileceğinizi biliyor muydunuz?",
- "empty_column.account_featured_other.unknown": "Bu hesap henüz hiçbir şeyi öne çıkarmadı.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} henüz bir koleksiyon oluşturmadı.",
+ "empty_column.account_featured_other.title": "Burada görülecek bir şey yok",
+ "empty_column.account_featured_self.no_collections": "Henüz hiçbir koleksiyon yok",
+ "empty_column.account_featured_self.no_collections_button": "Bir koleksiyon oluştur",
+ "empty_column.account_featured_self.pre_collections": "Koleksiyonlar için beklemede kalın",
+ "empty_column.account_featured_self.pre_collections_desc": "“Koleksiyonlar” (Mastodon 4.6 sürümünde kullanıma sunulacak) özelliği başkalarına önermek üzere kendi seçtiğiniz hesap listelerini oluşturmanıza olanak tanır.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Bu hesap henüz bir koleksiyon oluşturmadı.",
+ "empty_column.account_featured_unknown.other": "Bu hesap henüz hiçbir şeyi öne çıkarmadı.",
"empty_column.account_hides_collections": "Bu kullanıcı bu bilgiyi sağlamayı tercih etmemiştir",
"empty_column.account_suspended": "Hesap askıya alındı",
"empty_column.account_timeline": "Burada hiç gönderi yok!",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 0930bce3c6..2f7ab79d41 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -40,9 +40,6 @@
"account.enable_notifications": "@{name} язулары өчен белдерүләр яндыру",
"account.endorse": "Профильдә тәкъдим итү",
"account.featured.accounts": "Профильләр",
- "account.featured.hashtags": "Һәштэглар",
- "account.featured_tags.last_status_at": "Соңгы хәбәр {date}",
- "account.featured_tags.last_status_never": "Хәбәрләр юк",
"account.filters.all": "Барлык активлык",
"account.filters.boosts_toggle": "Бустларны күрсәт",
"account.follow": "Язылу",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index ce8faeb2d0..d01c04ec70 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -40,9 +40,6 @@
"account.familiar_followers_two": "Має серед підписників {name1} та {name2}",
"account.featured": "Рекомендоване",
"account.featured.accounts": "Профілі",
- "account.featured.hashtags": "Хештеги",
- "account.featured_tags.last_status_at": "Останній допис {date}",
- "account.featured_tags.last_status_never": "Немає дописів",
"account.field_overflow": "Показати повністю",
"account.filters.all": "Усі дії",
"account.filters.boosts_toggle": "Показати поширення",
@@ -357,7 +354,6 @@
"emoji_button.search_results": "Результати пошуку",
"emoji_button.symbols": "Символи",
"emoji_button.travel": "Подорожі та місця",
- "empty_column.account_featured_other.unknown": "Цей обліковий запис ще не виділив нічого.",
"empty_column.account_hides_collections": "Цей користувач вирішив не робити цю інформацію доступною",
"empty_column.account_suspended": "Обліковий запис заблоковано",
"empty_column.account_timeline": "Тут немає дописів!",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 77c0f8b80a..1e518485a7 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -19,8 +19,6 @@
"account.edit_profile": "مشخص ترمیم کریں",
"account.enable_notifications": "جب @{name} پوسٹ کرے تو مجھ مطلع کریں",
"account.endorse": "مشکص پر نمایاں کریں",
- "account.featured_tags.last_status_at": "آخری پوسٹ {date} کو",
- "account.featured_tags.last_status_never": "کوئی مراسلہ نہیں",
"account.follow": "پیروی کریں",
"account.follow_back": "اکاؤنٹ کو فالو بیک ",
"account.followers": "پیروکار",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 5751b82ab5..32f5da4cb4 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -22,8 +22,6 @@
"account.edit_profile": "Profilni tahrirlash",
"account.enable_notifications": "@{name} post qo‘yganida menga xabar olish",
"account.endorse": "Profildagi xususiyat",
- "account.featured_tags.last_status_at": "Oxirgi post: {date}",
- "account.featured_tags.last_status_never": "Habarlar yo'q",
"account.follow": "Obuna bo‘lish",
"account.followers": "Obunachilar",
"account.followers.empty": "Bu foydalanuvchini hali hech kim kuzatmaydi.",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 58f4e786d0..7cf12da44d 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -45,9 +45,6 @@
"account.featured": "Nêu bật",
"account.featured.accounts": "Tài khoản",
"account.featured.collections": "Gói khởi đầu",
- "account.featured.hashtags": "Hashtag thường dùng",
- "account.featured_tags.last_status_at": "Tút gần nhất {date}",
- "account.featured_tags.last_status_never": "Chưa có tút",
"account.field_overflow": "Hiện đầy đủ nội dung",
"account.filters.all": "Tất cả hoạt động",
"account.filters.boosts_toggle": "Hiện những lượt đăng lại",
@@ -75,6 +72,7 @@
"account.in_memoriam": "Tưởng Niệm.",
"account.joined_short": "Năm",
"account.languages": "Đổi ngôn ngữ mong muốn",
+ "account.last_active": "Hoạt động lần cuối",
"account.link_verified_on": "Liên kết này đã được xác minh vào {date}",
"account.locked_info": "Đây là tài khoản riêng tư. Chủ tài khoản tự mình xét duyệt các yêu cầu theo dõi.",
"account.media": "Phương tiện",
@@ -375,15 +373,14 @@
"collections.create_collection": "Tạo gói khởi đầu",
"collections.delete_collection": "Xóa gói khởi đầu",
"collections.description_length_hint": "Giới hạn 100 ký tự",
- "collections.detail.accept_inclusion": "Okay",
"collections.detail.accounts_heading": "Tài khoản",
+ "collections.detail.author_added_you_on_date": "{author} đã thêm bạn vào {date}",
"collections.detail.loading": "Đang tải gói khởi đầu…",
- "collections.detail.other_accounts_count": "{count, plural, other {# tài khoản khác}}",
"collections.detail.revoke_inclusion": "Xóa tôi",
"collections.detail.sensitive_content": "Nội dung nhạy cảm",
"collections.detail.sensitive_note": "Gói khởi đầu này chứa các tài khoản và nội dung có thể nhạy cảm đối với một số người.",
"collections.detail.share": "Chia sẻ gói khởi đầu này",
- "collections.detail.you_were_added_to_this_collection": "Bạn đã được thêm vào gói khởi đầu này",
+ "collections.detail.you_are_in_this_collection": "Bạn đã được thêm vào gói khởi đầu này",
"collections.edit_details": "Sửa chi tiết",
"collections.error_loading_collections": "Đã xảy ra lỗi khi tải những gói khởi đầu của bạn.",
"collections.hints.accounts_counter": "{count} / {max} tài khoản",
@@ -606,9 +603,15 @@
"emoji_button.search_results": "Kết quả tìm kiếm",
"emoji_button.symbols": "Biểu tượng",
"emoji_button.travel": "Du lịch",
- "empty_column.account_featured.me": "Bạn chưa nêu bật gì. Bạn có biết rằng, bạn có thể giới thiệu hashtag thường dùng và hồ sơ của bạn bè trên trang cá nhân của mình không?",
"empty_column.account_featured.other": "{acct} chưa nêu bật gì. Bạn có biết rằng, bạn có thể giới thiệu hashtag thường dùng và hồ sơ của bạn bè trên trang cá nhân của mình không?",
- "empty_column.account_featured_other.unknown": "Tài khoản này chưa nêu bật gì.",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} chưa tạo gói khởi đầu nào.",
+ "empty_column.account_featured_other.title": "Không có gì để xem ở đây",
+ "empty_column.account_featured_self.no_collections": "Chưa có gói khởi đầu",
+ "empty_column.account_featured_self.no_collections_button": "Tạo một gói khởi đầu",
+ "empty_column.account_featured_self.pre_collections": "Hãy đón chờ Gói khởi đầu",
+ "empty_column.account_featured_self.pre_collections_desc": "Gói khởi đầu (sẽ có trong Mastodon 4.6) cho phép bạn tạo danh sách các tài khoản được tuyển chọn để giới thiệu cho người khác.",
+ "empty_column.account_featured_unknown.no_collections_desc": "Tài khoản này chưa tạo gói khởi đầu nào.",
+ "empty_column.account_featured_unknown.other": "Tài khoản này chưa nêu bật gì.",
"empty_column.account_hides_collections": "Tài khoản này đã chọn ẩn thông tin",
"empty_column.account_suspended": "Tài khoản vô hiệu hóa",
"empty_column.account_timeline": "Chưa có tút nào!",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 7a2b9ed700..d623155b2a 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -45,9 +45,6 @@
"account.featured": "精选",
"account.featured.accounts": "个人资料",
"account.featured.collections": "收藏列表",
- "account.featured.hashtags": "话题",
- "account.featured_tags.last_status_at": "上次发言于 {date}",
- "account.featured_tags.last_status_never": "暂无嘟文",
"account.field_overflow": "显示完整内容",
"account.filters.all": "全部活动",
"account.filters.boosts_toggle": "显示转嘟",
@@ -375,15 +372,12 @@
"collections.create_collection": "创建收藏列表",
"collections.delete_collection": "删除收藏列表",
"collections.description_length_hint": "100字限制",
- "collections.detail.accept_inclusion": "确定",
"collections.detail.accounts_heading": "账号",
"collections.detail.loading": "正在加载收藏列表…",
- "collections.detail.other_accounts_count": "{count, plural, other {其他 # 个账号}}",
"collections.detail.revoke_inclusion": "移除我",
"collections.detail.sensitive_content": "敏感内容",
"collections.detail.sensitive_note": "此收藏列表可能包含某些对部分用户而言为敏感内容的账号或内容。",
"collections.detail.share": "分享此收藏列表",
- "collections.detail.you_were_added_to_this_collection": "你被添加到了此收藏列表",
"collections.edit_details": "编辑详情",
"collections.error_loading_collections": "加载你的收藏列表时发生错误。",
"collections.hints.accounts_counter": "{count} / {max} 个账号",
@@ -580,6 +574,15 @@
"domain_pill.your_server": "你的数字家园,你的全部嘟文都在此存储。不喜欢这里吗?你可以随时迁移到其它服务器,并带上你的关注者。",
"domain_pill.your_username": "你在此服务器上的唯一标识。不同服务器上可能存在相同用户名的用户。",
"dropdown.empty": "选项",
+ "email_subscriptions.email": "电子邮件地址",
+ "email_subscriptions.form.action": "订阅",
+ "email_subscriptions.form.disclaimer": "你可以随时退订。更多信息参见隐私政策。",
+ "email_subscriptions.form.lead": "无需注册 Mastodon 账号,在收件箱中获取嘟文。",
+ "email_subscriptions.form.title": "订阅 {name} 的电子邮件推送",
+ "email_subscriptions.submitted.lead": "请检查你的收件箱来完成邮件订阅注册。",
+ "email_subscriptions.submitted.title": "最后一步",
+ "email_subscriptions.validation.email.blocked": "电子邮件提供商已封禁",
+ "email_subscriptions.validation.email.invalid": "电子邮件地址无效",
"embed.instructions": "复制下列代码以在你的网站中嵌入此嘟文。",
"embed.preview": "这是它的预览效果:",
"emoji_button.activity": "活动",
@@ -597,9 +600,7 @@
"emoji_button.search_results": "搜索结果",
"emoji_button.symbols": "符号",
"emoji_button.travel": "旅行与地点",
- "empty_column.account_featured.me": "你尚未设置任何精选。你知道吗?你可以将自己最常使用的话题标签,甚至是好友的账号,在你的个人主页上设为精选。",
"empty_column.account_featured.other": "{acct} 尚未设置任何精选。你知道吗?你可以将自己最常使用的话题标签,甚至是好友的账号,在你的个人主页上设为精选。",
- "empty_column.account_featured_other.unknown": "此账号尚未设置任何精选。",
"empty_column.account_hides_collections": "该用户选择不公开此信息",
"empty_column.account_suspended": "账号已被停用",
"empty_column.account_timeline": "这里没有嘟文!",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index ce8e51f0ee..6437b9b8c5 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -36,9 +36,6 @@
"account.familiar_followers_two": "{name1} 及 {name2} 已追蹤",
"account.featured": "精選",
"account.featured.accounts": "個人檔案",
- "account.featured.hashtags": "標籤",
- "account.featured_tags.last_status_at": "上次帖文於 {date}",
- "account.featured_tags.last_status_never": "暫無文章",
"account.follow": "關注",
"account.follow_back": "追蹤對方",
"account.follow_back_short": "追蹤對方",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index f5e31418c9..22e40ee25f 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -45,9 +45,6 @@
"account.featured": "精選內容",
"account.featured.accounts": "個人檔案",
"account.featured.collections": "收藏名單",
- "account.featured.hashtags": "主題標籤",
- "account.featured_tags.last_status_at": "上次發嘟於 {date}",
- "account.featured_tags.last_status_never": "沒有嘟文",
"account.field_overflow": "顯示完整內容",
"account.filters.all": "所有活動",
"account.filters.boosts_toggle": "顯示轉嘟",
@@ -75,6 +72,7 @@
"account.in_memoriam": "謹此悼念。",
"account.joined_short": "加入時間",
"account.languages": "變更訂閱的語言",
+ "account.last_active": "上次活躍時間",
"account.link_verified_on": "已於 {date} 檢查此連結的擁有者權限",
"account.locked_info": "此帳號的隱私狀態被設為鎖定。該擁有者會手動審核能跟隨此帳號的人。",
"account.media": "媒體",
@@ -375,15 +373,14 @@
"collections.create_collection": "建立收藏名單",
"collections.delete_collection": "刪除收藏名單",
"collections.description_length_hint": "100 字限制",
- "collections.detail.accept_inclusion": "Okay",
"collections.detail.accounts_heading": "帳號",
+ "collections.detail.author_added_you_on_date": "{author} 於 {date} 將您加入",
"collections.detail.loading": "讀取收藏名單中...",
- "collections.detail.other_accounts_count": "{count, plural, other {# 個其他帳號}}",
"collections.detail.revoke_inclusion": "移除我",
"collections.detail.sensitive_content": "敏感內容",
"collections.detail.sensitive_note": "此收藏名單可能包含對某些使用者敏感之帳號或內容。",
"collections.detail.share": "分享此收藏名單",
- "collections.detail.you_were_added_to_this_collection": "您已被加入至此收藏名單",
+ "collections.detail.you_are_in_this_collection": "您已被加入至此收藏名單",
"collections.edit_details": "編輯詳細資料",
"collections.error_loading_collections": "讀取您的收藏名單時發生錯誤。",
"collections.hints.accounts_counter": "{count} / {max} 個帳號",
@@ -606,9 +603,15 @@
"emoji_button.search_results": "搜尋結果",
"emoji_button.symbols": "符號",
"emoji_button.travel": "旅遊與地點",
- "empty_column.account_featured.me": "您尚未有任何精選內容。您知道您可以將您的常用主題標籤、甚至您朋友們的帳號作為您個人檔案上之精選內容嗎?",
"empty_column.account_featured.other": "{acct} 尚未有任何精選內容。您知道您可以將您的常用主題標籤、甚至您朋友們的帳號作為您個人檔案上之精選內容嗎?",
- "empty_column.account_featured_other.unknown": "此帳號尚未有任何精選內容。",
+ "empty_column.account_featured_other.no_collections_desc": "{acct} 尚未建立任何收藏名單。",
+ "empty_column.account_featured_other.title": "此地一無所有",
+ "empty_column.account_featured_self.no_collections": "尚無蒐藏名單",
+ "empty_column.account_featured_self.no_collections_button": "建立收藏名單",
+ "empty_column.account_featured_self.pre_collections": "敬請期待收藏名單",
+ "empty_column.account_featured_self.pre_collections_desc": "收藏名單功能(將於 Mastodon 4.6 上線)允許您建立自己的精選帳號名單並推薦予其他人。",
+ "empty_column.account_featured_unknown.no_collections_desc": "此帳號尚未建立任何收藏名單。",
+ "empty_column.account_featured_unknown.other": "此帳號尚未有任何精選內容。",
"empty_column.account_hides_collections": "這位使用者選擇不提供此資訊",
"empty_column.account_suspended": "帳號已被停權",
"empty_column.account_timeline": "這裡還沒有嘟文!",
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index fad41b5eb8..924b12434b 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -225,34 +225,6 @@
}
}
-.account-role {
- display: inline-flex;
- padding: 4px;
- padding-inline-end: 8px;
- border: 1px solid var(--color-border-brand);
- color: var(--color-text-brand);
- font-weight: 500;
- font-size: 12px;
- letter-spacing: 0.5px;
- line-height: 16px;
- gap: 4px;
- border-radius: 6px;
- align-items: center;
-
- svg {
- width: auto;
- height: 15px;
- opacity: 0.85;
- fill: currentColor;
- }
-
- &__domain {
- font-weight: 400;
- opacity: 0.75;
- letter-spacing: 0;
- }
-}
-
.simple_form .not_recommended {
color: var(--color-text-error);
background-color: var(--color-bg-error-softest);
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 89f2493291..183b2321ad 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1125,10 +1125,6 @@ a.name-tag,
&:hover {
color: var(--color-text-brand);
}
-
- .account-role {
- vertical-align: middle;
- }
}
.icon {
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 593743a022..c84ec96ac7 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -8405,16 +8405,6 @@ noscript {
}
}
- &__badges {
- display: flex;
- flex-wrap: wrap;
- gap: 8px;
-
- .account-role {
- line-height: unset;
- }
- }
-
&__tabs {
display: flex;
align-items: flex-start;
diff --git a/app/views/admin/software_updates/_software_update.html.haml b/app/views/admin/software_updates/_software_update.html.haml
new file mode 100644
index 0000000000..9eb270e497
--- /dev/null
+++ b/app/views/admin/software_updates/_software_update.html.haml
@@ -0,0 +1,10 @@
+%tr{ id: dom_id(software_update) }
+ %td= software_update.version
+ %td= t("admin.software_updates.types.#{software_update.type}")
+ %td{ class: class_names(critical: software_update.urgent?) }
+ - if software_update.urgent?
+ = t('admin.software_updates.critical_update')
+ %td.release-notes
+ = table_link_to 'link',
+ t('admin.software_updates.release_notes'),
+ software_update.release_notes
diff --git a/app/views/admin/software_updates/index.html.haml b/app/views/admin/software_updates/index.html.haml
index d2ba115590..25de175a7b 100644
--- a/app/views/admin/software_updates/index.html.haml
+++ b/app/views/admin/software_updates/index.html.haml
@@ -18,12 +18,4 @@
%th
%th
%tbody
- - @software_updates.each do |update|
- %tr
- %td= update.version
- %td= t("admin.software_updates.types.#{update.type}")
- - if update.urgent?
- %td.critical= t('admin.software_updates.critical_update')
- - else
- %td
- %td= table_link_to 'link', t('admin.software_updates.release_notes'), update.release_notes
+ = render collection: @software_updates, partial: 'admin/software_updates/software_update'
diff --git a/app/views/settings/featured_tags/_featured_tag.html.haml b/app/views/settings/featured_tags/_featured_tag.html.haml
new file mode 100644
index 0000000000..f790b5e39b
--- /dev/null
+++ b/app/views/settings/featured_tags/_featured_tag.html.haml
@@ -0,0 +1,17 @@
+.directory__tag
+ %div
+ %h2
+ = material_symbol 'tag'
+ = featured_tag.display_name
+ %small
+ - if featured_tag.last_status_at?
+ %time.formatted{ datetime: featured_tag.last_status_at.iso8601, title: l(featured_tag.last_status_at) }= l featured_tag.last_status_at
+ - else
+ = t('accounts.nothing_here')
+ = table_link_to 'delete',
+ t('filters.index.delete'),
+ settings_featured_tag_path(featured_tag),
+ data: { confirm: t('admin.accounts.are_you_sure') },
+ method: :delete
+
+ .trends__item__current= friendly_number_to_human featured_tag.statuses_count
diff --git a/app/views/settings/featured_tags/index.html.haml b/app/views/settings/featured_tags/index.html.haml
index b7f6e56b3d..dcefe1b3b8 100644
--- a/app/views/settings/featured_tags/index.html.haml
+++ b/app/views/settings/featured_tags/index.html.haml
@@ -20,16 +20,4 @@
%hr.spacer/
-- @featured_tags.each do |featured_tag|
- .directory__tag
- %div
- %h2
- = material_symbol 'tag'
- = featured_tag.display_name
- %small
- - if featured_tag.last_status_at.nil?
- = t('accounts.nothing_here')
- - else
- %time.formatted{ datetime: featured_tag.last_status_at.iso8601, title: l(featured_tag.last_status_at) }= l featured_tag.last_status_at
- = table_link_to 'delete', t('filters.index.delete'), settings_featured_tag_path(featured_tag), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
- .trends__item__current= friendly_number_to_human featured_tag.statuses_count
+= render collection: @featured_tags, partial: 'settings/featured_tags/featured_tag'
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 46683cccd6..bac33f609e 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -16,7 +16,7 @@ fi:
one: seurattava
other: seurattavaa
instance_actor_flash: Tämä tili on virtuaalinen toimija, jota käytetään edustamaan itse palvelinta eikä yksittäistä käyttäjää. Sitä käytetään federointitarkoituksiin, eikä sitä tule jäädyttää.
- last_active: viimeksi aktiivinen
+ last_active: viimeksi aktiivisena
link_verified_on: Tämän linkin omistus on tarkastettu %{date}
nothing_here: Täällä ei ole mitään!
pin_errors:
@@ -1857,7 +1857,7 @@ fi:
followers: Seuraajat
following: Seurattavat
invited: Kutsutut
- last_active: Viimeksi aktiivinen
+ last_active: Viimeksi aktiivisena
most_recent: Tuorein
moved: Muuttaneet
mutual: Seuraatte toisianne
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index e64c6dc875..a05486f310 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1439,6 +1439,12 @@ fr-CA:
interact_with_this_post:
one: Interagissez avec ce message pour en découvrir d'autres.
other: Interagissez avec ces messages pour en découvrir plus.
+ subject:
+ plural: Nouveaux messages de %{name}
+ singular: 'Nouveau message : "%{excerpt}"'
+ title:
+ plural: Nouveaux messages de %{name}
+ singular: 'Nouveau message : "%{excerpt}"'
email_subscriptions:
active: Actif
confirmations:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c491cb0ae9..2d83566008 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1439,6 +1439,12 @@ fr:
interact_with_this_post:
one: Interagissez avec ce message pour en découvrir d'autres.
other: Interagissez avec ces messages pour en découvrir plus.
+ subject:
+ plural: Nouveaux messages de %{name}
+ singular: 'Nouveau message : "%{excerpt}"'
+ title:
+ plural: Nouveaux messages de %{name}
+ singular: 'Nouveau message : "%{excerpt}"'
email_subscriptions:
active: Actif
confirmations:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index a0bc348a87..c868b5a09b 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1439,6 +1439,12 @@ gl:
interact_with_this_post:
one: Interactúa con esta publicación e descubre máis coma ela.
other: Interactúa con estas publicacións e descubre máis coma elas.
+ subject:
+ plural: Novas publicacións de %{name}
+ singular: 'Nova publicación: "%{excerpt}"'
+ title:
+ plural: Novas publicacións de %{name}
+ singular: 'Nova publicación: "%{excerpt}"'
email_subscriptions:
active: Activa
confirmations:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index fe89c3eb58..56e533c67d 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1828,6 +1828,7 @@ hu:
public_timelines: Nyilvános idővonalak
privacy:
email_subscriptions: Bejegyzések küldése e-mailben
+ email_subscriptions_hint_html: E-mailes regisztrációs űrlap hozzáadása a profilodhoz, amely a kijelentkezett felhasználóknak jelenik meg. Ha a látogátok beírják az e-mail-címüket és kérik, akkor a Mastodon e-maileket fog írni a nyilvános bejegyzéseidről.
hint_html: "Testreszabható a profil és a bejegyzések megjelenése. A Mastodon számos funkciója segíthet szélesebb közönség elérésében, ha engedélyezve van. Szánj egy percet a beállítások áttekintésére, hogy megbizonyosodj arról, hogy ezek megfelelnek a te felhasználási esetednek."
privacy: Adatvédelem
privacy_hint_html: Szabályozd, hogy mások számára miket szeretnél nyilvánosságra hozni. Az emberek érdekes profilokat és nagyszerű alkalmazásokat fedezhetnek fel, amikor böngésznek mások követései között és látják, hogy mely alkalmazásokból tesznek közzé bejegyzéseket, de az is lehet, hogy inkább elrejtenéd ezeket az infókat.
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index be92d56a8a..779463de31 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -154,7 +154,7 @@ en:
jurisdiction: List the country where whoever pays the bills lives. If it’s a company or other entity, list the country where it’s incorporated, and the city, region, territory or state as appropriate.
min_age: Should not be below the minimum age required by the laws of your jurisdiction.
user:
- chosen_languages: When checked, only posts in selected languages will be displayed in public timelines
+ chosen_languages: When checked, only posts in selected languages will be displayed in public timelines. This setting does not affect your Home timeline and lists.
date_of_birth:
one: We have to make sure you're at least %{count} to use %{domain}. We won't store this.
other: We have to make sure you're at least %{count} to use %{domain}. We won't store this.
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 237e5ecee8..a674fadf6b 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -3,13 +3,13 @@
namespace :admin do
get '/dashboard', to: 'dashboard#index'
- resources :domain_allows, only: [:new, :create, :destroy]
- resources :domain_blocks, only: [:new, :create, :destroy, :update, :edit] do
- collection do
- post :batch
- end
+ concern :batch do
+ collection { post :batch }
end
+ resources :domain_allows, only: [:new, :create, :destroy]
+ resources :domain_blocks, only: [:new, :create, :destroy, :update, :edit], concerns: :batch
+
resources :export_domain_allows, only: [:new] do
collection do
get :export, constraints: { format: :csv }
@@ -24,11 +24,7 @@ namespace :admin do
end
end
- resources :email_domain_blocks, only: [:index, :new, :create] do
- collection do
- post :batch
- end
- end
+ resources :email_domain_blocks, only: [:index, :new, :create], concerns: :batch
resources :action_logs, only: [:index]
resources :warning_presets, except: [:new, :show]
@@ -131,7 +127,7 @@ namespace :admin do
resources :report_notes, only: [:create, :destroy]
- resources :accounts, only: [:index, :show, :destroy] do
+ resources :accounts, only: [:index, :show, :destroy], concerns: :batch do
member do
post :enable
post :unsensitive
@@ -146,21 +142,12 @@ namespace :admin do
post :unblock_email
end
- collection do
- post :batch
- end
-
resource :change_email, only: [:show, :update]
resource :reset, only: [:create]
resource :action, only: [:new, :create], controller: 'account_actions'
resources :collections, only: [:show]
-
- resources :statuses, only: [:index, :show] do
- collection do
- post :batch
- end
- end
+ resources :statuses, only: [:index, :show], concerns: :batch
resources :relationships, only: [:index]
@@ -178,17 +165,9 @@ namespace :admin do
end
end
- resources :custom_emojis, only: [:index, :new, :create] do
- collection do
- post :batch
- end
- end
+ resources :custom_emojis, only: [:index, :new, :create], concerns: :batch
- resources :ip_blocks, only: [:index, :new, :create] do
- collection do
- post :batch
- end
- end
+ resources :ip_blocks, only: [:index, :new, :create], concerns: :batch
resources :roles, except: [:show]
resources :account_moderation_notes, only: [:create, :destroy]
@@ -196,30 +175,14 @@ namespace :admin do
resources :tags, only: [:index, :show, :update]
namespace :trends do
- resources :links, only: [:index] do
- collection do
- post :batch
- end
- end
-
- resources :tags, only: [:index] do
- collection do
- post :batch
- end
- end
-
- resources :statuses, only: [:index] do
- collection do
- post :batch
- end
+ with_options only: [:index], concerns: :batch do
+ resources :links
+ resources :tags
+ resources :statuses
end
namespace :links do
- resources :preview_card_providers, only: [:index], path: :publishers do
- collection do
- post :batch
- end
- end
+ resources :preview_card_providers, only: [:index], path: :publishers, concerns: :batch
end
end
@@ -234,9 +197,5 @@ namespace :admin do
resources :software_updates, only: [:index]
- resources :username_blocks, except: [:show, :destroy] do
- collection do
- post :batch
- end
- end
+ resources :username_blocks, except: [:show, :destroy], concerns: :batch
end
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 9a0c083381..81828f6383 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -302,32 +302,20 @@ namespace :api, format: false do
resources :ip_blocks, only: [:index, :show, :update, :create, :destroy]
namespace :trends do
- resources :tags, only: [:index] do
+ concern :approvable do
member do
post :approve
post :reject
end
end
- resources :links, only: [:index] do
- member do
- post :approve
- post :reject
- end
- end
- resources :statuses, only: [:index] do
- member do
- post :approve
- post :reject
- end
+ with_options only: [:index], concerns: :approvable do
+ resources :tags
+ resources :links
+ resources :statuses
end
namespace :links do
- resources :preview_card_providers, only: [:index], path: :publishers do
- member do
- post :approve
- post :reject
- end
- end
+ resources :preview_card_providers, only: [:index], path: :publishers, concerns: :approvable
end
end
diff --git a/spec/system/admin/software_updates_spec.rb b/spec/system/admin/software_updates_spec.rb
index d9e4bf36fa..7eec0c659d 100644
--- a/spec/system/admin/software_updates_spec.rb
+++ b/spec/system/admin/software_updates_spec.rb
@@ -3,23 +3,26 @@
require 'rails_helper'
RSpec.describe 'finding software updates through the admin interface' do
- before do
- Fabricate(:software_update, version: '99.99.99', type: 'major', urgent: true, release_notes: 'https://github.com/mastodon/mastodon/releases/v99')
- Fabricate(:software_update, version: '3.5.0', type: 'major', urgent: true, release_notes: 'https://github.com/mastodon/mastodon/releases/v3.5.0')
+ before { sign_in Fabricate(:owner_user) }
- sign_in Fabricate(:owner_user), scope: :user
- end
+ let!(:latest_release) { Fabricate(:software_update, version: '99.99.99', type: 'major', urgent: true, release_notes: 'https://github.com/mastodon/mastodon/releases/v99') }
+ let!(:other_release) { Fabricate(:software_update, version: '98.0.0', type: 'major', release_notes: '') }
+ let!(:outdated_release) { Fabricate(:software_update, version: '3.5.0', type: 'major', urgent: true, release_notes: 'https://github.com/mastodon/mastodon/releases/v3.5.0') }
it 'shows a link to the software updates page, which links to release notes' do
visit settings_profile_path
click_on I18n.t('admin.critical_update_pending')
- expect(page).to have_title(I18n.t('admin.software_updates.title'))
+ expect(page)
+ .to have_title(I18n.t('admin.software_updates.title'))
+ .and have_content(latest_release.version)
+ .and have_content(other_release.version)
+ .and have_no_content(outdated_release.version)
- expect(page).to have_content('99.99.99')
- .and have_no_content('3.5.0')
-
- click_on I18n.t('admin.software_updates.release_notes')
- expect(page).to have_current_path('https://github.com/mastodon/mastodon/releases/v99', url: true)
+ within("#software_update_#{latest_release.id}") do
+ click_on I18n.t('admin.software_updates.release_notes')
+ end
+ expect(page)
+ .to have_current_path('https://github.com/mastodon/mastodon/releases/v99', url: true)
end
end