diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index d699a69dfd75d596dfd445f6515b6ee01a8a0452..f1bb465d949f02f1dcb48b68ca38c37da6c7de21 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "فك التدبيس",
   "column_subheading.navigation": "التصفح",
   "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.lock": "مقفل",
   "compose_form.placeholder": "فيمَ تفكّر؟",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "مستخدِم",
   "search_results.total": "{count, number} {count, plural, one {result} Ùˆ {results}}",
   "standalone.public_title": "نظرة على ...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "تعذرت ترقية هذا المنشور",
   "status.delete": "إحذف",
   "status.embed": "إدماج",
@@ -221,6 +223,7 @@
   "status.media_hidden": "الصورة مستترة",
   "status.mention": "أذكُر @{name}",
   "status.more": "المزيد",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "كتم المحادثة",
   "status.open": "وسع هذه المشاركة",
   "status.pin": "تدبيس على الملف الشخصي",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 1c04b3bfa3e87439d724486dc98e9bdcb031619c..c0a24dacb313eb2611728a01c5e73e7a116ab2aa 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "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.lock": "locked",
   "compose_form.placeholder": "Какво си мислиш?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Изтриване",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Media hidden",
   "status.mention": "Споменаване",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Expand this status",
   "status.pin": "Pin on profile",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 62d85a5e1ec8880f366cf8eb402c89b761367134..3d2fe28392dafc59ba7ddd1f01f8bcef2a089d53 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Deslligar",
   "column_subheading.navigation": "Navegació",
   "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.lock": "bloquejat",
   "compose_form.placeholder": "En què estàs pensant?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "usuari",
   "search_results.total": "{count, number} {count, plural, un {result} altres {results}}",
   "standalone.public_title": "Una mirada a l'interior ...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Aquesta publicació no pot ser retootejada",
   "status.delete": "Esborrar",
   "status.embed": "Incrustar",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Multimèdia amagat",
   "status.mention": "Esmentar @{name}",
   "status.more": "Més",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Silenciar conversació",
   "status.open": "Ampliar aquest estat",
   "status.pin": "Fixat en el perfil",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 6354f18b6d708578c49184a441a8b3d23594acea..9b6c857e4f8f65d46f72c7dfe551c335ae293747 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Lösen",
   "column_subheading.navigation": "Navigation",
   "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.lock": "gesperrt",
   "compose_form.placeholder": "Worüber möchtest du schreiben?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count, number} {count, plural, one {Ergebnis} other {Ergebnisse}}",
   "standalone.public_title": "Ein kleiner Einblick …",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
   "status.delete": "Löschen",
   "status.embed": "Einbetten",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Medien versteckt",
   "status.mention": "@{name} erwähnen",
   "status.more": "Mehr",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Thread stummschalten",
   "status.open": "Diesen Beitrag öffnen",
   "status.pin": "Im Profil anheften",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index bb82cf5f5818ee599dc0648acc93ff7876dffad7..797054d57b2e8110913d8238986aaac9193c2dc0 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -727,6 +727,10 @@
       {
         "defaultMessage": "locked",
         "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"
@@ -1053,7 +1057,7 @@
         "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"
       }
     ],
@@ -1244,6 +1248,22 @@
         "defaultMessage": "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}",
         "id": "status.report"
@@ -1276,6 +1296,14 @@
       {
         "defaultMessage": "Are you sure you want to delete this status?",
         "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"
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 5c39bd682d3fa102e4288b41c1f98f9a8fb1488f..d214fe85fe5d9dbbff3e0cb319959db69c0ab069 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "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.lock": "locked",
   "compose_form.placeholder": "What is on your mind?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Delete",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Expand this status",
   "status.pin": "Pin on profile",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 9e66c379fce21309263ef369bece1b8f50a461a7..eab8c09a6fe5bcc70355780b716e989ff3625507 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Depingli",
   "column_subheading.navigation": "Navigado",
   "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.lock": "ŝlosita",
   "compose_form.placeholder": "Pri kio vi pensas?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "uzanto",
   "search_results.total": "{count, number} {count, plural, one {rezultato} other {rezultatoj}}",
   "standalone.public_title": "Rigardeti…",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Tiun publikaĵon oni ne povas diskonigi",
   "status.delete": "Forigi",
   "status.embed": "Enmeti",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Sonbildaĵo kaŝita",
   "status.mention": "Mencii @{name}",
   "status.more": "Pli",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Silentigi konversacion",
   "status.open": "Disfaldi statkonigon",
   "status.pin": "Pingli al la profilo",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 6122a79abd2aec77b3adf96120f361f384b77039..8a8110b1e14b962cb368d94db0656b3d06272f9f 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Dejar de fijar",
   "column_subheading.navigation": "Navegación",
   "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.lock": "bloqueado",
   "compose_form.placeholder": "¿En qué estás pensando?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "usuario",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
   "standalone.public_title": "Un pequeño vistazo...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Este toot no puede retootearse",
   "status.delete": "Borrar",
   "status.embed": "Incrustado",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Contenido multimedia oculto",
   "status.mention": "Mencionar",
   "status.more": "Más",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Silenciar conversación",
   "status.open": "Expandir estado",
   "status.pin": "Fijar",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 75057a7dd8f6c4dbf11e944949d5e3be9db1264d..f6c6f5ced47d5a2f17d63b0e75b46a0c375c0958 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "رهاکردن",
   "column_subheading.navigation": "گشت و گذار",
   "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.lock": "قفل",
   "compose_form.placeholder": "تازه چه خبر؟",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "کاربر",
   "search_results.total": "{count, number} {count, plural, one {نتیجه} other {نتیجه}}",
   "standalone.public_title": "نگاهی به کاربران این سرور...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "این نوشته را نمی‌شود بازبوقید",
   "status.delete": "پاک‌کردن",
   "status.embed": "جاگذاری",
@@ -221,6 +223,7 @@
   "status.media_hidden": "تصویر پنهان شده",
   "status.mention": "نام‌بردن از @{name}",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "بی‌صداکردن گفتگو",
   "status.open": "این نوشته را باز کن",
   "status.pin": "نوشتهٔ ثابت نمایه",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 4ddc1cca747b130253610b0ecab99b4a1c220763..74ab699c4abe9617bf0dac2eb58a0054e3ee9cf2 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "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.lock": "locked",
   "compose_form.placeholder": "Mitä sinulla on mielessä?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Poista",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Media hidden",
   "status.mention": "Mainitse @{name}",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Expand this status",
   "status.pin": "Pin on profile",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index ecfff87c86413f98c652286b1be9c704a388d679..e77107fc5272f0819fa51cc658486a561953d75a 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Retirer",
   "column_subheading.navigation": "Navigation",
   "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 n’est pas {locked}. Tout le monde peut vous suivre et voir vos pouets privés.",
   "compose_form.lock_disclaimer.lock": "verrouillé",
   "compose_form.placeholder": "Qu’avez-vous en tête ?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "utilisateurâ‹…ice",
   "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
   "standalone.public_title": "Jeter un coup d’œil…",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Cette publication ne peut être boostée",
   "status.delete": "Effacer",
   "status.embed": "Intégrer",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Média caché",
   "status.mention": "Mentionner",
   "status.more": "Plus",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Masquer la conversation",
   "status.open": "Déplier ce statut",
   "status.pin": "Épingler sur le profil",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 6398daa1104ec17e7150d01aca0a0a9427a84180..523dcc92422afc8ec05d61d968ab65c89a7456e9 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Soltar",
   "column_subheading.navigation": "Navegación",
   "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.lock": "bloqueado",
   "compose_form.placeholder": "A qué andas?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "usuaria",
   "search_results.total": "{count, number} {count,plural,one {result} outros {results}}",
   "standalone.public_title": "Ollada dentro...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Esta mensaxe non pode ser promocionada",
   "status.delete": "Eliminar",
   "status.embed": "Incrustar",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Medios ocultos",
   "status.mention": "Mencionar @{name}",
   "status.more": "Máis",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Acalar conversa",
   "status.open": "Expandir este estado",
   "status.pin": "Fixar no perfil",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 5444c8e34f6518a52b7b68f4bffa0920e77f2e80..2eb18617387983a4386f9d91ec86bc6f68fe027f 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "שחרור קיבוע",
   "column_subheading.navigation": "ניווט",
   "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.lock": "נעול",
   "compose_form.placeholder": "מה עובר לך בראש?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "משתמש(ת)",
   "search_results.total": "{count, number} {count, plural, one {תוצאה} other {תוצאות}}",
   "standalone.public_title": "הצצה פנימה...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "לא ניתן להדהד הודעה זו",
   "status.delete": "מחיקה",
   "status.embed": "הטמעה",
@@ -221,6 +223,7 @@
   "status.media_hidden": "מדיה מוסתרת",
   "status.mention": "פניה אל @{name}",
   "status.more": "עוד",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "השתקת שיחה",
   "status.open": "הרחבת הודעה",
   "status.pin": "לקבע באודות",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index f70c66223ce67ded13d88145394b3bf25cb27782..00dea67f72a55240f398104584c40e626f005e9c 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigacija",
   "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.lock": "zaključan",
   "compose_form.placeholder": "Å to ti je na umu?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Ovaj post ne može biti boostan",
   "status.delete": "Obriši",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Sakriven media sadržaj",
   "status.mention": "Spomeni @{name}",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Utišaj razgovor",
   "status.open": "Proširi ovaj status",
   "status.pin": "Pin on profile",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 7cb816fe93950d5297cc97f57456b01ae398dda0..e1048519b3d99bf2d31f5a21fe6b15ab0dc065db 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "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.lock": "locked",
   "compose_form.placeholder": "Mire gondolsz?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Törlés",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Media hidden",
   "status.mention": "Említés",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Expand this status",
   "status.pin": "Pin on profile",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 429b77182609de65a52abd078d78f7caed6ae8aa..0942bc33c1075f21d36a430abde13bf5e9e39f89 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigasi",
   "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.lock": "dikunci",
   "compose_form.placeholder": "Apa yang ada di pikiran anda?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count} {count, plural, one {hasil} other {hasil}}",
   "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Hapus",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Media disembunyikan",
   "status.mention": "Balasan @{name}",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Tampilkan status ini",
   "status.pin": "Pin on profile",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 3e5c8edb9be962dc4bec32dce10e2e681ed31396..cfd8e299f52e831e545cdb559ff60bb9aaa11aa5 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "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.lock": "locked",
   "compose_form.placeholder": "Quo esas en tua spirito?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count, number} {count, plural, one {rezulto} other {rezulti}}",
   "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Efacar",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Kontenajo celita",
   "status.mention": "Mencionar @{name}",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Detaligar ca mesajo",
   "status.pin": "Pin on profile",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index e2ad1632a614bd41168920aafa5181c8c3c14679..e14fa410c10909cec64f292578afe21c9e3062fd 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "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.lock": "locked",
   "compose_form.placeholder": "A cosa stai pensando?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count} {count, plural, one {risultato} other {risultati}}",
   "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Elimina",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Allegato nascosto",
   "status.mention": "Nomina @{name}",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Espandi questo post",
   "status.pin": "Pin on profile",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 2d4ec531c1688d74c5a6a57577b5d31aea225b9a..e7f15691c555c4f71fc38ce6e4e4c92d4ed2d013 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "ピン留めを外す",
   "column_subheading.navigation": "ナビゲーション",
   "column_subheading.settings": "設定",
+  "compose_form.hashtag_warning": "このトゥートは未収載なのでハッシュタグの一覧に表示されません。公開トゥートだけがハッシュタグで検索できます。",
   "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
   "compose_form.lock_disclaimer.lock": "非公開",
   "compose_form.placeholder": "今なにしてる？",
@@ -91,7 +92,7 @@
   "empty_column.hashtag": "このハッシュタグはまだ使われていません。",
   "empty_column.home": "まだ誰もフォローしていません。{public}を見に行くか、検索を使って他のユーザーを見つけましょう。",
   "empty_column.home.public_timeline": "連合タイムライン",
-  "empty_column.list": "このリストにはまだなにもありません。",
+  "empty_column.list": "このリストにはまだなにもありません。このリストのメンバーが新しいトゥートをするとここに表示されます。",
   "empty_column.notifications": "まだ通知がありません。他の人とふれ合って会話を始めましょう。",
   "empty_column.public": "ここにはまだ何もありません！ 公開で何かを投稿したり、他のインスタンスのユーザーをフォローしたりしていっぱいにしましょう",
   "follow_request.authorize": "許可",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "ユーザー",
   "search_results.total": "{count, number}件の結果",
   "standalone.public_title": "今こんな話をしています...",
+  "status.block": "@{name}をブロック",
   "status.cannot_reblog": "この投稿はブーストできません",
   "status.delete": "削除",
   "status.embed": "埋め込み",
@@ -221,6 +223,7 @@
   "status.media_hidden": "非表示のメディア",
   "status.mention": "返信",
   "status.more": "もっと見る",
+  "status.mute": "@{name}をミュート",
   "status.mute_conversation": "会話をミュート",
   "status.open": "詳細を表示",
   "status.pin": "プロフィールに固定表示",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 7e77b78244db19e185d98c8448b387161576a9d7..321e3ce472bdf1af75d9f15efac25d80af507a20 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "고정 해제",
   "column_subheading.navigation": "내비게이션",
   "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.lock": "비공개",
   "compose_form.placeholder": "지금 무엇을 하고 있나요?",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index e154d1ab2534a26bf44f00eb9e7991e313eeafad..f85cc75c507a5a5145e60e0e79fed74cd7392f97 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Losmaken",
   "column_subheading.navigation": "Navigatie",
   "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.lock": "besloten",
   "compose_form.placeholder": "Wat wil je kwijt?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "gebruiker",
   "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
   "standalone.public_title": "Een kijkje binnenin...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Deze toot kan niet geboost worden",
   "status.delete": "Verwijderen",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Media verborgen",
   "status.mention": "Vermeld @{name}",
   "status.more": "Meer",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Negeer conversatie",
   "status.open": "Toot volledig tonen",
   "status.pin": "Aan profielpagina vastmaken",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index bf2b6259a04340f9d8e3fa527dbcdefb3f3b97a0..5fbc51ff3833786de34a661acf02fc149f44d993 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Løsne",
   "column_subheading.navigation": "Navigasjon",
   "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.lock": "låst",
   "compose_form.placeholder": "Hva har du på hjertet?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}",
   "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Denne posten kan ikke fremheves",
   "status.delete": "Slett",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Media skjult",
   "status.mention": "Nevn @{name}",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Demp samtale",
   "status.open": "Utvid denne statusen",
   "status.pin": "Pin on profile",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 0d1f7c9716015983c4ece383e6a994b86ef88881..4cb80c35c68c56c9e199e8debb5ed314de9a3aba 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Despenjar",
   "column_subheading.navigation": "Navigacion",
   "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": "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.placeholder": "A de qué pensatz ?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "utilizaire",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
   "standalone.public_title": "Una ulhada dedins…",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Aqueste estatut pòt pas èsser partejat",
   "status.delete": "Escafar",
   "status.embed": "Embarcar",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Mèdia rescondut",
   "status.mention": "Mencionar",
   "status.more": "Mai",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Rescondre la conversacion",
   "status.open": "Desplegar aqueste estatut",
   "status.pin": "Penjar al perfil",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 9295ab93732aabeb9ff07f66af009d5537f7e72f..ae2f296220c5f306bfc0cce3597b426c98b67e35 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Cofnij przypięcie",
   "column_subheading.navigation": "Nawigacja",
   "column_subheading.settings": "Ustawienia",
+  "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": "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.placeholder": "Co Ci chodzi po głowie?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "użytkownik",
   "search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}",
   "standalone.public_title": "Spojrzenie w głąb…",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Ten wpis nie może zostać podbity",
   "status.delete": "Usuń",
   "status.embed": "Osadź",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Zawartość multimedialna ukryta",
   "status.mention": "Wspomnij o @{name}",
   "status.more": "Więcej",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Wycisz konwersacjÄ™",
   "status.open": "Rozszerz ten wpis",
   "status.pin": "Przypnij do profilu",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 70632846c91508e5887f7d227c51a88f550be1ee..bc6ae928d496132f3f0a15694319a1fa8b410c54 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Desafixar",
   "column_subheading.navigation": "Navegação",
   "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.lock": "trancada",
   "compose_form.placeholder": "No que você está pensando?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "usuário",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
   "standalone.public_title": "Dê uma espiada...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Esta postagem não pode ser compartilhada",
   "status.delete": "Excluir",
   "status.embed": "Incorporar",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Mídia escondida",
   "status.mention": "Mencionar @{name}",
   "status.more": "Mais",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Silenciar conversa",
   "status.open": "Expandir",
   "status.pin": "Fixar no perfil",
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json
index 15d5deb932a76bd2de39a2dea0212430988ee13b..f9db2ad0802b90fb211f10d9c59d0d1eec930156 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Remover fixar",
   "column_subheading.navigation": "Navegação",
   "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.lock": "bloqueada",
   "compose_form.placeholder": "Em que estás a pensar?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "utilizador",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
   "standalone.public_title": "Espreitar lá dentro...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Este post não pode ser partilhado",
   "status.delete": "Eliminar",
   "status.embed": "Incorporar",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Media escondida",
   "status.mention": "Mencionar @{name}",
   "status.more": "Mais",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Silenciar conversa",
   "status.open": "Expandir",
   "status.pin": "Pin on profile",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index e9925b675b25a5a92de475f9c0580c79b3d87e30..0fec70df09de45669dca0572e7f1e0c9b4f35bd8 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Открепить",
   "column_subheading.navigation": "Навигация",
   "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.lock": "закрыт",
   "compose_form.placeholder": "О чем Вы думаете?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "пользователь",
   "search_results.total": "{count, number} {count, plural, one {результат} few {результата} many {результатов} other {результатов}}",
   "standalone.public_title": "Прямо сейчас",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Этот статус не может быть продвинут",
   "status.delete": "Удалить",
   "status.embed": "Встроить",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Медиаконтент скрыт",
   "status.mention": "Упомянуть @{name}",
   "status.more": "Больше",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Заглушить тред",
   "status.open": "Развернуть статус",
   "status.pin": "Закрепить в профиле",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index aacbc076ab45b453e450813482817c5b566d734d..41ebfbd0e0463cbaef79b4f1b8746d184248bf72 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -1,214 +1,262 @@
 {
-    "account.block": "Blokovať @{name}",
-    "account.block_domain": "Blokovať všetko z {domain}",
-    "account.disclaimer_full": "Inofrmácie nižšie nemusia reflektovať použivateľský účet kompletne.",
-    "account.edit_profile": "Upraviť profil",
-    "account.follow": "Sledovať",
-    "account.followers": "Sledujúci",
-    "account.follows": "Sledovaní",
-    "account.follows_you": "Sleduje teba",
-    "account.media": "Média",
-    "account.mention": "Napísať @{name}",
-    "account.mute": "Ignorovať @{name}",
-    "account.posts": "Správ",
-    "account.report": "Nahlásiť @{name}",
-    "account.requested": "Čaká na schválenie. Klikni na zrušenie žiadosti",
-    "account.share": "Zdieľať @{name} profil",
-    "account.unblock": "Odblokovať @{name}",
-    "account.unblock_domain": "Prestať blokovať {domain}",
-    "account.unfollow": "Prestať nasledovať",
-    "account.unmute": "Prestať ignorovať @{name}",
-    "account.view_full_profile": "Pozri celý profil",
-    "boost_modal.combo": "Nabudúce môžeš kliknúť {combo} a preskočiť",
-    "bundle_column_error.body": "Nastala chyba pri načítaní tohto komponentu.",
-    "bundle_column_error.retry": "Skús znova",
-    "bundle_column_error.title": "Chyba siete",
-    "bundle_modal_error.close": "Zatvoriť",
-    "bundle_modal_error.message": "Nastala chyba pri načítaní tohto komponentu.",
-    "bundle_modal_error.retry": "Skúsiť znova",
-    "column.blocks": "Blokovaní používatelia",
-    "column.community": "Lokálna časová os",
-    "column.favourites": "Obľúbené",
-    "column.follow_requests": "Žiadosti",
-    "column.home": "Moja časová os",
-    "column.mutes": "Ignorovaní používatelia",
-    "column.notifications": "Notifikácie",
-    "column.pins": "Pripnuté toots",
-    "column.public": "Federovaná časová os",
-    "column_back_button.label": "Späť",
-    "column_header.hide_settings": "Skryť nastavenia",
-    "column_header.moveLeft_settings": "Presunúť stĺpec doľava",
-    "column_header.moveRight_settings": "Presunúť stĺpec doprava",
-    "column_header.pin": "Pripnúť",
-    "column_header.show_settings": "Ukázať nastavenia",
-    "column_header.unpin": "Odopnúť",
-    "column_subheading.navigation": "Navigácia",
-    "column_subheading.settings": "Nastavenia",
-    "compose_form.lock_disclaimer": "Tvoj účet nie je zamknutý. Ktokoľvek ťa môže nasledovať a vidieť tvoje správy pre sledujúcich.",
-    "compose_form.lock_disclaimer.lock": "zamknutý",
-    "compose_form.placeholder": "Čo máš na mysli?",
-    "compose_form.publish": "Toot",
-    "compose_form.publish_loud": "{publish}!",
-    "compose_form.sensitive": "Označ súbor ako chúlostivý",
-    "compose_form.spoiler": "Skryť text za varovanie",
-    "compose_form.spoiler_placeholder": "Napíš sem tvoje varovanie",
-    "confirmation_modal.cancel": "Zrušiť",
-    "confirmations.block.confirm": "Blokovať",
-    "confirmations.block.message": "Naozaj chceš blokovať {name}?",
-    "confirmations.delete.confirm": "Zmazať",
-    "confirmations.delete.message": "Naozaj chceš zmazať túto správu?",
-    "confirmations.domain_block.confirm": "Skryť celú doménu",
-    "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.",
-    "confirmations.mute.confirm": "Ignoruj",
-    "confirmations.mute.message": "Naozaj chceš ignorovať {name}?",
-    "confirmations.unfollow.confirm": "Nesledovať",
-    "confirmations.unfollow.message": "Naozaj chceš prestať sledovať {name}?",
-    "embed.instructions": "Skopíruj kód nižšie a ridaj tento status na tvoju web stránku.",
-    "embed.preview": "Tu je ukážka ako to bude vyzerať:",
-    "emoji_button.activity": "Aktivity",
-    "emoji_button.custom": "Vlastné",
-    "emoji_button.flags": "Vlajky",
-    "emoji_button.food": "Jedlá a nápoje",
-    "emoji_button.label": "Vlož emoji",
-    "emoji_button.nature": "Zvieratká",
-    "emoji_button.not_found": "Nenájdené",
-    "emoji_button.objects": "Predmety",
-    "emoji_button.people": "Ľudia",
-    "emoji_button.recent": "Často používané",
-    "emoji_button.search": "Hľadaj...",
-    "emoji_button.search_results": "Nájdené",
-    "emoji_button.symbols": "Symboly",
-    "emoji_button.travel": "Cestovanie a miesta",
-    "empty_column.community": "Lokálna časová os je prázdna. Napíš niečo aby sa to začalo hýbať!",
-    "empty_column.hashtag": "Ešte nič nie je v tomto hashtag-u.",
-    "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.",
-    "empty_column.home.inactivity": "Tvoja časová os je prázdna. Ak si bol dlho neaktívny, za krátku chvíľku bude obnovená.",
-    "empty_column.home.public_timeline": "verejnú časovú os",
-    "empty_column.notifications": "Nemáš žiadne notifikácie. Napíš niekomu, nasleduj niekoho alebo komunikuj s ostatnými.",
-    "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",
-    "follow_request.authorize": "Potvrdiť",
-    "follow_request.reject": "Odmietnúť",
-    "getting_started.appsshort": "Aplikácie",
-    "getting_started.faq": "FAQ",
-    "getting_started.heading": "Začíname",
-    "getting_started.open_source_notice": "Mastodon má otvorený kód. Reportovať chyby alebo prispievať vlastným kódom môžeš na GitHube v {github}.",
-    "getting_started.userguide": "Používateľská príručka",
-    "home.column_settings.advanced": "Rozšírené",
-    "home.column_settings.basic": "Základné",
-    "home.column_settings.filter_regex": "Filtrovať použitím regulárnych výrazov",
-    "home.column_settings.show_reblogs": "Zobraziť boosts",
-    "home.column_settings.show_replies": "Zobraziť odpovede",
-    "home.settings": "Nastavenia stĺpcov",
-    "lightbox.close": "Zavrieť",
-    "lightbox.next": "Ďalší",
-    "lightbox.previous": "Predchádzajúci",
-    "loading_indicator.label": "Nahrávam...",
-    "media_gallery.toggle_visible": "Zapnúť/Vypnúť viditeľnosť",
-    "missing_indicator.label": "Nenájdené",
-    "navigation_bar.blocks": "Blokovaní používatelia",
-    "navigation_bar.community_timeline": "Lokálna časová os",
-    "navigation_bar.edit_profile": "Upraviť profil",
-    "navigation_bar.favourites": "Obľúbené",
-    "navigation_bar.follow_requests": "Žiadosti",
-    "navigation_bar.info": "O tomto Mastodon serveri",
-    "navigation_bar.logout": "Odhlásiť",
-    "navigation_bar.mutes": "Ignorovaní používatelia",
-    "navigation_bar.pins": "Pripnuté toots",
-    "navigation_bar.preferences": "Možnosti",
-    "navigation_bar.public_timeline": "Federovaná časová os",
-    "notification.favourite": "{name} sa páči tvoj status",
-    "notification.follow": "{name} ťa začal(a) sledovať",
-    "notification.mention": "{name} ťa zmienil",
-    "notification.reblog": "{name} re-tootol tvoj status",
-    "notifications.clear": "Vymazať notifikácie",
-    "notifications.clear_confirmation": "Naozaj chceš vymazať všetky tvoje notifikácie?",
-    "notifications.column_settings.alert": "Bublinové notifikácie",
-    "notifications.column_settings.favourite": "Obľúbené:",
-    "notifications.column_settings.follow": "Nový nasledujúci:",
-    "notifications.column_settings.mention": "Zmienenia:",
-    "notifications.column_settings.push": "Push notifikácie",
-    "notifications.column_settings.push_meta": "Toto zariadenie",
-    "notifications.column_settings.reblog": "Re-toots:",
-    "notifications.column_settings.show": "Zobraziť v stĺpci",
-    "notifications.column_settings.sound": "Prehrať zvuk",
-    "onboarding.done": "Koniec",
-    "onboarding.next": "ÄŽalej",
-    "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í.",
-    "onboarding.page_four.home": "Domovská časová os zobrazí správy od ľudí ktorých sleduješ.",
-    "onboarding.page_four.notifications": "Stĺpec s notifikáciami zobrazí keď budeš s niekým komunikovať.",
-    "onboarding.page_one.federation": "Mastodon je sieť nezávislých serverov spojením ktorých vzniká jedna veľká federovaná sociálna sieť.",
-    "onboarding.page_one.handle": "Ty si na {domain}, takže tvoje celý nickname je {handle}",
-    "onboarding.page_one.welcome": "Vitajte v Mastodon!",
-    "onboarding.page_six.admin": "Správca tohto servera je {admin}.",
-    "onboarding.page_six.almost_done": "Takmer hotovo...",
-    "onboarding.page_six.appetoot": "Bon Appetoot!",
-    "onboarding.page_six.apps_available": "Aplikácie {apps} sú dostupné na pre iOS, Android and ďalšie platformy.",
-    "onboarding.page_six.github": "Mastodon je free open-source software. Chyby, nové funkcie alebo prispievať svojím kódom mǒžeš na {github}.",
-    "onboarding.page_six.guidelines": "pravidlá komunity",
-    "onboarding.page_six.read_guidelines": "Prosím prečítajte si {domain} pravidlá {guidelines}!",
-    "onboarding.page_six.various_app": "mobilné applikácie",
-    "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.",
-    "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.",
-    "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.",
-    "onboarding.skip": "Preskočiť",
-    "privacy.change": "Zmeň viditeľnosť statusu",
-    "privacy.direct.long": "Pošli priamo iba spomenutým používateľom",
-    "privacy.direct.short": "Súkromne",
-    "privacy.private.long": "Pošli iba sledujúcim",
-    "privacy.private.short": "Iba sledujúci",
-    "privacy.public.long": "Pošli všetkým",
-    "privacy.public.short": "Verejne",
-    "privacy.unlisted.long": "Neposielať verejne",
-    "privacy.unlisted.short": "Nie je v zozname",
-    "reply_indicator.cancel": "Zrušiť",
-    "report.placeholder": "Ďalšie komentáre",
-    "report.submit": "Poslať",
-    "report.target": "Reportovať {target}",
-    "search.placeholder": "Hľadaj",
-    "search_results.total": "{count, number} nájdených",
-    "standalone.public_title": "Čo tam nájdeš...",
-    "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.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",
-    "upload_area.title": "Ťahaj a pusti pre nahratie",
-    "upload_button.label": "Pridať",
-    "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",
-    "video_player.expand": "Zväčšiť video",
-    "video_player.toggle_sound": "Zapnúť/Vypnúť zvuk",
-    "video_player.toggle_visible": "Zapnúť/Vypnúť video",
-    "video_player.video_error": "Video nebolo možné prehrať"
+  "account.block": "Blokovať @{name}",
+  "account.block_domain": "Blokovať všetko z {domain}",
+  "account.disclaimer_full": "Inofrmácie nižšie nemusia reflektovať použivateľský účet kompletne.",
+  "account.edit_profile": "Upraviť profil",
+  "account.follow": "Sledovať",
+  "account.followers": "Sledujúci",
+  "account.follows": "Sledovaní",
+  "account.follows_you": "Sleduje teba",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.media": "Média",
+  "account.mention": "Napísať @{name}",
+  "account.moved_to": "{name} has moved to:",
+  "account.mute": "Ignorovať @{name}",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.posts": "Správ",
+  "account.report": "Nahlásiť @{name}",
+  "account.requested": "Čaká na schválenie. Klikni na zrušenie žiadosti",
+  "account.share": "Zdieľať @{name} profil",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "account.unblock": "Odblokovať @{name}",
+  "account.unblock_domain": "Prestať blokovať {domain}",
+  "account.unfollow": "Prestať nasledovať",
+  "account.unmute": "Prestať ignorovať @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.view_full_profile": "Pozri celý profil",
+  "boost_modal.combo": "Nabudúce môžeš kliknúť {combo} a preskočiť",
+  "bundle_column_error.body": "Nastala chyba pri načítaní tohto komponentu.",
+  "bundle_column_error.retry": "Skús znova",
+  "bundle_column_error.title": "Chyba siete",
+  "bundle_modal_error.close": "Zatvoriť",
+  "bundle_modal_error.message": "Nastala chyba pri načítaní tohto komponentu.",
+  "bundle_modal_error.retry": "Skúsiť znova",
+  "column.blocks": "Blokovaní používatelia",
+  "column.community": "Lokálna časová os",
+  "column.favourites": "Obľúbené",
+  "column.follow_requests": "Žiadosti",
+  "column.home": "Moja časová os",
+  "column.lists": "Lists",
+  "column.mutes": "Ignorovaní používatelia",
+  "column.notifications": "Notifikácie",
+  "column.pins": "Pripnuté toots",
+  "column.public": "Federovaná časová os",
+  "column_back_button.label": "Späť",
+  "column_header.hide_settings": "Skryť nastavenia",
+  "column_header.moveLeft_settings": "Presunúť stĺpec doľava",
+  "column_header.moveRight_settings": "Presunúť stĺpec doprava",
+  "column_header.pin": "Pripnúť",
+  "column_header.show_settings": "Ukázať nastavenia",
+  "column_header.unpin": "Odopnúť",
+  "column_subheading.navigation": "Navigácia",
+  "column_subheading.settings": "Nastavenia",
+  "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 účet nie je zamknutý. Ktokoľvek ťa môže nasledovať a vidieť tvoje správy pre sledujúcich.",
+  "compose_form.lock_disclaimer.lock": "zamknutý",
+  "compose_form.placeholder": "Čo máš na mysli?",
+  "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.sensitive": "Označ súbor ako chúlostivý",
+  "compose_form.spoiler": "Skryť text za varovanie",
+  "compose_form.spoiler_placeholder": "Napíš sem tvoje varovanie",
+  "confirmation_modal.cancel": "Zrušiť",
+  "confirmations.block.confirm": "Blokovať",
+  "confirmations.block.message": "Naozaj chceš blokovať {name}?",
+  "confirmations.delete.confirm": "Zmazať",
+  "confirmations.delete.message": "Naozaj chceš zmazať túto správu?",
+  "confirmations.delete_list.confirm": "Delete",
+  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.domain_block.confirm": "Skryť celú doménu",
+  "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.",
+  "confirmations.mute.confirm": "Ignoruj",
+  "confirmations.mute.message": "Naozaj chceš ignorovať {name}?",
+  "confirmations.unfollow.confirm": "Nesledovať",
+  "confirmations.unfollow.message": "Naozaj chceš prestať sledovať {name}?",
+  "embed.instructions": "Skopíruj kód nižšie a ridaj tento status na tvoju web stránku.",
+  "embed.preview": "Tu je ukážka ako to bude vyzerať:",
+  "emoji_button.activity": "Aktivity",
+  "emoji_button.custom": "Vlastné",
+  "emoji_button.flags": "Vlajky",
+  "emoji_button.food": "Jedlá a nápoje",
+  "emoji_button.label": "Vlož emoji",
+  "emoji_button.nature": "Zvieratká",
+  "emoji_button.not_found": "Nenájdené",
+  "emoji_button.objects": "Predmety",
+  "emoji_button.people": "Ľudia",
+  "emoji_button.recent": "Často používané",
+  "emoji_button.search": "Hľadaj...",
+  "emoji_button.search_results": "Nájdené",
+  "emoji_button.symbols": "Symboly",
+  "emoji_button.travel": "Cestovanie a miesta",
+  "empty_column.community": "Lokálna časová os je prázdna. Napíš niečo aby sa to začalo hýbať!",
+  "empty_column.hashtag": "Ešte nič nie je v tomto hashtag-u.",
+  "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.",
+  "empty_column.home.public_timeline": "verejnú časovú os",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.notifications": "Nemáš žiadne notifikácie. Napíš niekomu, nasleduj niekoho alebo komunikuj s ostatnými.",
+  "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",
+  "follow_request.authorize": "Potvrdiť",
+  "follow_request.reject": "Odmietnúť",
+  "getting_started.appsshort": "Aplikácie",
+  "getting_started.faq": "FAQ",
+  "getting_started.heading": "Začíname",
+  "getting_started.open_source_notice": "Mastodon má otvorený kód. Reportovať chyby alebo prispievať vlastným kódom môžeš na GitHube v {github}.",
+  "getting_started.userguide": "Používateľská príručka",
+  "home.column_settings.advanced": "Rozšírené",
+  "home.column_settings.basic": "Základné",
+  "home.column_settings.filter_regex": "Filtrovať použitím regulárnych výrazov",
+  "home.column_settings.show_reblogs": "Zobraziť boosts",
+  "home.column_settings.show_replies": "Zobraziť odpovede",
+  "home.settings": "Nastavenia stĺpcov",
+  "keyboard_shortcuts.back": "to navigate back",
+  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.toot": "to start a brand new toot",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "Zavrieť",
+  "lightbox.next": "Ďalší",
+  "lightbox.previous": "Predchádzajúci",
+  "lists.account.add": "Add to list",
+  "lists.account.remove": "Remove from list",
+  "lists.delete": "Delete list",
+  "lists.edit": "Edit list",
+  "lists.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Your lists",
+  "loading_indicator.label": "Nahrávam...",
+  "media_gallery.toggle_visible": "Zapnúť/Vypnúť viditeľnosť",
+  "missing_indicator.label": "Nenájdené",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.blocks": "Blokovaní používatelia",
+  "navigation_bar.community_timeline": "Lokálna časová os",
+  "navigation_bar.edit_profile": "Upraviť profil",
+  "navigation_bar.favourites": "Obľúbené",
+  "navigation_bar.follow_requests": "Žiadosti",
+  "navigation_bar.info": "O tomto Mastodon serveri",
+  "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
+  "navigation_bar.lists": "Lists",
+  "navigation_bar.logout": "Odhlásiť",
+  "navigation_bar.mutes": "Ignorovaní používatelia",
+  "navigation_bar.pins": "Pripnuté toots",
+  "navigation_bar.preferences": "Možnosti",
+  "navigation_bar.public_timeline": "Federovaná časová os",
+  "notification.favourite": "{name} sa páči tvoj status",
+  "notification.follow": "{name} ťa začal(a) sledovať",
+  "notification.mention": "{name} ťa zmienil",
+  "notification.reblog": "{name} re-tootol tvoj status",
+  "notifications.clear": "Vymazať notifikácie",
+  "notifications.clear_confirmation": "Naozaj chceš vymazať všetky tvoje notifikácie?",
+  "notifications.column_settings.alert": "Bublinové notifikácie",
+  "notifications.column_settings.favourite": "Obľúbené:",
+  "notifications.column_settings.follow": "Nový nasledujúci:",
+  "notifications.column_settings.mention": "Zmienenia:",
+  "notifications.column_settings.push": "Push notifikácie",
+  "notifications.column_settings.push_meta": "Toto zariadenie",
+  "notifications.column_settings.reblog": "Re-toots:",
+  "notifications.column_settings.show": "Zobraziť v stĺpci",
+  "notifications.column_settings.sound": "Prehrať zvuk",
+  "onboarding.done": "Koniec",
+  "onboarding.next": "ÄŽalej",
+  "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í.",
+  "onboarding.page_four.home": "Domovská časová os zobrazí správy od ľudí ktorých sleduješ.",
+  "onboarding.page_four.notifications": "Stĺpec s notifikáciami zobrazí keď budeš s niekým komunikovať.",
+  "onboarding.page_one.federation": "Mastodon je sieť nezávislých serverov spojením ktorých vzniká jedna veľká federovaná sociálna sieť.",
+  "onboarding.page_one.handle": "Ty si na {domain}, takže tvoje celý nickname je {handle}",
+  "onboarding.page_one.welcome": "Vitajte v Mastodon!",
+  "onboarding.page_six.admin": "Správca tohto servera je {admin}.",
+  "onboarding.page_six.almost_done": "Takmer hotovo...",
+  "onboarding.page_six.appetoot": "Bon Appetoot!",
+  "onboarding.page_six.apps_available": "Aplikácie {apps} sú dostupné na pre iOS, Android and ďalšie platformy.",
+  "onboarding.page_six.github": "Mastodon je free open-source software. Chyby, nové funkcie alebo prispievať svojím kódom mǒžeš na {github}.",
+  "onboarding.page_six.guidelines": "pravidlá komunity",
+  "onboarding.page_six.read_guidelines": "Prosím prečítajte si {domain} pravidlá {guidelines}!",
+  "onboarding.page_six.various_app": "mobilné applikácie",
+  "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.",
+  "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.",
+  "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.",
+  "onboarding.skip": "Preskočiť",
+  "privacy.change": "Zmeň viditeľnosť statusu",
+  "privacy.direct.long": "Pošli priamo iba spomenutým používateľom",
+  "privacy.direct.short": "Súkromne",
+  "privacy.private.long": "Pošli iba sledujúcim",
+  "privacy.private.short": "Iba sledujúci",
+  "privacy.public.long": "Pošli všetkým",
+  "privacy.public.short": "Verejne",
+  "privacy.unlisted.long": "Neposielať verejne",
+  "privacy.unlisted.short": "Nie je v zozname",
+  "relative_time.days": "{number}d",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "now",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "reply_indicator.cancel": "Zrušiť",
+  "report.placeholder": "Ďalšie komentáre",
+  "report.submit": "Poslať",
+  "report.target": "Reportovať {target}",
+  "search.placeholder": "Hľadaj",
+  "search_popout.search_format": "Advanced search format",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "status",
+  "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"
 }
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index c8e4573e6720c41c743cc9375cd533da123937a9..7824be2b2762b707f01c2487b50bf8e1061a1fd1 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Откачи",
   "column_subheading.navigation": "Навигација",
   "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.lock": "закључан",
   "compose_form.placeholder": "Шта Вам је на уму?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "корисник",
   "search_results.total": "{count, number} {count, plural, one {резултат} few {резултата} other {резултата}}",
   "standalone.public_title": "Поглед изнутра...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Овај статус не може да се подржи",
   "status.delete": "Обриши",
   "status.embed": "Угради на сајт",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Мултимедија сакривена",
   "status.mention": "Помени корисника @{name}",
   "status.more": "Још",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Мутирај преписку",
   "status.open": "Прошири овај статус",
   "status.pin": "Прикачи на профил",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 9d9646509ff426e98c9b830242d7a2960a7bfcdc..edfa9b8c238001118bb573b7f904233f42c380e0 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Ångra fäst",
   "column_subheading.navigation": "Navigation",
   "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.lock": "låst",
   "compose_form.placeholder": "Vad funderar du på?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "användare",
   "search_results.total": "{count, number} {count, plural, ett {result} andra {results}}",
   "standalone.public_title": "En titt inuti...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Detta inlägg kan inte knuffas",
   "status.delete": "Ta bort",
   "status.embed": "Bädda in",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Media dold",
   "status.mention": "Omnämn @{name}",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Tysta konversation",
   "status.open": "Utvidga denna status",
   "status.pin": "Fäst i profil",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index cc18a609622fe8a46f841c445193688bf9900058..06323ebfce34814085e48ef314ba10ea978f2d18 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "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.lock": "locked",
   "compose_form.placeholder": "What is on your mind?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Delete",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Expand this status",
   "status.pin": "Pin on profile",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index c51f3e41772945066a0ed55873fbdf9e947bff1f..ce6434ca68ead08690719ae55494deace0e3653f 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigasyon",
   "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.lock": "kilitli",
   "compose_form.placeholder": "Ne düşünüyorsun?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count, number} {count, plural, one {sonuç} other {sonuçlar}}",
   "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Bu gönderi boost edilemez",
   "status.delete": "Sil",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Gizli görsel",
   "status.mention": "Bahset @{name}",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Bu gönderiyi genişlet",
   "status.pin": "Pin on profile",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 86c0ce76d7d1a61eebdf0d90771227957af7288f..46d22ac833060ee8ff962aee63cee88b45bc3381 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Навігація",
   "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.lock": "приватний",
   "compose_form.placeholder": "Що у Вас на думці?",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count, number} {count, plural, one {результат} few {результати} many {результатів} other {результатів}}",
   "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "Цей допис не може бути передмухнутий",
   "status.delete": "Видалити",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "Медіаконтент приховано",
   "status.mention": "Згадати",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "Заглушити діалог",
   "status.open": "Розгорнути допис",
   "status.pin": "Pin on profile",
diff --git a/app/javascript/mastodon/locales/whitelist_sk.json b/app/javascript/mastodon/locales/whitelist_sk.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_sk.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_sr.json b/app/javascript/mastodon/locales/whitelist_sr.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_sr.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 9be6a9f736f0ccf8899bbd77f1381f781505ff85..ce16dcd8e9958c08c5506fa3e8b124fb951be79a 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "取消固定",
   "column_subheading.navigation": "导航",
   "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.lock": "开启保护",
   "compose_form.placeholder": "在想啥？",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "用户",
   "search_results.total": "共 {count, number} 个结果",
   "standalone.public_title": "大家都在干啥？",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "无法转嘟这条嘟文",
   "status.delete": "删除",
   "status.embed": "嵌入",
@@ -221,6 +223,7 @@
   "status.media_hidden": "隐藏媒体内容",
   "status.mention": "提及 @{name}",
   "status.more": "更多",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "隐藏此对话",
   "status.open": "展开嘟文",
   "status.pin": "在个人资料页面置顶",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 15a68c915b163db3122c24c29403b1901d82dff5..7745da622c4982baf34f8dbc11ffc9d4e15bbd64 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "取下",
   "column_subheading.navigation": "瀏覽",
   "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.lock": "公共",
   "compose_form.placeholder": "你在想甚麼？",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count, number} 項結果",
   "standalone.public_title": "站點一瞥…",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "這篇文章無法被轉推",
   "status.delete": "刪除",
   "status.embed": "鑲嵌",
@@ -221,6 +223,7 @@
   "status.media_hidden": "隱藏媒體內容",
   "status.mention": "提及 @{name}",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "靜音對話",
   "status.open": "展開文章",
   "status.pin": "置頂到資料頁",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 1bdc883a88dc7c8c947fdfeb64de6ad345555c2b..876fb0e1387f08fb33210414c109777de54ac041 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -50,6 +50,7 @@
   "column_header.unpin": "取下",
   "column_subheading.navigation": "瀏覽",
   "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.lock": "上鎖",
   "compose_form.placeholder": "在想些什麼？",
@@ -213,6 +214,7 @@
   "search_popout.tips.user": "user",
   "search_results.total": "{count, number} 項結果",
   "standalone.public_title": "站點一瞥…",
+  "status.block": "Block @{name}",
   "status.cannot_reblog": "此貼文無法轉推",
   "status.delete": "刪除",
   "status.embed": "Embed",
@@ -221,6 +223,7 @@
   "status.media_hidden": "媒體已隱藏",
   "status.mention": "提到 @{name}",
   "status.more": "More",
+  "status.mute": "Mute @{name}",
   "status.mute_conversation": "消音對話",
   "status.open": "展開這個狀態",
   "status.pin": "置頂到個人資訊頁",
diff --git a/app/views/user_mailer/email_changed.ja.html.erb b/app/views/user_mailer/email_changed.ja.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..c66f409c61ea20024000761093e6c0d5e15d5f2d
--- /dev/null
+++ b/app/views/user_mailer/email_changed.ja.html.erb
@@ -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>
diff --git a/app/views/user_mailer/email_changed.ja.text.erb b/app/views/user_mailer/email_changed.ja.text.erb
new file mode 100644
index 0000000000000000000000000000000000000000..33ee6d10b67966010e6553a65d6de5d738e543b6
--- /dev/null
+++ b/app/views/user_mailer/email_changed.ja.text.erb
@@ -0,0 +1,11 @@
+Hello <%= @resource.email %>!
+
+<% if @resource&.unconfirmed_email? %>
+<%= @instance %>で使っているメールアドレスが<%= @resource.unconfirmed_email %>に変更されようとしています。
+<% else %>
+<%= @instance %>で使っているメールアドレスが<%= @resource.email %>に変更されました。
+<% end %>
+
+メールアドレスを変更した覚えがない場合、誰かがあなたのアカウントにアクセスしたおそれがあります。すぐにパスワードを変更するか、アカウントにアクセスできない場合はインスタンスの管理者に連絡してください。
+
+<%= @instance %>チームより
diff --git a/app/views/user_mailer/reconfirmation_instructions.ja.html.erb b/app/views/user_mailer/reconfirmation_instructions.ja.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..caa53032ab6cb7e7fbeeeaed6e30a5a815996adf
--- /dev/null
+++ b/app/views/user_mailer/reconfirmation_instructions.ja.html.erb
@@ -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>
diff --git a/app/views/user_mailer/reconfirmation_instructions.ja.text.erb b/app/views/user_mailer/reconfirmation_instructions.ja.text.erb
new file mode 100644
index 0000000000000000000000000000000000000000..5326e45126c06792b50ebc08de8a32f1600857f7
--- /dev/null
+++ b/app/views/user_mailer/reconfirmation_instructions.ja.text.erb
@@ -0,0 +1,10 @@
+こんにちは<%= @resource.unconfirmed_email %>さん
+
+<%= @instance %>で使っているメールアドレスの変更をあなたがリクエストしました。
+
+新しいメールアドレスを確認するには次のリンクをクリックしてください:
+<%= confirmation_url(@resource, confirmation_token: @token) %>
+
+また利用規約もご確認ください <%= terms_url %>
+
+<%= @instance %>チームより
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
index 1a46b80b5f025786b3916e72c46a30c7ac595b84..118186877be54b84e873a72f1bb80ce9057856dc 100644
--- a/config/locales/devise.ja.yml
+++ b/config/locales/devise.ja.yml
@@ -18,8 +18,12 @@ ja:
     mailer:
       confirmation_instructions:
         subject: 'Mastodon: メールアドレスの確認'
+      email_changed:
+        subject: 'Mastodon: メールアドレスの変更'
       password_change:
         subject: 'Mastodon: パスワードが変更されました'
+      reconfirmation_instructions:
+        subject: 'Mastodon: %{instance}のメールを確認する'
       reset_password_instructions:
         subject: 'Mastodon: パスワード再発行'
       unlock_instructions:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index debf68d1d24754a8c55911a3194987b11e8b00df..f3f23b8f65940700f528f4ac9fd0a6156b1f0ba4 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -116,6 +116,7 @@ ja:
       roles:
         admin: 管理者
         moderator: モデレーター
+        staff: スタッフ
         user: ユーザー
       salmon_url: Salmon URL
       search: 検索
@@ -160,6 +161,7 @@ ja:
         update_status: "%{name} さんが %{target} さんの投稿を更新しました"
       title: 操作履歴
     custom_emojis:
+      by_domain: ドメイン
       copied_msg: 絵文字のコピーをローカルに作成しました
       copy: コピー
       copy_failed_msg: 絵文字のコピーをローカルに作成できませんでした
@@ -263,12 +265,18 @@ ja:
       unresolved: 未解決
       view: 表示
     settings:
+      activity_api_enabled:
+        desc_html: ローカルに投稿されたトゥート数、アクティブなユーザー数、週ごとの新規登録者数
+        title: ユーザーアクティビティに関する統計を公開する
       bootstrap_timeline_accounts:
         desc_html: 複数のユーザー名はコンマで区切ります。ローカルの公開アカウントのみ有効です。指定しない場合は管理者がデフォルトで指定されます。
         title: 新規ユーザーが自動フォローするアカウント
       contact_information:
         email: ビジネスメールアドレス
         username: 連絡先のユーザー名
+      peers_api_enabled:
+        desc_html: 連合内でこのインスタンスが遭遇したドメインの名前
+        title: 接続しているインスタンスのリストを公開する
       registrations:
         closed_message:
           desc_html: 新規登録を停止しているときにフロントページに表示されます。HTMLタグが使えます