Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

This commit is contained in:
Jenkins 2018-01-03 20:17:13 +00:00
commit a7b8cb9493
66 changed files with 679 additions and 262 deletions

View file

@ -0,0 +1,18 @@
# frozen_string_literal: true
class ActivityPub::FollowsController < Api::BaseController
include SignatureVerification
def show
render(
json: FollowRequest.includes(:account).references(:account).find_by!(
id: params.require(:id),
accounts: { domain: nil, username: params.require(:account_username) },
target_account: signed_request_account
),
serializer: ActivityPub::FollowSerializer,
adapter: ActivityPub::Adapter,
content_type: 'application/activity+json'
)
end
end

View file

@ -50,6 +50,7 @@
"column_header.unpin": "فك التدبيس", "column_header.unpin": "فك التدبيس",
"column_subheading.navigation": "التصفح", "column_subheading.navigation": "التصفح",
"column_subheading.settings": "الإعدادات", "column_subheading.settings": "الإعدادات",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "حسابك ليس {locked}. يمكن لأي شخص متابعتك و عرض المنشورات.", "compose_form.lock_disclaimer": "حسابك ليس {locked}. يمكن لأي شخص متابعتك و عرض المنشورات.",
"compose_form.lock_disclaimer.lock": "مقفل", "compose_form.lock_disclaimer.lock": "مقفل",
"compose_form.placeholder": "فيمَ تفكّر؟", "compose_form.placeholder": "فيمَ تفكّر؟",
@ -213,6 +214,7 @@
"search_popout.tips.user": "مستخدِم", "search_popout.tips.user": "مستخدِم",
"search_results.total": "{count, number} {count, plural, one {result} و {results}}", "search_results.total": "{count, number} {count, plural, one {result} و {results}}",
"standalone.public_title": "نظرة على ...", "standalone.public_title": "نظرة على ...",
"status.block": "Block @{name}",
"status.cannot_reblog": "تعذرت ترقية هذا المنشور", "status.cannot_reblog": "تعذرت ترقية هذا المنشور",
"status.delete": "إحذف", "status.delete": "إحذف",
"status.embed": "إدماج", "status.embed": "إدماج",
@ -221,6 +223,7 @@
"status.media_hidden": "الصورة مستترة", "status.media_hidden": "الصورة مستترة",
"status.mention": "أذكُر @{name}", "status.mention": "أذكُر @{name}",
"status.more": "المزيد", "status.more": "المزيد",
"status.mute": "Mute @{name}",
"status.mute_conversation": "كتم المحادثة", "status.mute_conversation": "كتم المحادثة",
"status.open": "وسع هذه المشاركة", "status.open": "وسع هذه المشاركة",
"status.pin": "تدبيس على الملف الشخصي", "status.pin": "تدبيس على الملف الشخصي",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Unpin", "column_header.unpin": "Unpin",
"column_subheading.navigation": "Navigation", "column_subheading.navigation": "Navigation",
"column_subheading.settings": "Settings", "column_subheading.settings": "Settings",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.", "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
"compose_form.lock_disclaimer.lock": "locked", "compose_form.lock_disclaimer.lock": "locked",
"compose_form.placeholder": "Какво си мислиш?", "compose_form.placeholder": "Какво си мислиш?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count, number} {count, plural, one {result} other {results}}", "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
"standalone.public_title": "A look inside...", "standalone.public_title": "A look inside...",
"status.block": "Block @{name}",
"status.cannot_reblog": "This post cannot be boosted", "status.cannot_reblog": "This post cannot be boosted",
"status.delete": "Изтриване", "status.delete": "Изтриване",
"status.embed": "Embed", "status.embed": "Embed",
@ -221,6 +223,7 @@
"status.media_hidden": "Media hidden", "status.media_hidden": "Media hidden",
"status.mention": "Споменаване", "status.mention": "Споменаване",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Mute conversation", "status.mute_conversation": "Mute conversation",
"status.open": "Expand this status", "status.open": "Expand this status",
"status.pin": "Pin on profile", "status.pin": "Pin on profile",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Deslligar", "column_header.unpin": "Deslligar",
"column_subheading.navigation": "Navegació", "column_subheading.navigation": "Navegació",
"column_subheading.settings": "Configuració", "column_subheading.settings": "Configuració",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "El teu compte no està bloquejat {locked}. Tothom pot seguir-te i veure els teus missatges a seguidors.", "compose_form.lock_disclaimer": "El teu compte no està bloquejat {locked}. Tothom pot seguir-te i veure els teus missatges a seguidors.",
"compose_form.lock_disclaimer.lock": "bloquejat", "compose_form.lock_disclaimer.lock": "bloquejat",
"compose_form.placeholder": "En què estàs pensant?", "compose_form.placeholder": "En què estàs pensant?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "usuari", "search_popout.tips.user": "usuari",
"search_results.total": "{count, number} {count, plural, un {result} altres {results}}", "search_results.total": "{count, number} {count, plural, un {result} altres {results}}",
"standalone.public_title": "Una mirada a l'interior ...", "standalone.public_title": "Una mirada a l'interior ...",
"status.block": "Block @{name}",
"status.cannot_reblog": "Aquesta publicació no pot ser retootejada", "status.cannot_reblog": "Aquesta publicació no pot ser retootejada",
"status.delete": "Esborrar", "status.delete": "Esborrar",
"status.embed": "Incrustar", "status.embed": "Incrustar",
@ -221,6 +223,7 @@
"status.media_hidden": "Multimèdia amagat", "status.media_hidden": "Multimèdia amagat",
"status.mention": "Esmentar @{name}", "status.mention": "Esmentar @{name}",
"status.more": "Més", "status.more": "Més",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Silenciar conversació", "status.mute_conversation": "Silenciar conversació",
"status.open": "Ampliar aquest estat", "status.open": "Ampliar aquest estat",
"status.pin": "Fixat en el perfil", "status.pin": "Fixat en el perfil",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Lösen", "column_header.unpin": "Lösen",
"column_subheading.navigation": "Navigation", "column_subheading.navigation": "Navigation",
"column_subheading.settings": "Einstellungen", "column_subheading.settings": "Einstellungen",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.", "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.",
"compose_form.lock_disclaimer.lock": "gesperrt", "compose_form.lock_disclaimer.lock": "gesperrt",
"compose_form.placeholder": "Worüber möchtest du schreiben?", "compose_form.placeholder": "Worüber möchtest du schreiben?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count, number} {count, plural, one {Ergebnis} other {Ergebnisse}}", "search_results.total": "{count, number} {count, plural, one {Ergebnis} other {Ergebnisse}}",
"standalone.public_title": "Ein kleiner Einblick …", "standalone.public_title": "Ein kleiner Einblick …",
"status.block": "Block @{name}",
"status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden", "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
"status.delete": "Löschen", "status.delete": "Löschen",
"status.embed": "Einbetten", "status.embed": "Einbetten",
@ -221,6 +223,7 @@
"status.media_hidden": "Medien versteckt", "status.media_hidden": "Medien versteckt",
"status.mention": "@{name} erwähnen", "status.mention": "@{name} erwähnen",
"status.more": "Mehr", "status.more": "Mehr",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Thread stummschalten", "status.mute_conversation": "Thread stummschalten",
"status.open": "Diesen Beitrag öffnen", "status.open": "Diesen Beitrag öffnen",
"status.pin": "Im Profil anheften", "status.pin": "Im Profil anheften",

View file

@ -727,6 +727,10 @@
{ {
"defaultMessage": "locked", "defaultMessage": "locked",
"id": "compose_form.lock_disclaimer.lock" "id": "compose_form.lock_disclaimer.lock"
},
{
"defaultMessage": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"id": "compose_form.hashtag_warning"
} }
], ],
"path": "app/javascript/mastodon/features/compose/containers/warning_container.json" "path": "app/javascript/mastodon/features/compose/containers/warning_container.json"
@ -1053,7 +1057,7 @@
"id": "lists.delete" "id": "lists.delete"
}, },
{ {
"defaultMessage": "There is nothing in this list yet.", "defaultMessage": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
"id": "empty_column.list" "id": "empty_column.list"
} }
], ],
@ -1244,6 +1248,22 @@
"defaultMessage": "Favourite", "defaultMessage": "Favourite",
"id": "status.favourite" "id": "status.favourite"
}, },
{
"defaultMessage": "Mute @{name}",
"id": "status.mute"
},
{
"defaultMessage": "Mute conversation",
"id": "status.mute_conversation"
},
{
"defaultMessage": "Unmute conversation",
"id": "status.unmute_conversation"
},
{
"defaultMessage": "Block @{name}",
"id": "status.block"
},
{ {
"defaultMessage": "Report @{name}", "defaultMessage": "Report @{name}",
"id": "status.report" "id": "status.report"
@ -1276,6 +1296,14 @@
{ {
"defaultMessage": "Are you sure you want to delete this status?", "defaultMessage": "Are you sure you want to delete this status?",
"id": "confirmations.delete.message" "id": "confirmations.delete.message"
},
{
"defaultMessage": "Block",
"id": "confirmations.block.confirm"
},
{
"defaultMessage": "Are you sure you want to block {name}?",
"id": "confirmations.block.message"
} }
], ],
"path": "app/javascript/mastodon/features/status/index.json" "path": "app/javascript/mastodon/features/status/index.json"

View file

@ -54,6 +54,7 @@
"column_subheading.lists": "Lists", "column_subheading.lists": "Lists",
"column_subheading.navigation": "Navigation", "column_subheading.navigation": "Navigation",
"column_subheading.settings": "Settings", "column_subheading.settings": "Settings",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.", "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
"compose_form.lock_disclaimer.lock": "locked", "compose_form.lock_disclaimer.lock": "locked",
"compose_form.placeholder": "What is on your mind?", "compose_form.placeholder": "What is on your mind?",
@ -220,6 +221,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count, number} {count, plural, one {result} other {results}}", "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
"standalone.public_title": "A look inside...", "standalone.public_title": "A look inside...",
"status.block": "Block @{name}",
"status.cannot_reblog": "This post cannot be boosted", "status.cannot_reblog": "This post cannot be boosted",
"status.delete": "Delete", "status.delete": "Delete",
"status.embed": "Embed", "status.embed": "Embed",
@ -228,6 +230,7 @@
"status.media_hidden": "Media hidden", "status.media_hidden": "Media hidden",
"status.mention": "Mention @{name}", "status.mention": "Mention @{name}",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Mute conversation", "status.mute_conversation": "Mute conversation",
"status.open": "Expand this status", "status.open": "Expand this status",
"status.pin": "Pin on profile", "status.pin": "Pin on profile",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Depingli", "column_header.unpin": "Depingli",
"column_subheading.navigation": "Navigado", "column_subheading.navigation": "Navigado",
"column_subheading.settings": "Agordoj", "column_subheading.settings": "Agordoj",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Via konta ne estas ŝlosita. Iu ajn povas sekvi vin por vidi viajn privatajn pepojn.", "compose_form.lock_disclaimer": "Via konta ne estas ŝlosita. Iu ajn povas sekvi vin por vidi viajn privatajn pepojn.",
"compose_form.lock_disclaimer.lock": "ŝlosita", "compose_form.lock_disclaimer.lock": "ŝlosita",
"compose_form.placeholder": "Pri kio vi pensas?", "compose_form.placeholder": "Pri kio vi pensas?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "uzanto", "search_popout.tips.user": "uzanto",
"search_results.total": "{count, number} {count, plural, one {rezultato} other {rezultatoj}}", "search_results.total": "{count, number} {count, plural, one {rezultato} other {rezultatoj}}",
"standalone.public_title": "Rigardeti…", "standalone.public_title": "Rigardeti…",
"status.block": "Block @{name}",
"status.cannot_reblog": "Tiun publikaĵon oni ne povas diskonigi", "status.cannot_reblog": "Tiun publikaĵon oni ne povas diskonigi",
"status.delete": "Forigi", "status.delete": "Forigi",
"status.embed": "Enmeti", "status.embed": "Enmeti",
@ -221,6 +223,7 @@
"status.media_hidden": "Sonbildaĵo kaŝita", "status.media_hidden": "Sonbildaĵo kaŝita",
"status.mention": "Mencii @{name}", "status.mention": "Mencii @{name}",
"status.more": "Pli", "status.more": "Pli",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Silentigi konversacion", "status.mute_conversation": "Silentigi konversacion",
"status.open": "Disfaldi statkonigon", "status.open": "Disfaldi statkonigon",
"status.pin": "Pingli al la profilo", "status.pin": "Pingli al la profilo",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Dejar de fijar", "column_header.unpin": "Dejar de fijar",
"column_subheading.navigation": "Navegación", "column_subheading.navigation": "Navegación",
"column_subheading.settings": "Ajustes", "column_subheading.settings": "Ajustes",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.", "compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
"compose_form.lock_disclaimer.lock": "bloqueado", "compose_form.lock_disclaimer.lock": "bloqueado",
"compose_form.placeholder": "¿En qué estás pensando?", "compose_form.placeholder": "¿En qué estás pensando?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "usuario", "search_popout.tips.user": "usuario",
"search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}", "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
"standalone.public_title": "Un pequeño vistazo...", "standalone.public_title": "Un pequeño vistazo...",
"status.block": "Block @{name}",
"status.cannot_reblog": "Este toot no puede retootearse", "status.cannot_reblog": "Este toot no puede retootearse",
"status.delete": "Borrar", "status.delete": "Borrar",
"status.embed": "Incrustado", "status.embed": "Incrustado",
@ -221,6 +223,7 @@
"status.media_hidden": "Contenido multimedia oculto", "status.media_hidden": "Contenido multimedia oculto",
"status.mention": "Mencionar", "status.mention": "Mencionar",
"status.more": "Más", "status.more": "Más",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Silenciar conversación", "status.mute_conversation": "Silenciar conversación",
"status.open": "Expandir estado", "status.open": "Expandir estado",
"status.pin": "Fijar", "status.pin": "Fijar",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "رهاکردن", "column_header.unpin": "رهاکردن",
"column_subheading.navigation": "گشت و گذار", "column_subheading.navigation": "گشت و گذار",
"column_subheading.settings": "تنظیمات", "column_subheading.settings": "تنظیمات",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "حساب شما {locked} نیست. هر کسی می‌تواند پیگیر شما شود و نوشته‌های ویژهٔ پیگیران شما را ببیند.", "compose_form.lock_disclaimer": "حساب شما {locked} نیست. هر کسی می‌تواند پیگیر شما شود و نوشته‌های ویژهٔ پیگیران شما را ببیند.",
"compose_form.lock_disclaimer.lock": "قفل", "compose_form.lock_disclaimer.lock": "قفل",
"compose_form.placeholder": "تازه چه خبر؟", "compose_form.placeholder": "تازه چه خبر؟",
@ -213,6 +214,7 @@
"search_popout.tips.user": "کاربر", "search_popout.tips.user": "کاربر",
"search_results.total": "{count, number} {count, plural, one {نتیجه} other {نتیجه}}", "search_results.total": "{count, number} {count, plural, one {نتیجه} other {نتیجه}}",
"standalone.public_title": "نگاهی به کاربران این سرور...", "standalone.public_title": "نگاهی به کاربران این سرور...",
"status.block": "Block @{name}",
"status.cannot_reblog": "این نوشته را نمی‌شود بازبوقید", "status.cannot_reblog": "این نوشته را نمی‌شود بازبوقید",
"status.delete": "پاک‌کردن", "status.delete": "پاک‌کردن",
"status.embed": "جاگذاری", "status.embed": "جاگذاری",
@ -221,6 +223,7 @@
"status.media_hidden": "تصویر پنهان شده", "status.media_hidden": "تصویر پنهان شده",
"status.mention": "نام‌بردن از @{name}", "status.mention": "نام‌بردن از @{name}",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "بی‌صداکردن گفتگو", "status.mute_conversation": "بی‌صداکردن گفتگو",
"status.open": "این نوشته را باز کن", "status.open": "این نوشته را باز کن",
"status.pin": "نوشتهٔ ثابت نمایه", "status.pin": "نوشتهٔ ثابت نمایه",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Unpin", "column_header.unpin": "Unpin",
"column_subheading.navigation": "Navigation", "column_subheading.navigation": "Navigation",
"column_subheading.settings": "Settings", "column_subheading.settings": "Settings",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.", "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
"compose_form.lock_disclaimer.lock": "locked", "compose_form.lock_disclaimer.lock": "locked",
"compose_form.placeholder": "Mitä sinulla on mielessä?", "compose_form.placeholder": "Mitä sinulla on mielessä?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count, number} {count, plural, one {result} other {results}}", "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
"standalone.public_title": "A look inside...", "standalone.public_title": "A look inside...",
"status.block": "Block @{name}",
"status.cannot_reblog": "This post cannot be boosted", "status.cannot_reblog": "This post cannot be boosted",
"status.delete": "Poista", "status.delete": "Poista",
"status.embed": "Embed", "status.embed": "Embed",
@ -221,6 +223,7 @@
"status.media_hidden": "Media hidden", "status.media_hidden": "Media hidden",
"status.mention": "Mainitse @{name}", "status.mention": "Mainitse @{name}",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Mute conversation", "status.mute_conversation": "Mute conversation",
"status.open": "Expand this status", "status.open": "Expand this status",
"status.pin": "Pin on profile", "status.pin": "Pin on profile",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Retirer", "column_header.unpin": "Retirer",
"column_subheading.navigation": "Navigation", "column_subheading.navigation": "Navigation",
"column_subheading.settings": "Paramètres", "column_subheading.settings": "Paramètres",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Votre compte nest pas {locked}. Tout le monde peut vous suivre et voir vos pouets privés.", "compose_form.lock_disclaimer": "Votre compte nest pas {locked}. Tout le monde peut vous suivre et voir vos pouets privés.",
"compose_form.lock_disclaimer.lock": "verrouillé", "compose_form.lock_disclaimer.lock": "verrouillé",
"compose_form.placeholder": "Quavez-vous en tête?", "compose_form.placeholder": "Quavez-vous en tête?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "utilisateur⋅ice", "search_popout.tips.user": "utilisateur⋅ice",
"search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}", "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
"standalone.public_title": "Jeter un coup dœil…", "standalone.public_title": "Jeter un coup dœil…",
"status.block": "Block @{name}",
"status.cannot_reblog": "Cette publication ne peut être boostée", "status.cannot_reblog": "Cette publication ne peut être boostée",
"status.delete": "Effacer", "status.delete": "Effacer",
"status.embed": "Intégrer", "status.embed": "Intégrer",
@ -221,6 +223,7 @@
"status.media_hidden": "Média caché", "status.media_hidden": "Média caché",
"status.mention": "Mentionner", "status.mention": "Mentionner",
"status.more": "Plus", "status.more": "Plus",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Masquer la conversation", "status.mute_conversation": "Masquer la conversation",
"status.open": "Déplier ce statut", "status.open": "Déplier ce statut",
"status.pin": "Épingler sur le profil", "status.pin": "Épingler sur le profil",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Soltar", "column_header.unpin": "Soltar",
"column_subheading.navigation": "Navegación", "column_subheading.navigation": "Navegación",
"column_subheading.settings": "Axustes", "column_subheading.settings": "Axustes",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "A súa conta non está {locked}. Calquera pode seguila para ver as súas mensaxes só-para-seguidoras.", "compose_form.lock_disclaimer": "A súa conta non está {locked}. Calquera pode seguila para ver as súas mensaxes só-para-seguidoras.",
"compose_form.lock_disclaimer.lock": "bloqueado", "compose_form.lock_disclaimer.lock": "bloqueado",
"compose_form.placeholder": "A qué andas?", "compose_form.placeholder": "A qué andas?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "usuaria", "search_popout.tips.user": "usuaria",
"search_results.total": "{count, number} {count,plural,one {result} outros {results}}", "search_results.total": "{count, number} {count,plural,one {result} outros {results}}",
"standalone.public_title": "Ollada dentro...", "standalone.public_title": "Ollada dentro...",
"status.block": "Block @{name}",
"status.cannot_reblog": "Esta mensaxe non pode ser promocionada", "status.cannot_reblog": "Esta mensaxe non pode ser promocionada",
"status.delete": "Eliminar", "status.delete": "Eliminar",
"status.embed": "Incrustar", "status.embed": "Incrustar",
@ -221,6 +223,7 @@
"status.media_hidden": "Medios ocultos", "status.media_hidden": "Medios ocultos",
"status.mention": "Mencionar @{name}", "status.mention": "Mencionar @{name}",
"status.more": "Máis", "status.more": "Máis",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Acalar conversa", "status.mute_conversation": "Acalar conversa",
"status.open": "Expandir este estado", "status.open": "Expandir este estado",
"status.pin": "Fixar no perfil", "status.pin": "Fixar no perfil",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "שחרור קיבוע", "column_header.unpin": "שחרור קיבוע",
"column_subheading.navigation": "ניווט", "column_subheading.navigation": "ניווט",
"column_subheading.settings": "אפשרויות", "column_subheading.settings": "אפשרויות",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.", "compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
"compose_form.lock_disclaimer.lock": "נעול", "compose_form.lock_disclaimer.lock": "נעול",
"compose_form.placeholder": "מה עובר לך בראש?", "compose_form.placeholder": "מה עובר לך בראש?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "משתמש(ת)", "search_popout.tips.user": "משתמש(ת)",
"search_results.total": "{count, number} {count, plural, one {תוצאה} other {תוצאות}}", "search_results.total": "{count, number} {count, plural, one {תוצאה} other {תוצאות}}",
"standalone.public_title": "הצצה פנימה...", "standalone.public_title": "הצצה פנימה...",
"status.block": "Block @{name}",
"status.cannot_reblog": "לא ניתן להדהד הודעה זו", "status.cannot_reblog": "לא ניתן להדהד הודעה זו",
"status.delete": "מחיקה", "status.delete": "מחיקה",
"status.embed": "הטמעה", "status.embed": "הטמעה",
@ -221,6 +223,7 @@
"status.media_hidden": "מדיה מוסתרת", "status.media_hidden": "מדיה מוסתרת",
"status.mention": "פניה אל @{name}", "status.mention": "פניה אל @{name}",
"status.more": "עוד", "status.more": "עוד",
"status.mute": "Mute @{name}",
"status.mute_conversation": "השתקת שיחה", "status.mute_conversation": "השתקת שיחה",
"status.open": "הרחבת הודעה", "status.open": "הרחבת הודעה",
"status.pin": "לקבע באודות", "status.pin": "לקבע באודות",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Unpin", "column_header.unpin": "Unpin",
"column_subheading.navigation": "Navigacija", "column_subheading.navigation": "Navigacija",
"column_subheading.settings": "Postavke", "column_subheading.settings": "Postavke",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Tvoj račun nije {locked}. Svatko te može slijediti kako bi vidio postove namijenjene samo tvojim sljedbenicima.", "compose_form.lock_disclaimer": "Tvoj račun nije {locked}. Svatko te može slijediti kako bi vidio postove namijenjene samo tvojim sljedbenicima.",
"compose_form.lock_disclaimer.lock": "zaključan", "compose_form.lock_disclaimer.lock": "zaključan",
"compose_form.placeholder": "Što ti je na umu?", "compose_form.placeholder": "Što ti je na umu?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count, number} {count, plural, one {result} other {results}}", "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
"standalone.public_title": "A look inside...", "standalone.public_title": "A look inside...",
"status.block": "Block @{name}",
"status.cannot_reblog": "Ovaj post ne može biti boostan", "status.cannot_reblog": "Ovaj post ne može biti boostan",
"status.delete": "Obriši", "status.delete": "Obriši",
"status.embed": "Embed", "status.embed": "Embed",
@ -221,6 +223,7 @@
"status.media_hidden": "Sakriven media sadržaj", "status.media_hidden": "Sakriven media sadržaj",
"status.mention": "Spomeni @{name}", "status.mention": "Spomeni @{name}",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Utišaj razgovor", "status.mute_conversation": "Utišaj razgovor",
"status.open": "Proširi ovaj status", "status.open": "Proširi ovaj status",
"status.pin": "Pin on profile", "status.pin": "Pin on profile",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Unpin", "column_header.unpin": "Unpin",
"column_subheading.navigation": "Navigation", "column_subheading.navigation": "Navigation",
"column_subheading.settings": "Settings", "column_subheading.settings": "Settings",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.", "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
"compose_form.lock_disclaimer.lock": "locked", "compose_form.lock_disclaimer.lock": "locked",
"compose_form.placeholder": "Mire gondolsz?", "compose_form.placeholder": "Mire gondolsz?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count, number} {count, plural, one {result} other {results}}", "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
"standalone.public_title": "A look inside...", "standalone.public_title": "A look inside...",
"status.block": "Block @{name}",
"status.cannot_reblog": "This post cannot be boosted", "status.cannot_reblog": "This post cannot be boosted",
"status.delete": "Törlés", "status.delete": "Törlés",
"status.embed": "Embed", "status.embed": "Embed",
@ -221,6 +223,7 @@
"status.media_hidden": "Media hidden", "status.media_hidden": "Media hidden",
"status.mention": "Említés", "status.mention": "Említés",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Mute conversation", "status.mute_conversation": "Mute conversation",
"status.open": "Expand this status", "status.open": "Expand this status",
"status.pin": "Pin on profile", "status.pin": "Pin on profile",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Unpin", "column_header.unpin": "Unpin",
"column_subheading.navigation": "Navigasi", "column_subheading.navigation": "Navigasi",
"column_subheading.settings": "Pengaturan", "column_subheading.settings": "Pengaturan",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Akun anda tidak {locked}. Semua orang dapat mengikuti anda untuk melihat postingan khusus untuk pengikut anda.", "compose_form.lock_disclaimer": "Akun anda tidak {locked}. Semua orang dapat mengikuti anda untuk melihat postingan khusus untuk pengikut anda.",
"compose_form.lock_disclaimer.lock": "dikunci", "compose_form.lock_disclaimer.lock": "dikunci",
"compose_form.placeholder": "Apa yang ada di pikiran anda?", "compose_form.placeholder": "Apa yang ada di pikiran anda?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count} {count, plural, one {hasil} other {hasil}}", "search_results.total": "{count} {count, plural, one {hasil} other {hasil}}",
"standalone.public_title": "A look inside...", "standalone.public_title": "A look inside...",
"status.block": "Block @{name}",
"status.cannot_reblog": "This post cannot be boosted", "status.cannot_reblog": "This post cannot be boosted",
"status.delete": "Hapus", "status.delete": "Hapus",
"status.embed": "Embed", "status.embed": "Embed",
@ -221,6 +223,7 @@
"status.media_hidden": "Media disembunyikan", "status.media_hidden": "Media disembunyikan",
"status.mention": "Balasan @{name}", "status.mention": "Balasan @{name}",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Mute conversation", "status.mute_conversation": "Mute conversation",
"status.open": "Tampilkan status ini", "status.open": "Tampilkan status ini",
"status.pin": "Pin on profile", "status.pin": "Pin on profile",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Unpin", "column_header.unpin": "Unpin",
"column_subheading.navigation": "Navigation", "column_subheading.navigation": "Navigation",
"column_subheading.settings": "Settings", "column_subheading.settings": "Settings",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.", "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
"compose_form.lock_disclaimer.lock": "locked", "compose_form.lock_disclaimer.lock": "locked",
"compose_form.placeholder": "Quo esas en tua spirito?", "compose_form.placeholder": "Quo esas en tua spirito?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count, number} {count, plural, one {rezulto} other {rezulti}}", "search_results.total": "{count, number} {count, plural, one {rezulto} other {rezulti}}",
"standalone.public_title": "A look inside...", "standalone.public_title": "A look inside...",
"status.block": "Block @{name}",
"status.cannot_reblog": "This post cannot be boosted", "status.cannot_reblog": "This post cannot be boosted",
"status.delete": "Efacar", "status.delete": "Efacar",
"status.embed": "Embed", "status.embed": "Embed",
@ -221,6 +223,7 @@
"status.media_hidden": "Kontenajo celita", "status.media_hidden": "Kontenajo celita",
"status.mention": "Mencionar @{name}", "status.mention": "Mencionar @{name}",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Mute conversation", "status.mute_conversation": "Mute conversation",
"status.open": "Detaligar ca mesajo", "status.open": "Detaligar ca mesajo",
"status.pin": "Pin on profile", "status.pin": "Pin on profile",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Unpin", "column_header.unpin": "Unpin",
"column_subheading.navigation": "Navigation", "column_subheading.navigation": "Navigation",
"column_subheading.settings": "Settings", "column_subheading.settings": "Settings",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.", "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
"compose_form.lock_disclaimer.lock": "locked", "compose_form.lock_disclaimer.lock": "locked",
"compose_form.placeholder": "A cosa stai pensando?", "compose_form.placeholder": "A cosa stai pensando?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count} {count, plural, one {risultato} other {risultati}}", "search_results.total": "{count} {count, plural, one {risultato} other {risultati}}",
"standalone.public_title": "A look inside...", "standalone.public_title": "A look inside...",
"status.block": "Block @{name}",
"status.cannot_reblog": "This post cannot be boosted", "status.cannot_reblog": "This post cannot be boosted",
"status.delete": "Elimina", "status.delete": "Elimina",
"status.embed": "Embed", "status.embed": "Embed",
@ -221,6 +223,7 @@
"status.media_hidden": "Allegato nascosto", "status.media_hidden": "Allegato nascosto",
"status.mention": "Nomina @{name}", "status.mention": "Nomina @{name}",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Mute conversation", "status.mute_conversation": "Mute conversation",
"status.open": "Espandi questo post", "status.open": "Espandi questo post",
"status.pin": "Pin on profile", "status.pin": "Pin on profile",

View file

@ -54,6 +54,7 @@
"column_subheading.lists": "リスト", "column_subheading.lists": "リスト",
"column_subheading.navigation": "ナビゲーション", "column_subheading.navigation": "ナビゲーション",
"column_subheading.settings": "設定", "column_subheading.settings": "設定",
"compose_form.hashtag_warning": "このトゥートは未収載なのでハッシュタグの一覧に表示されません。公開トゥートだけがハッシュタグで検索できます。",
"compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。", "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
"compose_form.lock_disclaimer.lock": "非公開", "compose_form.lock_disclaimer.lock": "非公開",
"compose_form.placeholder": "今なにしてる?", "compose_form.placeholder": "今なにしてる?",
@ -96,7 +97,7 @@
"empty_column.hashtag": "このハッシュタグはまだ使われていません。", "empty_column.hashtag": "このハッシュタグはまだ使われていません。",
"empty_column.home": "まだ誰もフォローしていません。{public}を見に行くか、検索を使って他のユーザーを見つけましょう。", "empty_column.home": "まだ誰もフォローしていません。{public}を見に行くか、検索を使って他のユーザーを見つけましょう。",
"empty_column.home.public_timeline": "連合タイムライン", "empty_column.home.public_timeline": "連合タイムライン",
"empty_column.list": "このリストにはまだなにもありません。", "empty_column.list": "このリストにはまだなにもありません。このリストのメンバーが新しいトゥートをするとここに表示されます。",
"empty_column.notifications": "まだ通知がありません。他の人とふれ合って会話を始めましょう。", "empty_column.notifications": "まだ通知がありません。他の人とふれ合って会話を始めましょう。",
"empty_column.public": "ここにはまだ何もありません! 公開で何かを投稿したり、他のインスタンスのユーザーをフォローしたりしていっぱいにしましょう", "empty_column.public": "ここにはまだ何もありません! 公開で何かを投稿したり、他のインスタンスのユーザーをフォローしたりしていっぱいにしましょう",
"follow_request.authorize": "許可", "follow_request.authorize": "許可",
@ -220,6 +221,7 @@
"search_popout.tips.user": "ユーザー", "search_popout.tips.user": "ユーザー",
"search_results.total": "{count, number}件の結果", "search_results.total": "{count, number}件の結果",
"standalone.public_title": "今こんな話をしています...", "standalone.public_title": "今こんな話をしています...",
"status.block": "@{name}をブロック",
"status.cannot_reblog": "この投稿はブーストできません", "status.cannot_reblog": "この投稿はブーストできません",
"status.delete": "削除", "status.delete": "削除",
"status.embed": "埋め込み", "status.embed": "埋め込み",
@ -228,6 +230,7 @@
"status.media_hidden": "非表示のメディア", "status.media_hidden": "非表示のメディア",
"status.mention": "返信", "status.mention": "返信",
"status.more": "もっと見る", "status.more": "もっと見る",
"status.mute": "@{name}をミュート",
"status.mute_conversation": "会話をミュート", "status.mute_conversation": "会話をミュート",
"status.open": "詳細を表示", "status.open": "詳細を表示",
"status.pin": "プロフィールに固定表示", "status.pin": "プロフィールに固定表示",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "고정 해제", "column_header.unpin": "고정 해제",
"column_subheading.navigation": "내비게이션", "column_subheading.navigation": "내비게이션",
"column_subheading.settings": "설정", "column_subheading.settings": "설정",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "이 계정은 {locked}로 설정 되어 있지 않습니다. 누구나 이 계정을 팔로우 할 수 있으며, 팔로워 공개의 포스팅을 볼 수 있습니다.", "compose_form.lock_disclaimer": "이 계정은 {locked}로 설정 되어 있지 않습니다. 누구나 이 계정을 팔로우 할 수 있으며, 팔로워 공개의 포스팅을 볼 수 있습니다.",
"compose_form.lock_disclaimer.lock": "비공개", "compose_form.lock_disclaimer.lock": "비공개",
"compose_form.placeholder": "지금 무엇을 하고 있나요?", "compose_form.placeholder": "지금 무엇을 하고 있나요?",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Losmaken", "column_header.unpin": "Losmaken",
"column_subheading.navigation": "Navigatie", "column_subheading.navigation": "Navigatie",
"column_subheading.settings": "Instellingen", "column_subheading.settings": "Instellingen",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Jouw account is niet {locked}. Iedereen kan jou volgen en toots zien die je alleen aan volgers hebt gericht.", "compose_form.lock_disclaimer": "Jouw account is niet {locked}. Iedereen kan jou volgen en toots zien die je alleen aan volgers hebt gericht.",
"compose_form.lock_disclaimer.lock": "besloten", "compose_form.lock_disclaimer.lock": "besloten",
"compose_form.placeholder": "Wat wil je kwijt?", "compose_form.placeholder": "Wat wil je kwijt?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "gebruiker", "search_popout.tips.user": "gebruiker",
"search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}", "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
"standalone.public_title": "Een kijkje binnenin...", "standalone.public_title": "Een kijkje binnenin...",
"status.block": "Block @{name}",
"status.cannot_reblog": "Deze toot kan niet geboost worden", "status.cannot_reblog": "Deze toot kan niet geboost worden",
"status.delete": "Verwijderen", "status.delete": "Verwijderen",
"status.embed": "Embed", "status.embed": "Embed",
@ -221,6 +223,7 @@
"status.media_hidden": "Media verborgen", "status.media_hidden": "Media verborgen",
"status.mention": "Vermeld @{name}", "status.mention": "Vermeld @{name}",
"status.more": "Meer", "status.more": "Meer",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Negeer conversatie", "status.mute_conversation": "Negeer conversatie",
"status.open": "Toot volledig tonen", "status.open": "Toot volledig tonen",
"status.pin": "Aan profielpagina vastmaken", "status.pin": "Aan profielpagina vastmaken",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Løsne", "column_header.unpin": "Løsne",
"column_subheading.navigation": "Navigasjon", "column_subheading.navigation": "Navigasjon",
"column_subheading.settings": "Innstillinger", "column_subheading.settings": "Innstillinger",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Din konto er ikke {locked}. Hvem som helst kan følge deg og se dine private poster.", "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Hvem som helst kan følge deg og se dine private poster.",
"compose_form.lock_disclaimer.lock": "låst", "compose_form.lock_disclaimer.lock": "låst",
"compose_form.placeholder": "Hva har du på hjertet?", "compose_form.placeholder": "Hva har du på hjertet?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}", "search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}",
"standalone.public_title": "A look inside...", "standalone.public_title": "A look inside...",
"status.block": "Block @{name}",
"status.cannot_reblog": "Denne posten kan ikke fremheves", "status.cannot_reblog": "Denne posten kan ikke fremheves",
"status.delete": "Slett", "status.delete": "Slett",
"status.embed": "Embed", "status.embed": "Embed",
@ -221,6 +223,7 @@
"status.media_hidden": "Media skjult", "status.media_hidden": "Media skjult",
"status.mention": "Nevn @{name}", "status.mention": "Nevn @{name}",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Demp samtale", "status.mute_conversation": "Demp samtale",
"status.open": "Utvid denne statusen", "status.open": "Utvid denne statusen",
"status.pin": "Pin on profile", "status.pin": "Pin on profile",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Despenjar", "column_header.unpin": "Despenjar",
"column_subheading.navigation": "Navigacion", "column_subheading.navigation": "Navigacion",
"column_subheading.settings": "Paramètres", "column_subheading.settings": "Paramètres",
"compose_form.hashtag_warning": "Aqueste tut serà pas ligat a cap etiqueta estant ques pas listat. Òm pas cercar que los tuts publics per etiqueta.",
"compose_form.lock_disclaimer": "Vòstre compte es pas {locked}. Tot lo mond pòt vos sègre e veire los estatuts reservats als seguidors.", "compose_form.lock_disclaimer": "Vòstre compte es pas {locked}. Tot lo mond pòt vos sègre e veire los estatuts reservats als seguidors.",
"compose_form.lock_disclaimer.lock": "clavat", "compose_form.lock_disclaimer.lock": "clavat",
"compose_form.placeholder": "A de qué pensatz?", "compose_form.placeholder": "A de qué pensatz?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "utilizaire", "search_popout.tips.user": "utilizaire",
"search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}", "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
"standalone.public_title": "Una ulhada dedins…", "standalone.public_title": "Una ulhada dedins…",
"status.block": "Blocar @{name}",
"status.cannot_reblog": "Aqueste estatut pòt pas èsser partejat", "status.cannot_reblog": "Aqueste estatut pòt pas èsser partejat",
"status.delete": "Escafar", "status.delete": "Escafar",
"status.embed": "Embarcar", "status.embed": "Embarcar",
@ -221,6 +223,7 @@
"status.media_hidden": "Mèdia rescondut", "status.media_hidden": "Mèdia rescondut",
"status.mention": "Mencionar", "status.mention": "Mencionar",
"status.more": "Mai", "status.more": "Mai",
"status.mute": "Rescondre @{name}",
"status.mute_conversation": "Rescondre la conversacion", "status.mute_conversation": "Rescondre la conversacion",
"status.open": "Desplegar aqueste estatut", "status.open": "Desplegar aqueste estatut",
"status.pin": "Penjar al perfil", "status.pin": "Penjar al perfil",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Cofnij przypięcie", "column_header.unpin": "Cofnij przypięcie",
"column_subheading.navigation": "Nawigacja", "column_subheading.navigation": "Nawigacja",
"column_subheading.settings": "Ustawienia", "column_subheading.settings": "Ustawienia",
"compose_form.hashtag_warning": "Ten wpis nie będzie widoczny pod podanymi hashtagami, ponieważ jest oznaczony jako niewidoczny. Tylko publiczne wpisy mogą zostać znalezione z użyciem hashtagów.",
"compose_form.lock_disclaimer": "Twoje konto nie jest {locked}. Każdy, kto Cię śledzi, może wyświetlać Twoje wpisy przeznaczone tylko dla śledzących.", "compose_form.lock_disclaimer": "Twoje konto nie jest {locked}. Każdy, kto Cię śledzi, może wyświetlać Twoje wpisy przeznaczone tylko dla śledzących.",
"compose_form.lock_disclaimer.lock": "zablokowane", "compose_form.lock_disclaimer.lock": "zablokowane",
"compose_form.placeholder": "Co Ci chodzi po głowie?", "compose_form.placeholder": "Co Ci chodzi po głowie?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "użytkownik", "search_popout.tips.user": "użytkownik",
"search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}", "search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}",
"standalone.public_title": "Spojrzenie w głąb…", "standalone.public_title": "Spojrzenie w głąb…",
"status.block": "Zablokuj @{name}",
"status.cannot_reblog": "Ten wpis nie może zostać podbity", "status.cannot_reblog": "Ten wpis nie może zostać podbity",
"status.delete": "Usuń", "status.delete": "Usuń",
"status.embed": "Osadź", "status.embed": "Osadź",
@ -221,6 +223,7 @@
"status.media_hidden": "Zawartość multimedialna ukryta", "status.media_hidden": "Zawartość multimedialna ukryta",
"status.mention": "Wspomnij o @{name}", "status.mention": "Wspomnij o @{name}",
"status.more": "Więcej", "status.more": "Więcej",
"status.mute": "Wycisz @{name}",
"status.mute_conversation": "Wycisz konwersację", "status.mute_conversation": "Wycisz konwersację",
"status.open": "Rozszerz ten wpis", "status.open": "Rozszerz ten wpis",
"status.pin": "Przypnij do profilu", "status.pin": "Przypnij do profilu",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Desafixar", "column_header.unpin": "Desafixar",
"column_subheading.navigation": "Navegação", "column_subheading.navigation": "Navegação",
"column_subheading.settings": "Configurações", "column_subheading.settings": "Configurações",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "A sua conta não está {locked}. Qualquer pessoa pode te seguir e visualizar postagens direcionadas a apenas seguidores.", "compose_form.lock_disclaimer": "A sua conta não está {locked}. Qualquer pessoa pode te seguir e visualizar postagens direcionadas a apenas seguidores.",
"compose_form.lock_disclaimer.lock": "trancada", "compose_form.lock_disclaimer.lock": "trancada",
"compose_form.placeholder": "No que você está pensando?", "compose_form.placeholder": "No que você está pensando?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "usuário", "search_popout.tips.user": "usuário",
"search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}", "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
"standalone.public_title": "Dê uma espiada...", "standalone.public_title": "Dê uma espiada...",
"status.block": "Block @{name}",
"status.cannot_reblog": "Esta postagem não pode ser compartilhada", "status.cannot_reblog": "Esta postagem não pode ser compartilhada",
"status.delete": "Excluir", "status.delete": "Excluir",
"status.embed": "Incorporar", "status.embed": "Incorporar",
@ -221,6 +223,7 @@
"status.media_hidden": "Mídia escondida", "status.media_hidden": "Mídia escondida",
"status.mention": "Mencionar @{name}", "status.mention": "Mencionar @{name}",
"status.more": "Mais", "status.more": "Mais",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Silenciar conversa", "status.mute_conversation": "Silenciar conversa",
"status.open": "Expandir", "status.open": "Expandir",
"status.pin": "Fixar no perfil", "status.pin": "Fixar no perfil",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Remover fixar", "column_header.unpin": "Remover fixar",
"column_subheading.navigation": "Navegação", "column_subheading.navigation": "Navegação",
"column_subheading.settings": "Preferências", "column_subheading.settings": "Preferências",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "A tua conta não está {locked}. Qualquer pessoa pode seguir-te e ver as publicações direcionadas apenas a seguidores.", "compose_form.lock_disclaimer": "A tua conta não está {locked}. Qualquer pessoa pode seguir-te e ver as publicações direcionadas apenas a seguidores.",
"compose_form.lock_disclaimer.lock": "bloqueada", "compose_form.lock_disclaimer.lock": "bloqueada",
"compose_form.placeholder": "Em que estás a pensar?", "compose_form.placeholder": "Em que estás a pensar?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "utilizador", "search_popout.tips.user": "utilizador",
"search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}", "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
"standalone.public_title": "Espreitar lá dentro...", "standalone.public_title": "Espreitar lá dentro...",
"status.block": "Block @{name}",
"status.cannot_reblog": "Este post não pode ser partilhado", "status.cannot_reblog": "Este post não pode ser partilhado",
"status.delete": "Eliminar", "status.delete": "Eliminar",
"status.embed": "Incorporar", "status.embed": "Incorporar",
@ -221,6 +223,7 @@
"status.media_hidden": "Media escondida", "status.media_hidden": "Media escondida",
"status.mention": "Mencionar @{name}", "status.mention": "Mencionar @{name}",
"status.more": "Mais", "status.more": "Mais",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Silenciar conversa", "status.mute_conversation": "Silenciar conversa",
"status.open": "Expandir", "status.open": "Expandir",
"status.pin": "Pin on profile", "status.pin": "Pin on profile",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Открепить", "column_header.unpin": "Открепить",
"column_subheading.navigation": "Навигация", "column_subheading.navigation": "Навигация",
"column_subheading.settings": "Настройки", "column_subheading.settings": "Настройки",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Ваш аккаунт не {locked}. Любой человек может подписаться на Вас и просматривать посты для подписчиков.", "compose_form.lock_disclaimer": "Ваш аккаунт не {locked}. Любой человек может подписаться на Вас и просматривать посты для подписчиков.",
"compose_form.lock_disclaimer.lock": "закрыт", "compose_form.lock_disclaimer.lock": "закрыт",
"compose_form.placeholder": "О чем Вы думаете?", "compose_form.placeholder": "О чем Вы думаете?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "пользователь", "search_popout.tips.user": "пользователь",
"search_results.total": "{count, number} {count, plural, one {результат} few {результата} many {результатов} other {результатов}}", "search_results.total": "{count, number} {count, plural, one {результат} few {результата} many {результатов} other {результатов}}",
"standalone.public_title": "Прямо сейчас", "standalone.public_title": "Прямо сейчас",
"status.block": "Block @{name}",
"status.cannot_reblog": "Этот статус не может быть продвинут", "status.cannot_reblog": "Этот статус не может быть продвинут",
"status.delete": "Удалить", "status.delete": "Удалить",
"status.embed": "Встроить", "status.embed": "Встроить",
@ -221,6 +223,7 @@
"status.media_hidden": "Медиаконтент скрыт", "status.media_hidden": "Медиаконтент скрыт",
"status.mention": "Упомянуть @{name}", "status.mention": "Упомянуть @{name}",
"status.more": "Больше", "status.more": "Больше",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Заглушить тред", "status.mute_conversation": "Заглушить тред",
"status.open": "Развернуть статус", "status.open": "Развернуть статус",
"status.pin": "Закрепить в профиле", "status.pin": "Закрепить в профиле",

View file

@ -1,214 +1,262 @@
{ {
"account.block": "Blokovať @{name}", "account.block": "Blokovať @{name}",
"account.block_domain": "Blokovať všetko z {domain}", "account.block_domain": "Blokovať všetko z {domain}",
"account.disclaimer_full": "Inofrmácie nižšie nemusia reflektovať použivateľský účet kompletne.", "account.disclaimer_full": "Inofrmácie nižšie nemusia reflektovať použivateľský účet kompletne.",
"account.edit_profile": "Upraviť profil", "account.edit_profile": "Upraviť profil",
"account.follow": "Sledovať", "account.follow": "Sledovať",
"account.followers": "Sledujúci", "account.followers": "Sledujúci",
"account.follows": "Sledovaní", "account.follows": "Sledovaní",
"account.follows_you": "Sleduje teba", "account.follows_you": "Sleduje teba",
"account.media": "Média", "account.hide_reblogs": "Hide boosts from @{name}",
"account.mention": "Napísať @{name}", "account.media": "Média",
"account.mute": "Ignorovať @{name}", "account.mention": "Napísať @{name}",
"account.posts": "Správ", "account.moved_to": "{name} has moved to:",
"account.report": "Nahlásiť @{name}", "account.mute": "Ignorovať @{name}",
"account.requested": "Čaká na schválenie. Klikni na zrušenie žiadosti", "account.mute_notifications": "Mute notifications from @{name}",
"account.share": "Zdieľať @{name} profil", "account.posts": "Správ",
"account.unblock": "Odblokovať @{name}", "account.report": "Nahlásiť @{name}",
"account.unblock_domain": "Prestať blokovať {domain}", "account.requested": "Čaká na schválenie. Klikni na zrušenie žiadosti",
"account.unfollow": "Prestať nasledovať", "account.share": "Zdieľať @{name} profil",
"account.unmute": "Prestať ignorovať @{name}", "account.show_reblogs": "Show boosts from @{name}",
"account.view_full_profile": "Pozri celý profil", "account.unblock": "Odblokovať @{name}",
"boost_modal.combo": "Nabudúce môžeš kliknúť {combo} a preskočiť", "account.unblock_domain": "Prestať blokovať {domain}",
"bundle_column_error.body": "Nastala chyba pri načítaní tohto komponentu.", "account.unfollow": "Prestať nasledovať",
"bundle_column_error.retry": "Skús znova", "account.unmute": "Prestať ignorovať @{name}",
"bundle_column_error.title": "Chyba siete", "account.unmute_notifications": "Unmute notifications from @{name}",
"bundle_modal_error.close": "Zatvoriť", "account.view_full_profile": "Pozri celý profil",
"bundle_modal_error.message": "Nastala chyba pri načítaní tohto komponentu.", "boost_modal.combo": "Nabudúce môžeš kliknúť {combo} a preskočiť",
"bundle_modal_error.retry": "Skúsiť znova", "bundle_column_error.body": "Nastala chyba pri načítaní tohto komponentu.",
"column.blocks": "Blokovaní používatelia", "bundle_column_error.retry": "Skús znova",
"column.community": "Lokálna časová os", "bundle_column_error.title": "Chyba siete",
"column.favourites": "Obľúbené", "bundle_modal_error.close": "Zatvoriť",
"column.follow_requests": "Žiadosti", "bundle_modal_error.message": "Nastala chyba pri načítaní tohto komponentu.",
"column.home": "Moja časová os", "bundle_modal_error.retry": "Skúsiť znova",
"column.mutes": "Ignorovaní používatelia", "column.blocks": "Blokovaní používatelia",
"column.notifications": "Notifikácie", "column.community": "Lokálna časová os",
"column.pins": "Pripnuté toots", "column.favourites": "Obľúbené",
"column.public": "Federovaná časová os", "column.follow_requests": "Žiadosti",
"column_back_button.label": "Späť", "column.home": "Moja časová os",
"column_header.hide_settings": "Skryť nastavenia", "column.lists": "Lists",
"column_header.moveLeft_settings": "Presunúť stĺpec doľava", "column.mutes": "Ignorovaní používatelia",
"column_header.moveRight_settings": "Presunúť stĺpec doprava", "column.notifications": "Notifikácie",
"column_header.pin": "Pripnúť", "column.pins": "Pripnuté toots",
"column_header.show_settings": "Ukázať nastavenia", "column.public": "Federovaná časová os",
"column_header.unpin": "Odopnúť", "column_back_button.label": "Späť",
"column_subheading.navigation": "Navigácia", "column_header.hide_settings": "Skryť nastavenia",
"column_subheading.settings": "Nastavenia", "column_header.moveLeft_settings": "Presunúť stĺpec doľava",
"compose_form.lock_disclaimer": "Tvoj účet nie je zamknutý. Ktokoľvek ťa môže nasledovať a vidieť tvoje správy pre sledujúcich.", "column_header.moveRight_settings": "Presunúť stĺpec doprava",
"compose_form.lock_disclaimer.lock": "zamknutý", "column_header.pin": "Pripnúť",
"compose_form.placeholder": "Čo máš na mysli?", "column_header.show_settings": "Ukázať nastavenia",
"compose_form.publish": "Toot", "column_header.unpin": "Odopnúť",
"compose_form.publish_loud": "{publish}!", "column_subheading.navigation": "Navigácia",
"compose_form.sensitive": "Označ súbor ako chúlostivý", "column_subheading.settings": "Nastavenia",
"compose_form.spoiler": "Skryť text za varovanie", "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.spoiler_placeholder": "Napíš sem tvoje varovanie", "compose_form.lock_disclaimer": "Tvoj účet nie je zamknutý. Ktokoľvek ťa môže nasledovať a vidieť tvoje správy pre sledujúcich.",
"confirmation_modal.cancel": "Zrušiť", "compose_form.lock_disclaimer.lock": "zamknutý",
"confirmations.block.confirm": "Blokovať", "compose_form.placeholder": "Čo máš na mysli?",
"confirmations.block.message": "Naozaj chceš blokovať {name}?", "compose_form.publish": "Toot",
"confirmations.delete.confirm": "Zmazať", "compose_form.publish_loud": "{publish}!",
"confirmations.delete.message": "Naozaj chceš zmazať túto správu?", "compose_form.sensitive": "Označ súbor ako chúlostivý",
"confirmations.domain_block.confirm": "Skryť celú doménu", "compose_form.spoiler": "Skryť text za varovanie",
"confirmations.domain_block.message": "Si si naozaj istý, že chceš blokovať celú {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať daných používateľov.", "compose_form.spoiler_placeholder": "Napíš sem tvoje varovanie",
"confirmations.mute.confirm": "Ignoruj", "confirmation_modal.cancel": "Zrušiť",
"confirmations.mute.message": "Naozaj chceš ignorovať {name}?", "confirmations.block.confirm": "Blokovať",
"confirmations.unfollow.confirm": "Nesledovať", "confirmations.block.message": "Naozaj chceš blokovať {name}?",
"confirmations.unfollow.message": "Naozaj chceš prestať sledovať {name}?", "confirmations.delete.confirm": "Zmazať",
"embed.instructions": "Skopíruj kód nižšie a ridaj tento status na tvoju web stránku.", "confirmations.delete.message": "Naozaj chceš zmazať túto správu?",
"embed.preview": "Tu je ukážka ako to bude vyzerať:", "confirmations.delete_list.confirm": "Delete",
"emoji_button.activity": "Aktivity", "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
"emoji_button.custom": "Vlastné", "confirmations.domain_block.confirm": "Skryť celú doménu",
"emoji_button.flags": "Vlajky", "confirmations.domain_block.message": "Si si naozaj istý, že chceš blokovať celú {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať daných používateľov.",
"emoji_button.food": "Jedlá a nápoje", "confirmations.mute.confirm": "Ignoruj",
"emoji_button.label": "Vlož emoji", "confirmations.mute.message": "Naozaj chceš ignorovať {name}?",
"emoji_button.nature": "Zvieratká", "confirmations.unfollow.confirm": "Nesledovať",
"emoji_button.not_found": "Nenájdené", "confirmations.unfollow.message": "Naozaj chceš prestať sledovať {name}?",
"emoji_button.objects": "Predmety", "embed.instructions": "Skopíruj kód nižšie a ridaj tento status na tvoju web stránku.",
"emoji_button.people": "Ľudia", "embed.preview": "Tu je ukážka ako to bude vyzerať:",
"emoji_button.recent": "Často používané", "emoji_button.activity": "Aktivity",
"emoji_button.search": "Hľadaj...", "emoji_button.custom": "Vlastné",
"emoji_button.search_results": "Nájdené", "emoji_button.flags": "Vlajky",
"emoji_button.symbols": "Symboly", "emoji_button.food": "Jedlá a nápoje",
"emoji_button.travel": "Cestovanie a miesta", "emoji_button.label": "Vlož emoji",
"empty_column.community": "Lokálna časová os je prázdna. Napíš niečo aby sa to začalo hýbať!", "emoji_button.nature": "Zvieratká",
"empty_column.hashtag": "Ešte nič nie je v tomto hashtag-u.", "emoji_button.not_found": "Nenájdené",
"empty_column.home": "Ešte nesleduješ nikoho. Pre začiatok pozri {public} alebo použi vyhľadávanie aby si našiel ostatných používateľov.", "emoji_button.objects": "Predmety",
"empty_column.home.inactivity": "Tvoja časová os je prázdna. Ak si bol dlho neaktívny, za krátku chvíľku bude obnovená.", "emoji_button.people": "Ľudia",
"empty_column.home.public_timeline": "verejnú časovú os", "emoji_button.recent": "Často používané",
"empty_column.notifications": "Nemáš žiadne notifikácie. Napíš niekomu, nasleduj niekoho alebo komunikuj s ostatnými.", "emoji_button.search": "Hľadaj...",
"empty_column.public": "Ešte tu nič nie je. Napíš niečo verejne alebo začni sledovať používateľov z iných Mastodon serverov aby tu niečo bolo", "emoji_button.search_results": "Nájdené",
"follow_request.authorize": "Potvrdiť", "emoji_button.symbols": "Symboly",
"follow_request.reject": "Odmietnúť", "emoji_button.travel": "Cestovanie a miesta",
"getting_started.appsshort": "Aplikácie", "empty_column.community": "Lokálna časová os je prázdna. Napíš niečo aby sa to začalo hýbať!",
"getting_started.faq": "FAQ", "empty_column.hashtag": "Ešte nič nie je v tomto hashtag-u.",
"getting_started.heading": "Začíname", "empty_column.home": "Ešte nesleduješ nikoho. Pre začiatok pozri {public} alebo použi vyhľadávanie aby si našiel ostatných používateľov.",
"getting_started.open_source_notice": "Mastodon má otvorený kód. Reportovať chyby alebo prispievať vlastným kódom môžeš na GitHube v {github}.", "empty_column.home.public_timeline": "verejnú časovú os",
"getting_started.userguide": "Používateľská príručka", "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
"home.column_settings.advanced": "Rozšírené", "empty_column.notifications": "Nemáš žiadne notifikácie. Napíš niekomu, nasleduj niekoho alebo komunikuj s ostatnými.",
"home.column_settings.basic": "Základné", "empty_column.public": "Ešte tu nič nie je. Napíš niečo verejne alebo začni sledovať používateľov z iných Mastodon serverov aby tu niečo bolo",
"home.column_settings.filter_regex": "Filtrovať použitím regulárnych výrazov", "follow_request.authorize": "Potvrdiť",
"home.column_settings.show_reblogs": "Zobraziť boosts", "follow_request.reject": "Odmietnúť",
"home.column_settings.show_replies": "Zobraziť odpovede", "getting_started.appsshort": "Aplikácie",
"home.settings": "Nastavenia stĺpcov", "getting_started.faq": "FAQ",
"lightbox.close": "Zavrieť", "getting_started.heading": "Začíname",
"lightbox.next": "Ďalší", "getting_started.open_source_notice": "Mastodon má otvorený kód. Reportovať chyby alebo prispievať vlastným kódom môžeš na GitHube v {github}.",
"lightbox.previous": "Predchádzajúci", "getting_started.userguide": "Používateľská príručka",
"loading_indicator.label": "Nahrávam...", "home.column_settings.advanced": "Rozšírené",
"media_gallery.toggle_visible": "Zapnúť/Vypnúť viditeľnosť", "home.column_settings.basic": "Základné",
"missing_indicator.label": "Nenájdené", "home.column_settings.filter_regex": "Filtrovať použitím regulárnych výrazov",
"navigation_bar.blocks": "Blokovaní používatelia", "home.column_settings.show_reblogs": "Zobraziť boosts",
"navigation_bar.community_timeline": "Lokálna časová os", "home.column_settings.show_replies": "Zobraziť odpovede",
"navigation_bar.edit_profile": "Upraviť profil", "home.settings": "Nastavenia stĺpcov",
"navigation_bar.favourites": "Obľúbené", "keyboard_shortcuts.back": "to navigate back",
"navigation_bar.follow_requests": "Žiadosti", "keyboard_shortcuts.boost": "to boost",
"navigation_bar.info": "O tomto Mastodon serveri", "keyboard_shortcuts.column": "to focus a status in one of the columns",
"navigation_bar.logout": "Odhlásiť", "keyboard_shortcuts.compose": "to focus the compose textarea",
"navigation_bar.mutes": "Ignorovaní používatelia", "keyboard_shortcuts.description": "Description",
"navigation_bar.pins": "Pripnuté toots", "keyboard_shortcuts.down": "to move down in the list",
"navigation_bar.preferences": "Možnosti", "keyboard_shortcuts.enter": "to open status",
"navigation_bar.public_timeline": "Federovaná časová os", "keyboard_shortcuts.favourite": "to favourite",
"notification.favourite": "{name} sa páči tvoj status", "keyboard_shortcuts.heading": "Keyboard Shortcuts",
"notification.follow": "{name} ťa začal(a) sledovať", "keyboard_shortcuts.hotkey": "Hotkey",
"notification.mention": "{name} ťa zmienil", "keyboard_shortcuts.legend": "to display this legend",
"notification.reblog": "{name} re-tootol tvoj status", "keyboard_shortcuts.mention": "to mention author",
"notifications.clear": "Vymazať notifikácie", "keyboard_shortcuts.reply": "to reply",
"notifications.clear_confirmation": "Naozaj chceš vymazať všetky tvoje notifikácie?", "keyboard_shortcuts.search": "to focus search",
"notifications.column_settings.alert": "Bublinové notifikácie", "keyboard_shortcuts.toot": "to start a brand new toot",
"notifications.column_settings.favourite": "Obľúbené:", "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
"notifications.column_settings.follow": "Nový nasledujúci:", "keyboard_shortcuts.up": "to move up in the list",
"notifications.column_settings.mention": "Zmienenia:", "lightbox.close": "Zavrieť",
"notifications.column_settings.push": "Push notifikácie", "lightbox.next": "Ďalší",
"notifications.column_settings.push_meta": "Toto zariadenie", "lightbox.previous": "Predchádzajúci",
"notifications.column_settings.reblog": "Re-toots:", "lists.account.add": "Add to list",
"notifications.column_settings.show": "Zobraziť v stĺpci", "lists.account.remove": "Remove from list",
"notifications.column_settings.sound": "Prehrať zvuk", "lists.delete": "Delete list",
"onboarding.done": "Koniec", "lists.edit": "Edit list",
"onboarding.next": "Ďalej", "lists.new.create": "Add list",
"onboarding.page_five.public_timelines": "Lokálna časová os zobrazuje verejné správy od všetkých na {domain}. Federovaná časová os zobrazuje verejné správy od všetkých ľudí ktoré {domain} nasleduje. Tieto sú takzvané Verejné Časové Osi, výborná možnosť ako nájsť a spoznať nových ľudí.", "lists.new.title_placeholder": "New list title",
"onboarding.page_four.home": "Domovská časová os zobrazí správy od ľudí ktorých sleduješ.", "lists.search": "Search among people you follow",
"onboarding.page_four.notifications": "Stĺpec s notifikáciami zobrazí keď budeš s niekým komunikovať.", "lists.subheading": "Your lists",
"onboarding.page_one.federation": "Mastodon je sieť nezávislých serverov spojením ktorých vzniká jedna veľká federovaná sociálna sieť.", "loading_indicator.label": "Nahrávam...",
"onboarding.page_one.handle": "Ty si na {domain}, takže tvoje celý nickname je {handle}", "media_gallery.toggle_visible": "Zapnúť/Vypnúť viditeľnosť",
"onboarding.page_one.welcome": "Vitajte v Mastodon!", "missing_indicator.label": "Nenájdené",
"onboarding.page_six.admin": "Správca tohto servera je {admin}.", "mute_modal.hide_notifications": "Hide notifications from this user?",
"onboarding.page_six.almost_done": "Takmer hotovo...", "navigation_bar.blocks": "Blokovaní používatelia",
"onboarding.page_six.appetoot": "Bon Appetoot!", "navigation_bar.community_timeline": "Lokálna časová os",
"onboarding.page_six.apps_available": "Aplikácie {apps} sú dostupné na pre iOS, Android and ďalšie platformy.", "navigation_bar.edit_profile": "Upraviť profil",
"onboarding.page_six.github": "Mastodon je free open-source software. Chyby, nové funkcie alebo prispievať svojím kódom mǒžeš na {github}.", "navigation_bar.favourites": "Obľúbené",
"onboarding.page_six.guidelines": "pravidlá komunity", "navigation_bar.follow_requests": "Žiadosti",
"onboarding.page_six.read_guidelines": "Prosím prečítajte si {domain} pravidlá {guidelines}!", "navigation_bar.info": "O tomto Mastodon serveri",
"onboarding.page_six.various_app": "mobilné applikácie", "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
"onboarding.page_three.profile": "Uprav svoj profile a zmeň svoj avatar, bio a meno ktoré bude zobrazené. V nastaveniach nájdeš ďalšie možnosti.", "navigation_bar.lists": "Lists",
"onboarding.page_three.search": "Použi vyhľadávacie políčko na nájdenie ľudí a hashtagov, ako napríklad {slovensko}, {slovakia} alebo {pivo}. Na nájdenie človeka ktorý je registrovaný na inom Mastodon serveri použi jeho celý nickname.", "navigation_bar.logout": "Odhlásiť",
"onboarding.page_two.compose": "Správy píš zo stĺpca na komponovanie. Môžeš nahrávať obrázky, meniť nastavenia súkromia správ a pridávať varovania ikonkami nižšie.", "navigation_bar.mutes": "Ignorovaní používatelia",
"onboarding.skip": "Preskočiť", "navigation_bar.pins": "Pripnuté toots",
"privacy.change": "Zmeň viditeľnosť statusu", "navigation_bar.preferences": "Možnosti",
"privacy.direct.long": "Pošli priamo iba spomenutým používateľom", "navigation_bar.public_timeline": "Federovaná časová os",
"privacy.direct.short": "Súkromne", "notification.favourite": "{name} sa páči tvoj status",
"privacy.private.long": "Pošli iba sledujúcim", "notification.follow": "{name} ťa začal(a) sledovať",
"privacy.private.short": "Iba sledujúci", "notification.mention": "{name} ťa zmienil",
"privacy.public.long": "Pošli všetkým", "notification.reblog": "{name} re-tootol tvoj status",
"privacy.public.short": "Verejne", "notifications.clear": "Vymazať notifikácie",
"privacy.unlisted.long": "Neposielať verejne", "notifications.clear_confirmation": "Naozaj chceš vymazať všetky tvoje notifikácie?",
"privacy.unlisted.short": "Nie je v zozname", "notifications.column_settings.alert": "Bublinové notifikácie",
"reply_indicator.cancel": "Zrušiť", "notifications.column_settings.favourite": "Obľúbené:",
"report.placeholder": "Ďalšie komentáre", "notifications.column_settings.follow": "Nový nasledujúci:",
"report.submit": "Poslať", "notifications.column_settings.mention": "Zmienenia:",
"report.target": "Reportovať {target}", "notifications.column_settings.push": "Push notifikácie",
"search.placeholder": "Hľadaj", "notifications.column_settings.push_meta": "Toto zariadenie",
"search_results.total": "{count, number} nájdených", "notifications.column_settings.reblog": "Re-toots:",
"standalone.public_title": "Čo tam nájdeš...", "notifications.column_settings.show": "Zobraziť v stĺpci",
"status.cannot_reblog": "Tento príspevok nemôže byť re-tootnutý", "notifications.column_settings.sound": "Prehrať zvuk",
"status.delete": "Zmazať", "onboarding.done": "Koniec",
"status.embed": "Embed", "onboarding.next": "Ďalej",
"status.favourite": "Páči sa mi", "onboarding.page_five.public_timelines": "Lokálna časová os zobrazuje verejné správy od všetkých na {domain}. Federovaná časová os zobrazuje verejné správy od všetkých ľudí ktoré {domain} nasleduje. Tieto sú takzvané Verejné Časové Osi, výborná možnosť ako nájsť a spoznať nových ľudí.",
"status.load_more": "Zobraziť viac", "onboarding.page_four.home": "Domovská časová os zobrazí správy od ľudí ktorých sleduješ.",
"status.media_hidden": "Skryté médiá", "onboarding.page_four.notifications": "Stĺpec s notifikáciami zobrazí keď budeš s niekým komunikovať.",
"status.mention": "Napísať @{name}", "onboarding.page_one.federation": "Mastodon je sieť nezávislých serverov spojením ktorých vzniká jedna veľká federovaná sociálna sieť.",
"status.mute_conversation": "Ignorovať konverzáciu", "onboarding.page_one.handle": "Ty si na {domain}, takže tvoje celý nickname je {handle}",
"status.open": "Otvoriť", "onboarding.page_one.welcome": "Vitajte v Mastodon!",
"status.pin": "Pripnúť na profil", "onboarding.page_six.admin": "Správca tohto servera je {admin}.",
"status.reblog": "Re-toot", "onboarding.page_six.almost_done": "Takmer hotovo...",
"status.reblogged_by": "{name} re-tootol", "onboarding.page_six.appetoot": "Bon Appetoot!",
"status.reply": "Odpovedať", "onboarding.page_six.apps_available": "Aplikácie {apps} sú dostupné na pre iOS, Android and ďalšie platformy.",
"status.replyAll": "Odpovedať všetkým", "onboarding.page_six.github": "Mastodon je free open-source software. Chyby, nové funkcie alebo prispievať svojím kódom mǒžeš na {github}.",
"status.report": "Nahlásiť @{name}", "onboarding.page_six.guidelines": "pravidlá komunity",
"status.sensitive_toggle": "Klikni pre zobrazenie", "onboarding.page_six.read_guidelines": "Prosím prečítajte si {domain} pravidlá {guidelines}!",
"status.sensitive_warning": "Chúlostivý obsah", "onboarding.page_six.various_app": "mobilné applikácie",
"status.share": "Zdieľať", "onboarding.page_three.profile": "Uprav svoj profile a zmeň svoj avatar, bio a meno ktoré bude zobrazené. V nastaveniach nájdeš ďalšie možnosti.",
"status.show_less": "Zobraziť menej", "onboarding.page_three.search": "Použi vyhľadávacie políčko na nájdenie ľudí a hashtagov, ako napríklad {slovensko}, {slovakia} alebo {pivo}. Na nájdenie človeka ktorý je registrovaný na inom Mastodon serveri použi jeho celý nickname.",
"status.show_more": "Zobraziť viac", "onboarding.page_two.compose": "Správy píš zo stĺpca na komponovanie. Môžeš nahrávať obrázky, meniť nastavenia súkromia správ a pridávať varovania ikonkami nižšie.",
"status.unmute_conversation": "Prestať ignorovať konverzáciu", "onboarding.skip": "Preskočiť",
"status.unpin": "Odopnúť z profilu", "privacy.change": "Zmeň viditeľnosť statusu",
"tabs_bar.compose": "Napísať", "privacy.direct.long": "Pošli priamo iba spomenutým používateľom",
"tabs_bar.federated_timeline": "Federovaná", "privacy.direct.short": "Súkromne",
"tabs_bar.home": "Domov", "privacy.private.long": "Pošli iba sledujúcim",
"tabs_bar.local_timeline": "Local", "privacy.private.short": "Iba sledujúci",
"tabs_bar.notifications": "Notifikácie", "privacy.public.long": "Pošli všetkým",
"upload_area.title": "Ťahaj a pusti pre nahratie", "privacy.public.short": "Verejne",
"upload_button.label": "Pridať", "privacy.unlisted.long": "Neposielať verejne",
"upload_form.undo": "Späť", "privacy.unlisted.short": "Nie je v zozname",
"upload_progress.label": "Nahrávam...", "relative_time.days": "{number}d",
"video.close": "Zavrieť video", "relative_time.hours": "{number}h",
"video.exit_fullscreen": "Vpnúť zobrazenie na celú obrazovku", "relative_time.just_now": "now",
"video.expand": "Zväčšiť video", "relative_time.minutes": "{number}m",
"video.fullscreen": "Zapnúť zobrazenie na celú obrazovku", "relative_time.seconds": "{number}s",
"video.hide": "Skryť video", "reply_indicator.cancel": "Zrušiť",
"video.mute": "Vypnúť zvuk", "report.placeholder": "Ďalšie komentáre",
"video.pause": "Pauza", "report.submit": "Poslať",
"video.play": "Prehrať", "report.target": "Reportovať {target}",
"video.unmute": "Zapnúť zvuk", "search.placeholder": "Hľadaj",
"video_player.expand": "Zväčšiť video", "search_popout.search_format": "Advanced search format",
"video_player.toggle_sound": "Zapnúť/Vypnúť zvuk", "search_popout.tips.hashtag": "hashtag",
"video_player.toggle_visible": "Zapnúť/Vypnúť video", "search_popout.tips.status": "status",
"video_player.video_error": "Video nebolo možné prehrať" "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
"search_popout.tips.user": "user",
"search_results.total": "{count, number} nájdených",
"standalone.public_title": "Čo tam nájdeš...",
"status.block": "Block @{name}",
"status.cannot_reblog": "Tento príspevok nemôže byť re-tootnutý",
"status.delete": "Zmazať",
"status.embed": "Embed",
"status.favourite": "Páči sa mi",
"status.load_more": "Zobraziť viac",
"status.media_hidden": "Skryté médiá",
"status.mention": "Napísať @{name}",
"status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Ignorovať konverzáciu",
"status.open": "Otvoriť",
"status.pin": "Pripnúť na profil",
"status.reblog": "Re-toot",
"status.reblogged_by": "{name} re-tootol",
"status.reply": "Odpovedať",
"status.replyAll": "Odpovedať všetkým",
"status.report": "Nahlásiť @{name}",
"status.sensitive_toggle": "Klikni pre zobrazenie",
"status.sensitive_warning": "Chúlostivý obsah",
"status.share": "Zdieľať",
"status.show_less": "Zobraziť menej",
"status.show_more": "Zobraziť viac",
"status.unmute_conversation": "Prestať ignorovať konverzáciu",
"status.unpin": "Odopnúť z profilu",
"tabs_bar.compose": "Napísať",
"tabs_bar.federated_timeline": "Federovaná",
"tabs_bar.home": "Domov",
"tabs_bar.local_timeline": "Local",
"tabs_bar.notifications": "Notifikácie",
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
"upload_area.title": "Ťahaj a pusti pre nahratie",
"upload_button.label": "Pridať",
"upload_form.description": "Describe for the visually impaired",
"upload_form.undo": "Späť",
"upload_progress.label": "Nahrávam...",
"video.close": "Zavrieť video",
"video.exit_fullscreen": "Vpnúť zobrazenie na celú obrazovku",
"video.expand": "Zväčšiť video",
"video.fullscreen": "Zapnúť zobrazenie na celú obrazovku",
"video.hide": "Skryť video",
"video.mute": "Vypnúť zvuk",
"video.pause": "Pauza",
"video.play": "Prehrať",
"video.unmute": "Zapnúť zvuk"
} }

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Откачи", "column_header.unpin": "Откачи",
"column_subheading.navigation": "Навигација", "column_subheading.navigation": "Навигација",
"column_subheading.settings": "Поставке", "column_subheading.settings": "Поставке",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.", "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.",
"compose_form.lock_disclaimer.lock": "закључан", "compose_form.lock_disclaimer.lock": "закључан",
"compose_form.placeholder": "Шта Вам је на уму?", "compose_form.placeholder": "Шта Вам је на уму?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "корисник", "search_popout.tips.user": "корисник",
"search_results.total": "{count, number} {count, plural, one {резултат} few {резултата} other {резултата}}", "search_results.total": "{count, number} {count, plural, one {резултат} few {резултата} other {резултата}}",
"standalone.public_title": "Поглед изнутра...", "standalone.public_title": "Поглед изнутра...",
"status.block": "Block @{name}",
"status.cannot_reblog": "Овај статус не може да се подржи", "status.cannot_reblog": "Овај статус не може да се подржи",
"status.delete": "Обриши", "status.delete": "Обриши",
"status.embed": "Угради на сајт", "status.embed": "Угради на сајт",
@ -221,6 +223,7 @@
"status.media_hidden": "Мултимедија сакривена", "status.media_hidden": "Мултимедија сакривена",
"status.mention": "Помени корисника @{name}", "status.mention": "Помени корисника @{name}",
"status.more": "Још", "status.more": "Још",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Мутирај преписку", "status.mute_conversation": "Мутирај преписку",
"status.open": "Прошири овај статус", "status.open": "Прошири овај статус",
"status.pin": "Прикачи на профил", "status.pin": "Прикачи на профил",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Ångra fäst", "column_header.unpin": "Ångra fäst",
"column_subheading.navigation": "Navigation", "column_subheading.navigation": "Navigation",
"column_subheading.settings": "Inställningar", "column_subheading.settings": "Inställningar",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Ditt konto är inte {locked}. Vemsomhelst kan följa dig och även se dina inlägg skrivna för endast dina följare.", "compose_form.lock_disclaimer": "Ditt konto är inte {locked}. Vemsomhelst kan följa dig och även se dina inlägg skrivna för endast dina följare.",
"compose_form.lock_disclaimer.lock": "låst", "compose_form.lock_disclaimer.lock": "låst",
"compose_form.placeholder": "Vad funderar du på?", "compose_form.placeholder": "Vad funderar du på?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "användare", "search_popout.tips.user": "användare",
"search_results.total": "{count, number} {count, plural, ett {result} andra {results}}", "search_results.total": "{count, number} {count, plural, ett {result} andra {results}}",
"standalone.public_title": "En titt inuti...", "standalone.public_title": "En titt inuti...",
"status.block": "Block @{name}",
"status.cannot_reblog": "Detta inlägg kan inte knuffas", "status.cannot_reblog": "Detta inlägg kan inte knuffas",
"status.delete": "Ta bort", "status.delete": "Ta bort",
"status.embed": "Bädda in", "status.embed": "Bädda in",
@ -221,6 +223,7 @@
"status.media_hidden": "Media dold", "status.media_hidden": "Media dold",
"status.mention": "Omnämn @{name}", "status.mention": "Omnämn @{name}",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Tysta konversation", "status.mute_conversation": "Tysta konversation",
"status.open": "Utvidga denna status", "status.open": "Utvidga denna status",
"status.pin": "Fäst i profil", "status.pin": "Fäst i profil",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Unpin", "column_header.unpin": "Unpin",
"column_subheading.navigation": "Navigation", "column_subheading.navigation": "Navigation",
"column_subheading.settings": "Settings", "column_subheading.settings": "Settings",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.", "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
"compose_form.lock_disclaimer.lock": "locked", "compose_form.lock_disclaimer.lock": "locked",
"compose_form.placeholder": "What is on your mind?", "compose_form.placeholder": "What is on your mind?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count, number} {count, plural, one {result} other {results}}", "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
"standalone.public_title": "A look inside...", "standalone.public_title": "A look inside...",
"status.block": "Block @{name}",
"status.cannot_reblog": "This post cannot be boosted", "status.cannot_reblog": "This post cannot be boosted",
"status.delete": "Delete", "status.delete": "Delete",
"status.embed": "Embed", "status.embed": "Embed",
@ -221,6 +223,7 @@
"status.media_hidden": "Media hidden", "status.media_hidden": "Media hidden",
"status.mention": "Mention @{name}", "status.mention": "Mention @{name}",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Mute conversation", "status.mute_conversation": "Mute conversation",
"status.open": "Expand this status", "status.open": "Expand this status",
"status.pin": "Pin on profile", "status.pin": "Pin on profile",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Unpin", "column_header.unpin": "Unpin",
"column_subheading.navigation": "Navigasyon", "column_subheading.navigation": "Navigasyon",
"column_subheading.settings": "Ayarlar", "column_subheading.settings": "Ayarlar",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Hesabınız {locked} değil. Sadece takipçilerle paylaştığınız gönderileri görebilmek için sizi herhangi bir kullanıcı takip edebilir.", "compose_form.lock_disclaimer": "Hesabınız {locked} değil. Sadece takipçilerle paylaştığınız gönderileri görebilmek için sizi herhangi bir kullanıcı takip edebilir.",
"compose_form.lock_disclaimer.lock": "kilitli", "compose_form.lock_disclaimer.lock": "kilitli",
"compose_form.placeholder": "Ne düşünüyorsun?", "compose_form.placeholder": "Ne düşünüyorsun?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count, number} {count, plural, one {sonuç} other {sonuçlar}}", "search_results.total": "{count, number} {count, plural, one {sonuç} other {sonuçlar}}",
"standalone.public_title": "A look inside...", "standalone.public_title": "A look inside...",
"status.block": "Block @{name}",
"status.cannot_reblog": "Bu gönderi boost edilemez", "status.cannot_reblog": "Bu gönderi boost edilemez",
"status.delete": "Sil", "status.delete": "Sil",
"status.embed": "Embed", "status.embed": "Embed",
@ -221,6 +223,7 @@
"status.media_hidden": "Gizli görsel", "status.media_hidden": "Gizli görsel",
"status.mention": "Bahset @{name}", "status.mention": "Bahset @{name}",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Mute conversation", "status.mute_conversation": "Mute conversation",
"status.open": "Bu gönderiyi genişlet", "status.open": "Bu gönderiyi genişlet",
"status.pin": "Pin on profile", "status.pin": "Pin on profile",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "Unpin", "column_header.unpin": "Unpin",
"column_subheading.navigation": "Навігація", "column_subheading.navigation": "Навігація",
"column_subheading.settings": "Налаштування", "column_subheading.settings": "Налаштування",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "Ваш акаунт не {locked}. Кожен може підписатися на Вас та бачити Ваші приватні пости.", "compose_form.lock_disclaimer": "Ваш акаунт не {locked}. Кожен може підписатися на Вас та бачити Ваші приватні пости.",
"compose_form.lock_disclaimer.lock": "приватний", "compose_form.lock_disclaimer.lock": "приватний",
"compose_form.placeholder": "Що у Вас на думці?", "compose_form.placeholder": "Що у Вас на думці?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count, number} {count, plural, one {результат} few {результати} many {результатів} other {результатів}}", "search_results.total": "{count, number} {count, plural, one {результат} few {результати} many {результатів} other {результатів}}",
"standalone.public_title": "A look inside...", "standalone.public_title": "A look inside...",
"status.block": "Block @{name}",
"status.cannot_reblog": "Цей допис не може бути передмухнутий", "status.cannot_reblog": "Цей допис не може бути передмухнутий",
"status.delete": "Видалити", "status.delete": "Видалити",
"status.embed": "Embed", "status.embed": "Embed",
@ -221,6 +223,7 @@
"status.media_hidden": "Медіаконтент приховано", "status.media_hidden": "Медіаконтент приховано",
"status.mention": "Згадати", "status.mention": "Згадати",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "Заглушити діалог", "status.mute_conversation": "Заглушити діалог",
"status.open": "Розгорнути допис", "status.open": "Розгорнути допис",
"status.pin": "Pin on profile", "status.pin": "Pin on profile",

View file

@ -0,0 +1,2 @@
[
]

View file

@ -0,0 +1,2 @@
[
]

View file

@ -50,6 +50,7 @@
"column_header.unpin": "取消固定", "column_header.unpin": "取消固定",
"column_subheading.navigation": "导航", "column_subheading.navigation": "导航",
"column_subheading.settings": "设置", "column_subheading.settings": "设置",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "你的帐户没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。", "compose_form.lock_disclaimer": "你的帐户没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。",
"compose_form.lock_disclaimer.lock": "开启保护", "compose_form.lock_disclaimer.lock": "开启保护",
"compose_form.placeholder": "在想啥?", "compose_form.placeholder": "在想啥?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "用户", "search_popout.tips.user": "用户",
"search_results.total": "共 {count, number} 个结果", "search_results.total": "共 {count, number} 个结果",
"standalone.public_title": "大家都在干啥?", "standalone.public_title": "大家都在干啥?",
"status.block": "Block @{name}",
"status.cannot_reblog": "无法转嘟这条嘟文", "status.cannot_reblog": "无法转嘟这条嘟文",
"status.delete": "删除", "status.delete": "删除",
"status.embed": "嵌入", "status.embed": "嵌入",
@ -221,6 +223,7 @@
"status.media_hidden": "隐藏媒体内容", "status.media_hidden": "隐藏媒体内容",
"status.mention": "提及 @{name}", "status.mention": "提及 @{name}",
"status.more": "更多", "status.more": "更多",
"status.mute": "Mute @{name}",
"status.mute_conversation": "隐藏此对话", "status.mute_conversation": "隐藏此对话",
"status.open": "展开嘟文", "status.open": "展开嘟文",
"status.pin": "在个人资料页面置顶", "status.pin": "在个人资料页面置顶",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "取下", "column_header.unpin": "取下",
"column_subheading.navigation": "瀏覽", "column_subheading.navigation": "瀏覽",
"column_subheading.settings": "設定", "column_subheading.settings": "設定",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "你的用戶狀態為「{locked}」,任何人都能立即關注你,然後看到「只有關注者能看」的文章。", "compose_form.lock_disclaimer": "你的用戶狀態為「{locked}」,任何人都能立即關注你,然後看到「只有關注者能看」的文章。",
"compose_form.lock_disclaimer.lock": "公共", "compose_form.lock_disclaimer.lock": "公共",
"compose_form.placeholder": "你在想甚麼?", "compose_form.placeholder": "你在想甚麼?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count, number} 項結果", "search_results.total": "{count, number} 項結果",
"standalone.public_title": "站點一瞥…", "standalone.public_title": "站點一瞥…",
"status.block": "Block @{name}",
"status.cannot_reblog": "這篇文章無法被轉推", "status.cannot_reblog": "這篇文章無法被轉推",
"status.delete": "刪除", "status.delete": "刪除",
"status.embed": "鑲嵌", "status.embed": "鑲嵌",
@ -221,6 +223,7 @@
"status.media_hidden": "隱藏媒體內容", "status.media_hidden": "隱藏媒體內容",
"status.mention": "提及 @{name}", "status.mention": "提及 @{name}",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "靜音對話", "status.mute_conversation": "靜音對話",
"status.open": "展開文章", "status.open": "展開文章",
"status.pin": "置頂到資料頁", "status.pin": "置頂到資料頁",

View file

@ -50,6 +50,7 @@
"column_header.unpin": "取下", "column_header.unpin": "取下",
"column_subheading.navigation": "瀏覽", "column_subheading.navigation": "瀏覽",
"column_subheading.settings": "設定", "column_subheading.settings": "設定",
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
"compose_form.lock_disclaimer": "你的帳號沒有{locked}。任何人都可以關注你,看到發給關注者的貼文。", "compose_form.lock_disclaimer": "你的帳號沒有{locked}。任何人都可以關注你,看到發給關注者的貼文。",
"compose_form.lock_disclaimer.lock": "上鎖", "compose_form.lock_disclaimer.lock": "上鎖",
"compose_form.placeholder": "在想些什麼?", "compose_form.placeholder": "在想些什麼?",
@ -213,6 +214,7 @@
"search_popout.tips.user": "user", "search_popout.tips.user": "user",
"search_results.total": "{count, number} 項結果", "search_results.total": "{count, number} 項結果",
"standalone.public_title": "站點一瞥…", "standalone.public_title": "站點一瞥…",
"status.block": "Block @{name}",
"status.cannot_reblog": "此貼文無法轉推", "status.cannot_reblog": "此貼文無法轉推",
"status.delete": "刪除", "status.delete": "刪除",
"status.embed": "Embed", "status.embed": "Embed",
@ -221,6 +223,7 @@
"status.media_hidden": "媒體已隱藏", "status.media_hidden": "媒體已隱藏",
"status.mention": "提到 @{name}", "status.mention": "提到 @{name}",
"status.more": "More", "status.more": "More",
"status.mute": "Mute @{name}",
"status.mute_conversation": "消音對話", "status.mute_conversation": "消音對話",
"status.open": "展開這個狀態", "status.open": "展開這個狀態",
"status.pin": "置頂到個人資訊頁", "status.pin": "置頂到個人資訊頁",

View file

@ -2,16 +2,18 @@
class ActivityPub::Activity::Accept < ActivityPub::Activity class ActivityPub::Activity::Accept < ActivityPub::Activity
def perform def perform
case @object['type'] if @object.respond_to?(:[]) &&
when 'Follow' @object['type'] == 'Follow' && @object['actor'].present?
accept_follow accept_follow_from @object['actor']
else
accept_follow_object @object
end end
end end
private private
def accept_follow def accept_follow_from(actor)
target_account = account_from_uri(target_uri) target_account = account_from_uri(value_or_id(actor))
return if target_account.nil? || !target_account.local? return if target_account.nil? || !target_account.local?
@ -19,7 +21,8 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity
follow_request&.authorize! follow_request&.authorize!
end end
def target_uri def accept_follow_object(object)
@target_uri ||= value_or_id(@object['actor']) follow_request = ActivityPub::TagManager.instance.uri_to_resource(value_or_id(object), FollowRequest)
follow_request&.authorize!
end end
end end

View file

@ -28,6 +28,8 @@ class ActivityPub::TagManager
return target.uri if target.respond_to?(:local?) && !target.local? return target.uri if target.respond_to?(:local?) && !target.local?
case target.object_type case target.object_type
when :follow
account_follow_url(target.account.username, target)
when :person when :person
account_url(target) account_url(target)
when :note, :comment, :activity when :note, :comment, :activity
@ -97,6 +99,12 @@ class ActivityPub::TagManager
case klass.name case klass.name
when 'Account' when 'Account'
klass.find_local(uri_to_local_id(uri, :username)) klass.find_local(uri_to_local_id(uri, :username))
when 'FollowRequest'
params = Rails.application.routes.recognize_path(uri)
klass.joins(:account).find_by!(
accounts: { domain: nil, username: params[:account_username] },
id: params[:id]
)
else else
StatusFinder.new(uri).status StatusFinder.new(uri).status
end end

View file

@ -171,10 +171,10 @@ class Formatter
end end
def link_to_url(entity) def link_to_url(entity)
normalized_url = Addressable::URI.parse(entity[:url]).normalize url = Addressable::URI.parse(entity[:url])
html_attrs = { target: '_blank', rel: 'nofollow noopener' } html_attrs = { target: '_blank', rel: 'nofollow noopener' }
Twitter::Autolink.send(:link_to_text, entity, link_html(entity[:url]), normalized_url, html_attrs) Twitter::Autolink.send(:link_to_text, entity, link_html(entity[:url]), url, html_attrs)
rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
encode(entity[:url]) encode(entity[:url])
end end

View file

@ -21,6 +21,10 @@ class FollowRequest < ApplicationRecord
validates :account_id, uniqueness: { scope: :target_account_id } validates :account_id, uniqueness: { scope: :target_account_id }
def object_type
:follow
end
def authorize! def authorize!
account.follow!(target_account, reblogs: show_reblogs) account.follow!(target_account, reblogs: show_reblogs)
MergeWorker.perform_async(target_account.id, account.id) MergeWorker.perform_async(target_account.id, account.id)

View file

@ -1,11 +1,12 @@
# frozen_string_literal: true # frozen_string_literal: true
class ActivityPub::FollowSerializer < ActiveModel::Serializer class ActivityPub::FollowSerializer < ActiveModel::Serializer
attributes :id, :type, :actor attributes :type, :actor
attribute :id, if: :dereferencable?
attribute :virtual_object, key: :object attribute :virtual_object, key: :object
def id def id
[ActivityPub::TagManager.instance.uri_for(object.account), '#follows/', object.id].join ActivityPub::TagManager.instance.uri_for(object)
end end
def type def type
@ -19,4 +20,8 @@ class ActivityPub::FollowSerializer < ActiveModel::Serializer
def virtual_object def virtual_object
ActivityPub::TagManager.instance.uri_for(object.target_account) ActivityPub::TagManager.instance.uri_for(object.target_account)
end end
def dereferencable?
object.respond_to?(:object_type)
end
end end

View file

@ -9,7 +9,7 @@
= fa_icon 'user-times' = fa_icon 'user-times'
= t('accounts.unfollow') = t('accounts.unfollow')
- else - else
= link_to account_follow_path(account), data: { method: :post }, class: 'icon-button' do = link_to account_follows_path(account), data: { method: :post }, class: 'icon-button' do
= fa_icon 'user-plus' = fa_icon 'user-plus'
= t('accounts.follow') = t('accounts.follow')
- elsif !user_signed_in? - elsif !user_signed_in?

View file

@ -1,4 +1,4 @@
<p>Witaj, <%= @resource.email %> !</p> <p>Witaj, <%= @resource.email %>!</p>
<p>Właśnie utworzyłeś konto na instancji <%= @instance %>.</p> <p>Właśnie utworzyłeś konto na instancji <%= @instance %>.</p>

View file

@ -1,4 +1,4 @@
Witaj, <%= @resource.email %> ! Witaj, <%= @resource.email %>!
Właśnie utworzyłeś konto na instancji <%= @instance %>. Właśnie utworzyłeś konto na instancji <%= @instance %>.

View file

@ -0,0 +1,13 @@
<p>こんにちは<%= @resource.email %>さん</p>
<% if @resource&.unconfirmed_email? %>
<p><%= @instance %>で使っているメールアドレスが<%= @resource.unconfirmed_email %>に変更されようとしています。</p>
<% else %>
<p><%= @instance %>で使っているメールアドレスが<%= @resource.email %>に変更されました。</p>
<% end %>
<p>
メールアドレスを変更した覚えがない場合、誰かがあなたのアカウントにアクセスしたおそれがあります。すぐにパスワードを変更するか、アカウントにアクセスできない場合はインスタンスの管理者に連絡してください。
</p>
<p><%= @instance %>チームより</p>

View file

@ -0,0 +1,11 @@
Hello <%= @resource.email %>!
<% if @resource&.unconfirmed_email? %>
<%= @instance %>で使っているメールアドレスが<%= @resource.unconfirmed_email %>に変更されようとしています。
<% else %>
<%= @instance %>で使っているメールアドレスが<%= @resource.email %>に変更されました。
<% end %>
メールアドレスを変更した覚えがない場合、誰かがあなたのアカウントにアクセスしたおそれがあります。すぐにパスワードを変更するか、アカウントにアクセスできない場合はインスタンスの管理者に連絡してください。
<%= @instance %>チームより

View file

@ -0,0 +1,15 @@
<p>Witaj, <%= @resource.email %>!</p>
<% if @resource&.unconfirmed_email? %>
<p>Informujemy, że e-mail używany przez Ciebie na <%= @instance %> został zmieniony na <%= @resource.unconfirmed_email %>.</p>
<% else %>
<p>Informujemy, że e-mail używany przez Ciebie na <%= @instance %> został zmieniony na <%= @resource.email %>.</p>
<% end %>
<p>
Jeżeli to nie Ty, prawdopodobnie ktoś uzyskał dostęp do Twojego konta. Zalecana jest natychmiastowa zmiana hasła lub skontaktowanie się z administratorem, jeżeli nie masz dostępu do swojego konta.
</p>
<p>Z pozdrowieniami,<p>
<p>Zespół <%= @instance %></p>

View file

@ -0,0 +1,13 @@
Witaj, <%= @resource.email %>!
<% if @resource&.unconfirmed_email? %>
Informujemy, że e-mail używany przez Ciebie na <%= @instance %> został zmieniony na <%= @resource.unconfirmed_email %>.
<% else %>
Informujemy, że e-mail używany przez Ciebie na <%= @instance %> został zmieniony na <%= @resource.email %>.
<% end %>
Jeżeli to nie Ty, prawdopodobnie ktoś uzyskał dostęp do Twojego konta. Zalecana jest natychmiastowa zmiana hasła lub skontaktowanie się z administratorem, jeżeli nie masz dostępu do swojego konta.
Z pozdrowieniami,
Zespół <%= @instance %>

View file

@ -0,0 +1,13 @@
<p>こんにちは<%= @resource.unconfirmed_email %>さん</p>
<p><%= @instance %>で使っているメールアドレスの変更をあなたがリクエストしました。</p>
<p>新しいメールアドレスを確認するには次のリンクをクリックしてください:<br>
<%= link_to 'わたしのメールアドレスを確認する', confirmation_url(@resource, confirmation_token: @token) %></p>
<p>上記のリンクがうまくいかなかった場合はこのURLをコピーしてアドレスバーに貼り付けてください:<br>
<span><%= confirmation_url(@resource, confirmation_token: @token) %></span>
<p>また<%= link_to '利用規約', terms_url %>もご確認ください。</p>
<p><%= @instance %>チームより</p>

View file

@ -0,0 +1,10 @@
こんにちは<%= @resource.unconfirmed_email %>さん
<%= @instance %>で使っているメールアドレスの変更をあなたがリクエストしました。
新しいメールアドレスを確認するには次のリンクをクリックしてください:
<%= confirmation_url(@resource, confirmation_token: @token) %>
また利用規約もご確認ください <%= terms_url %>
<%= @instance %>チームより

View file

@ -0,0 +1,15 @@
<p>Witaj, <%= @resource.unconfirmed_email %>!</p>
<p>Dokonano próby zmiany adresu e-mail, którego używasz na <%= @instance %>.</p>
<p>Aby potwierdzić posiadanie tego adresu e-mail, kliknij na poniższy odnośnik:<br>
<%= link_to 'Potwierdź mój adres e-mail', confirmation_url(@resource, confirmation_token: @token) %></p>
<p>Jeżeli ten odnośnik nie działa, wklej następujący adres w pasek adresu Twojej przeglądarki: <br>
<span><%= confirmation_url(@resource, confirmation_token: @token) %></span>
<p>Pamiętaj o przeczytaniu naszych <%= link_to 'zasad użytkowania', terms_url %>.</p>
<p>Z pozdrowieniami,<p>
<p>Zespół <%= @instance %></p>

View file

@ -0,0 +1,12 @@
Witaj, <%= @resource.unconfirmed_email %>!
Dokonano próby zmiany adresu e-mail, którego używasz na <%= @instance %>.
Aby potwierdzić posiadanie tego adresu e-mail, kliknij na poniższy odnośnik:
<%= confirmation_url(@resource, confirmation_token: @token) %>
Pamiętaj o przeczytaniu naszych zasad użytkowania: <%= terms_url %>
Z pozdrowieniami,
Zespół <%= @instance %>

View file

@ -18,8 +18,12 @@ ja:
mailer: mailer:
confirmation_instructions: confirmation_instructions:
subject: 'Mastodon: メールアドレスの確認' subject: 'Mastodon: メールアドレスの確認'
email_changed:
subject: 'Mastodon: メールアドレスの変更'
password_change: password_change:
subject: 'Mastodon: パスワードが変更されました' subject: 'Mastodon: パスワードが変更されました'
reconfirmation_instructions:
subject: 'Mastodon: %{instance}のメールを確認する'
reset_password_instructions: reset_password_instructions:
subject: 'Mastodon: パスワード再発行' subject: 'Mastodon: パスワード再発行'
unlock_instructions: unlock_instructions:

View file

@ -18,8 +18,12 @@ oc:
mailer: mailer:
confirmation_instructions: confirmation_instructions:
subject: Mercés de confirmar vòstra inscripcion sus %{instance} subject: Mercés de confirmar vòstra inscripcion sus %{instance}
email_changed:
subject: 'Mastodon: corrièl cambiat'
password_change: password_change:
subject: Mastodon:senhal cambiat subject: Mastodon:senhal cambiat
reconfirmation_instructions:
subject: 'Mastodon: Confirmatz ladreça per %{instance}'
reset_password_instructions: reset_password_instructions:
subject: Mastodon:instruccions per reïnicializar lo senhal subject: Mastodon:instruccions per reïnicializar lo senhal
unlock_instructions: unlock_instructions:

View file

@ -18,8 +18,12 @@ pl:
mailer: mailer:
confirmation_instructions: confirmation_instructions:
subject: 'Mastodon: Instrukcje weryfikacji adresu e-mail' subject: 'Mastodon: Instrukcje weryfikacji adresu e-mail'
email_changed:
subject: 'Mastodon: Zmieniono adres e-mail'
password_change: password_change:
subject: 'Mastodon: Hasło zmienione' subject: 'Mastodon: Zmieniono hasło'
reconfirmation_instructions:
subject: 'Mastodon: Potwierdź adres e-mail na &{instance}'
reset_password_instructions: reset_password_instructions:
subject: 'Mastodon: Instrukcje ustawienia nowego hasła' subject: 'Mastodon: Instrukcje ustawienia nowego hasła'
unlock_instructions: unlock_instructions:

View file

@ -116,6 +116,7 @@ ja:
roles: roles:
admin: 管理者 admin: 管理者
moderator: モデレーター moderator: モデレーター
staff: スタッフ
user: ユーザー user: ユーザー
salmon_url: Salmon URL salmon_url: Salmon URL
search: 検索 search: 検索
@ -160,6 +161,7 @@ ja:
update_status: "%{name} さんが %{target} さんの投稿を更新しました" update_status: "%{name} さんが %{target} さんの投稿を更新しました"
title: 操作履歴 title: 操作履歴
custom_emojis: custom_emojis:
by_domain: ドメイン
copied_msg: 絵文字のコピーをローカルに作成しました copied_msg: 絵文字のコピーをローカルに作成しました
copy: コピー copy: コピー
copy_failed_msg: 絵文字のコピーをローカルに作成できませんでした copy_failed_msg: 絵文字のコピーをローカルに作成できませんでした
@ -263,12 +265,18 @@ ja:
unresolved: 未解決 unresolved: 未解決
view: 表示 view: 表示
settings: settings:
activity_api_enabled:
desc_html: ローカルに投稿されたトゥート数、アクティブなユーザー数、週ごとの新規登録者数
title: ユーザーアクティビティに関する統計を公開する
bootstrap_timeline_accounts: bootstrap_timeline_accounts:
desc_html: 複数のユーザー名はコンマで区切ります。ローカルの公開アカウントのみ有効です。指定しない場合は管理者がデフォルトで指定されます。 desc_html: 複数のユーザー名はコンマで区切ります。ローカルの公開アカウントのみ有効です。指定しない場合は管理者がデフォルトで指定されます。
title: 新規ユーザーが自動フォローするアカウント title: 新規ユーザーが自動フォローするアカウント
contact_information: contact_information:
email: ビジネスメールアドレス email: ビジネスメールアドレス
username: 連絡先のユーザー名 username: 連絡先のユーザー名
peers_api_enabled:
desc_html: 連合内でこのインスタンスが遭遇したドメインの名前
title: 接続しているインスタンスのリストを公開する
registrations: registrations:
closed_message: closed_message:
desc_html: 新規登録を停止しているときにフロントページに表示されます。HTMLタグが使えます desc_html: 新規登録を停止しているときにフロントページに表示されます。HTMLタグが使えます

View file

@ -265,12 +265,18 @@ oc:
unresolved: Pas resolguts unresolved: Pas resolguts
view: Veire view: Veire
settings: settings:
activity_api_enabled:
desc_html: Nombre destatuts publicats, utilizaires actius e novèlas inscripcions en rapòrt setmanièr
title: Publica las estatisticas totalas de lactivitat dels utilizaires
bootstrap_timeline_accounts: bootstrap_timeline_accounts:
desc_html: Separatz los noms dutilizaire amb de virgula. Pas que los comptes locals e pas clavats foncionaràn. Se lo camp es void los admins seràn selecionats. desc_html: Separatz los noms dutilizaire amb de virgula. Pas que los comptes locals e pas clavats foncionaràn. Se lo camp es void los admins seràn selecionats.
title: Per defaut los nouvenguts sègon title: Per defaut los nòuvenguts sègon
contact_information: contact_information:
email: Picatz una adreça de corrièl email: Picatz una adreça de corrièl
username: Picatz un nom dutilizaire username: Picatz un nom dutilizaire
peers_api_enabled:
desc_html: Noms de domeni quaquesta instància a trobats pel fediverse
title: Publica la lista de las instàncias conegudas
registrations: registrations:
closed_message: closed_message:
desc_html: Afichat sus las pagina dacuèlh quand las inscripcions son tampadas.<br>Podètz utilizar de balisas HTML desc_html: Afichat sus las pagina dacuèlh quand las inscripcions son tampadas.<br>Podètz utilizar de balisas HTML

View file

@ -264,12 +264,18 @@ pl:
unresolved: Nierozwiązane unresolved: Nierozwiązane
view: Wyświetl view: Wyświetl
settings: settings:
activity_api_enabled:
desc_html: Liczy publikowane lokalnie wpisy, aktywnych użytkowników i nowe rejestracje w ciągu danego tygodnia
title: Publikuj zbiorowe statystyki o aktywności użytkowników
bootstrap_timeline_accounts: bootstrap_timeline_accounts:
desc_html: Oddzielaj nazwy użytkowników przecinkami. Działa tylko dla niezablokowanych kont w obrębie instancji. Jeżeli puste, zostaną użyte konta administratorów instancji. desc_html: Oddzielaj nazwy użytkowników przecinkami. Działa tylko dla niezablokowanych kont w obrębie instancji. Jeżeli puste, zostaną użyte konta administratorów instancji.
title: Domyślnie obserwowani użytkownicy title: Domyślnie obserwowani użytkownicy
contact_information: contact_information:
email: Służbowy adres e-mail email: Służbowy adres e-mail
username: Nazwa użytkownika do kontaktu username: Nazwa użytkownika do kontaktu
peers_api_enabled:
desc_html: Nazwy domen, z którymi ta instancja wchodziła w interakcje
title: Publikuj listę znanych instancji
registrations: registrations:
closed_message: closed_message:
desc_html: Wyświetlana na stronie głównej, gdy możliwość otwarej rejestracji nie jest dostępna. Możesz korzystać z tagów HTML desc_html: Wyświetlana na stronie głównej, gdy możliwość otwarej rejestracji nie jest dostępna. Możesz korzystać z tagów HTML
@ -480,7 +486,7 @@ pl:
acct: nazwa@domena nowego konta acct: nazwa@domena nowego konta
currently_redirecting: 'Obecnie Twoje konto przekierowuje do:' currently_redirecting: 'Obecnie Twoje konto przekierowuje do:'
proceed: Zapisz proceed: Zapisz
updated_msg: Pomyślnie zaktualizowano ustawienia i migracji Twojego konta! updated_msg: Pomyślnie zaktualizowano ustawienia migracji Twojego konta!
moderation: moderation:
title: Moderacja title: Moderacja
notification_mailer: notification_mailer:

View file

@ -54,7 +54,8 @@ Rails.application.routes.draw do
resources :followers, only: [:index], controller: :follower_accounts resources :followers, only: [:index], controller: :follower_accounts
resources :following, only: [:index], controller: :following_accounts resources :following, only: [:index], controller: :following_accounts
resource :follow, only: [:create], controller: :account_follow resources :follows, only: [:show], module: :activitypub
resource :follow, only: [:create], controller: :account_follow, as: :follows
resource :unfollow, only: [:create], controller: :account_unfollow resource :unfollow, only: [:create], controller: :account_unfollow
resource :outbox, only: [:show], module: :activitypub resource :outbox, only: [:show], module: :activitypub
resource :inbox, only: [:create], module: :activitypub resource :inbox, only: [:create], module: :activitypub

View file

@ -0,0 +1,43 @@
# frozen_string_literal: true
require 'rails_helper'
describe ActivityPub::FollowsController, type: :controller do
let(:follow_request) { Fabricate(:follow_request, account: account) }
render_views
context 'with local account' do
let(:account) { Fabricate(:account, domain: nil) }
it 'returns follow request' do
signed_request = Request.new(:get, account_follow_url(account, follow_request))
signed_request.on_behalf_of(follow_request.target_account)
request.headers.merge! signed_request.headers
get :show, params: { id: follow_request, account_username: account.username }
expect(body_as_json[:id]).to eq ActivityPub::TagManager.instance.uri_for(follow_request)
expect(response).to have_http_status :success
end
it 'returns http 404 without signature' do
get :show, params: { id: follow_request, account_username: account.username }
expect(response).to have_http_status 404
end
end
context 'with remote account' do
let(:account) { Fabricate(:account, domain: Faker::Internet.domain_name) }
it 'returns http 404' do
signed_request = Request.new(:get, account_follow_url(account, follow_request))
signed_request.on_behalf_of(follow_request.target_account)
request.headers.merge! signed_request.headers
get :show, params: { id: follow_request, account_username: account.username }
expect(response).to have_http_status 404
end
end
end

View file

@ -3,36 +3,49 @@ require 'rails_helper'
RSpec.describe ActivityPub::Activity::Accept do RSpec.describe ActivityPub::Activity::Accept do
let(:sender) { Fabricate(:account) } let(:sender) { Fabricate(:account) }
let(:recipient) { Fabricate(:account) } let(:recipient) { Fabricate(:account) }
let!(:follow_request) { Fabricate(:follow_request, account: recipient, target_account: sender) }
let(:json) do
{
'@context': 'https://www.w3.org/ns/activitystreams',
id: 'foo',
type: 'Accept',
actor: ActivityPub::TagManager.instance.uri_for(sender),
object: {
id: 'bar',
type: 'Follow',
actor: ActivityPub::TagManager.instance.uri_for(recipient),
object: ActivityPub::TagManager.instance.uri_for(sender),
},
}.with_indifferent_access
end
describe '#perform' do describe '#perform' do
subject { described_class.new(json, sender) } subject { described_class.new(json, sender) }
before do before do
Fabricate(:follow_request, account: recipient, target_account: sender)
subject.perform subject.perform
end end
it 'creates a follow relationship' do context 'with concerete object representation' do
expect(recipient.following?(sender)).to be true let(:json) do
{
'@context': 'https://www.w3.org/ns/activitystreams',
id: 'foo',
type: 'Accept',
actor: ActivityPub::TagManager.instance.uri_for(sender),
object: {
type: 'Follow',
actor: ActivityPub::TagManager.instance.uri_for(recipient),
object: ActivityPub::TagManager.instance.uri_for(sender),
},
}.with_indifferent_access
end
it 'creates a follow relationship' do
expect(recipient.following?(sender)).to be true
end
end end
it 'removes the follow request' do context 'with object represented by id' do
expect(recipient.requested?(sender)).to be false let(:json) do
{
'@context': 'https://www.w3.org/ns/activitystreams',
id: 'foo',
type: 'Accept',
actor: ActivityPub::TagManager.instance.uri_for(sender),
object: ActivityPub::TagManager.instance.uri_for(follow_request),
}.with_indifferent_access
end
it 'creates a follow relationship' do
expect(recipient.following?(sender)).to be true
end
end end
end end
end end

View file

@ -17,7 +17,7 @@ RSpec.describe Formatter do
let(:text) { 'http://google.com' } let(:text) { 'http://google.com' }
it 'has valid URL' do it 'has valid URL' do
is_expected.to include 'href="http://google.com/"' is_expected.to include 'href="http://google.com"'
end end
end end
@ -25,7 +25,7 @@ RSpec.describe Formatter do
let(:text) { 'https://nic.みんな/' } let(:text) { 'https://nic.みんな/' }
it 'has valid URL' do it 'has valid URL' do
is_expected.to include 'href="https://nic.xn--q9jyb4c/"' is_expected.to include 'href="https://nic.みんな/"'
end end
it 'has display URL' do it 'has display URL' do
@ -53,7 +53,7 @@ RSpec.describe Formatter do
let(:text) { 'http://www.google.com!' } let(:text) { 'http://www.google.com!' }
it 'has valid URL' do it 'has valid URL' do
is_expected.to include 'href="http://www.google.com/"' is_expected.to include 'href="http://www.google.com"'
end end
end end
@ -61,7 +61,7 @@ RSpec.describe Formatter do
let(:text) { "http://www.google.com'" } let(:text) { "http://www.google.com'" }
it 'has valid URL' do it 'has valid URL' do
is_expected.to include 'href="http://www.google.com/"' is_expected.to include 'href="http://www.google.com"'
end end
end end
@ -69,7 +69,7 @@ RSpec.describe Formatter do
let(:text) { 'http://www.google.com>' } let(:text) { 'http://www.google.com>' }
it 'has valid URL' do it 'has valid URL' do
is_expected.to include 'href="http://www.google.com/"' is_expected.to include 'href="http://www.google.com"'
end end
end end
@ -93,7 +93,7 @@ RSpec.describe Formatter do
let(:text) { 'https://ja.wikipedia.org/wiki/日本' } let(:text) { 'https://ja.wikipedia.org/wiki/日本' }
it 'has valid URL' do it 'has valid URL' do
is_expected.to include 'href="https://ja.wikipedia.org/wiki/%E6%97%A5%E6%9C%AC"' is_expected.to include 'href="https://ja.wikipedia.org/wiki/日本"'
end end
end end
@ -101,7 +101,7 @@ RSpec.describe Formatter do
let(:text) { 'https://ko.wikipedia.org/wiki/대한민국' } let(:text) { 'https://ko.wikipedia.org/wiki/대한민국' }
it 'has valid URL' do it 'has valid URL' do
is_expected.to include 'href="https://ko.wikipedia.org/wiki/%EB%8C%80%ED%95%9C%EB%AF%BC%EA%B5%AD"' is_expected.to include 'href="https://ko.wikipedia.org/wiki/대한민국"'
end end
end end
@ -109,7 +109,7 @@ RSpec.describe Formatter do
let(:text) { 'https://baike.baidu.com/item/中华人民共和国' } let(:text) { 'https://baike.baidu.com/item/中华人民共和国' }
it 'has valid URL' do it 'has valid URL' do
is_expected.to include 'href="https://baike.baidu.com/item/%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD"' is_expected.to include 'href="https://baike.baidu.com/item/中华人民共和国"'
end end
end end
@ -117,7 +117,7 @@ RSpec.describe Formatter do
let(:text) { 'https://zh.wikipedia.org/wiki/臺灣' } let(:text) { 'https://zh.wikipedia.org/wiki/臺灣' }
it 'has valid URL' do it 'has valid URL' do
is_expected.to include 'href="https://zh.wikipedia.org/wiki/%E8%87%BA%E7%81%A3"' is_expected.to include 'href="https://zh.wikipedia.org/wiki/臺灣"'
end end
end end

View file

@ -34,4 +34,12 @@ RSpec.describe FollowRequest, type: :model do
expect(follow_request.account.muting_reblogs?(target)).to be true expect(follow_request.account.muting_reblogs?(target)).to be true
end end
end end
describe '#object_type' do
let(:follow_request) { Fabricate(:follow_request) }
it 'equals to :follow' do
expect(follow_request.object_type).to eq :follow
end
end
end end