Merge branch 'master' into glitch-soc/merge-upstream

author: Thibaut Girka <thib@sitedethib.com> 2018-07-11 17:57:08 +0200
committer: Thibaut Girka <thib@sitedethib.com> 2018-07-11 17:57:08 +0200
commit: 6f0f583abeb34737f01defab5cdee7b626447f5e (patch)
tree: c6cad9011fd1900dc1062b67b0db400418832ce8
parent: 612b00d1bb91c6b11f00fdb273dd8cd2ca883b12 (diff)
parent: 7ac5151b74510aa82b07e349373bd442176e1e94 (diff)
93 files changed, 908 insertions, 91 deletions
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.js b/app/javascript/mastodon/features/compose/components/action_bar.js
index d6dcf51e0..daee18552 100644
--- a/app/javascript/mastodon/features/compose/components/action_bar.js
+++ b/app/javascript/mastodon/features/compose/components/action_bar.js
@@ -14,6 +14,7 @@ const messages = defineMessages({
   blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
   domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
+  filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
 });
 
 @injectIntl
@@ -40,6 +41,7 @@ export default class ActionBar extends React.PureComponent {
     menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
     menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
     menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
+    menu.push({ text: intl.formatMessage(messages.filters), href: '/filters' });
 
     return (
       <div className='compose__action-bar'>
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index a8a87c729..ff0ddd95f 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "النطاقات المخفية",
   "navigation_bar.edit_profile": "تعديل الملف الشخصي",
   "navigation_bar.favourites": "المفضلة",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "طلبات المتابعة",
   "navigation_bar.info": "معلومات إضافية",
   "navigation_bar.keyboard_shortcuts": "إختصارات لوحة المفاتيح",
@@ -256,7 +257,7 @@
   "status.direct": "رسالة خاصة إلى @{name}",
   "status.embed": "إدماج",
   "status.favourite": "أضف إلى المفضلة",
-  "status.filtered": "Filtered",
+  "status.filtered": "مُصفّى",
   "status.load_more": "حمّل المزيد",
   "status.media_hidden": "الصورة مستترة",
   "status.mention": "أذكُر @{name}",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 7b38f9dde..c788b8c61 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Редактирай профил",
   "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.info": "Extended information",
   "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index aa80ed555..408f5ced7 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Dominis ocults",
   "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.favourites": "Favorits",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Sol·licituds de seguiment",
   "navigation_bar.info": "Informació addicional",
   "navigation_bar.keyboard_shortcuts": "Dreceres de teclat",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 09207287a..1e7090a19 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Duminii piattati",
   "navigation_bar.edit_profile": "Mudificà u prufile",
   "navigation_bar.favourites": "Favuriti",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Dumande d'abbunamentu",
   "navigation_bar.info": "À prupositu di l'istanza",
   "navigation_bar.keyboard_shortcuts": "Accorte cù a tastera",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
new file mode 100644
index 000000000..59d7c403b
--- /dev/null
+++ b/app/javascript/mastodon/locales/cs.json
@@ -0,0 +1,308 @@
+{
+  "account.badges.bot": "Robot",
+  "account.block": "Blokovat @{name}",
+  "account.block_domain": "Skrýt vše z {domain}",
+  "account.blocked": "Blocked",
+  "account.direct": "Direct message @{name}",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
+  "account.domain_blocked": "Domain hidden",
+  "account.edit_profile": "Edit profile",
+  "account.follow": "Follow",
+  "account.followers": "Followers",
+  "account.follows": "Follows",
+  "account.follows_you": "Follows you",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.media": "Media",
+  "account.mention": "Mention @{name}",
+  "account.moved_to": "{name} has moved to:",
+  "account.mute": "Mute @{name}",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.muted": "Muted",
+  "account.posts": "Toots",
+  "account.posts_with_replies": "Toots and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "account.unblock": "Unblock @{name}",
+  "account.unblock_domain": "Unhide {domain}",
+  "account.unfollow": "Unfollow",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.view_full_profile": "View full profile",
+  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.title": "Oops!",
+  "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
+  "column.blocks": "Blocked users",
+  "column.community": "Local timeline",
+  "column.direct": "Direct messages",
+  "column.domain_blocks": "Hidden domains",
+  "column.favourites": "Favourites",
+  "column.follow_requests": "Follow requests",
+  "column.home": "Home",
+  "column.lists": "Lists",
+  "column.mutes": "Muted users",
+  "column.notifications": "Notifications",
+  "column.pins": "Pinned toot",
+  "column.public": "Federated timeline",
+  "column_back_button.label": "Back",
+  "column_header.hide_settings": "Hide settings",
+  "column_header.moveLeft_settings": "Move column to the left",
+  "column_header.moveRight_settings": "Move column to the right",
+  "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
+  "column_header.unpin": "Unpin",
+  "column_subheading.settings": "Settings",
+  "community.column_settings.media_only": "Media Only",
+  "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.",
+  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "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?",
+  "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.sensitive.marked": "Media is marked as sensitive",
+  "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+  "compose_form.spoiler.marked": "Text is hidden behind warning",
+  "compose_form.spoiler.unmarked": "Text is not hidden",
+  "compose_form.spoiler_placeholder": "Write your warning here",
+  "confirmation_modal.cancel": "Cancel",
+  "confirmations.block.confirm": "Block",
+  "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.delete.confirm": "Delete",
+  "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete_list.confirm": "Delete",
+  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.mute.confirm": "Mute",
+  "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.redraft.confirm": "Delete & redraft",
+  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "embed.instructions": "Embed this status on your website by copying the code below.",
+  "embed.preview": "Here is what it will look like:",
+  "emoji_button.activity": "Activity",
+  "emoji_button.custom": "Custom",
+  "emoji_button.flags": "Flags",
+  "emoji_button.food": "Food & Drink",
+  "emoji_button.label": "Insert emoji",
+  "emoji_button.nature": "Nature",
+  "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.objects": "Objects",
+  "emoji_button.people": "People",
+  "emoji_button.recent": "Frequently used",
+  "emoji_button.search": "Search...",
+  "emoji_button.search_results": "Search results",
+  "emoji_button.symbols": "Symbols",
+  "emoji_button.travel": "Travel & Places",
+  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
+  "empty_column.home.public_timeline": "the public timeline",
+  "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": "You don't have any notifications yet. Interact with others to start the conversation.",
+  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
+  "getting_started.developers": "Developers",
+  "getting_started.documentation": "Documentation",
+  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.heading": "Getting started",
+  "getting_started.invite": "Invite people",
+  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+  "getting_started.security": "Security",
+  "getting_started.terms": "Terms of service",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_replies": "Show replies",
+  "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.toggle_hidden": "to show/hide text behind CW",
+  "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": "Close",
+  "lightbox.next": "Next",
+  "lightbox.previous": "Previous",
+  "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": "Loading...",
+  "media_gallery.toggle_visible": "Toggle visibility",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.discover": "Discover",
+  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
+  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.info": "About this instance",
+  "navigation_bar.keyboard_shortcuts": "Hotkeys",
+  "navigation_bar.lists": "Lists",
+  "navigation_bar.logout": "Logout",
+  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Pinned toots",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.security": "Security",
+  "notification.favourite": "{name} favourited your status",
+  "notification.follow": "{name} followed you",
+  "notification.mention": "{name} mentioned you",
+  "notification.reblog": "{name} boosted your status",
+  "notifications.clear": "Clear notifications",
+  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.alert": "Desktop notifications",
+  "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
+  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.show": "Show in column",
+  "notifications.column_settings.sound": "Play sound",
+  "notifications.group": "{count} notifications",
+  "onboarding.done": "Done",
+  "onboarding.next": "Next",
+  "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
+  "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
+  "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
+  "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
+  "onboarding.page_one.full_handle": "Your full handle",
+  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
+  "onboarding.page_one.welcome": "Welcome to Mastodon!",
+  "onboarding.page_six.admin": "Your instance's admin is {admin}.",
+  "onboarding.page_six.almost_done": "Almost done...",
+  "onboarding.page_six.appetoot": "Bon Appetoot!",
+  "onboarding.page_six.apps_available": "There are {apps} available for iOS, Android and other platforms.",
+  "onboarding.page_six.github": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
+  "onboarding.page_six.guidelines": "community guidelines",
+  "onboarding.page_six.read_guidelines": "Please read {domain}'s {guidelines}!",
+  "onboarding.page_six.various_app": "mobile apps",
+  "onboarding.page_three.profile": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
+  "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
+  "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
+  "onboarding.skip": "Skip",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Post to mentioned users only",
+  "privacy.direct.short": "Direct",
+  "privacy.private.long": "Post to followers only",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Post to public timelines",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.short": "Unlisted",
+  "regeneration_indicator.label": "Loading…",
+  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "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": "Cancel",
+  "report.forward": "Forward to {target}",
+  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.placeholder": "Additional comments",
+  "report.submit": "Submit",
+  "report.target": "Report {target}",
+  "search.placeholder": "Search",
+  "search_popout.search_format": "Advanced search format",
+  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "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.accounts": "People",
+  "search_results.hashtags": "Hashtags",
+  "search_results.statuses": "Toots",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.delete": "Delete",
+  "status.direct": "Direct message @{name}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filtered": "Filtered",
+  "status.load_more": "Load more",
+  "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",
+  "status.pinned": "Pinned toot",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost to original audience",
+  "status.reblogged_by": "{name} boosted",
+  "status.redraft": "Delete & re-draft",
+  "status.reply": "Reply",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_toggle": "Click to view",
+  "status.sensitive_warning": "Sensitive content",
+  "status.share": "Share",
+  "status.show_less": "Show less",
+  "status.show_less_all": "Show less for all",
+  "status.show_more": "Show more",
+  "status.show_more_all": "Show more for all",
+  "status.unmute_conversation": "Unmute conversation",
+  "status.unpin": "Unpin from profile",
+  "tabs_bar.federated_timeline": "Federated",
+  "tabs_bar.home": "Home",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notifications",
+  "tabs_bar.search": "Search",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add media",
+  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.focus": "Crop",
+  "upload_form.undo": "Delete",
+  "upload_progress.label": "Uploading...",
+  "video.close": "Close video",
+  "video.exit_fullscreen": "Exit full screen",
+  "video.expand": "Expand video",
+  "video.fullscreen": "Full screen",
+  "video.hide": "Hide video",
+  "video.mute": "Mute sound",
+  "video.pause": "Pause",
+  "video.play": "Play",
+  "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index d1857cd19..37b5e73ee 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -60,13 +60,13 @@
   "column_header.unpin": "Fastgør ikke længere",
   "column_subheading.settings": "Indstillinger",
   "community.column_settings.media_only": "Kun multimedier",
-  "compose_form.direct_message_warning": "Dette toot vil kun blive sendt til de nævnte brugere.",
+  "compose_form.direct_message_warning": "Dette trut vil kun blive sendt til de nævnte brugere.",
   "compose_form.direct_message_warning_learn_more": "Lær mere",
-  "compose_form.hashtag_warning": "Dette toot vil ikke blive vist under noget hashtag da det ikke er listet. Kun offentlige toots kan blive vist under søgninger med hashtags.",
+  "compose_form.hashtag_warning": "Dette trut vil ikke blive vist under noget hashtag da det ikke er listet. Kun offentlige trut kan blive vist under søgninger med hashtags.",
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Alle kan følge dig for at se dine følger-kun indlæg.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Hvad har du på hjertet?",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Trut",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.marked": "Multimedie er markeret som værende følsomt",
   "compose_form.sensitive.unmarked": "Multimediet er ikke markeret som værende følsomt",
@@ -140,7 +140,7 @@
   "keyboard_shortcuts.reply": "for at svare",
   "keyboard_shortcuts.search": "for at fokusere søgningen",
   "keyboard_shortcuts.toggle_hidden": "for at vise/skjule tekst bag CW",
-  "keyboard_shortcuts.toot": "for at påbegynde en helt ny toot",
+  "keyboard_shortcuts.toot": "for at påbegynde et helt nyt trut",
   "keyboard_shortcuts.unfocus": "for at fjerne fokus fra skriveområde/søgning",
   "keyboard_shortcuts.up": "for at bevæge dig op ad listen",
   "lightbox.close": "Luk",
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Skjulte domæner",
   "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.favourites": "Favoritter",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Følgeanmodninger",
   "navigation_bar.info": "Om denne instans",
   "navigation_bar.keyboard_shortcuts": "Hurtigtast",
@@ -256,7 +257,7 @@
   "status.direct": "Send direkte besked til @{name}",
   "status.embed": "Indlejre",
   "status.favourite": "Favorit",
-  "status.filtered": "Filtered",
+  "status.filtered": "Filtreret",
   "status.load_more": "Indlæs mere",
   "status.media_hidden": "Multimedia skjult",
   "status.mention": "Nævn @{name}",
@@ -265,7 +266,7 @@
   "status.mute_conversation": "Dæmp samtale",
   "status.open": "Udvid denne status",
   "status.pin": "Fastgør til profil",
-  "status.pinned": "Fastgjort toot",
+  "status.pinned": "Fastgjort trut",
   "status.reblog": "Fremhæv",
   "status.reblog_private": "Fremhæv til oprindeligt publikum",
   "status.reblogged_by": "{name} fremhævede",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index ac14f037d..8ea318158 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -65,7 +65,7 @@
   "compose_form.hashtag_warning": "Dieser Beitrag wird nicht unter einen dieser Hashtags sichtbar sein, solange er ungelistet ist. Bei einer Suche kann er nicht gefunden werden.",
   "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?",
+  "compose_form.placeholder": "Was gibt's neues?",
   "compose_form.publish": "Tröt",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.marked": "Medien sind als heikel markiert",
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Versteckte Domains",
   "navigation_bar.edit_profile": "Profil bearbeiten",
   "navigation_bar.favourites": "Favoriten",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Folgeanfragen",
   "navigation_bar.info": "Über diese Instanz",
   "navigation_bar.keyboard_shortcuts": "Tastenkombinationen",
@@ -256,7 +257,7 @@
   "status.direct": "Direktnachricht @{name}",
   "status.embed": "Einbetten",
   "status.favourite": "Favorisieren",
-  "status.filtered": "Filtered",
+  "status.filtered": "Gefiltert",
   "status.load_more": "Weitere laden",
   "status.media_hidden": "Medien versteckt",
   "status.mention": "@{name} erwähnen",
@@ -287,7 +288,7 @@
   "tabs_bar.local_timeline": "Lokal",
   "tabs_bar.notifications": "Mitteilungen",
   "tabs_bar.search": "Suchen",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "trends.count_by_accounts": "{count} {rawCount, plural, eine {Person} other {Personen}} reden darüber",
   "ui.beforeunload": "Dein Entwurf geht verloren, wenn du Mastodon verlässt.",
   "upload_area.title": "Zum Hochladen hereinziehen",
   "upload_button.label": "Mediendatei hinzufügen",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 132399b87..9a0d16b8b 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -693,6 +693,10 @@
       {
         "defaultMessage": "Muted users",
         "id": "navigation_bar.mutes"
+      },
+      {
+        "defaultMessage": "Muted words",
+        "id": "navigation_bar.filters"
       }
     ],
     "path": "app/javascript/mastodon/features/compose/components/action_bar.json"
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index b9bc474eb..7e8fa8b17 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -117,7 +117,7 @@
   "getting_started.developers": "Προγραμματιστές",
   "getting_started.documentation": "Documentation",
   "getting_started.find_friends": "Βρες φίλους/ες από το Twitter",
-  "getting_started.heading": "Ξεκινώντας",
+  "getting_started.heading": "Αφετηρία",
   "getting_started.invite": "Προσκάλεσε κόσμο",
   "getting_started.open_source_notice": "Το Mastodon είναι ελεύθερο λογισμικό. Μπορείς να συνεισφέρεις ή να αναφέρεις ζητήματα στο GitHub στο {github}.",
   "getting_started.security": "Ασφάλεια",
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Κρυφοί τομείς",
   "navigation_bar.edit_profile": "Επεξεργασία προφίλ",
   "navigation_bar.favourites": "Αγαπημένα",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
   "navigation_bar.info": "Extended information",
   "navigation_bar.keyboard_shortcuts": "Συντομεύσεις",
@@ -256,7 +257,7 @@
   "status.direct": "Προσωπικό μήνυμα προς @{name}",
   "status.embed": "Ενσωμάτωσε",
   "status.favourite": "Σημείωσε ως αγαπημένο",
-  "status.filtered": "Filtered",
+  "status.filtered": "Φιλτραρισμένα",
   "status.load_more": "Φόρτωσε περισσότερα",
   "status.media_hidden": "Κρυμμένο πολυμέσο",
   "status.mention": "Ανέφερε τον/την @{name}",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 6ed35ebf7..f8ded63e9 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -170,6 +170,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.info": "About this instance",
   "navigation_bar.keyboard_shortcuts": "Hotkeys",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 93bf53b9f..be2bc3d65 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Kaŝitaj domajnoj",
   "navigation_bar.edit_profile": "Redakti profilon",
   "navigation_bar.favourites": "Stelumoj",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Petoj de sekvado",
   "navigation_bar.info": "Pri ĉi tiu nodo",
   "navigation_bar.keyboard_shortcuts": "Rapidklavoj",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index a56620e2b..d4db8d15f 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.favourites": "Favoritos",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Solicitudes para seguirte",
   "navigation_bar.info": "Información adicional",
   "navigation_bar.keyboard_shortcuts": "Atajos de teclado",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index e67dd02ef..33f477af3 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Ezkutatutako domeinuak",
   "navigation_bar.edit_profile": "Aldatu profila",
   "navigation_bar.favourites": "Gogokoak",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Jarraitzeko eskariak",
   "navigation_bar.info": "Instantzia honi buruz",
   "navigation_bar.keyboard_shortcuts": "Laster-teklak",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index d6aea20d5..ad53e9b7d 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "دامین‌های پنهان‌شده",
   "navigation_bar.edit_profile": "ویرایش نمایه",
   "navigation_bar.favourites": "پسندیده‌ها",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "درخواست‌های پیگیری",
   "navigation_bar.info": "اطلاعات تکمیلی",
   "navigation_bar.keyboard_shortcuts": "میان‌برهای صفحه‌کلید",
@@ -256,7 +257,7 @@
   "status.direct": "پیغام مستقیم به @{name}",
   "status.embed": "جاگذاری",
   "status.favourite": "پسندیدن",
-  "status.filtered": "Filtered",
+  "status.filtered": "فیلترشده",
   "status.load_more": "بیشتر نشان بده",
   "status.media_hidden": "تصویر پنهان شده",
   "status.mention": "نام‌بردن از @{name}",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 009938d5e..dd7310a61 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Piilotetut verkkotunnukset",
   "navigation_bar.edit_profile": "Muokkaa profiilia",
   "navigation_bar.favourites": "Suosikit",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Seuraamispyynnöt",
   "navigation_bar.info": "Tietoa tästä instanssista",
   "navigation_bar.keyboard_shortcuts": "Näppäinkomennot",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 22ebc5df5..41cea6a82 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Domaines cachés",
   "navigation_bar.edit_profile": "Modifier le profil",
   "navigation_bar.favourites": "Favoris",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Demandes de suivi",
   "navigation_bar.info": "Plus d’informations",
   "navigation_bar.keyboard_shortcuts": "Raccourcis-clavier",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 7693c7671..ff817d681 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Dominios agochados",
   "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.favourites": "Favoritas",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Peticións de seguimento",
   "navigation_bar.info": "Sobre esta instancia",
   "navigation_bar.keyboard_shortcuts": "Atallos",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 61a5700e1..952c3d6db 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "עריכת פרופיל",
   "navigation_bar.favourites": "חיבובים",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "בקשות מעקב",
   "navigation_bar.info": "מידע נוסף",
   "navigation_bar.keyboard_shortcuts": "קיצורי מקלדת",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index dcef385da..f8f1d0eb3 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.favourites": "Favoriti",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Zahtjevi za slijeđenje",
   "navigation_bar.info": "Više informacija",
   "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 2072b740a..1b2397f70 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Profil szerkesztése",
   "navigation_bar.favourites": "Kedvencek",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Követési kérések",
   "navigation_bar.info": "Ezen szerverről",
   "navigation_bar.keyboard_shortcuts": "Gyorsbillentyűk",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index d06d1c302..d2e1bf03e 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Խմբագրել անձնական էջը",
   "navigation_bar.favourites": "Հավանածներ",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Հետեւելու հայցեր",
   "navigation_bar.info": "Այս հանգույցի մասին",
   "navigation_bar.keyboard_shortcuts": "Ստեղնաշարի կարճատներ",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index fe98cf00b..06045ae99 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Ubah profil",
   "navigation_bar.favourites": "Favorit",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Permintaan mengikuti",
   "navigation_bar.info": "Informasi selengkapnya",
   "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 24758bd2e..5f9175c4f 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Modifikar profilo",
   "navigation_bar.favourites": "Favorati",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Demandi di sequado",
   "navigation_bar.info": "Detaloza informi",
   "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 287549769..b20263df6 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Domini nascosti",
   "navigation_bar.edit_profile": "Modifica profilo",
   "navigation_bar.favourites": "Apprezzati",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Richieste di amicizia",
   "navigation_bar.info": "Informazioni estese",
   "navigation_bar.keyboard_shortcuts": "Tasti di scelta rapida",
@@ -256,7 +257,7 @@
   "status.direct": "Messaggio diretto @{name}",
   "status.embed": "Incorpora",
   "status.favourite": "Apprezzato",
-  "status.filtered": "Filtered",
+  "status.filtered": "Filtrato",
   "status.load_more": "Mostra di più",
   "status.media_hidden": "Allegato nascosto",
   "status.mention": "Nomina @{name}",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index e7947acf8..e61b13548 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -170,6 +170,7 @@
   "navigation_bar.domain_blocks": "非表示にしたドメイン",
   "navigation_bar.edit_profile": "プロフィールを編集",
   "navigation_bar.favourites": "お気に入り",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "フォローリクエスト",
   "navigation_bar.info": "このインスタンスについて",
   "navigation_bar.keyboard_shortcuts": "ホットキー",
@@ -261,7 +262,7 @@
   "status.direct": "@{name}さんにダイレクトメッセージ",
   "status.embed": "埋め込み",
   "status.favourite": "お気に入り",
-  "status.filtered": "Filtered",
+  "status.filtered": "フィルターされました",
   "status.load_more": "もっと見る",
   "status.media_hidden": "非表示のメディア",
   "status.mention": "@{name}さんにトゥート",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 10da7d358..8f4b57c2b 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "숨겨진 도메인",
   "navigation_bar.edit_profile": "프로필 편집",
   "navigation_bar.favourites": "즐겨찾기",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "팔로우 요청",
   "navigation_bar.info": "이 인스턴스에 대해서",
   "navigation_bar.keyboard_shortcuts": "단축키",
@@ -256,7 +257,7 @@
   "status.direct": "@{name}에게 다이렉트 메시지",
   "status.embed": "공유하기",
   "status.favourite": "즐겨찾기",
-  "status.filtered": "Filtered",
+  "status.filtered": "필터링 됨",
   "status.load_more": "더 보기",
   "status.media_hidden": "미디어 숨겨짐",
   "status.mention": "답장",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index ac785fb24..63c902668 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -25,10 +25,10 @@
   "account.share": "Profiel van @{name} delen",
   "account.show_reblogs": "Toon boosts van @{name}",
   "account.unblock": "Deblokkeer @{name}",
-  "account.unblock_domain": "{domain} niet meer negeren",
+  "account.unblock_domain": "{domain} niet langer negeren",
   "account.unfollow": "Ontvolgen",
-  "account.unmute": "@{name} niet meer negeren",
-  "account.unmute_notifications": "@{name} meldingen niet meer negeren",
+  "account.unmute": "@{name} niet langer negeren",
+  "account.unmute_notifications": "@{name} meldingen niet langer negeren",
   "account.view_full_profile": "Volledig profiel tonen",
   "alert.unexpected.message": "Er deed zich een onverwachte fout voor",
   "alert.unexpected.title": "Oeps!",
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Verborgen domeinen",
   "navigation_bar.edit_profile": "Profiel bewerken",
   "navigation_bar.favourites": "Favorieten",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Volgverzoeken",
   "navigation_bar.info": "Over deze server",
   "navigation_bar.keyboard_shortcuts": "Sneltoetsen",
@@ -250,13 +251,13 @@
   "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
   "standalone.public_title": "Een kijkje binnenin...",
   "status.block": "Blokkeer @{name}",
-  "status.cancel_reblog_private": "Niet meer boosten",
+  "status.cancel_reblog_private": "Niet langer boosten",
   "status.cannot_reblog": "Deze toot kan niet geboost worden",
   "status.delete": "Verwijderen",
   "status.direct": "Directe toot @{name}",
   "status.embed": "Embed",
   "status.favourite": "Favoriet",
-  "status.filtered": "Filtered",
+  "status.filtered": "Gefilterd",
   "status.load_more": "Meer laden",
   "status.media_hidden": "Media verborgen",
   "status.mention": "Vermeld @{name}",
@@ -280,7 +281,7 @@
   "status.show_less_all": "Alles minder tonen",
   "status.show_more": "Meer tonen",
   "status.show_more_all": "Alles meer tonen",
-  "status.unmute_conversation": "Conversatie niet meer negeren",
+  "status.unmute_conversation": "Conversatie niet langer negeren",
   "status.unpin": "Van profielpagina losmaken",
   "tabs_bar.federated_timeline": "Globaal",
   "tabs_bar.home": "Start",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 295d44ae8..31bbf7664 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.favourites": "Favoritter",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Følgeforespørsler",
   "navigation_bar.info": "Utvidet informasjon",
   "navigation_bar.keyboard_shortcuts": "Tastatursnarveier",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index cb9ff8713..fb025594d 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Domenis resconduts",
   "navigation_bar.edit_profile": "Modificar lo perfil",
   "navigation_bar.favourites": "Favorits",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Demandas d’abonament",
   "navigation_bar.info": "Mai informacions",
   "navigation_bar.keyboard_shortcuts": "Acorchis clavièr",
@@ -256,7 +257,7 @@
   "status.direct": "Messatge per @{name}",
   "status.embed": "Embarcar",
   "status.favourite": "Apondre als favorits",
-  "status.filtered": "Filtered",
+  "status.filtered": "Filtrat",
   "status.load_more": "Cargar mai",
   "status.media_hidden": "Mèdia rescondut",
   "status.mention": "Mencionar",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index da35af8e4..355a11a03 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -170,6 +170,7 @@
   "navigation_bar.domain_blocks": "Ukryte domeny",
   "navigation_bar.edit_profile": "Edytuj profil",
   "navigation_bar.favourites": "Ulubione",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Prośby o śledzenie",
   "navigation_bar.info": "Szczegółowe informacje",
   "navigation_bar.keyboard_shortcuts": "Skróty klawiszowe",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 37684efb7..4ee02f757 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Domínios escondidos",
   "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.favourites": "Favoritos",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Seguidores pendentes",
   "navigation_bar.info": "Mais informações",
   "navigation_bar.keyboard_shortcuts": "Atalhos de teclado",
@@ -256,7 +257,7 @@
   "status.direct": "Enviar mensagem direta a @{name}",
   "status.embed": "Incorporar",
   "status.favourite": "Adicionar aos favoritos",
-  "status.filtered": "Filtered",
+  "status.filtered": "Filtrado",
   "status.load_more": "Carregar mais",
   "status.media_hidden": "Mídia escondida",
   "status.mention": "Mencionar @{name}",
@@ -292,7 +293,7 @@
   "upload_area.title": "Arraste e solte para enviar",
   "upload_button.label": "Adicionar mídia",
   "upload_form.description": "Descreva a imagem para deficientes visuais",
-  "upload_form.focus": "Recortar",
+  "upload_form.focus": "Ajustar foco",
   "upload_form.undo": "Remover",
   "upload_progress.label": "Salvando...",
   "video.close": "Fechar vídeo",
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json
index bda1020aa..686c05d72 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.favourites": "Favoritos",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Seguidores pendentes",
   "navigation_bar.info": "Mais informações",
   "navigation_bar.keyboard_shortcuts": "Atalhos de teclado",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 8bf6012e2..ecde3fb2c 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Скрытые домены",
   "navigation_bar.edit_profile": "Изменить профиль",
   "navigation_bar.favourites": "Понравившееся",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Запросы на подписку",
   "navigation_bar.info": "Об узле",
   "navigation_bar.keyboard_shortcuts": "Сочетания клавиш",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 839ef70f9..47271f98f 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Skryté domény",
   "navigation_bar.edit_profile": "Upraviť profil",
   "navigation_bar.favourites": "Obľúbené",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Žiadosti o sledovanie",
   "navigation_bar.info": "O tomto Mastodon serveri",
   "navigation_bar.keyboard_shortcuts": "Klávesové skratky",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index f738274db..73f31e8cf 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.info": "O tem vozlišču",
   "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 6c7e56fe8..e3bf2189b 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Izmeni profil",
   "navigation_bar.favourites": "Omiljeni",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Zahtevi za praćenje",
   "navigation_bar.info": "O ovoj instanci",
   "navigation_bar.keyboard_shortcuts": "Prečice na tastaturi",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 6a9e80559..ba84a4d24 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Измени профил",
   "navigation_bar.favourites": "Омиљени",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Захтеви за праћење",
   "navigation_bar.info": "О овој инстанци",
   "navigation_bar.keyboard_shortcuts": "Пречице на тастатури",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 0701bf925..64d488324 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Dolda domäner",
   "navigation_bar.edit_profile": "Redigera profil",
   "navigation_bar.favourites": "Favoriter",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Följförfrågningar",
   "navigation_bar.info": "Om denna instans",
   "navigation_bar.keyboard_shortcuts": "Tangentbordsgenvägar",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 8928bfb9b..7e405b8c2 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "దాచిన డొమైన్లు",
   "navigation_bar.edit_profile": "ప్రొఫైల్ని సవరించండి",
   "navigation_bar.favourites": "ఇష్టపడినవి",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు",
   "navigation_bar.info": "ఈ దృష్టాంతం గురించి",
   "navigation_bar.keyboard_shortcuts": "హాట్ కీలు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 57a0bb01f..1d76735a2 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.info": "About this instance",
   "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 475ee4f05..03a09019f 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Profili düzenle",
   "navigation_bar.favourites": "Favoriler",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Takip istekleri",
   "navigation_bar.info": "Genişletilmiş bilgi",
   "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index bf3262558..7bb2476d0 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Редагувати профіль",
   "navigation_bar.favourites": "Вподобане",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Запити на підписку",
   "navigation_bar.info": "Про інстанцію",
   "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
diff --git a/app/javascript/mastodon/locales/whitelist_cs.json b/app/javascript/mastodon/locales/whitelist_cs.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_cs.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_da.json b/app/javascript/mastodon/locales/whitelist_da.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_da.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 1b1997cff..8b73bb8f9 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "已屏蔽的网站",
   "navigation_bar.edit_profile": "修改个人资料",
   "navigation_bar.favourites": "收藏的内容",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "关注请求",
   "navigation_bar.info": "关于本站",
   "navigation_bar.keyboard_shortcuts": "快捷键列表",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 9e964ee88..21c3e6154 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "隱藏的服務站",
   "navigation_bar.edit_profile": "修改個人資料",
   "navigation_bar.favourites": "最愛的內容",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "關注請求",
   "navigation_bar.info": "關於本服務站",
   "navigation_bar.keyboard_shortcuts": "鍵盤快速鍵",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 7221d3383..b4a70ef70 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -166,6 +166,7 @@
   "navigation_bar.domain_blocks": "隱藏的站點",
   "navigation_bar.edit_profile": "編輯使用者資訊",
   "navigation_bar.favourites": "最愛",
+  "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "關注請求",
   "navigation_bar.info": "關於本站",
   "navigation_bar.keyboard_shortcuts": "快捷鍵",
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index d0212c379..106198f74 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -47,7 +47,18 @@ export const regexFromFilters = filters => {
 
   return new RegExp(filters.map(filter => {
     let expr = escapeRegExp(filter.get('phrase'));
-    return filter.get('whole_word') ? `\\b${expr}\\b` : expr;
+
+    if (filter.get('whole_word')) {
+      if (/^[\w]/.test(expr)) {
+        expr = `\\b${expr}`;
+      }
+
+      if (/[\w]$/.test(expr)) {
+        expr = `${expr}\\b`;
+      }
+    }
+
+    return expr;
   }).join('|'), 'i');
 };
 
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index c247ab21d..14cba70dc 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -200,10 +200,11 @@ class FeedManager
     active_filters = Rails.cache.fetch("filters:#{receiver_id}") { CustomFilter.where(account_id: receiver_id).active_irreversible.to_a }.to_a
 
     active_filters.select! { |filter| filter.context.include?(context.to_s) && !filter.expired? }
+
     active_filters.map! do |filter|
       if filter.whole_word
         sb = filter.phrase =~ /\A[[:word:]]/ ? '\b' : ''
-        eb = filter.phrase =~ /[[:word:]]\Z/ ? '\b' : ''
+        eb = filter.phrase =~ /[[:word:]]\z/ ? '\b' : ''
 
         /(?mix:#{sb}#{Regexp.escape(filter.phrase)}#{eb})/
       else
diff --git a/config/locales/activerecord.cs.yml b/config/locales/activerecord.cs.yml
new file mode 100644
index 000000000..006d3e600
--- /dev/null
+++ b/config/locales/activerecord.cs.yml
@@ -0,0 +1,13 @@
+---
+cs:
+  activerecord:
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: pouze písmena, číslice a podtržítka
+        status:
+          attributes:
+            reblog:
+              taken: stavu již existuje
diff --git a/config/locales/activerecord.oc.yml b/config/locales/activerecord.oc.yml
index e52f79188..cdf0fa0ac 100644
--- a/config/locales/activerecord.oc.yml
+++ b/config/locales/activerecord.oc.yml
@@ -6,7 +6,7 @@ oc:
         account:
           attributes:
             username:
-              invalid: solament letras, nombres e tirets bas
+              invalid: solament letras, nombres e tirets basses
         status:
           attributes:
             reblog:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
new file mode 100644
index 000000000..7b6021f13
--- /dev/null
+++ b/config/locales/cs.yml
@@ -0,0 +1,44 @@
+---
+cs:
+  about:
+    about_hashtag_html: Toto jsou veřejné příspěvky typu označené jako <strong>#%{hashtag}</strong>. Pokud máte účet kdekoliv na fediverse, můžete s nimi interagovat.
+    about_mastodon_html: Mastodon je sociální síť založená na otevřených webových protokolech a svobodném, otevřeném softwaru. Je decentrovalizovaná jako e-mail.
+    about_this: O této instanci
+    administered_by: 'Server spravuje:'
+    closed_registrations: Registrace na této instanci jsou momentálně uzavřené. Můžete si však najít jinou instanci, vytvořit si na ní účet a získat z ní přístup do naprosto stejné sítě.
+    contact: Kontakt
+    contact_missing: Nenastaveno
+    contact_unavailable: Neuvedeno
+    description_headline: Co je %{domain}?
+    domain_count_after: dalším instancím
+    domain_count_before: Připojeno k
+    extended_description_html: |
+      <h3>Dobré místo pro pravidla</h3>
+      <p>Rozšířený popis ještě nebyl nastaven.</p>
+    features:
+      humane_approach_body: Mastodon, poučen z chyb jiných sociálních sítí, se snaží bojovat se zneužíváním sociálních sítí vytvářením etických možností.
+      humane_approach_title: Lidštější přístup
+      not_a_product_title: Jste osoba, ne produkt.
+    generic_description: "%{domain} je jedním serverem v síti"
+    learn_more: Zjistit více
+    source_code: Zdrojový kód
+    status_count_after: příspěvků
+    status_count_before: Kdo je autorem
+    user_count_after: uživatelů
+    user_count_before: Domov pro
+    what_is_mastodon: Co je Mastodon?
+  accounts:
+    follow: Sledovat
+    followers: Sledovatelé
+    following: Sleduje
+    media: Média
+    moved_html: 'Účet %{name} byl přesunut na %{new_profile_link}:'
+    network_hidden: Tato informace není k dispozici
+    nothing_here: Tady nic není!
+  user_mailer:
+    welcome:
+      tips: Tipy
+      title: Vítejte na palubě, %{name}!
+  users:
+    invalid_email: E-mailová adresa je neplatná
+    signed_in_as: 'Přihlášen/a jako:'
diff --git a/config/locales/da.yml b/config/locales/da.yml
index d76730b33..0e3da55f1 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -219,6 +219,7 @@ da:
           suspend: Udeluk
         title: Ny domæne blokering
       reject_media: Afvis multimedie filer
+      reject_media_hint: Fjerner lokalt lagrede multimedie filer og nægter at hente nogen i fremtiden. Irrelevant for udelukkelser
       severities:
         noop: Ingen
         silence: Dæmp
@@ -228,6 +229,9 @@ da:
         affected_accounts:
           one: En konto i databasen påvirket
           other: "%{count} konti i databasen påvirket"
+        retroactive:
+          silence: Fjern dæmpningen af alle eksisterende konti fra dette domæne
+          suspend: Fjern udelukkelsen af alle eksisterende konti fra dette domæne
         title: Annuller domæne blokeringen for domænet %{domain}
         undo: Fortryd
       title: Domæne blokeringer
@@ -268,14 +272,17 @@ da:
       mark_as_unresolved: Marker som værende uløst
       notes:
         create: Tilføj notat
+        create_and_resolve: Løs med notat
         create_and_unresolve: Genåbne med notat
         delete: Slet
+        placeholder: Beskriv hvilke handlinger der er blevet udført, eller andre relevante opdateringer...
       reopen: Genåben anmeldelse
       report: 'Anmeldelse #%{id}'
       report_contents: Indhold
       reported_account: Anmeldt konto
       reported_by: Anmeldt af
       resolved: Løst
+      resolved_msg: Anmeldelse er sat til at være løst!
       silence_account: Dæmp konto
       status: Status
       suspend_account: Udeluk konto
@@ -285,6 +292,9 @@ da:
       updated_at: Opdateret
       view: Se
     settings:
+      contact_information:
+        email: Forretnings email
+        username: Kontakt brugernavn
       hero:
         title: Billede af helt
       registrations:
@@ -357,6 +367,7 @@ da:
   authorize_follow:
     already_following: Du følger allerede denne konto
     follow: Følg
+    follow_request: 'Du har anmodet om at følge:'
     following: 'Succes! Du følger nu:'
     post_follow:
       close: Du kan også bare lukke dette vindue.
@@ -372,6 +383,7 @@ da:
       x_seconds: "%{count}s"
   deletes:
     bad_password_msg: Godt forsøg, hackere! Forkert kodeord
+    confirm_password: Indtast dit nuværende kodeord for at bekræfte din identitet
     proceed: Slet konto
     success_msg: Din konto er nu blevet slettet
   errors:
@@ -418,6 +430,7 @@ da:
     types:
       blocking: Blokeringsliste
       following: Følgningsliste
+      muting: Liste over dæmpninger
     upload: Læg op
   invites:
     delete: Deaktiver
@@ -440,6 +453,8 @@ da:
     validations:
       too_many: Kan ikke vedhæfte mere en 4 filer
   migrations:
+    acct: username@domain af den nye konto
+    currently_redirecting: 'Din profil er sat til at henvise til:'
     proceed: Gem
   moderation:
     title: Moderatering
@@ -461,6 +476,12 @@ da:
       body: 'Din status blev fremhævet af %{name}:'
       subject: "%{name} fremhævede din status"
       title: Ny fremhævelse
+  number:
+    human:
+      decimal_units:
+        units:
+          billion: mia.
+          million: mio.
   pagination:
     newer: Nyere
     next: Næste
@@ -469,16 +490,25 @@ da:
   preferences:
     languages: Sprog
     other: Andet
+    web: Web
   remote_unfollow:
     error: Fejl
     title: Titel
     unfollowed: Følger ikke længere
   sessions:
     browsers:
+      blackberry: Blackberry OS
+      chrome: Google Chrome
+      firefox: Mozilla Firefox
       generic: Ukendt browser
+      ie: IE
     description: "%{browser} på %{platform}"
     ip: IP
     platforms:
+      android: Android
+      ios: iOS
+      linux: Linux
+      mac: Mac.
       other: ukendt platform
   settings:
     authorized_apps: Godkendte apps
@@ -488,6 +518,7 @@ da:
     edit_profile: Rediger profil
     followers: Godkendte følgere
     import: Importer
+    migrate: Konto migrering
     notifications: Notifikationer
     preferences: Indstillinger
     settings: Indstillinger
@@ -501,9 +532,12 @@ da:
       video:
         one: "%{count} video"
         other: "%{count} videoer"
+    content_warning: 'Advarsel om indhold: %{warning}'
+    language_detection: Opfang automatisk sprog
     pin_errors:
       ownership: Dun kan ikke fastgøre en anden persons toot
     show_more: Vis mere
+    title: '%{name}: "%{quote}"'
     visibilities:
       private: Kun-følgere
       private_long: Vis kun til følgere
@@ -519,11 +553,13 @@ da:
     default: Mastodon
     mastodon-light: Mastodon (lys)
   two_factor_authentication:
+    code_hint: Indtast koden der er genereret af din app for at bekræfte
     disable: Deaktiver
     enable: Aktiver
     enabled: To-faktor godkendelse er aktiveret
     enabled_success: To-faktor godkendelse succesfuldt aktiveret
     generate_recovery_codes: Generer gendannelseskoder
+    manual_instructions: 'Hvis du ikke kan scanne QR koden er er nødt til at skrive koden ind manuelt, kan er din almindelig tekst secret:'
     recovery_codes: Reserve koder
     recovery_codes_regenerated: Reserve koder blev succesfuldt regenereret
     setup: Sæt op
diff --git a/config/locales/de.yml b/config/locales/de.yml
index e91f03941..30135cf79 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -476,7 +476,9 @@ de:
     storage: Medienspeicher
   filters:
     contexts:
+      home: Startseite
       notifications: Benachrichtigungen
+      public: Öffentliche Zeitleisten
       thread: Gespräche
     edit:
       title: Filter bearbeiten
@@ -613,6 +615,7 @@ de:
   remote_follow:
     acct: Profilname@Domain, von wo aus du dieser Person folgen möchtest
     missing_resource: Die erforderliche Weiterleitungs-URL für dein Konto konnte nicht gefunden werden
+    no_account_html: Noch keinen Account? Du kannst dich <a href='%{sign_up_path}' target='_blank'>hier anmelden</a>
     proceed: Weiter
     prompt: 'Du wirst dieser Person folgen:'
   remote_unfollow:
diff --git a/config/locales/devise.cs.yml b/config/locales/devise.cs.yml
new file mode 100644
index 000000000..adaa40835
--- /dev/null
+++ b/config/locales/devise.cs.yml
@@ -0,0 +1,10 @@
+---
+cs:
+  devise:
+    confirmations:
+      confirmed: Vaše e-mailová adresa byla úspěšně ověřena.
+      send_instructions: Za několik minut obdržíte e-mail s instrukcemi pro potvrzení vašeho účtu. Pokud tento e-mail neobdržíte, zkontrolujte si složku „spam“.
+      send_paranoid_instructions: Pokud tato e-mailová adresa existuje v naší databázi, obdržíte za několik minut e-mail s instrukcemi pro potvrzení vašeho účtu. Pokud tento e-mail neobdržíte, zkontrolujte si složku „spam“.
+    failure:
+      already_authenticated: Již jste přihlášen/a.
+      inactive: Váš účet ještě není aktivován.
diff --git a/config/locales/devise.da.yml b/config/locales/devise.da.yml
index 61b40fade..7c6ac8b19 100644
--- a/config/locales/devise.da.yml
+++ b/config/locales/devise.da.yml
@@ -40,10 +40,13 @@ da:
         title: Kodeordet er blevet nulstillet
     registrations:
       signed_up: Velkommen! Du har nu tilmeldt dig.
+      updated: Din konto er nu blevet opdateret.
     sessions:
+      already_signed_out: Du er nu logget ud.
       signed_in: Du er nu logget ind.
       signed_out: Du er nu logget ud.
     unlocks:
+      send_instructions: Du vil modtage en email med instrukser for hvordan du låser op for din konto om nogle få minutter. Venligst tjek din spam mappe hvis du ikke har modtaget denne email.
       send_paranoid_instructions: Hvis din konto findes, vil du modtage en email med instrukser for hvordan du låser op for den om få minutter. Tjek venligst din spam mappe hvis du ikke har modtaget denne mail.
       unlocked: Din konto er succesfuldt blevet låst op. Log venligst ind for at fortsætte.
   errors:
diff --git a/config/locales/devise.sl.yml b/config/locales/devise.sl.yml
index ecbaaf91a..13c48e199 100644
--- a/config/locales/devise.sl.yml
+++ b/config/locales/devise.sl.yml
@@ -24,3 +24,13 @@ sl:
         title: Potrdi e-poštni naslov
       email_changed:
         explanation: 'E-poštni naslov za vaš račun je spremenjen na:'
+        extra: Če niste spremenili e-pošte, je verjetno, da je nekdo pridobil dostop do vašega računa. Prosim, zamenjajte geslo takoj. Če ste blokirani iz svojega računa  se obrnite na skrbnika vozlišča.
+        subject: 'Mastodon: E-pošta je spremenjena'
+        title: Novi e-poštni naslov
+      password_change:
+        explanation: Geslo za vaš račun je bilo spremenjeno.
+        extra: Če niste spremenili gesla, je verjetno, da je nekdo pridobil dostop do vašega računa. Prosim, zamenjajte geslo takoj. Če ste blokirani iz svojega računa  se obrnite na skrbnika vozlišča.
+        subject: 'Mastodon: Geslo je spremenjeno'
+        title: Geslo je spremenjeno
+      reconfirmation_instructions:
+        explanation: Potrdite novi naslov, da spremenite svoj e-poštni naslov.
diff --git a/config/locales/doorkeeper.ar.yml b/config/locales/doorkeeper.ar.yml
index 3b4202903..200d340a8 100644
--- a/config/locales/doorkeeper.ar.yml
+++ b/config/locales/doorkeeper.ar.yml
@@ -113,7 +113,29 @@ ar:
       application:
         title: طلب تصريح مفتوح OAuth
     scopes:
-      follow: متابعة و حجب و فك الحجب و إلغاء متابعة حسابات المستخدمين
-      push: تلقى إشعارات حسابك
-      read: قراءة بيانات حسابك
-      write: النشر نيابةً عنك
+      follow: تعديل علاقات الحساب
+      push: تلقي إشعاراتك
+      read: قراءة كافة بيانات حسابك
+      read:accounts: معاينة معلومات الحساب
+      read:blocks: رؤية الحسابات التي قمت بحجبها
+      read:favourites: رؤية مفضلاتك
+      read:filters: رؤية عوامل التصفية الخاصة بك
+      read:follows: رؤية متابِعيك
+      read:lists: رؤية قوائمك
+      read:mutes: رؤية الحسابات التي كَتمتَها
+      read:notifications: رؤية إشعاراتك الخاصة
+      read:reports: رؤية إبلاغاتك
+      read:search: البحث مكانك
+      read:statuses: رؤية كافة المنشورات
+      write: تغيير كافة بيانات حسابك
+      write:accounts: تعديل ملفك الشخصي
+      write:blocks: حجب الحسابات و النطاقات
+      write:favourites: الإعجاب بمنشورات
+      write:filters: إنشاء عوامل تصفية
+      write:follows: متابَعة الأشخاص
+      write:lists: إنشاء القوائم
+      write:media: إرسال الصور
+      write:mutes: كتم الأشخاص و المحادثات
+      write:notifications: مسح إشعاراتك
+      write:reports: الإبلاغ عن الأشخاص نيابة عنك
+      write:statuses: نشر منشورات
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
new file mode 100644
index 000000000..876f448c7
--- /dev/null
+++ b/config/locales/doorkeeper.cs.yml
@@ -0,0 +1,6 @@
+---
+cs:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Název aplikace
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index 5e7ac0035..051bfd237 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -79,6 +79,8 @@ da:
       messages:
         access_denied: Ejeren af ressourcen eller godkendelses serveren afviste anmodningen.
         invalid_redirect_uri: Ormdirigerings-uri'en der blev angivet er ikke gyldig.
+        invalid_request: Anmodningen mangler en parametre, inkluderer en ikke understøttet parametre værdi eller er på en eller anden måde deformeret.
+        invalid_scope: Det anmodede omfang er ugyldigt, ukendt eller deformeret.
         invalid_token:
           expired: Adgangs-beviset er udløbet
           revoked: Adgangs-beviset er blevet ophævet
@@ -104,7 +106,29 @@ da:
       application:
         title: OAuth godkendelse påkrævet
     scopes:
-      follow: følge, blokere, afblokete og affølge kontoer
-      push: modtage push notifikationer for din konto
-      read: læse din kontos data
-      write: indsende på dine vegne
+      follow: ændre din kontos forhold
+      push: modtage dine push notifikationer
+      read: læse alle din kontos data
+      read:accounts: se konto oplysninger
+      read:blocks: se dine blokeringer
+      read:favourites: se dine favoritter
+      read:filters: se dine filtre
+      read:follows: se hvem du følger
+      read:lists: se dine lister
+      read:mutes: se dine dæmpninger
+      read:notifications: se dine notifikationer
+      read:reports: se dine anmeldelser
+      read:search: søge på dine vegne
+      read:statuses: se alle statusser
+      write: ændre din kontos data
+      write:accounts: ændre din profil
+      write:blocks: bloker konti og domæner
+      write:favourites: favoriser statusser
+      write:filters: opret filtre
+      write:follows: følg folk
+      write:lists: opret lister
+      write:media: upload multimedie filer
+      write:mutes: dæmp folk og samtaler
+      write:notifications: ryd dine notifikationer
+      write:reports: anmeld andre folk
+      write:statuses: udgiv statusser
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml
index cec4a586b..7f3764180 100644
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@@ -114,7 +114,29 @@ de:
       application:
         title: OAuth-Autorisierung nötig
     scopes:
-      follow: Konten folgen, blocken, entblocken und entfolgen
-      push: erhalte Push-Benachrichtigungen von deinem Account
-      read: deine Daten auslesen
-      write: Beiträge in deinem Namen veröffentlichen
+      follow: Kontenbeziehungen verändern
+      push: erhalte deine Push-Benachrichtigungen
+      read: all deine Daten lesen
+      read:accounts: deine Konteninformationen einsehen
+      read:blocks: deine Blockaden einsehen
+      read:favourites: deine Favoriten ansehen
+      read:filters: deine Filter ansehen
+      read:follows: deine Follows sehen
+      read:lists: deine Listen sehen
+      read:mutes: deine Stummschaltungen einsehen
+      read:notifications: deine Benachrichtigungen sehen
+      read:reports: deine Meldungen sehen
+      read:search: in deinem Namen suchen
+      read:statuses: alle Beiträge sehen
+      write: all deine Benutzerdaten verändern
+      write:accounts: dein Profil bearbeiten
+      write:blocks: Domains und Konten blockieren
+      write:favourites: Beiträge favorisieren
+      write:filters: Filter erstellen
+      write:follows: Leuten folgen
+      write:lists: Listen erstellen
+      write:media: Mediendateien hochladen
+      write:mutes: Leute und Konversationen stummschalten
+      write:notifications: deine Benachrichtigungen leeren
+      write:reports: andere Leute melden
+      write:statuses: Beiträge veröffentlichen
diff --git a/config/locales/doorkeeper.el.yml b/config/locales/doorkeeper.el.yml
index b81814650..e820ff8a6 100644
--- a/config/locales/doorkeeper.el.yml
+++ b/config/locales/doorkeeper.el.yml
@@ -114,7 +114,29 @@ el:
       application:
         title: Απαιτείται έγκριση OAuth
     scopes:
-      follow: παρακολούθηση, αποκλεισμός, άρση αποκλεισμού και άρση παρακολούθησης λογαριασμών
-      push: λήψη ειδοποιήσεων ώθησης για τον λογαριασμό σου
-      read: ανάγνωση στοιχείων του λογαριασμού σου
-      write: δημοσίευση εξ' ονόματός σου
+      follow: να αλλάζει τις σχέσεις με λογαριασμούς
+      push: να λαμβάνει τις ειδοποιήσεις σου
+      read: να διαβάζει όλα τα στοιχεία του λογαριασμού σου
+      read:accounts: να βλέπει τα στοιχεία λογαριασμών
+      read:blocks: να βλέπει τους αποκλεισμένους σου
+      read:favourites: να βλέπει τα αγαπημένα σου
+      read:filters: να βλέπει τα φίλτρα σου
+      read:follows: να βλέπει ποιους ακολουθείς
+      read:lists: να βλέπει τις λίστες σου
+      read:mutes: να βλέπει ποιους αποσιωπείς
+      read:notifications: να βλέπει τις ειδοποιήσεις σου
+      read:reports: να βλέπει τις καταγγελίες σου
+      read:search: να ψάχνει για εσένα
+      read:statuses: να βλέπει όλες τις δημοσιεύσεις σου
+      write: να αλλάζει όλα τα στοιχεία του λογαριασμού σου
+      write:accounts: να αλλάζει το προφίλ σου
+      write:blocks: να μπλοκάρει λογαριασμούς και τομείς
+      write:favourites: να σημειώνει δημοσιεύσεις ως αγαπημένες
+      write:filters: να δημιουργεί φίλτρα
+      write:follows: να ακολουθεί ανθρώπους
+      write:lists: να δημιουργεί λίστες
+      write:media: να ανεβάζει πολυμέσα
+      write:mutes: να αποσιωπεί ανθρώπους και συζητήσεις
+      write:notifications: να καθαρίζει τις ειδοποιήσεις σου
+      write:reports: να καταγγέλλει άλλους ανθρώπους
+      write:statuses: να κάνει δημοσιεύσεις
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index 0c68dfa01..09660cb49 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -115,7 +115,26 @@ fr:
       application:
         title: Autorisation OAuth requise
     scopes:
-      follow: s’abonner, se désabonner, bloquer et débloquer des comptes
-      push: recevoir des notifications pour votre compte
-      read: lire les données de votre compte
-      write: poster en votre nom
+      follow: modifier les relations avec les comptes
+      push: recevoir vos notifications
+      read: lire toutes les données de votre compte
+      read:accounts: voir les informations du compte
+      read:blocks: voir vos bloqués
+      read:favourites: voir vos favoris
+      read:filters: voir vos filtres
+      read:lists: voir vos listes
+      read:mutes: voir vos silenciés
+      read:notifications: voir vos notifications
+      read:reports: voir vos rapports
+      read:search: rechercher en votre nom
+      read:statuses: voir tous les statuts
+      write: modifier toutes les données de votre compte
+      write:accounts: modifier votre profil
+      write:blocks: bloquer des comptes et des domaines
+      write:filters: créer des filtres
+      write:follows: suivre les gens
+      write:lists: créer des listes
+      write:media: téléverser des fichiers-média
+      write:mutes: silencier des gens et des conversations
+      write:notifications: nettoyer vos notifications
+      write:statuses: publier des statuts
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index 6d0e16def..0dc45d5a3 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -114,7 +114,29 @@ gl:
       application:
         title: Precisa autorización OAuth
     scopes:
-      follow: seguir, bloquear, desbloquear e deixar de seguir contas
-      push: recibir notificatións tipo push para a súa conta
-      read: ler os datos da súa conta
-      write: publicar no seu nome
+      follow: modificar as relacións da conta
+      push: recibir notificacións push
+      read: ler todos os datos da súa conta
+      read:accounts: ver información das contas
+      read:blocks: ver a quen bloquea
+      read:favourites: ver as súas favoritas
+      read:filters: ver os seus filtros
+      read:follows: ver a quen segue
+      read:lists: ver as súas listas
+      read:mutes: ver a quen ten acalado
+      read:notifications: ver as notificacións
+      read:reports: ver os seus informes
+      read:search: buscar no seu nome
+      read:statuses: ver todos os estados
+      write: modificar todos os datos da súa conta
+      write:accounts: modificar o seu perfil
+      write:blocks: bloquear contas e dominios
+      write:favourites: estados favoritos
+      write:filters: crear filtros
+      write:follows: seguir usuarias
+      write:lists: crear listas
+      write:media: subir ficheiros de medios
+      write:mutes: acalar usuarias e conversas
+      write:notifications: eliminar as notificacións
+      write:reports: informe a outras usuarias
+      write:statuses: publicar estados
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index ce6fa07d2..37b6f1013 100644
--- a/config/locales/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -114,7 +114,28 @@ it:
       application:
         title: Autorizzazione OAuth richiesta
     scopes:
-      follow: seguire, bloccare, sbloccare e smettere di seguire account
-      push: ricevi notifiche push per il tuo account
-      read: leggere le informazioni del tuo account
-      write: pubblicare post in tua vece
+      follow: modificare relazioni tra account
+      push: ricevere le tue notifiche push
+      read: leggere tutte le informazioni del tuo account
+      read:accounts: vedere informazioni sull'account
+      read:blocks: vedere i tuoi blocchi
+      read:favourites: vedere i tuoi preferiti
+      read:filters: vedere i tuoi filtri
+      read:follows: vedere i tuoi seguiti
+      read:lists: vedere le tue liste
+      read:mutes: vedere i tuoi silenziati
+      read:notifications: vedere le tue notifiche
+      read:reports: vedere i tuoi rapporti
+      read:search: fare ricerche per te
+      read:statuses: vedere tutti gli status
+      write: modificare tutti i dati del tuo account
+      write:accounts: modificare il tuo profilo
+      write:blocks: bloccare account e domini
+      write:favourites: segnare status come preferiti
+      write:filters: creare filtri
+      write:follows: seguire persone
+      write:lists: creare liste
+      write:media: caricare media
+      write:mutes: silenziare persone e conversazioni
+      write:notifications: cancellare le tue notifiche
+      write:statuses: pubblicare status
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index 9c9098976..76174ef79 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -114,7 +114,29 @@ ja:
       application:
         title: OAuth認証
     scopes:
-      follow: アカウントのフォロー, ブロック, ブロック解除, フォロー解除
-      push: アカウントへのプッシュ通知の受信
-      read: アカウントからのデータの読み取り
-      write: アカウントへのデータの書き込み
+      follow: アカウントのつながりを変更
+      push: プッシュ通知の受信
+      read: アカウントのすべてのデータの読み取り
+      read:accounts: アカウント情報の読み取り
+      read:blocks: ブロックの読み取り
+      read:favourites: お気に入りの読み取り
+      read:filters: フィルターの読み取り
+      read:follows: フォローの読み取り
+      read:lists: リストの読み取り
+      read:mutes: ミュートの読み取り
+      read:notifications: 通知の読み取り
+      read:reports: 通報の読み取り
+      read:search: あなたの代わりに検索
+      read:statuses: すべてのトゥートの読み取り
+      write: アカウントのすべてのデータの変更
+      write:accounts: プロフィールの変更
+      write:blocks: ユーザーのブロックやドメインの非表示
+      write:favourites: トゥートのお気に入り登録
+      write:filters: フィルターの変更
+      write:follows: フォローの変更
+      write:lists: リストの変更
+      write:media: メディアのアップロード
+      write:mutes: アカウントや会話のミュート
+      write:notifications: 通知の消去
+      write:reports: 通報の作成
+      write:statuses: トゥートの投稿
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index 996cdce7f..bf6d46f4b 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -115,7 +115,29 @@ nl:
       application:
         title: OAuth-autorisatie vereist
     scopes:
-      follow: accounts volgen, negeren en blokkeren
-      push: ontvang pushmeldingen voor jouw account
-      read: berichten lezen
-      write: berichten plaatsen
+      follow: relaties tussen accounts bewerken
+      push: ontvang jouw pushmeldingen
+      read: alle gegevens van jouw account lezen
+      read:accounts: zie informatie accounts
+      read:blocks: zie jouw geblokkeerde gebruikers
+      read:favourites: zie jouw favorieten
+      read:filters: zie jouw filters
+      read:follows: zie de accounts die jij volgt
+      read:lists: zie jouw lijsten
+      read:mutes: zie jouw genegeerde gebruikers
+      read:notifications: zie jouw meldingen
+      read:reports: zie jouw gerapporteerde toots
+      read:search: namens jou zoeken
+      read:statuses: zie alle toots
+      write: alle gegevens van jouw account bewerken
+      write:accounts: jouw profiel bewerken
+      write:blocks: accounts en domeinen blokkeren
+      write:favourites: toots als favoriet markeren
+      write:filters: filters aanmaken
+      write:follows: mensen volgen
+      write:lists: lijsten aanmaken
+      write:media: mediabestanden uploaden
+      write:mutes: mensen en gesprekken negeren
+      write:notifications: meldingen verwijderen
+      write:reports: andere mensen rapporteren
+      write:statuses: toots publiceren
diff --git a/config/locales/doorkeeper.oc.yml b/config/locales/doorkeeper.oc.yml
index 46060e49f..d97c2f600 100644
--- a/config/locales/doorkeeper.oc.yml
+++ b/config/locales/doorkeeper.oc.yml
@@ -114,7 +114,29 @@ oc:
       application:
         title: Cal una autorizacion OAuth
     scopes:
-      follow: sègre, blocar, quitar de blocar e quitar de sègre de comptes
-      push: recebre las notificacions push per vòstre compte
-      read: legir las donadas de vòstre compte
-      write: publicar per vos
+      follow: modificar las relacions del compte
+      push: recebre vòstras notificacions push
+      read: legir totas las donadas de vòstre compte
+      read:accounts: veire las informacions del compte
+      read:blocks: veire vòstres blocatges
+      read:favourites: veire vòstres favorits
+      read:filters: veire vòstres filtres
+      read:follows: veire vòstres abonaments
+      read:lists: veire vòstras listas
+      read:mutes: veire qual rescondètz
+      read:notifications: veire vòstras notificacions
+      read:reports: veire vòstres senhalaments
+      read:search: recercar per vos
+      read:statuses: veire los estatuts
+      write: modificar totas las donadas de vòstre compte
+      write:accounts: modificar vòstre perfil
+      write:blocks: blocar de comptes e de domenis
+      write:favourites: metre en favorit
+      write:filters: crear de filtres
+      write:follows: sègre de monde
+      write:lists: crear de listas
+      write:media: mandar de fichièrs mèdias
+      write:mutes: rescondre de monde e de conversacions
+      write:notifications: escafar vòstras notificacions
+      write:reports: senhalar de monde
+      write:statuses: publicar d’estatuts
diff --git a/config/locales/doorkeeper.sk.yml b/config/locales/doorkeeper.sk.yml
index eb70a1762..98597ca8b 100644
--- a/config/locales/doorkeeper.sk.yml
+++ b/config/locales/doorkeeper.sk.yml
@@ -114,7 +114,29 @@ sk:
       application:
         title: Požadovaná OAuth autorizácia
     scopes:
-      follow: sledovať, blokovať, povoliť a zušiť sledovanie účtov
-      push: dostávaj oboznámenia ohľadom tvojho účtu ako notifikácie na plochu
-      read: prezrieť dáta svojho účetu
-      write: poslať v tvojom mene
+      follow: uprav vzťahy svojho účtu
+      push: dostávaj oboznámenia ohľadom tvojho účtu na obrazovku
+      read: prezri si všetky dáta ohľadom svojho účetu
+      read:accounts: prezri si informácie o účte
+      read:blocks: prezri svoje bloky
+      read:favourites: prezri svoje obľúbené
+      read:filters: prezri svoje filtrovanie
+      read:follows: prezri si svoje sledovania
+      read:lists: prezri si svoje zoznamy
+      read:mutes: prezri svoje utíšenia
+      read:notifications: zhliadni svoje oboznámenia
+      read:reports: prezri svoje reporty
+      read:search: vyhľadvávaj v rámci seba
+      read:statuses: zhliadni všetky príspevky
+      write: upraviť všetky dáta tvojho účtu
+      write:accounts: uprav svoj profil
+      write:blocks: blokuj účty a domény
+      write:favourites: obľúbené príspevky
+      write:filters: vytvor roztriedenie
+      write:follows: následuj ľudí
+      write:lists: vytvor listy
+      write:media: nahraj mediálne súbory
+      write:mutes: stíš diskusie, aj zapojených užívateľov
+      write:notifications: vyčisti oboznámenia
+      write:reports: nahlás iných užívateľov
+      write:statuses: publikuj príspevky
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 4b2fe6075..11ba128c1 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -318,7 +318,7 @@ el:
         title: Δημοσίευση λίστας κόμβων που έχουν ανακαλυφθεί
       registrations:
         closed_message:
-          desc_html: Εμφανίζεται στην αρχική σελίδα όταν οι εγγραφές είναι κλειστές. Μπορείς να χρησιμοποιήσεις HTML tags
+          desc_html: Εμφανίζεται στην εισαγωγική σελίδα όταν οι εγγραφές είναι κλειστές. Μπορείς να χρησιμοποιήσεις HTML tags
           title: Μήνυμα κλεισμένων εγγραφών
         deletion:
           desc_html: Επέτρεψε σε οποιονδήποτε να διαγράψει το λογαριασμό του/της
@@ -699,7 +699,7 @@ el:
       ownership: Δεν μπορείς να καρφιτσώσεις μη δικό σου τουτ
       private: Τα μη δημόσια τουτ δεν καρφιτσώνονται
       reblog: Οι προωθήσεις δεν καρφιτσώνονται
-    show_more: Περισσότερα
+    show_more: Δείξε περισσότερα
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Μόνο ακόλουθοι
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index cc1148019..89ed2bbfb 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -316,6 +316,9 @@ fa:
       peers_api_enabled:
         desc_html: دامین‌هایی که این سرور به آن‌ها برخورده است
         title: انتشار فهرست سرورهای یافته‌شده
+      preview_sensitive_media:
+        desc_html: پیوند به سایت‌های دیگر پیش‌نمایشی خواهد داشت که یک تصویر کوچک را نشان می‌دهد، حتی اگر نوشته به عنوان حساس علامت‌گذاری شده باشد
+        title: نمایش تصاویر حساسیت‌برانگیز در پیش‌نمایش‌های OpenGraph
       registrations:
         closed_message:
           desc_html: وقتی امکان ثبت نام روی سرور فعال نباشد در صفحهٔ اصلی نمایش می‌یابد<br>می‌توانید HTML بنویسید
@@ -615,6 +618,7 @@ fa:
   remote_follow:
     acct: نشانی حساب username@domain خود را این‌جا بنویسید
     missing_resource: نشانی اینترنتی برای رسیدن به حساب شما پیدا نشد
+    no_account_html: هنوز عضو نیستید؟ <a href='%{sign_up_path}' target='_blank'>این‌جا می‌توانید حساب باز کنید</a>
     proceed: درخواست پیگیری
     prompt: 'شما قرار است این حساب را پیگیری کنید:'
   remote_unfollow:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 9638f2728..f1de0a7c7 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -316,6 +316,9 @@ gl:
       peers_api_enabled:
         desc_html: Nome de dominio que esta instancia atopou no fediverso
         title: Publicar lista de instancias descubertas
+      preview_sensitive_media:
+        desc_html: A vista previa de ligazóns de outros sitios web mostrará unha imaxe incluso si os medios están marcados como sensibles
+        title: Mostrar medios sensibles con vista previa OpenGraph
       registrations:
         closed_message:
           desc_html: Mostrado na páxina de portada cando o rexistro está pechado. Pode utilizar etiquetas HTML
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d37967f31..99fd5dd7b 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -316,6 +316,9 @@ ja:
       peers_api_enabled:
         desc_html: 連合内でこのインスタンスが遭遇したドメインの名前
         title: 接続しているインスタンスのリストを公開する
+      preview_sensitive_media:
+        desc_html: 他のウェブサイトにリンクを貼った際、メディアが閲覧注意としてマークされていてもサムネイルが表示されます
+        title: OpenGraphによるプレビューで閲覧注意のメディアも表示する
       registrations:
         closed_message:
           desc_html: 新規登録を停止しているときにフロントページに表示されます。HTMLタグが使えます
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 368d389ca..9b742d18b 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -318,6 +318,9 @@ ko:
       peers_api_enabled:
         desc_html: 이 인스턴스가 페디버스에서 만났던 도메인 네임들
         title: 발견 된 인스턴스들의 리스트 발행
+      preview_sensitive_media:
+        desc_html: 민감한 미디어로 설정되었더라도 다른 웹사이트에서 링크 미리보기에 썸네일을 보여줍니다
+        title: 민감한 미디어를 오픈그래프 미리보기에 보여주기
       registrations:
         closed_message:
           desc_html: 신규 등록을 받지 않을 때 프론트 페이지에 표시됩니다. HTML 태그를 사용할 수 있습니다
@@ -617,6 +620,7 @@ ko:
   remote_follow:
     acct: 아이디@도메인을 입력해 주십시오
     missing_resource: 리디렉션 대상을 찾을 수 없습니다
+    no_account_html: 계정이 없나요? <a href='%{sign_up_path}' target='_blank'>여기에서 가입 할 수 있습니다</a>
     proceed: 팔로우 하기
     prompt: '팔로우 하려 하고 있습니다:'
   remote_unfollow:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 1f47640a1..26a3b652b 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -145,8 +145,8 @@ nl:
       subscribe: Abonneren
       title: Accounts
       unconfirmed_email: Onbevestigd e-mailadres
-      undo_silenced: Niet meer negeren
-      undo_suspension: Niet meer opschorten
+      undo_silenced: Niet langer negeren
+      undo_suspension: Niet langer opschorten
       unsubscribe: Opzeggen
       username: Gebruikersnaam
       web: Webapp
@@ -232,8 +232,8 @@ nl:
           one: Eén account in de database aangepast
           other: "%{count} accounts in de database aangepast"
         retroactive:
-          silence: Alle genegeerde accounts van dit domein niet meer negeren
-          suspend: Alle opgeschorte accounts van dit domein niet meer opschorten
+          silence: Alle genegeerde accounts van dit domein niet langer negeren
+          suspend: Alle opgeschorte accounts van dit domein niet langer opschorten
         title: Domeinblokkade voor %{domain} ongedaan maken
         undo: Ongedaan maken
       title: Domeinblokkades
@@ -296,7 +296,7 @@ nl:
       suspend_account: Account opschorten
       target: Gerapporteerde account
       title: Gerapporteerde toots
-      unassign: Niet meer toewijzen
+      unassign: Niet langer toewijzen
       unresolved: Onopgelost
       updated_at: Bijgewerkt
       view: Weergeven
@@ -316,6 +316,9 @@ nl:
       peers_api_enabled:
         desc_html: Domeinnamen die deze server in de fediverse is tegengekomen
         title: Lijst van bekende servers publiceren
+      preview_sensitive_media:
+        desc_html: Linkvoorvertoningen op andere websites hebben een thumbnail, zelfs als een afbeelding of video als gevoelig is gemarkeerd
+        title: Gevoelige afbeeldingen en video's in OpenGraph-voorvertoningen tonen
       registrations:
         closed_message:
           desc_html: Wordt op de voorpagina weergegeven wanneer registratie van nieuwe accounts is uitgeschakeld<br>En ook hier kan je HTML gebruiken
@@ -474,6 +477,22 @@ nl:
     follows: Jij volgt
     mutes: Jij negeert
     storage: Mediaopslag
+  filters:
+    contexts:
+      home: Starttijdlijn
+      notifications: Meldingen
+      public: Openbare tijdlijnen
+      thread: Gesprekken
+    edit:
+      title: Filter bewerken
+    errors:
+      invalid_context: Geen of ongeldige context verstrekt
+      invalid_irreversible: Onomkeerbaar filteren werkt alleen met de starttijdlijn en meldingen
+    index:
+      delete: Verwijderen
+      title: Filters
+    new:
+      title: Nieuwe filter toevoegen
   followers:
     domain: Domein
     explanation_html: Wanneer je de privacy van jouw toots wilt garanderen, moet je goed weten wie jouw volgers zijn. <strong>Toots die alleen aan jouw volgers zijn gericht, worden aan de Mastodonservers van jouw volgers afgeleverd.</strong> Daarom wil je ze misschien controleren en desnoods volgers verwijderen die zich op een Mastodonserver bevinden die jij niet vertrouwd. Bijvoorbeeld omdat de beheerder(s) of de software van zo'n server jouw privacy niet respecteert.
@@ -484,7 +503,7 @@ nl:
       one: Bezig om volgers van één domein te verwijderen...
       other: Bezig om volgers van %{count} domeinen te verwijderen...
     true_privacy_html: Hou er wel rekening mee dat <strong>echte privacy alleen gegarandeerd kan worden met behulp van end-to-end-encryptie</strong>.
-    unlocked_warning_html: Iedereen kan jou volgen en daarmee meteen toots zien die je alleen aan volgers hebt gericht. %{lock_link} om volgers te kunnen beoordelen en desnoods te weigeren.
+    unlocked_warning_html: Iedereen kan jou volgen en daarmee meteen toots zien die je alleen aan jouw volgers hebt gericht. %{lock_link} om volgers te kunnen beoordelen en desnoods te weigeren.
     unlocked_warning_title: Jouw account is niet besloten
   generic:
     changes_saved_msg: Wijzigingen succesvol opgeslagen!
@@ -599,6 +618,7 @@ nl:
   remote_follow:
     acct: Geef jouw account@domein.tld op waarvandaan je wilt volgen
     missing_resource: Kon vereiste doorverwijzings-URL voor jouw account niet vinden
+    no_account_html: Heb je geen account? Je kunt er <a href='%{sign_up_path}' target='_blank'>hier een registreren</a>
     proceed: Ga door om te volgen
     prompt: 'Jij gaat volgen:'
   remote_unfollow:
@@ -687,7 +707,7 @@ nl:
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Alleen volgers
-      private_long: Alleen aan volgers tonen
+      private_long: Alleen aan jouw volgers tonen
       public: Openbaar
       public_long: Aan iedereen tonen, ook op openbare tijdlijnen
       unlisted: Minder openbaar
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 90ae75053..07486ad27 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -317,6 +317,9 @@ oc:
       peers_api_enabled:
         desc_html: Noms de domeni qu’aquesta instància a trobats pel fediverse
         title: Publica la lista de las instàncias conegudas
+      preview_sensitive_media:
+        desc_html: Los apercebuts dels ligams sus los autres sites mostraràn una vinheta encara que lo mèdia siá marcat coma sensible
+        title: Mostrar los mèdias sensibles dins los apercebuts OpenGraph
       registrations:
         closed_message:
           desc_html: Afichat sus las pagina d’acuèlh quand las inscripcions son tampadas.<br>Podètz utilizar de balisas HTML
@@ -338,7 +341,7 @@ oc:
         title: Mostrar lo badge personal
       site_description:
         desc_html: Afichada jos la forma de paragraf sus la pagina d’acuèlh e utilizada coma balisa meta. Podètz utilizar de balisas HTML, en particular <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
-        title: Descripcion del site
+        title: Descripcion de l’instància
       site_description_extended:
         desc_html: Afichada sus la pagina d’informacion complementària del site<br>Podètz utilizar de balisas HTML
         title: Descripcion espandida del site
@@ -387,7 +390,7 @@ oc:
     view_status: Veire los estatuts
   applications:
     created: Aplicacion ben creada
-    destroyed: Aplication ben suprimida
+    destroyed: Aplication corrcètament suprimida
     invalid_url: L’URL donada es invalida
     regenerate_token: Tornar generar lo geton d’accès
     token_regenerated: Geton d’accès ben regenerat
@@ -672,6 +675,7 @@ oc:
   remote_follow:
     acct: Picatz vòstre utilizaire@instància que cal utilizar per sègre aqueste utilizaire
     missing_resource: URL de redireccion pas trobada
+    no_account_html: Avètz pas cap de compte ? Podètz <a href='%{sign_up_path}' target='_blank'>vos marcar aquí</a>
     proceed: Clicatz per sègre
     prompt: 'Sètz per sègre :'
   remote_unfollow:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 99c1dfe1e..1ce256da3 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -316,6 +316,9 @@ pt-BR:
       peers_api_enabled:
         desc_html: Nomes de domínio que essa instância encontrou no fediverso
         title: Publicar lista de instâncias descobertas
+      preview_sensitive_media:
+        desc_html: A pré-visualização do link em outros sites vai incluir uma miniatura mesmo se a mídia estiver marcada como sensível
+        title: Mostrar mídia sensível em pré-visualizações OpenGraph
       registrations:
         closed_message:
           desc_html: Exibido na página inicial quando cadastros estão fechados. Você pode usar tags HTML
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index d0dda5334..5c0c0a57c 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -19,6 +19,7 @@ ar:
         note:
           one: <span class="note-counter">1</span> حرف باق
           other: <span class="note-counter">%{count}</span> حرف باق
+        scopes: ما هي المجالات المسموح بها في التطبيق ؟ إن قمت باختيار أعلى المجالات فيمكنك الإستغناء عن الخَيار اليدوي.
         setting_default_language: يمكن الكشف التلقائي للّغة اللتي استخدمتها في تحرير تبويقاتك ، غيرَ أنّ العملية ليست دائما دقيقة
         setting_hide_network: الحسابات التي تُتابعها و التي تُتابِعك على حد سواء لن تُعرَض على صفحتك الشخصية
         setting_noindex: ذلك يؤثر على حالة ملفك الشخصي و صفحاتك
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
new file mode 100644
index 000000000..e8e7628f3
--- /dev/null
+++ b/config/locales/simple_form.cs.yml
@@ -0,0 +1,10 @@
+---
+cs:
+  simple_form:
+    hints:
+      defaults:
+        avatar: PNG, GIF či JPG. Maximálně 2 MB. Bude zmenšena na 400x400px
+        bot: Tento účet provádí hlavně automatizované akce a nemusí být spravován.
+        display_name:
+          one: Zbývá <span class="name-counter">1</span> znak
+          other: Zbývá <span class="name-counter">%{count}</span> znaků
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index aaa556fa1..07862e8a8 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -20,6 +20,7 @@ da:
           one: <span class="note-counter">1</span> tegn tilbage
           other: <span class="note-counter">%{count}</span> tegn tilbage
         phrase: Vil blive parret uanset om der er store eller små bogstaver i teksten eller om der er en advarsel om en toot
+        scopes: Hvilke APIs applikationen vil få adgang til. Hvis du vælger et højtlevel omfang, behøver du ikke vælge enkeltstående.
         setting_default_language: Sproget for dine toots kan blive fundet automatisk, men det er ikke altid præcist
         setting_hide_network: Hvem du følger og hvem der følger dig vil ikke blive vist på din profil
         setting_noindex: Påvirker din offentlige profil og status sider
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 273103fd6..fb8d9e7c7 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -6,17 +6,21 @@ de:
         autofollow: Leute die sich über deine Einladung registrieren werden dir automatisch folgen
         avatar: PNG, GIF oder JPG. Maximal 2 MB. Wird auf 400×400 px herunterskaliert
         bot: Dieses Konto führt lediglich automatisierte Aktionen durch und wird möglicherweise nicht überwacht
+        context: Ein oder mehrere Aspekte, wo der Filter greifen soll
         digest: Wenn du lange Zeit inaktiv bist, wird dir eine Zusammenfassung von Erwähnungen in deiner Abwesenheit zugeschickt
         display_name:
           one: <span class="name-counter">1</span> Zeichen verbleibt
           other: <span class="name-counter">%{count}</span> Zeichen verbleiben
         fields: Du kannst bis zu 4 Elemente als Tabelle dargestellt auf deinem Profil anzeigen lassen
         header: PNG, GIF oder JPG. Maximal 2 MB. Wird auf 700×335 px herunterskaliert
+        irreversible: Gefilterte Beiträge werden unwiderruflich gefiltert, selbst wenn der Filter später entfernt wurde
         locale: Die Sprache der Oberfläche, E-Mails und Push-Benachrichtigungen
         locked: Wer dir folgen möchte, muss um deine Erlaubnis bitten
         note:
           one: <span class="note-counter">1</span> Zeichen verbleibt
           other: <span class="note-counter">%{count}</span> Zeichen verbleiben
+        phrase: Wird unabhängig vom umgebenen Text oder Inhaltswarnung eines Beitrags verglichen
+        scopes: Welche Schnittstellen der Applikation erlaubt sind. Wenn du einen Top-Level-Scope auswählst, dann musst du nicht jeden einzelnen darunter auswählen.
         setting_default_language: Die Sprache der Beiträge kann automatisch erkannt werden, aber dies ist nicht immer genau
         setting_hide_network: Wem du folgst und wer dir folgt wird in deinem Profil nicht angezeigt
         setting_noindex: Betrifft dein öffentliches Profil und deine Beiträge
@@ -39,6 +43,7 @@ de:
         chosen_languages: Sprachen filtern
         confirm_new_password: Neues Passwort bestätigen
         confirm_password: Passwort bestätigen
+        context: Aspekte filtern
         current_password: Derzeitiges Passwort
         data: Daten
         display_name: Anzeigename
@@ -46,6 +51,7 @@ de:
         expires_in: Gültig bis
         fields: Profil-Metadaten
         header: Kopfbild
+        irreversible: Fallen lassen anstatt es zu verstecken
         locale: Sprache der Benutzeroberfläche
         locked: Gesperrtes Profil
         max_uses: Maximale Verwendungen
@@ -53,6 +59,7 @@ de:
         note: Über mich
         otp_attempt: Zwei-Faktor-Authentisierungs-Code
         password: Passwort
+        phrase: Schlagwort oder Phrase
         setting_auto_play_gif: Animierte GIFs automatisch abspielen
         setting_boost_modal: Bestätigungsdialog anzeigen, bevor ein Beitrag geteilt wird
         setting_default_language: Beitragssprache
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 0954ed4b9..00fba5d27 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -20,6 +20,7 @@ el:
           one: απομένει <span class="note-counter">1</span> χαρακτήρας
           other: απομένουν <span class="note-counter">%{count}</span> χαρακτήρες
         phrase: Θα ταιριάζει ανεξαρτήτως πεζών/κεφαλαίων ή προειδοποίησης περιεχομένου του τουτ
+        scopes: Ποια API θα επιτρέπεται στην εφαρμογή να χρησιμοποιήσεις. Αν επιλέξεις κάποιο υψηλό εύρος εφαρμογής, δε χρειάζεται να επιλέξεις και εξειδικευμένα.
         setting_default_language: Η γλώσσα των τουτ σου μπορεί να ανιχνευτεί αυτόματα αλλά δεν είναι πάντα ακριβές
         setting_hide_network: Το ποιους ακολουθείς και το ποιοι σε ακολουθούν δε θα φαίνεται στο προφίλ σου
         setting_noindex: Επηρεάζει το δημόσιο προφίλ και τις δημοσιεύσεις σου
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 852e49d05..e510bd155 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -20,6 +20,7 @@ fr:
           one: <span class="note-counter">1</span> caractère restant
           other: <span class="note-counter">%{count}</span> caractères restants
         phrase: Sera trouvé sans que la case ou l'avertissement de contenu du pouet soit pris en compte
+        scopes: À quelles APIs l'application sera autorisée à accéder. Si vous sélectionnez un périmètre de haut-niveau, vous n'avez pas besoin de sélectionner les individuels.
         setting_default_language: La langue de vos pouets peut être détectée automatiquement, mais ça n'est pas toujours pertinent
         setting_hide_network: Ceux que vous suivez et ceux qui vous suivent ne seront pas affichés sur votre profil
         setting_noindex: Affecte votre profil public ainsi que vos statuts
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 6401671a7..25694395d 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -20,6 +20,7 @@ gl:
           one: <span class="note-counter">1</span> caracter restante
           other: <span class="note-counter">%{count}</span> caracteres restantes
         phrase: Concordará independentemente das maiúsculas ou avisos de contido no toot
+        scopes: A que APIs terá acceso a aplicación. Si selecciona un ámbito de alto nivel, non precisa seleccionar elementos individuais.
         setting_default_language: Pódese detectar automáticamente o idioma dos seus toots, mais non sempre é preciso
         setting_hide_network: Non se mostrará no seu perfil quen a segue e quen a está a seguir
         setting_noindex: Afecta ao seu perfil público e páxinas de estado
@@ -27,7 +28,7 @@ gl:
       imports:
         data: Ficheiro CSV exportado desde outra instancia Mastodon
       sessions:
-        otp: Introduza o código de doble-factor xerado no aplicativo do seu móbil ou utilice un dos seus códigos de recuperación.
+        otp: 'Introduza o código de doble-factor xerado no aplicativo do seu móbil ou utilice un dos seus códigos de recuperación:'
       user:
         chosen_languages: Si se marca, só os toots nos idiomas seleccionados serán mostrados en liñas temporais públicas
     labels:
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 6e4df665e..185bba205 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -20,6 +20,7 @@ it:
           one: <span class="note-counter">1</span> carattere rimanente
           other: <span class="note-counter">%{count}</span> caratteri rimanenti
         phrase: Il confronto sarà eseguito ignorando minuscole/maiuscole e i content warning
+        scopes: A quali API l'applicazione potrà avere accesso. Se selezionate un ambito di alto livello, non c'è bisogno di selezionare quelle singole.
         setting_default_language: La lingua dei tuoi toot può essere individuata automaticamente, ma il risultato non è sempre accurato
         setting_hide_network: Chi segui e chi segue te non saranno mostrati sul tuo profilo
         setting_noindex: Ha effetto sul tuo profilo pubblico e sulle pagine degli status
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index af574ac01..f691ea814 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -6,7 +6,7 @@ ja:
         autofollow: 招待から登録した人が自動的にあなたをフォローするようになります
         avatar: 2MBまでのPNG、GIF、JPGが利用可能です。400x400pxまで縮小されます
         bot: このアカウントは主に自動で動作し、人が見ていない可能性があります
-        context: フィルターを適用する対象
+        context: フィルターを適用する対象 (複数選択可)
         digest: 長期間使用していない場合と不在時に返信を受けた場合のみ送信されます
         display_name: あと<span class="name-counter">%{count}</span>文字入力できます。
         fields: プロフィールに表として4つまでの項目を表示することができます
@@ -16,6 +16,7 @@ ja:
         locked: フォロワーを手動で承認する必要があります
         note: あと<span class="note-counter">%{count}</span>文字入力できます。
         phrase: トゥートの大文字小文字や閲覧注意に関係なく一致
+        scopes: アプリの API に許可するアクセス権を選択してください。最上位のスコープを選択する場合、個々のスコープを選択する必要はありません。
         setting_default_language: トゥートの言語は自動的に検出されますが、必ずしも正確とは限りません
         setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします
         setting_noindex: 公開プロフィールおよび各投稿ページに影響します
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 591a9f2d9..eb13ec195 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -6,17 +6,21 @@ nl:
         autofollow: Mensen die zich via de uitnodiging hebben geregistreerd, volgen jou automatisch
         avatar: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 400x400px
         bot: Dit is een geautomatiseerd account en wordt mogelijk niet gemonitord
+        context: Een of meerdere locaties waar de filter actief moet zijn
         digest: Wordt alleen na een lange periode van inactiviteit verzonden en alleen wanneer je tijdens jouw afwezigheid persoonlijke berichten hebt ontvangen
         display_name:
           one: <span class="name-counter">1</span> teken over
           other: <span class="name-counter">%{count}</span> tekens over
         fields: Je kan maximaal 4 items als een tabel op je profiel weergeven
         header: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 700x335px
+        irreversible: Gefilterde toots verdwijnen onomkeerbaar, zelfs als de filter later wordt verwijderd
         locale: De taal van de gebruikersomgeving, e-mails en pushmeldingen
         locked: Vereist dat je handmatig volgers moet accepteren
         note:
           one: <span class="note-counter">1</span> teken over
           other: <span class="note-counter">%{count}</span> tekens over
+        phrase: Komt overeen ongeacht hoofd-/kleine letters of tekstwaarschuwingen
+        scopes: Tot welke API's heeft de toepassing toegang. Wanneer je een toestemming van het bovenste niveau kiest, hoef je geen individuele toestemmingen meer te kiezen.
         setting_default_language: De taal van jouw toots kan automatisch worden gedetecteerd, maar het is niet altijd accuraat
         setting_hide_network: Wie jij volgt en wie jou volgen wordt niet op jouw profiel getoond
         setting_noindex: Heeft invloed op jouw openbare profiel en toots
@@ -39,6 +43,7 @@ nl:
         chosen_languages: Talen filteren
         confirm_new_password: Nieuw wachtwoord bevestigen
         confirm_password: Wachtwoord bevestigen
+        context: Filterlocaties
         current_password: Huidig wachtwoord
         data: Gegevens
         display_name: Weergavenaam
@@ -46,6 +51,7 @@ nl:
         expires_in: Vervalt na
         fields: Metadata profiel
         header: Omslagfoto
+        irreversible: Verwijderen in plaats van verbergen
         locale: Taal van de gebruikersomgeving
         locked: Maak account besloten
         max_uses: Max. aantal keer te gebruiken
@@ -53,10 +59,11 @@ nl:
         note: Bio
         otp_attempt: Tweestaps-aanmeldcode
         password: Wachtwoord
+        phrase: Trefwoord of zinsdeel
         setting_auto_play_gif: Speel geanimeerde GIF's automatisch af
         setting_boost_modal: Vraag voor het boosten van een toot een bevestiging
         setting_default_language: Taal van jouw toots
-        setting_default_privacy: Zichtbaarheid toots
+        setting_default_privacy: Standaardzichtbaarheid van jouw toots
         setting_default_sensitive: Media altijd als gevoelig markeren
         setting_delete_modal: Vraag voor het verwijderen van een toot een bevestiging
         setting_display_sensitive_media: Als gevoelig gemarkeerde media altijd tonen
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index 5a3eb8c7c..7d11d0d3f 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -20,6 +20,7 @@ oc:
           one: Demòra encara <span class="name-counter">1</span> caractèr
           other: Demòran encara <span class="name-counter">%{count}</span> caractèrs
         phrase: Serà pres en compte que siá en majuscula o minuscula o dins un avertiment de contengut sensible
+        scopes: A quinas APIs poiràn accedir las aplicacions. Se seleccionatz un encastre de naut nivèl, fa pas mestièr de seleccionar los nivèls mai basses.
         setting_default_language: La lenga de vòstres tuts pòt èsser detectada automaticament, mas de còps es pas corrèctament determinada
         setting_hide_network: Vòstre perfil mostrarà pas los que vos sègon e lo monde que seguètz
         setting_noindex: Aquò es destinat a vòstre perfil public e vòstra pagina d’estatuts
@@ -44,7 +45,7 @@ oc:
         confirm_password: Confirmatz lo nòu senhal
         context: Contèxte del filtre
         current_password: Senhal actual
-        data: Data
+        data: Donadas
         display_name: Escais
         email: Corrièl
         expires_in: Expira aprèp
@@ -64,16 +65,16 @@ oc:
         setting_default_language: Lenga de publicacion
         setting_default_privacy: Confidencialitat de las publicacions
         setting_default_sensitive: Totjorn marcar los mèdias coma sensibles
-        setting_delete_modal: Afichar una fenèstra de confirmacion abans de suprimir un estatut
+        setting_delete_modal: Mostrar una fenèstra de confirmacion abans de suprimir un estatut
         setting_display_sensitive_media: Totjorn mostrar los mèdias coma sensibles
         setting_hide_network: Amagar vòstre malhum
         setting_noindex: Èsser pas indexat pels motors de recèrca
         setting_reduce_motion: Reduire la velocitat de las animacions
         setting_system_font_ui: Utilizar la polissa del sisèma
         setting_theme: Tèma del site
-        setting_unfollow_modal: Afichar una confirmacion abans de quitar de sègre qualqu’un
+        setting_unfollow_modal: Mostrar una confirmacion abans de quitar de sègre qualqu’un
         severity: Severitat
-        type: Tip d’impòrt
+        type: Tipe d’impòrt
         username: Nom d’utilizaire
         username_or_email: Nom d’utilizaire o corrièl
       interactions:
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 7f316a767..9b72c7a7a 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -20,6 +20,7 @@ pt-BR:
           one: <span class="note-counter">1</span> caracter restante
           other: <span class="note-counter">%{count}</span> caracteres restantes
         phrase: Vai coincidir, independente de maiúsculas ou minúsculas, no texto ou no aviso de conteúdo de um toot
+        scopes: Quais APIs a aplicação vai ter permissão de acessar. Se você selecionar um escopo de alto nível, você não precisa selecionar individualmente os outros.
         setting_default_language: O idioma de seus toots pode ser detectado automaticamente, mas isso nem sempre é preciso
         setting_hide_network: Quem você segue e quem segue você não serão exibidos no seu perfil
         setting_noindex: Afeta seu perfil público e as páginas de suas postagens
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index 74eacf08e..39fa3b833 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -22,6 +22,7 @@ sk:
           one: Ostáva ti <span class="note-counter">1</span> znak
           other: Ostáva ti <span class="note-counter">%{count}</span> znakov
         phrase: Zhoda sa nájde nezávisle od toho, či je text napísaný, veľkými, alebo malými písmenami, či už v tele, alebo v hlavičke
+        scopes: Ktoré API budú povolené aplikácii pre prístup. Ak vyberieš vrcholný stupeň, nemusíš už potom vyberať po jednom.
         setting_default_language: Jazyk tvojích príspevkov môže byť zistený automaticky, ale nieje to vždy presné
         setting_hide_network: Koho následuješ, a kto následuje teba nebude zobrazené na tvojom profile
         setting_noindex: Ovplyvňuje verejný profil a statusy
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 2e6f7af2d..9921eb525 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -317,6 +317,9 @@ sk:
       peers_api_enabled:
         desc_html: Domény na ktoré táto instancia už vo fediverse natrafila
         title: Zverejniť zoznam objavených instancií
+      preview_sensitive_media:
+        desc_html: Náhľad adresy z iných instancií, bude zobrazený aj vtedy, keď sú dané médiá označené ako senzitívne
+        title: Ukazuj aj chúlostivé médiá v náhľadoch OpenGraph
       registrations:
         closed_message:
           desc_html: Toto sa zobrazí na hlavnej stránke v prípade že sú registrácie uzavreté. Možno tu použiť aj HTML kód
@@ -620,6 +623,7 @@ sk:
   remote_follow:
     acct: Napíš svoju prezývku@doménu z ktorej chceš následovať
     missing_resource: Nemôžeme nájsť potrebnú presmerovaciu adresu k tvojmu účtu
+    no_account_html: Nemáš ešte účet? Môžeš sa <a href='%{sign_up_path}' target='_blank'>zaregistrovať tu</a>
     proceed: Začni následovať
     prompt: 'Budeš sledovať:'
   remote_unfollow:
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 60739d40e..62e55d32d 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -21,7 +21,7 @@ module Mastodon
     end
 
     def flags
-      'rc2'
+      ''
     end
 
     def to_a
author	Thibaut Girka <thib@sitedethib.com>	2018-07-11 17:57:08 +0200
committer	Thibaut Girka <thib@sitedethib.com>	2018-07-11 17:57:08 +0200
commit	6f0f583abeb34737f01defab5cdee7b626447f5e (patch)
tree	c6cad9011fd1900dc1062b67b0db400418832ce8
parent	612b00d1bb91c6b11f00fdb273dd8cd2ca883b12 (diff)
parent	7ac5151b74510aa82b07e349373bd442176e1e94 (diff)