about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--app/javascript/mastodon/locales/ja.json2
-rw-r--r--app/javascript/mastodon/locales/nl.json4
-rw-r--r--app/javascript/mastodon/locales/sk.json8
-rw-r--r--app/javascript/mastodon/locales/te.json594
-rw-r--r--app/javascript/mastodon/locales/zh-HK.json2
-rw-r--r--app/javascript/mastodon/locales/zh-TW.json236
-rw-r--r--config/locales/ca.yml6
-rw-r--r--config/locales/de.yml1
-rw-r--r--config/locales/devise.sk.yml2
-rw-r--r--config/locales/devise.zh-TW.yml40
-rw-r--r--config/locales/doorkeeper.sk.yml2
-rw-r--r--config/locales/doorkeeper.zh-TW.yml33
-rw-r--r--config/locales/eu.yml1
-rw-r--r--config/locales/gl.yml1
-rw-r--r--config/locales/it.yml2
-rw-r--r--config/locales/ms.yml7
-rw-r--r--config/locales/nl.yml6
-rw-r--r--config/locales/oc.yml22
-rw-r--r--config/locales/simple_form.de.yml16
-rw-r--r--config/locales/simple_form.eo.yml8
-rw-r--r--config/locales/simple_form.eu.yml8
-rw-r--r--config/locales/simple_form.fa.yml8
-rw-r--r--config/locales/simple_form.fr.yml8
-rw-r--r--config/locales/simple_form.gl.yml8
-rw-r--r--config/locales/simple_form.it.yml8
-rw-r--r--config/locales/simple_form.sk.yml4
-rw-r--r--config/locales/simple_form.zh-HK.yml10
-rw-r--r--config/locales/simple_form.zh-TW.yml91
-rw-r--r--config/locales/sk.yml10
-rw-r--r--config/locales/zh-HK.yml4
-rw-r--r--config/locales/zh-TW.yml636
31 files changed, 1184 insertions, 604 deletions
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index b7613b87a..bb43df44e 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -116,7 +116,7 @@
   "follow_request.reject": "拒否",
   "getting_started.developers": "開発",
   "getting_started.documentation": "ドキュメント",
-  "getting_started.find_friends": "Twitterでの友達を探す",
+  "getting_started.find_friends": "Twitterの友達を探す",
   "getting_started.heading": "スタート",
   "getting_started.invite": "招待",
   "getting_started.open_source_notice": "Mastodonはオープンソースソフトウェアです。誰でもGitHub({github})から開発に参加したり、問題を報告したりできます。",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 891e5b45b..a6cba4b47 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -170,12 +170,12 @@
   "navigation_bar.edit_profile": "Profiel bewerken",
   "navigation_bar.favourites": "Favorieten",
   "navigation_bar.follow_requests": "Volgverzoeken",
-  "navigation_bar.info": "Uitgebreide informatie",
+  "navigation_bar.info": "Over deze server",
   "navigation_bar.keyboard_shortcuts": "Sneltoetsen",
   "navigation_bar.lists": "Lijsten",
   "navigation_bar.logout": "Afmelden",
   "navigation_bar.mutes": "Genegeerde gebruikers",
-  "navigation_bar.personal": "Personal",
+  "navigation_bar.personal": "Persoonlijk",
   "navigation_bar.pins": "Vastgezette toots",
   "navigation_bar.preferences": "Instellingen",
   "navigation_bar.public_timeline": "Globale tijdlijn",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index efe0a2f30..648e5c598 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -75,11 +75,11 @@
   "compose_form.spoiler_placeholder": "Sem napíšte vaše varovanie",
   "confirmation_modal.cancel": "Zrušiť",
   "confirmations.block.confirm": "Blokovať",
-  "confirmations.block.message": "Ste si istý, že chcete blokovať {name}?",
+  "confirmations.block.message": "Si si istý, že chcete blokovať {name}?",
   "confirmations.delete.confirm": "Zmazať",
-  "confirmations.delete.message": "Naozaj chcete vymazať túto správu?",
+  "confirmations.delete.message": "Si si naozaj istá/ý, že chceš vymazať túto správu?",
   "confirmations.delete_list.confirm": "Vymazať",
-  "confirmations.delete_list.message": "Ste si istý/á, že chceťe navždy vymazať tento zoznam?",
+  "confirmations.delete_list.message": "Si si istý/á, že chceš navždy vymazať tento zoznam?",
   "confirmations.domain_block.confirm": "Skryť celú doménu",
   "confirmations.domain_block.message": "Si si naozaj istý, že chceš blokovať celú {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych používateľov, čo sa doporučuje. Neuvidíš obsah z tejto domény v žiadnej verejnej časovej osi, ani v oznámeniach. Tvoji následovníci pochádzajúci z tejto domény budú odstránení.",
   "confirmations.mute.confirm": "Ignoruj",
@@ -119,7 +119,7 @@
   "getting_started.find_friends": "Nájdi priateľov z Twitteru",
   "getting_started.heading": "Začni tu",
   "getting_started.invite": "Pozvať ľudí",
-  "getting_started.open_source_notice": "Mastodon má otvorený kód. Nahlásiť chyby, alebo prispieť môžeš na GitHube v {github}.",
+  "getting_started.open_source_notice": "Mastodon je softvér s otvoreným kódom. Nahlásiť chyby, alebo prispievať môžeš na GitHube v {github}.",
   "getting_started.security": "Zabezpečenie",
   "getting_started.terms": "Podmienky prevozu",
   "home.column_settings.advanced": "Pokročilé",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 74fe732e1..a89734ce6 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -1,309 +1,309 @@
 {
-  "account.badges.bot": "Bot",
-  "account.block": "Block @{name}",
-  "account.block_domain": "Hide everything from {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",
+  "account.badges.bot": "బాట్",
+  "account.block": "@{name} ను బ్లాక్ చేయి",
+  "account.block_domain": "{domain} నుంచి అన్నీ దాచిపెట్టు",
+  "account.blocked": "బ్లాక్ అయినవి",
+  "account.direct": "@{name}కు నేరుగా సందేశం పంపు",
+  "account.disclaimer_full": "క్రింది సమాచారం వాడుకరి యొక్క ప్రొఫైల్ను అసంపూర్తిగా ప్రతిబింబించవచ్చు.",
+  "account.domain_blocked": "డొమైన్ దాచిపెట్టబడినది",
+  "account.edit_profile": "ప్రొఫైల్ని సవరించండి",
+  "account.follow": "అనుసరించు",
+  "account.followers": "అనుచరులు",
+  "account.follows": "అనుసరిస్తున్నవి",
+  "account.follows_you": "మిమ్మల్ని అనుసరిస్తున్నారు",
+  "account.hide_reblogs": "@{name} నుంచి బూస్ట్ లను దాచిపెట్టు",
+  "account.media": "మీడియా",
+  "account.mention": "@{name}ను ప్రస్తావించు",
+  "account.moved_to": "{name} ఇక్కడికి మారారు:",
+  "account.mute": "@{name}ను మ్యూట్ చెయ్యి",
+  "account.mute_notifications": "@{name}నుంచి ప్రకటనలను మ్యూట్ చెయ్యి",
+  "account.muted": "మ్యూట్ అయినవి",
+  "account.posts": "టూట్లు",
+  "account.posts_with_replies": "టూట్లు మరియు ప్రత్యుత్తరములు",
+  "account.report": "@{name}పై ఫిర్యాదుచేయు",
+  "account.requested": "ఆమోదం కోసం వేచి ఉంది. అభ్యర్థనను రద్దు చేయడానికి క్లిక్ చేయండి",
+  "account.share": "@{name} యొక్క ప్రొఫైల్ను పంచుకోండి",
+  "account.show_reblogs": "@{name}నుంచి బూస్ట్ లను చూపించు",
+  "account.unblock": "@{name}పై బ్లాక్ ను తొలగించు",
+  "account.unblock_domain": "{domain}ను దాచవద్దు",
+  "account.unfollow": "అనుసరించవద్దు",
+  "account.unmute": "@{name}పై మ్యూట్ ని తొలగించు",
+  "account.unmute_notifications": "@{name} నుంచి ప్రకటనలపై మ్యూట్ ని తొలగించు",
+  "account.view_full_profile": "పూర్తి ప్రొఫైల్ను చూడండి",
+  "alert.unexpected.message": "అనుకోని తప్పు జరిగినది.",
+  "alert.unexpected.title": "అయ్యో!",
+  "boost_modal.combo": "మీరు తదుపరిసారి దీనిని దాటవేయడానికి {combo} నొక్కవచ్చు",
+  "bundle_column_error.body": "ఈ భాగం లోడ్ అవుతున్నప్పుడు ఏదో తప్పు జరిగింది.",
+  "bundle_column_error.retry": "మళ్ళీ ప్రయత్నించండి",
+  "bundle_column_error.title": "నెట్వర్క్ లోపం",
+  "bundle_modal_error.close": "మూసివేయు",
+  "bundle_modal_error.message": "ఈ భాగం లోడ్ అవుతున్నప్పుడు ఏదో తప్పు జరిగింది.",
+  "bundle_modal_error.retry": "మళ్ళీ ప్రయత్నించండి",
+  "column.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
+  "column.community": "స్థానిక కాలక్రమం",
+  "column.direct": "ప్రత్యక్ష సందేశాలు",
+  "column.domain_blocks": "దాచిన డొమైన్లు",
+  "column.favourites": "ఇష్టపడినవి",
+  "column.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు",
+  "column.home": "హోమ్",
+  "column.lists": "జాబితాలు",
+  "column.mutes": "మ్యూట్ చేయబడిన వినియోగదారులు",
+  "column.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 visible 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",
+  "column.public": "సమాఖ్య కాలక్రమం",
+  "column_back_button.label": "వెనక్కి",
+  "column_header.hide_settings": "అమర్పులను దాచిపెట్టు",
+  "column_header.moveLeft_settings": "నిలువు వరుసను ఎడమకి తరలించు",
+  "column_header.moveRight_settings": "నిలువు వరుసను కుడికి తరలించు",
+  "column_header.pin": "అతికించు",
+  "column_header.show_settings": "అమర్పులను చూపించు",
+  "column_header.unpin": "పీకివేయు",
+  "column_subheading.settings": "అమర్పులు",
+  "community.column_settings.media_only": "మీడియా మాత్రమే",
+  "compose_form.direct_message_warning": "ఈ టూట్ పేర్కొన్న వినియోగదారులకు మాత్రమే పంపబడుతుంది.",
+  "compose_form.direct_message_warning_learn_more": "మరింత తెలుసుకోండి",
+  "compose_form.hashtag_warning": "ఈ టూట్ అన్లిస్టెడ్ కాబట్టి ఏ హాష్ ట్యాగ్ క్రిందకూ రాదు. పబ్లిక్ టూట్ లను మాత్రమే హాష్ ట్యాగ్ ద్వారా శోధించవచ్చు.",
+  "compose_form.lock_disclaimer": "మీ ఖాతా {locked} చేయబడలేదు. ఎవరైనా మిమ్మల్ని అనుసరించి మీ అనుచరులకు-మాత్రమే పోస్ట్లను వీక్షించవచ్చు.",
+  "compose_form.lock_disclaimer.lock": "బిగించబడినది",
+  "compose_form.placeholder": "మీ మనస్సులో ఏమి ఉంది?",
+  "compose_form.publish": "టూట్",
   "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.",
-  "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",
+  "compose_form.sensitive.marked": "మీడియా సున్నితమైనదిగా గుర్తించబడింది",
+  "compose_form.sensitive.unmarked": "మీడియా సున్నితమైనదిగా గుర్తించబడలేదు",
+  "compose_form.spoiler.marked": "హెచ్చరిక వెనుక పాఠ్యం దాచబడింది",
+  "compose_form.spoiler.unmarked": "పాఠ్యం దాచబడలేదు",
+  "compose_form.spoiler_placeholder": "ఇక్కడ మీ హెచ్చరికను రాయండి",
+  "confirmation_modal.cancel": "రద్దు చెయ్యి",
+  "confirmations.block.confirm": "బ్లాక్ చేయి",
+  "confirmations.block.message": "మీరు ఖచ్చితంగా {name}ని బ్లాక్ చేయాలనుకుంటున్నారా?",
+  "confirmations.delete.confirm": "తొలగించు",
+  "confirmations.delete.message": "మీరు ఖచ్చితంగా ఈ స్టేటస్ ని తొలగించాలనుకుంటున్నారా?",
+  "confirmations.delete_list.confirm": "తొలగించు",
+  "confirmations.delete_list.message": "మీరు ఖచ్చితంగా ఈ జాబితాను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",
+  "confirmations.domain_block.confirm": "మొత్తం డొమైన్ను దాచు",
+  "confirmations.domain_block.message": "మీరు నిజంగా నిజంగా మొత్తం {domain} ని బ్లాక్ చేయాలనుకుంటున్నారా? చాలా సందర్భాలలో కొన్ని లక్ష్యంగా ఉన్న బ్లాక్స్ లేదా మ్యూట్స్ సరిపోతాయి మరియు ఉత్తమమైనవి. మీరు ఆ డొమైన్ నుండి కంటెంట్ను ఏ ప్రజా కాలక్రమాలలో లేదా మీ నోటిఫికేషన్లలో చూడలేరు. ఆ డొమైన్ నుండి మీ అనుచరులు తీసివేయబడతారు.",
+  "confirmations.mute.confirm": "మ్యూట్ చేయి",
+  "confirmations.mute.message": "{name}ను మీరు ఖచ్చితంగా మ్యూట్ చేయాలనుకుంటున్నారా?",
+  "confirmations.redraft.confirm": "తొలగించు & తిరగరాయు",
+  "confirmations.redraft.message": "మీరు ఖచ్చితంగా ఈ స్టేటస్ ని తొలగించి తిరగరాయాలనుకుంటున్నారా? మీరు అన్ని ప్రత్యుత్తరాలను, బూస్ట్ లను మరియు ఇష్టపడినవి కోల్పోతారు.",
+  "confirmations.unfollow.confirm": "అనుసరించవద్దు",
+  "confirmations.unfollow.message": "{name}ను మీరు ఖచ్చితంగా అనుసరించవద్దనుకుంటున్నారా?",
+  "embed.instructions": "దిగువ కోడ్ను కాపీ చేయడం ద్వారా మీ వెబ్సైట్లో ఈ స్టేటస్ ని పొందుపరచండి.",
+  "embed.preview": "అది ఈ క్రింది విధంగా కనిపిస్తుంది:",
+  "emoji_button.activity": "కార్యకలాపాలు",
+  "emoji_button.custom": "అనుకూలీకరించిన",
+  "emoji_button.flags": "ఫ్లాగ్స్",
+  "emoji_button.food": "ఆహారం & పానీయం",
+  "emoji_button.label": "ఎమోజి చొప్పించు",
+  "emoji_button.nature": "ప్రకృతి",
+  "emoji_button.not_found": "ఎమోజీలు లేవు!! (╯°□°)╯︵ ┻━┻",
+  "emoji_button.objects": "వస్తువులు",
+  "emoji_button.people": "ప్రజలు",
+  "emoji_button.recent": "తరచుగా ఉపయోగించునవి",
+  "emoji_button.search": "వెదుకు...",
+  "emoji_button.search_results": "శోధన ఫలితాలు",
+  "emoji_button.symbols": "చిహ్నాలు",
+  "emoji_button.travel": "ప్రయాణం & ప్రదేశాలు",
+  "empty_column.community": "స్థానిక కాలక్రమం ఖాళీగా ఉంది. మొదలుపెట్టడానికి బహిరంగంగా ఏదో ఒకటి వ్రాయండి!",
+  "empty_column.direct": "మీకు ఇంకా ఏ ప్రత్యక్ష సందేశాలు లేవు. మీరు ఒకదాన్ని పంపినప్పుడు లేదా స్వీకరించినప్పుడు, అది ఇక్కడ చూపబడుతుంది.",
+  "empty_column.hashtag": "ఇంకా హాష్ ట్యాగ్లో ఏమీ లేదు.",
+  "empty_column.home": "మీ హోమ్ కాలక్రమం ఖాళీగా ఉంది! {Public} ను సందర్శించండి లేదా ఇతర వినియోగదారులను కలుసుకోవడానికి మరియు అన్వేషణ కోసం శోధనను ఉపయోగించండి.",
+  "empty_column.home.public_timeline": "ప్రజా కాలక్రమం",
+  "empty_column.list": "ఇంకా ఈ జాబితాలో ఏదీ లేదు. ఈ జాబితాలోని సభ్యులు కొత్త స్టేటస్ లను పోస్ట్ చేసినప్పుడు, అవి ఇక్కడ కనిపిస్తాయి.",
+  "empty_column.notifications": "మీకు ఇంకా ఏ నోటిఫికేషన్లు లేవు. సంభాషణను ప్రారంభించడానికి ఇతరులతో ప్రతిస్పందించండి.",
+  "empty_column.public": "ఇక్కడ ఏమీ లేదు! దీన్ని నింపడానికి బహిరంగంగా ఏదైనా వ్రాయండి, లేదా ఇతర దృష్టాంతాల్లోని వినియోగదారులను అనుసరించండి",
+  "follow_request.authorize": "అనుమతించు",
+  "follow_request.reject": "తిరస్కరించు",
+  "getting_started.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.advanced": "Advanced",
-  "home.column_settings.basic": "Basic",
-  "home.column_settings.filter_regex": "Filter out by regular expressions",
-  "home.column_settings.show_reblogs": "Show boosts",
-  "home.column_settings.show_replies": "Show replies",
-  "home.settings": "Column settings",
-  "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",
+  "getting_started.find_friends": "ట్విట్టర్ నుండి స్నేహితులను కనుగొనండి",
+  "getting_started.heading": "మొదలుపెడదాం",
+  "getting_started.invite": "వ్యక్తులను ఆహ్వానించండి",
+  "getting_started.open_source_notice": "మాస్టొడొన్ ఓపెన్ సోర్స్ సాఫ్ట్వేర్. మీరు {github} వద్ద GitHub పై సమస్యలను నివేదించవచ్చు లేదా తోడ్పడచ్చు.",
+  "getting_started.security": "భద్రత",
+  "getting_started.terms": "సేవా నిబంధనలు",
+  "home.column_settings.advanced": "అధునాతన",
+  "home.column_settings.basic": "ప్రాథమిక",
+  "home.column_settings.filter_regex": "రెగ్యులర్ ఎక్స్ప్రెషన్ల ద్వారా ఫిల్టర్ చేయండి",
+  "home.column_settings.show_reblogs": "బూస్ట్ లను చూపించు",
+  "home.column_settings.show_replies": "ప్రత్యుత్తరాలను చూపించు",
+  "home.settings": "నిలువు వరుస అమర్పులు",
+  "keyboard_shortcuts.back": "వెనక్కి తిరిగి వెళ్ళడానికి",
+  "keyboard_shortcuts.boost": "బూస్ట్ చేయడానికి",
+  "keyboard_shortcuts.column": "నిలువు వరుసలలో ఒకదానిపై దృష్టి పెట్టడానికి",
+  "keyboard_shortcuts.compose": "కంపోజ్ టెక్స్ట్ఏరియా పై దృష్టి పెట్టడానికి",
   "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.down": "జాబితాలో క్రిందికి వెళ్ళడానికి",
   "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.follow_requests": "Follow requests",
-  "navigation_bar.info": "Extended information",
-  "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
-  "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!",
+  "keyboard_shortcuts.favourite": "ఇష్టపడడానికి",
+  "keyboard_shortcuts.heading": "కీబోర్డ్ సత్వరమార్గాలు",
+  "keyboard_shortcuts.hotkey": "హాట్ కీ",
+  "keyboard_shortcuts.legend": "ఈ లెజెండ్ ప్రదర్శించడానికి",
+  "keyboard_shortcuts.mention": "రచయితను ప్రస్తావించడానికి",
+  "keyboard_shortcuts.reply": "ప్రత్యుత్తరం ఇవ్వడానికి",
+  "keyboard_shortcuts.search": "శోధనపై దృష్టి పెట్టండి",
+  "keyboard_shortcuts.toggle_hidden": "CW వెనుక ఉన్న పాఠ్యాన్ని చూపడానికి / దాచడానికి",
+  "keyboard_shortcuts.toot": "ఒక సరికొత్త టూట్ను ప్రారంభించడానికి",
+  "keyboard_shortcuts.unfocus": "పాఠ్యం వ్రాసే ఏరియా/శోధన పట్టిక నుండి బయటకు రావడానికి",
+  "keyboard_shortcuts.up": "జాబితాలో పైకి తరలించడానికి",
+  "lightbox.close": "మూసివేయు",
+  "lightbox.next": "తరువాత",
+  "lightbox.previous": "మునుపటి",
+  "lists.account.add": "జాబితాకు జోడించు",
+  "lists.account.remove": "జాబితా నుండి తొలగించు",
+  "lists.delete": "జాబితాను తొలగించు",
+  "lists.edit": "జాబితాను సవరించు",
+  "lists.new.create": "జాబితాను జోడించు",
+  "lists.new.title_placeholder": "కొత్త జాబితా శీర్షిక",
+  "lists.search": "మీరు అనుసరించే వ్యక్తులలో శోధించండి",
+  "lists.subheading": "మీ జాబితాలు",
+  "loading_indicator.label": "లోడ్ అవుతోంది...",
+  "media_gallery.toggle_visible": "దృశ్యమానతను టోగుల్ చేయండి",
+  "missing_indicator.label": "దొరకలేదు",
+  "missing_indicator.sublabel": "ఈ వనరు కనుగొనబడలేదు",
+  "mute_modal.hide_notifications": "ఈ వినియోగదారు నుండి నోటిఫికేషన్లను దాచాలా?",
+  "navigation_bar.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
+  "navigation_bar.community_timeline": "స్థానిక కాలక్రమం",
+  "navigation_bar.direct": "ప్రత్యక్ష సందేశాలు",
+  "navigation_bar.discover": "కనుగొను",
+  "navigation_bar.domain_blocks": "దాచిన డొమైన్లు",
+  "navigation_bar.edit_profile": "ప్రొఫైల్ని సవరించండి",
+  "navigation_bar.favourites": "ఇష్టపడినవి",
+  "navigation_bar.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు",
+  "navigation_bar.info": "ఈ దృష్టాంతం గురించి",
+  "navigation_bar.keyboard_shortcuts": "హాట్ కీలు",
+  "navigation_bar.lists": "జాబితాలు",
+  "navigation_bar.logout": "లాగ్ అవుట్ చేయండి",
+  "navigation_bar.mutes": "మ్యూట్ చేయబడిన వినియోగదారులు",
+  "navigation_bar.personal": "వ్యక్తిగతం",
+  "navigation_bar.pins": "అతికించిన టూట్లు",
+  "navigation_bar.preferences": "ప్రాధాన్యతలు",
+  "navigation_bar.public_timeline": "సమాఖ్య కాలక్రమం",
+  "navigation_bar.security": "భద్రత",
+  "notification.favourite": "{name} మీ స్టేటస్ ను ఇష్టపడ్డారు",
+  "notification.follow": "{name} మిమ్మల్ని అనుసరిస్తున్నారు",
+  "notification.mention": "{name} మిమ్మల్ని ప్రస్తావించారు",
+  "notification.reblog": "{name} మీ స్టేటస్ ను బూస్ట్ చేసారు",
+  "notifications.clear": "ప్రకటనలను తుడిచివేయు",
+  "notifications.clear_confirmation": "మీరు మీ అన్ని నోటిఫికేషన్లను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",
+  "notifications.column_settings.alert": "డెస్క్టాప్ నోటిఫికేషన్లు",
+  "notifications.column_settings.favourite": "ఇష్టపడినవి:",
+  "notifications.column_settings.follow": "క్రొత్త అనుచరులు:",
+  "notifications.column_settings.mention": "ప్రస్తావనలు:",
+  "notifications.column_settings.push": "పుష్ ప్రకటనలు",
+  "notifications.column_settings.push_meta": "ఈ పరికరం",
+  "notifications.column_settings.reblog": "బూస్ట్ లు:",
+  "notifications.column_settings.show": "నిలువు వరుసలో చూపు",
+  "notifications.column_settings.sound": "ధ్వనిని ప్లే చేయి",
+  "notifications.group": "{count} ప్రకటనలు",
+  "onboarding.done": "పూర్తయింది",
+  "onboarding.next": "తరువాత",
+  "onboarding.page_five.public_timelines": "స్థానిక కాలక్రమం {domain}లో ప్రతి ఒక్కరి నుండి పబ్లిక్ పోస్ట్లను చూపుతుంది. సమాఖ్య కాలక్రమం {డొమైన్} లోని వ్యక్తులు అనుసరించే ప్రతి ఒక్కరి నుండి పబ్లిక్ పోస్ట్లను చూపుతుంది. ఈ పబ్లిక్ కాలక్రమాలు క్రొత్త వ్యక్తులను కనుగొనడానికి ఒక గొప్ప మార్గం.",
+  "onboarding.page_four.home": "హోమ్ కాలక్రమం మీరు అనుసరించే వ్యక్తుల నుండి పోస్ట్లను చూపిస్తుంది.",
+  "onboarding.page_four.notifications": "ఎవరైనా మీతో సంభాషించినప్పుడు నోటిఫికేషన్ల నిలువు వరుసలో కనిపిస్తుంది.",
+  "onboarding.page_one.federation": "మాస్టొడొన్ అనేది అనేక స్వతంత్ర సేవికల సమాహారం వలన ఏర్పడిన ఒక సోషల్ నెట్వర్క్. మేము ఈ సేవికలను దుష్టాంతాలని అంటాము.",
+  "onboarding.page_one.full_handle": "మీ పూర్తి హ్యాండిల్",
+  "onboarding.page_one.handle_hint": "మీరు మీ స్నేహితులకు శోధించమని చెప్పేది ఇదే.",
+  "onboarding.page_one.welcome": "మాస్తోడాన్ కు స్వాగతం!",
+  "onboarding.page_six.admin": "మీ దృష్టాంతం యొక్క నిర్వాహకులు {admin}.",
+  "onboarding.page_six.almost_done": "దాదాపుగా అయిపోయింది...",
+  "onboarding.page_six.appetoot": "బాన్ ఆప్పెటూట్!",
+  "onboarding.page_six.apps_available": "iOS, Android మరియు ఇతర ప్లాట్ఫారమ్లకు {apps} అందుబాటులో ఉన్నాయి.",
+  "onboarding.page_six.github": "మాస్టొడొన్ ఉచిత ఓపెన్ సోర్స్ సాఫ్ట్వేర్. మీరు దోషాలను నివేదించవచ్చు, ఫీచర్లను అభ్యర్థించవచ్చు లేదా {github} లో కోడ్కు దోహదం చేయవచ్చు.",
+  "onboarding.page_six.guidelines": "సంఘం మార్గదర్శకాలు",
+  "onboarding.page_six.read_guidelines": "దయచేసి {domain} యొక్క {guidelines} చదవండి!",
+  "onboarding.page_six.various_app": "మొబైల్ అనువర్తనాలు",
+  "onboarding.page_three.profile": "మీ అవతార్, బయో, ప్రదర్శన పేరు మార్చడానికి మీ ప్రొఫైల్ను సవరించండి. అక్కడ, మీరు ఇతర ప్రాధాన్యతలను కూడా కనుగొంటారు.",
+  "onboarding.page_three.search": "వ్యక్తులను కనుగొనడానికి లేదా {illustration} మరియు {introductions} వంటి హ్యాష్ట్యాగ్లను చూడటానికి శోధన పట్టీని ఉపయోగించండి. ఈ దుష్టాంతంలో లేని ఒక వ్యక్తి కోసం శోధించేందుకు, వారి పూర్తి హ్యాండిల్ను ఉపయోగించండి.",
+  "onboarding.page_two.compose": "కంపోజ్ నిలువు వరుస నుండి పోస్ట్లను వ్రాయండి. మీరు చిత్రాలను అప్లోడ్ చెయ్యవచ్చు, గోప్యతా సెట్టింగ్లను మార్చవచ్చు మరియు దిగువ చిహ్నాలతో కంటెంట్ హెచ్చరికలను జోడించవచ్చు.",
+  "onboarding.skip": "దాటవేయి",
+  "privacy.change": "స్టేటస్ గోప్యతను సర్దుబాటు చేయండి",
+  "privacy.direct.long": "పేర్కొన్న వినియోగదారులకు మాత్రమే పోస్ట్ చేయి",
+  "privacy.direct.short": "ప్రత్యక్ష",
+  "privacy.private.long": "అనుచరులకు మాత్రమే పోస్ట్ చేయి",
+  "privacy.private.short": "అనుచరులకు మాత్రమే",
+  "privacy.public.long": "ప్రజా కాలక్రమాలకు పోస్ట్ చేయండి",
+  "privacy.public.short": "ప్రజా",
+  "privacy.unlisted.long": "ప్రజా కాలక్రమాలలో చూపించవద్దు",
+  "privacy.unlisted.short": "జాబితా చేయబడనిది",
+  "regeneration_indicator.label": "లోడ్ అవుతోంది…",
+  "regeneration_indicator.sublabel": "మీ హోమ్ ఫీడ్ సిద్ధమవుతోంది!",
   "relative_time.days": "{number}d",
   "relative_time.hours": "{number}h",
-  "relative_time.just_now": "now",
+  "relative_time.just_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",
+  "reply_indicator.cancel": "రద్దు చెయ్యి",
+  "report.forward": "{target}కి ఫార్వార్డ్ చేయండి",
+  "report.forward_hint": "ఖాతా మరొక సర్వర్లో ఉంది. నివేదిక యొక్క ఒక అనామకంగా ఉన్న కాపీని అక్కడికి కూడా పంపించమంటారా?",
+  "report.hint": "మీ దుష్టాంత మోడరేటర్లకు నివేదిక పంపబడుతుంది. దిగువ ఈ ఖాతాను ఎందుకు నివేదిస్తున్నారనేదాని వివరణను మీరు అందించవచ్చు:",
+  "report.placeholder": "అదనపు వ్యాఖ్యలు",
+  "report.submit": "సమర్పించండి",
+  "report.target": "{target}పై ఫిర్యాదు చేయండి",
+  "search.placeholder": "శోధన",
+  "search_popout.search_format": "అధునాతన శోధన ఆకృతి",
+  "search_popout.tips.full_text": "సాధారణ వచనం మీరు వ్రాసిన, ఇష్టపడే, పెంచబడిన లేదా పేర్కొనబడిన, అలాగే యూజర్పేర్లు, ప్రదర్శన పేర్లు, మరియు హ్యాష్ట్యాగ్లను నమోదు చేసిన హోదాలను అందిస్తుంది.",
+  "search_popout.tips.hashtag": "హాష్ ట్యాగ్",
+  "search_popout.tips.status": "స్టేటస్",
+  "search_popout.tips.text": "సింపుల్ టెక్స్ట్ ప్రదర్శన పేర్లు, యూజర్ పేర్లు మరియు హ్యాష్ట్యాగ్లను సరిపోలుస్తుంది",
+  "search_popout.tips.user": "వాడుకరి",
+  "search_results.accounts": "వ్యక్తులు",
+  "search_results.hashtags": "హాష్ ట్యాగ్లు",
+  "search_results.statuses": "టూట్లు",
   "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.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": "Undo",
-  "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"
+  "standalone.public_title": "లోపలికి ఒక చూపు...",
+  "status.block": "@{name} ను బ్లాక్ చేయి",
+  "status.cancel_reblog_private": "బూస్ట్ను తొలగించు",
+  "status.cannot_reblog": "ఈ పోస్ట్ను బూస్ట్ చేయడం సాధ్యం కాదు",
+  "status.delete": "తొలగించు",
+  "status.direct": "@{name}కు నేరుగా సందేశం పంపు",
+  "status.embed": "ఎంబెడ్",
+  "status.favourite": "ఇష్టపడు",
+  "status.load_more": "మరిన్ని లోడ్ చేయి",
+  "status.media_hidden": "మీడియా దాచబడింది",
+  "status.mention": "@{name}ను ప్రస్తావించు",
+  "status.more": "ఇంకొన్ని",
+  "status.mute": "@{name}ను మ్యూట్ చెయ్యి",
+  "status.mute_conversation": "సంభాషణను మ్యూట్ చెయ్యి",
+  "status.open": "ఈ స్టేటస్ ను విస్తరించు",
+  "status.pin": "ప్రొఫైల్లో అతికించు",
+  "status.pinned": "అతికించిన టూట్",
+  "status.reblog": "బూస్ట్",
+  "status.reblog_private": "అసలు ప్రేక్షకులకు బూస్ట్ చేయి",
+  "status.reblogged_by": "{name} బూస్ట్ చేసారు",
+  "status.redraft": "తొలగించు & తిరగరాయు",
+  "status.reply": "ప్రత్యుత్తరం",
+  "status.replyAll": "సంభాషణకు ప్రత్యుత్తరం ఇవ్వండి",
+  "status.report": "@{name}పై ఫిర్యాదుచేయు",
+  "status.sensitive_toggle": "వీక్షించడానికి క్లిక్ చేయండి",
+  "status.sensitive_warning": "సున్నితమైన కంటెంట్",
+  "status.share": "పంచుకోండి",
+  "status.show_less": "తక్కువ చూపించు",
+  "status.show_less_all": "అన్నిటికీ తక్కువ చూపించు",
+  "status.show_more": "ఇంకా చూపించు",
+  "status.show_more_all": "అన్నిటికీ ఇంకా చూపించు",
+  "status.unmute_conversation": "సంభాషణను అన్మ్యూట్ చేయి",
+  "status.unpin": "ప్రొఫైల్ నుండి పీకివేయు",
+  "tabs_bar.federated_timeline": "సమాఖ్య",
+  "tabs_bar.home": "హోమ్",
+  "tabs_bar.local_timeline": "స్థానిక",
+  "tabs_bar.notifications": "ప్రకటనలు",
+  "tabs_bar.search": "శోధన",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} మాట్లాడుతున్నారు",
+  "ui.beforeunload": "మీరు మాస్టొడొన్ను వదిలివేస్తే మీ డ్రాఫ్ట్లు పోతాయి.",
+  "upload_area.title": "అప్లోడ్ చేయడానికి డ్రాగ్ & డ్రాప్ చేయండి",
+  "upload_button.label": "మీడియాను జోడించండి",
+  "upload_form.description": "దృష్టి లోపమున్న వారి కోసం వివరించండి",
+  "upload_form.focus": "కత్తిరించు",
+  "upload_form.undo": "తొలగించు",
+  "upload_progress.label": "అప్లోడ్ అవుతోంది...",
+  "video.close": "వీడియోని మూసివేయి",
+  "video.exit_fullscreen": "పూర్తి స్క్రీన్ నుండి నిష్క్రమించు",
+  "video.expand": "వీడియోను విస్తరించండి",
+  "video.fullscreen": "పూర్తి స్క్రీన్",
+  "video.hide": "వీడియోను దాచు",
+  "video.mute": "ధ్వనిని మ్యూట్ చేయి",
+  "video.pause": "పాజ్ చేయి",
+  "video.play": "ప్లే చేయి",
+  "video.unmute": "ధ్వనిని అన్మ్యూట్ చేయి"
 }
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 90a6500ae..c65d8ed38 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -81,7 +81,7 @@
   "confirmations.delete_list.confirm": "刪除",
   "confirmations.delete_list.message": "你確定要永久刪除這列表嗎?",
   "confirmations.domain_block.confirm": "隱藏整個網站",
-  "confirmations.domain_block.message": "你真的真的確定要隱藏整個 {domain} ?多數情況下,比較推薦封鎖或靜音幾個特定目標就好。",
+  "confirmations.domain_block.message": "你真的真的確定要隱藏整個 {domain} ?多數情況下,比較推薦封鎖或靜音幾個特定目標就好。你從此將不會再看到該站的內容和通知。來自該站的關注者亦會被移除。",
   "confirmations.mute.confirm": "靜音",
   "confirmations.mute.message": "你確定要將{name}靜音嗎?",
   "confirmations.redraft.confirm": "Delete & redraft",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 1ba277e28..0eca30158 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -1,34 +1,34 @@
 {
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "機器人",
   "account.block": "封鎖 @{name}",
   "account.block_domain": "隱藏來自 {domain} 的一切貼文",
   "account.blocked": "已被封鎖的",
-  "account.direct": "給 @{name} 私人訊息",
+  "account.direct": "發送私訊給 @{name}",
   "account.disclaimer_full": "下列資料不一定完整。",
-  "account.domain_blocked": "域名隱藏",
+  "account.domain_blocked": "站點被隱藏",
   "account.edit_profile": "編輯使用者資訊",
   "account.follow": "關注",
   "account.followers": "關注者",
-  "account.follows": "正關注",
+  "account.follows": "正在關注",
   "account.follows_you": "關注你",
   "account.hide_reblogs": "隱藏來自 @{name} 的轉推",
   "account.media": "媒體",
   "account.mention": "提到 @{name}",
   "account.moved_to": "{name} 已經移至:",
-  "account.mute": "消音 @{name}",
-  "account.mute_notifications": "消音來自 @{name} 的通知",
-  "account.muted": "消音的",
-  "account.posts": "貼文",
-  "account.posts_with_replies": "貼文及回覆",
+  "account.mute": "靜音 @{name}",
+  "account.mute_notifications": "靜音來自 @{name} 的通知",
+  "account.muted": "靜音",
+  "account.posts": "嘟文",
+  "account.posts_with_replies": "嘟文與回覆",
   "account.report": "檢舉 @{name}",
-  "account.requested": "正在等待許可",
-  "account.share": "分享 @{name} 的用者資訊",
-  "account.show_reblogs": "Show boosts from @{name}",
+  "account.requested": "正在等待對方同意。點擊以取消發送關注請求",
+  "account.share": "分享 @{name} 的使用者資訊",
+  "account.show_reblogs": "顯示來自 @{name} 的嘟文",
   "account.unblock": "取消封鎖 @{name}",
   "account.unblock_domain": "不再隱藏 {domain}",
   "account.unfollow": "取消關注",
-  "account.unmute": "不再消音 @{name}",
-  "account.unmute_notifications": "不再對來自 @{name} 的通知消音",
+  "account.unmute": "不再靜音 @{name}",
+  "account.unmute_notifications": "不再對來自 @{name} 的通知靜音",
   "account.view_full_profile": "查看完整資訊",
   "alert.unexpected.message": "發生非預期的錯誤。",
   "alert.unexpected.title": "哎呀!",
@@ -41,16 +41,16 @@
   "bundle_modal_error.retry": "重試",
   "column.blocks": "封鎖的使用者",
   "column.community": "本地時間軸",
-  "column.direct": "Direct messages",
-  "column.domain_blocks": "隱藏域名",
+  "column.direct": "私訊",
+  "column.domain_blocks": "隱藏的站點",
   "column.favourites": "最愛",
   "column.follow_requests": "關注請求",
-  "column.home": "家",
+  "column.home": "主頁",
   "column.lists": "名單",
-  "column.mutes": "消音的使用者",
+  "column.mutes": "靜音的使用者",
   "column.notifications": "通知",
-  "column.pins": "置頂貼文",
-  "column.public": "聯盟時間軸",
+  "column.pins": "置頂嘟文",
+  "column.public": "其他站點時間軸",
   "column_back_button.label": "上一頁",
   "column_header.hide_settings": "隱藏設定",
   "column_header.moveLeft_settings": "將欄左移",
@@ -59,9 +59,9 @@
   "column_header.show_settings": "顯示設定",
   "column_header.unpin": "取下",
   "column_subheading.settings": "設定",
-  "community.column_settings.media_only": "Media Only",
-  "compose_form.direct_message_warning": "此則推文只會被所有提到的使用者看見。",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "community.column_settings.media_only": "僅媒體",
+  "compose_form.direct_message_warning": "這條嘟文僅對有被提及的使用者才能看到。",
+  "compose_form.direct_message_warning_learn_more": "了解更多",
   "compose_form.hashtag_warning": "此則推文將不會在任何主題標籤中看見,只有公開的推文可以用主題標籤來搜尋。",
   "compose_form.lock_disclaimer": "你的帳號沒有{locked}。任何人都可以關注你,看到發給關注者的貼文。",
   "compose_form.lock_disclaimer.lock": "上鎖",
@@ -81,11 +81,11 @@
   "confirmations.delete_list.confirm": "刪除",
   "confirmations.delete_list.message": "確定要永久性地刪除這個名單嗎?",
   "confirmations.domain_block.confirm": "隱藏整個網域",
-  "confirmations.domain_block.message": "你真的真的確定要隱藏整個 {domain} ?多數情況下,比較推薦封鎖或消音幾個特定目標就好。",
+  "confirmations.domain_block.message": "你真的確定要靜音所有來自 {domain} 的內容嗎? 多數情況下,封鎖或靜音幾個特定用戶應該就能滿足你的需求了。來自該站點的內容將不再出現在你的公共時間軸或通知裡。來自該站點的關注者將會被移除。",
   "confirmations.mute.confirm": "消音",
   "confirmations.mute.message": "你確定要消音 {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.redraft.confirm": "刪除 & 編輯",
+  "confirmations.redraft.message": "你確定要刪除這條嘟文並重新編輯它嗎? 所有相關的回覆、轉嘟與最愛都會被刪除。",
   "confirmations.unfollow.confirm": "取消關注",
   "confirmations.unfollow.message": "真的不要繼續關注 {name} 了嗎?",
   "embed.instructions": "要內嵌此貼文,請將以下代碼貼進你的網站。",
@@ -98,30 +98,30 @@
   "emoji_button.nature": "自然",
   "emoji_button.not_found": "沒有表情符號吼!! (╯°□°)╯︵ ┻━┻",
   "emoji_button.objects": "物件",
-  "emoji_button.people": "人",
+  "emoji_button.people": "使用者",
   "emoji_button.recent": "常用",
   "emoji_button.search": "搜尋…",
   "emoji_button.search_results": "搜尋結果",
   "emoji_button.symbols": "符號",
   "emoji_button.travel": "旅遊與地點",
   "empty_column.community": "本地時間軸是空的。公開寫點什麼吧!",
-  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.direct": "你還沒有使用過私訊。當你發出或著收到私訊時,它會在這裡顯示。",
   "empty_column.hashtag": "這個主題標籤下什麼都沒有。",
   "empty_column.home": "你還沒關注任何人。造訪{public}或利用搜尋功能找到其他用者。",
   "empty_column.home.public_timeline": "公開時間軸",
   "empty_column.list": "此份清單尚未有東西。當此清單的成員貼出了新的狀態時,它們就會出現在這裡。",
   "empty_column.notifications": "還沒有任何通知。和別的使用者互動來開始對話。",
-  "empty_column.public": "這裡什麼都沒有!公開寫些什麼,或是關注其他副本的使用者。",
+  "empty_column.public": "這裡什麼都沒有! 寫一些公開的嘟文,或著關注其他站點的使用者後,這裡就會有嘟文出現了",
   "follow_request.authorize": "授權",
   "follow_request.reject": "拒絕",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "開發",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.find_friends": "尋找 Twitter 好友",
   "getting_started.heading": "馬上開始",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "邀請使用者",
   "getting_started.open_source_notice": "Mastodon 是開源軟體。你可以在 GitHub {github} 上做出貢獻或是回報問題。",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
+  "getting_started.security": "登入資訊",
+  "getting_started.terms": "使用條款",
   "home.column_settings.advanced": "進階",
   "home.column_settings.basic": "基本",
   "home.column_settings.filter_regex": "以正規表示式過濾",
@@ -130,22 +130,22 @@
   "home.settings": "欄位設定",
   "keyboard_shortcuts.back": "回到上一個",
   "keyboard_shortcuts.boost": "到轉推",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.column": "選擇第 X 欄中的嘟文",
   "keyboard_shortcuts.compose": "焦點移至撰寫文字區塊",
   "keyboard_shortcuts.description": "描述",
-  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.down": "在列表往下移動",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "收藏",
   "keyboard_shortcuts.heading": "鍵盤快速鍵",
   "keyboard_shortcuts.hotkey": "快速鍵",
-  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.legend": "顯示這個說明",
   "keyboard_shortcuts.mention": "到提到的作者",
   "keyboard_shortcuts.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",
+  "keyboard_shortcuts.search": "把滑鼠移動到搜尋",
+  "keyboard_shortcuts.toggle_hidden": "顯示或隱藏被標為敏感的嘟文",
+  "keyboard_shortcuts.toot": "新的嘟文",
+  "keyboard_shortcuts.unfocus": "取消輸入",
+  "keyboard_shortcuts.up": "在列表往上移動",
   "lightbox.close": "關閉",
   "lightbox.next": "繼續",
   "lightbox.previous": "回退",
@@ -164,26 +164,26 @@
   "mute_modal.hide_notifications": "隱藏來自這個使用者的通知?",
   "navigation_bar.blocks": "封鎖的使用者",
   "navigation_bar.community_timeline": "本地時間軸",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "隱藏的域名",
-  "navigation_bar.edit_profile": "編輯用者資訊",
+  "navigation_bar.direct": "私訊",
+  "navigation_bar.discover": "探索",
+  "navigation_bar.domain_blocks": "隱藏的站點",
+  "navigation_bar.edit_profile": "編輯使用者資訊",
   "navigation_bar.favourites": "最愛",
   "navigation_bar.follow_requests": "關注請求",
   "navigation_bar.info": "關於本站",
-  "navigation_bar.keyboard_shortcuts": "快速鍵",
+  "navigation_bar.keyboard_shortcuts": "快捷鍵",
   "navigation_bar.lists": "名單",
   "navigation_bar.logout": "登出",
-  "navigation_bar.mutes": "消音的使用者",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "置頂貼文",
+  "navigation_bar.mutes": "靜音的使用者",
+  "navigation_bar.personal": "個人",
+  "navigation_bar.pins": "置頂嘟文",
   "navigation_bar.preferences": "偏好設定",
-  "navigation_bar.public_timeline": "聯盟時間軸",
-  "navigation_bar.security": "Security",
-  "notification.favourite": "{name}收藏了你的狀態",
+  "navigation_bar.public_timeline": "其他站點時間軸",
+  "navigation_bar.security": "登入資訊",
+  "notification.favourite": "{name}把你的嘟文加入了最愛",
   "notification.follow": "{name}關注了你",
   "notification.mention": "{name}提到了你",
-  "notification.reblog": "{name}推了你的狀態",
+  "notification.reblog": "{name}轉嘟了你的嘟文",
   "notifications.clear": "清除通知",
   "notifications.clear_confirmation": "確定要永久清除你的通知嗎?",
   "notifications.column_settings.alert": "桌面通知",
@@ -192,118 +192,118 @@
   "notifications.column_settings.mention": "提到:",
   "notifications.column_settings.push": "推送通知",
   "notifications.column_settings.push_meta": "這臺設備",
-  "notifications.column_settings.reblog": "轉推:",
+  "notifications.column_settings.reblog": "轉嘟:",
   "notifications.column_settings.show": "顯示在欄位中",
   "notifications.column_settings.sound": "播放音效",
-  "notifications.group": "{count} notifications",
+  "notifications.group": "{count} 條通知",
   "onboarding.done": "完成",
   "onboarding.next": "下一步",
-  "onboarding.page_five.public_timelines": "本地時間軸顯示 {domain} 上所有人的公開貼文。聯盟時間軸顯示 {domain} 上所有人關注的公開貼文。這就是公開時間軸,發現新朋友的好地方。",
-  "onboarding.page_four.home": "家時間軸顯示所有你關注的人的貼文。",
+  "onboarding.page_five.public_timelines": "本站時間軸顯示 {domain} 上所有的公開嘟文。其他站點時間軸顯示 {domain} 上所有人關注的公開嘟文。這就是公開時間軸,發現新朋友的好地方。",
+  "onboarding.page_four.home": "主頁時間軸顯示所有你關注的人的嘟文。",
   "onboarding.page_four.notifications": "通知欄顯示別人和你的互動。",
-  "onboarding.page_one.federation": "Mastodon 是由獨立的伺服器連結起來,形成的大社群網路。我們把這些伺服器稱為副本。",
-  "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.federation": "Mastodon 是由獨立的伺服器連結起來,形成的大社群網路。我們把這些伺服器稱為站點。",
+  "onboarding.page_one.full_handle": "你的完整帳戶名稱",
+  "onboarding.page_one.handle_hint": "你的朋友們可以從這個帳戶全名找到你。",
   "onboarding.page_one.welcome": "歡迎來到 Mastodon !",
-  "onboarding.page_six.admin": "你的副本的管理員是 {admin} 。",
+  "onboarding.page_six.admin": "你的站點的管理員是 {admin} 。",
   "onboarding.page_six.almost_done": "快好了…",
-  "onboarding.page_six.appetoot": "貼口大開!",
+  "onboarding.page_six.appetoot": "嗷嗚~!",
   "onboarding.page_six.apps_available": "在 iOS 、 Android 和其他平台上有這些 {apps} 可以用。",
-  "onboarding.page_six.github": "Mastodon 是自由的開源軟體。你可以在 {github} 上回報臭蟲、請求新功能或是做出貢獻。",
+  "onboarding.page_six.github": "Mastodon 是自由的開源軟體。你可以在 {github} 上回報問題、請求新功能或是做出貢獻。",
   "onboarding.page_six.guidelines": "社群指南",
   "onboarding.page_six.read_guidelines": "請閱讀 {domain} 的 {guidelines} !",
   "onboarding.page_six.various_app": "行動版應用程式",
-  "onboarding.page_three.profile": "編輯你的大頭貼、自傳和顯示名稱。你也可以在這邊找到其他設定。",
-  "onboarding.page_three.search": "利用搜尋列來找到其他人或是主題標籤,像是 {illustration} 或 {introductions} 。用完整的帳號名稱來找不在這個副本上的使用者。",
+  "onboarding.page_three.profile": "編輯你的頭貼、簡介與顯示名稱。你也可以在這邊找到其他設定。",
+  "onboarding.page_three.search": "利用搜尋列來找到其他人或是主題標籤,像是 {illustration} 或 {introductions} 。用完整的帳戶名稱來找其他站點上的使用者。",
   "onboarding.page_two.compose": "在編輯欄寫些什麼。可以上傳圖片、改變隱私設定或是用下面的圖示加上內容警告。",
   "onboarding.skip": "跳過",
   "privacy.change": "調整隱私狀態",
-  "privacy.direct.long": "只貼給提到的使用者",
-  "privacy.direct.short": "直接貼",
-  "privacy.private.long": "只貼給關注者",
-  "privacy.private.short": "關注貼",
+  "privacy.direct.long": "只有被提到的使用者能看到",
+  "privacy.direct.short": "私訊",
+  "privacy.private.long": "只有關注你的使用者能看到",
+  "privacy.private.short": "僅關注者",
   "privacy.public.long": "貼到公開時間軸",
-  "privacy.public.short": "公開貼",
-  "privacy.unlisted.long": "不要貼到公開時間軸",
-  "privacy.unlisted.short": "不列出來",
+  "privacy.public.short": "公開",
+  "privacy.unlisted.long": "公開,但不會顯示在公開時間軸",
+  "privacy.unlisted.short": "不公開",
   "regeneration_indicator.label": "載入中…",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "regeneration_indicator.sublabel": "你的主頁時間軸正在準備中!",
   "relative_time.days": "{number} 天",
-  "relative_time.hours": "{number} 時",
-  "relative_time.just_now": "現在",
+  "relative_time.hours": "{number} 小時",
+  "relative_time.just_now": "剛剛",
   "relative_time.minutes": "{number} 分",
   "relative_time.seconds": "{number} 秒",
   "reply_indicator.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.forward": "轉寄到 {target}",
+  "report.forward_hint": "這個帳戶屬於其他站點。要像該站點發送匿名的檢舉訊息嗎?",
+  "report.hint": "這項訊息會發送到你該站點的管理員。你可以提供檢舉這個帳戶的理由:",
   "report.placeholder": "更多訊息",
   "report.submit": "送出",
-  "report.target": "通報中",
+  "report.target": "檢舉 {target}",
   "search.placeholder": "搜尋",
   "search_popout.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.full_text": "輸入簡單的文字,搜尋由你撰寫、最愛、轉嘟或提你的嘟文,以及符合使用者名稱、帳戶名稱和標籤。",
   "search_popout.tips.hashtag": "主題標籤",
   "search_popout.tips.status": "狀態",
-  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search_popout.tips.text": "輸入簡單的文字,搜尋符合的使用者名稱,帳戶名稱與標籤",
   "search_popout.tips.user": "使用者",
-  "search_results.accounts": "人",
+  "search_results.accounts": "使用者",
   "search_results.hashtags": "主題標籤",
-  "search_results.statuses": "推文",
+  "search_results.statuses": "嘟文",
   "search_results.total": "{count, number} 項結果",
   "standalone.public_title": "站點一瞥…",
   "status.block": "封鎖 @{name}",
-  "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "此貼文無法轉推",
+  "status.cancel_reblog_private": "取消轉嘟",
+  "status.cannot_reblog": "這篇嘟文無法被轉嘟",
   "status.delete": "刪除",
-  "status.direct": "Direct message @{name}",
-  "status.embed": "Embed",
-  "status.favourite": "收藏",
+  "status.direct": "發送私訊給 @{name}",
+  "status.embed": "嵌入",
+  "status.favourite": "最愛",
   "status.load_more": "載入更多",
-  "status.media_hidden": "媒體已隱藏",
+  "status.media_hidden": "隱藏媒體內容",
   "status.mention": "提到 @{name}",
-  "status.more": "More",
-  "status.mute": "Mute @{name}",
-  "status.mute_conversation": "消音對話",
-  "status.open": "展開這個狀態",
+  "status.more": "更多",
+  "status.mute": "靜音 @{name}",
+  "status.mute_conversation": "靜音對話",
+  "status.open": "展開嘟文",
   "status.pin": "置頂到個人資訊頁",
-  "status.pinned": "置頂的推文",
-  "status.reblog": "轉推",
-  "status.reblog_private": "Boost to original audience",
-  "status.reblogged_by": "{name} 轉推了",
-  "status.redraft": "Delete & re-draft",
-  "status.reply": "回應",
-  "status.replyAll": "回應這串",
-  "status.report": "通報 @{name}",
-  "status.sensitive_toggle": "點來看",
+  "status.pinned": "置頂嘟文",
+  "status.reblog": "轉嘟",
+  "status.reblog_private": "轉嘟給原有關注者",
+  "status.reblogged_by": "{name} 轉嘟了",
+  "status.redraft": "刪除 & 編輯",
+  "status.reply": "回覆",
+  "status.replyAll": "回覆所有人",
+  "status.report": "檢舉 @{name}",
+  "status.sensitive_toggle": "點擊顯示",
   "status.sensitive_warning": "敏感內容",
   "status.share": "分享",
-  "status.show_less": "看少點",
-  "status.show_less_all": "Show less for all",
-  "status.show_more": "看更多",
-  "status.show_more_all": "Show more for all",
-  "status.unmute_conversation": "不消音對話",
+  "status.show_less": "減少顯示",
+  "status.show_less_all": "減少顯示這類嘟文",
+  "status.show_more": "顯示更多",
+  "status.show_more_all": "顯示更多這類嘟文",
+  "status.unmute_conversation": "解除此對話的靜音",
   "status.unpin": "解除置頂",
-  "tabs_bar.federated_timeline": "聯盟",
-  "tabs_bar.home": "家",
-  "tabs_bar.local_timeline": "本地",
+  "tabs_bar.federated_timeline": "其他站點",
+  "tabs_bar.home": "主頁",
+  "tabs_bar.local_timeline": "本站",
   "tabs_bar.notifications": "通知",
-  "tabs_bar.search": "Search",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "tabs_bar.search": "搜尋",
+  "trends.count_by_accounts": "{count} 位使用者在討論",
   "ui.beforeunload": "如果離開 Mastodon,你的草稿將會不見。",
   "upload_area.title": "拖放來上傳",
-  "upload_button.label": "增加媒體",
-  "upload_form.description": "爲視障者加上描述",
+  "upload_button.label": "上傳媒體檔案",
+  "upload_form.description": "為視障人士增加文字說明",
   "upload_form.focus": "裁切",
-  "upload_form.undo": "復原",
+  "upload_form.undo": "刪除",
   "upload_progress.label": "上傳中...",
   "video.close": "關閉影片",
   "video.exit_fullscreen": "退出全螢幕",
   "video.expand": "展開影片",
   "video.fullscreen": "全螢幕",
   "video.hide": "隱藏影片",
-  "video.mute": "消音",
+  "video.mute": "靜音",
   "video.pause": "暫停",
   "video.play": "播放",
-  "video.unmute": "解除消音"
+  "video.unmute": "解除靜音"
 }
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 3cd4281f0..41215c2ca 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -72,7 +72,7 @@ ca:
         title: Canviar adreça de correu de %{username}
       confirm: Confirma
       confirmed: Confirmat
-      confirming: Confirmando
+      confirming: Confirmant
       demote: Degrada
       disable: Inhabilita
       disable_two_factor_authentication: Desactiva 2FA
@@ -81,7 +81,7 @@ ca:
       domain: Domini
       edit: Edita
       email: Correu electrònic
-      email_status: Estado del correo electrónico
+      email_status: Estat del correu electrònic
       enable: Habilita
       enabled: Habilitat
       feed_url: URL del canal
@@ -122,7 +122,7 @@ ca:
       remove_avatar: Eliminar avatar
       resend_confirmation:
         already_confirmed: Este usuario ya está confirmado
-        send: Reenviar el correo electrónico de confirmación
+        send: Reenviar el correu electrònic de confirmació
         success: "¡Correo electrónico de confirmación enviado con éxito!"
       reset: Reinicialitza
       reset_password: Restableix la contrasenya
diff --git a/config/locales/de.yml b/config/locales/de.yml
index cd06ef0e6..1b9a02e5a 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -675,6 +675,7 @@ de:
     disallowed_hashtags:
       one: 'Enthält den unerlaubten Hashtag: %{tags}'
       other: 'Enthält die unerlaubten Hashtags: %{tags}'
+    language_detection: Sprache automatisch erkennen
     open_in_web: Im Web öffnen
     over_character_limit: Zeichenlimit von %{max} überschritten
     pin_errors:
diff --git a/config/locales/devise.sk.yml b/config/locales/devise.sk.yml
index 173622bc5..2872140d1 100644
--- a/config/locales/devise.sk.yml
+++ b/config/locales/devise.sk.yml
@@ -39,7 +39,7 @@ sk:
         title: Overiť emailovú adresu
       reset_password_instructions:
         action: Zmeniť heslo
-        explanation: Vyžiadal/a ste si nové heslo pre svoj účet.
+        explanation: Vyžiadal/a si si nové heslo pre svoj účet.
         extra: Pokiaľ si túto akciu nevyžiadal/a, prosím ignoruj tento email. Tvoje heslo nebude zmenené pokiaľ nepostúpiš na adresu uvedenú vyššie a vytvoríš si nové.
         subject: 'Mastodon: Inštrukcie pre obnovu hesla'
         title: Nastav nové heslo
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index 976e96be2..571429429 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -2,45 +2,45 @@
 zh-TW:
   devise:
     confirmations:
-      confirmed: 您的電子郵件地址確認成功。
+      confirmed: 您的 E-mail 驗證成功。
       send_instructions: 您將會在幾分鐘內收到驗證信。
-      send_paranoid_instructions: 如果您的電子信箱已經存在於我們的資料庫,您將會在幾分鐘內收到信,確認您電子信箱的指示。
+      send_paranoid_instructions: 如果您的 E-mail 存在於我們的資料庫,將會在幾分鐘內收到驗證信。
     failure:
       already_authenticated: 您已經登入了。
-      inactive: 您的帳號尚未啟用。
+      inactive: 您的帳戶尚未啟用。
       invalid: 不正確的 %{authentication_keys} 或密碼。
-      last_attempt: 若您再次嘗試失敗,我們將鎖定您的帳號,以策安全。
-      locked: 您的帳號已被鎖定。
+      last_attempt: 您剩下最後一次嘗試機會,如失敗將會進行帳戶鎖定。如有問題請洽詢站點管理員。
+      locked: 您的帳戶已被鎖定。
       not_found_in_database: 不正確的 %{authentication_keys} 或密碼。
       timeout: 您的登入階段已經逾期,請重新登入以繼續使用。
       unauthenticated: 您必須先登入或註冊,以繼續使用。
-      unconfirmed: 您必須先完成信箱驗證,以繼續使用。
+      unconfirmed: 您必須先完成 E-mail 驗證,以繼續使用。
     mailer:
       confirmation_instructions:
-        action: 驗證電子郵件地址
-        explanation: 您已經在 %{host} 上以此電子郵件地址建立了一個帳號。您距離啟用它只剩一次點擊之遙了。如果這不是你,請忽略此電子郵件。
-        extra_html: 同時也請看看<a href="%{terms_path}">該實體的規則</a>與<a href="%{policy_path}">我們的服務條款</a>。
+        action: 驗證 E-mail 地址
+        explanation: 您已經在 %{host} 上以此 E-mail 地址建立了一個帳號。您距離啟用它只剩一次點擊之遙了。如果這不是你,請忽略此 E-mail 。
+        extra_html: 同時也請看看<a href="%{terms_path}">該站點的規則</a>與<a href="%{policy_path}">我們的服務條款</a>。
         subject: 'Mastodon: 信箱驗證'
-        title: 驗證電子郵件地址
+        title: 驗證 E-mail 地址
       email_changed:
-        explanation: 您帳號的電子郵件地址被變更為:
-        extra: 如果您並未變更您的電子郵件,那麼很有可能是某人取得了您帳號的存取權限。請立刻變更您的密碼,或是若您的帳號已被鎖定,請聯絡所使用實體的管理員。
-        subject: Mastodon 電子郵件變更
-        title: 新電子郵件地址
+        explanation: 您帳號的 E-mail 地址被變更為:
+        extra: 如果您並未變更您的 E-mail ,那麼很有可能是某人取得了你帳號的存取權限。請立刻變更您的密碼,或是若您的帳號已被鎖定,請聯絡站點的管理員。
+        subject: Mastodon  E-mail 變更
+        title: 新 E-mail 地址
       password_change:
         explanation: 您帳號的密碼已變更。
-        extra: 如果您並未變更您的密碼,那麼很有可能是某人取得了您帳號的存取權限。請立刻變更您的密碼,或是若您的帳號已被鎖定,請聯絡所使用實體的管理員。
+        extra: 如果您並未變更您的密碼,那麼很有可能是某人取得了您帳號的存取權限。請立刻變更您的密碼,或是若您的帳號已被鎖定,請聯絡站點的管理員。
         subject: 'Mastodon: 更改密碼'
         title: 密碼已變更
       reconfirmation_instructions:
-        explanation: 確認新的電子郵件地址以變更您的電子郵件。
-        extra: 若此次變更不是由您開啟的,請忽略這個電子郵件。Mastodon 帳號的電子郵件地址在您存取上面的連結前不會變更。
-        subject: Mastodon:%{instance} 的確認電子郵件
-        title: 驗證電子郵件地址
+        explanation: 確認新的 E-mail 地址以變更您的 E-mail 。
+        extra: 若此次變更不是由您開啟的,請忽略這個 E-mail 。Mastodon 帳號的 E-mail 地址在您存取上面的連結前不會變更。
+        subject: Mastodon:%{instance} 的確認 E-mail
+        title: 驗證 E-mail 地址
       reset_password_instructions:
         action: 變更密碼
         explanation: 您為您的帳號請求了一個新密碼。
-        extra: 若您並未請求這個,請忽略此電子郵件。您的密碼在您存取上面的連結並建立一個新的之前不會變更。
+        extra: 若您並未請求這個,請忽略此 E-mail 。您的密碼在您存取上面的連結並建立一個新的之前不會變更。
         subject: 'Mastodon: 重設密碼'
         title: 重設密碼
       unlock_instructions:
diff --git a/config/locales/doorkeeper.sk.yml b/config/locales/doorkeeper.sk.yml
index b998d9c37..eb70a1762 100644
--- a/config/locales/doorkeeper.sk.yml
+++ b/config/locales/doorkeeper.sk.yml
@@ -68,7 +68,7 @@ sk:
       buttons:
         revoke: Zrušiť oprávnenie
       confirmations:
-        revoke: Ste si istý?
+        revoke: Si si istý?
       index:
         application: Aplikácia
         created_at: Autorizované
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index 2aa271785..690fc4513 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -5,7 +5,7 @@ zh-TW:
       doorkeeper/application:
         name: 名稱
         redirect_uri: 重新導向 URI
-        scopes: 範圍
+        scopes: 權限範圍
         website: 應用程式網頁
     errors:
       models:
@@ -29,9 +29,9 @@ zh-TW:
       edit:
         title: 編輯應用程式
       form:
-        error: 噢!請檢查表單錯誤訊息
+        error: 唉呦!請檢查表單錯誤訊息
       help:
-        native_redirect_uri: 使用 %{native_redirect_uri} 作局部測試
+        native_redirect_uri: 請使用 %{native_redirect_uri} 作測試
         redirect_uri: 每行輸入一個 URI
         scopes: 請用半形空格分開權限範圍 (scope)。留空表示使用預設的權限範圍。
       index:
@@ -40,9 +40,9 @@ zh-TW:
         delete: 刪除
         name: 名稱
         new: 新增應用程式
-        scopes: 範圍
+        scopes: 權限範圍
         show: 顯示
-        title: 您的應用程式
+        title: 你的應用程式
       new:
         title: 新增應用程式
       show:
@@ -54,7 +54,7 @@ zh-TW:
         title: 應用程式︰ %{name}
     authorizations:
       buttons:
-        authorize: 允許
+        authorize: 授權
         deny: 拒絕
       error:
         title: 發生錯誤
@@ -66,25 +66,25 @@ zh-TW:
         title: 複製此授權碼並貼上到應用程式中。
     authorized_applications:
       buttons:
-        revoke: 取消授權
+        revoke: 撤銷授權
       confirmations:
-        revoke: 您確定要取消授權?
+        revoke: 您確定要撤銷這個授權?
       index:
         application: 應用程式
-        created_at: 授權於
+        created_at: 授權時間
         date_format: "%Y-%m-%d %H:%M:%S"
         scopes: 權限範圍
-        title: 已獲您授權的應用程式
+        title: 已授權的應用程式
     errors:
       messages:
-        access_denied: 資源擁有者或授權伺服器不接受請求。
+        access_denied: 資源擁有者或認證伺服器不接受請求。
         credential_flow_not_configured: 資源擁有者密碼認證程序失敗,由於 Doorkeeper.configure.resource_owner_from_credentials 沒有設定。
         invalid_client: 客戶端驗證失敗,可能是未知的客戶端程式、未包含客戶端驗證、或使用了不支援的認證方法。
         invalid_grant: 授權申請不正確、逾期、已被取消、與授權請求內的重新導向 URI 不符、或屬於別的客戶端程式。
         invalid_redirect_uri: 不正確的重新導向網址。
         invalid_request: 請求缺少必要的參數、包含不支援的參數、或其他輸入錯誤。
         invalid_resource_owner: 資源擁有者的登入資訊錯誤、或無法找到該資源擁有者
-        invalid_scope: 請求的權限範圍不正確、未有定義、或輸入錯誤。
+        invalid_scope: 請求的權限範圍無效、未定義、或輸入錯誤。
         invalid_token:
           expired: access token 已過期
           revoked: access token 已被取消
@@ -93,8 +93,8 @@ zh-TW:
         server_error: 認證伺服器發生未知錯誤。
         temporarily_unavailable: 認證伺服器暫時無法使用。
         unauthorized_client: 客戶端程式無權使用此方法進行請求。
-        unsupported_grant_type: 授權伺服器不支援這個授權類型。
-        unsupported_response_type: 授權伺服器不支援這個回應類型。
+        unsupported_grant_type: 認證伺服器不支援這個授權類型。
+        unsupported_response_type: 認證伺服器不支援這個回應類型。
     flash:
       applications:
         create:
@@ -105,7 +105,7 @@ zh-TW:
           notice: 已更新應用程式。
       authorized_applications:
         destroy:
-          notice: 已取消應用程式授權。
+          notice: 已撤銷應用程式授權。
     layouts:
       admin:
         nav:
@@ -115,5 +115,6 @@ zh-TW:
         title: 需要 OAuth 授權
     scopes:
       follow: 關注、封鎖、解除封鎖及取消關注帳號
+      push: 接收你帳號的推送通知
       read: 讀取您的帳號資料
-      write: 以您的名義發佈文章
+      write: 以您的名義發佈嘟文
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 78cb82abe..e141f27ee 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -675,6 +675,7 @@ eu:
     disallowed_hashtags:
       one: 'debekatutako traola bat zuen: %{tags}'
       other: 'debekatutako traola hauek zituen: %{tags}'
+    language_detection: Antzeman hizkuntza automatikoki
     open_in_web: Ireki web-ean
     over_character_limit: "%{max}eko karaktere muga gaindituta"
     pin_errors:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 305d5b17f..f748505d2 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -675,6 +675,7 @@ gl:
     disallowed_hashtags:
       one: 'contiña unha etiqueta non permitida: %{tags}'
       other: 'contiña etiquetas non permitidas: %{tags}'
+    language_detection: Detección automática do idioma
     open_in_web: Abrir na web
     over_character_limit: Excedeu o límite de caracteres %{max}
     pin_errors:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index cc79f352b..41f397feb 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -45,7 +45,7 @@ it:
     people_followed_by: Persone seguite da %{name}
     people_who_follow: Persone che seguono %{name}
     posts: Posts
-    posts_with_replies: Toot e repliche
+    posts_with_replies: Toot e risposte
     remote_follow: Segui da remoto
     reserved_username: Il nome utente è riservato
     roles:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 0967ef424..2eff09e1b 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1 +1,6 @@
-{}
+---
+ms:
+  about:
+    about_this: Mengenai
+    administered_by: 'Ditadbir oleh:'
+    contact: Hubungi
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d6d2183cf..d143367b6 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -330,8 +330,8 @@ nl:
           desc_html: Toestaan dat iedereen een account kan registereren
           title: Open registratie
       show_known_fediverse_at_about_page:
-        desc_html: Wanneer ingeschakeld wordt de globale tijdlijn als voorbeeld getoond en wanneer uitgeschakeld de lokale tijdljn.
-        title: De globale tijdlijn als voorbeeld tonen
+        desc_html: Wanneer ingeschakeld wordt de globale tijdlijn op de voorpagina getoond en wanneer uitgeschakeld de lokale tijdljn.
+        title: De globale tijdlijn op de voorpagina tonen
       show_staff_badge:
         desc_html: Medewerkersbadge op profielpagina tonen
         title: Medewerkersbadge tonen
@@ -350,7 +350,7 @@ nl:
         title: Thumbnail Mastodonserver
       timeline_preview:
         desc_html: Toon een openbare tijdlijn op de voorpagina
-        title: Tijdlijn als voorbeeld tonen
+        title: Tijdlijn op de voorpagina tonen
       title: Server-instellingen
     statuses:
       back_to_account: Terug naar accountpagina
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index fdaecbbbf..b69a1e76f 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -755,6 +755,28 @@ oc:
     reblogged: a partejat
     sensitive_content: Contengut sensible
   terms:
+    body_html: |
+      <h2>Politica de confidencialitat</h2>
+      <h3 id="collect">Quinas informacions reculhèm ?</h3>
+
+      <li>
+      <ul><em>Inforacions de basa del compte</em> :  se vos marcatz sus aqueste servidor, vos podèm demandar de picar un escais-nom, una adreça de corrièl e un senhal. Podètz tanben ajustar d’informacions de perfil addicionalas coma un nom de far veire, una biografia, un imatge de perfil e una banièra. L’escais-nom, lo nom d’afichatge, la biografia, l’imatge de perfil e la banièra son totjorn indicats per èsser vist publicament.</li>
+      <li><em>Publicacions, abonaments e autras informacions publicas</em> : La lista del monde que seguètz es visibla publicament, tot parièr per vòstres seguidors. Quand enviatz un messatge, la data e l’ora son gardats, l’aplicacion qu’avètz utilizada tanben. Los messatges pòdon conténer de mèdias juntats coma d’imatge e vidèos. Las publicacions publicas e pas listadas son disponiblas publicament. Quand penjatz una publicacion per vòstre perfil, aquò tanben es visible per tot lo monde. Vòstras publicacions son mandadas a vòstre seguidors, dins qualques cases aquò significa que passaràn per diferents servidors e seràn copiadas e gardadas sus aqueles servidors. Quand escafatz de publicacions, aquò es tanben mandat a vòstre seguidors. L’acion de partejar o d’ajustar als favorits una publicacion es totjorn quicòm de public.</li>
+      <li><em>Publicacions dirèctas e solament pels seguidors</em> :</li> totas las publicacions son gardadas e tractadas pel servidor. Las publicacions pas que per vòstres seguidors son enviadas a vòstres seguidors e las personas mencionadas dedins, las publicacions dirèctas son pas qu’enviadas a las personas mencionadas. Dins qualques cases aquò significa que passaràn per diferents servidors, copiadas e gardadas sus eles. Ensagem de limitar l’accès a aquelas publicacions a monde autorizat, mas los demai servidors pòdon fracar a far parièr. A causa d’aquò es fòrça important de repassar los servidors d’apertenéncia de vòstres seguidors. Podètz activar una opcion per autorizar o regetar una demanda de seguiment dins los paramètres. <em>Vos cal pas oblidar que’ls administrators dels servidors e dels servidors de recepcion pòdon veire aqueles messatges</em>, e que’ls destinataris pòdon realizar de captura d’ecran, copiar e tornar partejar los messatges.<em>Partegetz pas cap informacion perilhosa sus Mastodon</em><li>.
+      <li><em>Adreças IP e autras metadonadas</em> : quand vos connectatz, enregistrem l’adreça IP qu’utilizatz per establir la connexion, e tanben lo nom de vòstre navigador. Totas las sessions de connexion son disponiblas per que las repassetz e tiretz dins los paramètres. Las darrièras adreças IP son salvagardas fins a 12 meses. Podèm tanben gardar de jornals d’audit del servidor que pòdon conténer las adreças IP de cada requèstas mandadas a nòstre servidor.</li>
+      </ul>
+
+      <hr class="spacer" />
+
+      <h3 id="use">Qué fasèm de vòstras informacions ?</h3>
+
+      <p>Totas las informacions que collectem de vos pòdon servir dins los cases seguents :</p>
+
+      <ul>
+        <li>Per provesir la foncionament màger de Mastodon. Podètz pas qu’interagir amb lo contengut del monde e de vòstras publicacions quand sètz connectat. Per exemple, avètz la possibilitat de sègre de monde per veire lors publicacions amassadas dins vòstre flux d’actualitat personalizat.</li>
+        <li>Per ajudar la moderacion de la comunitat, per exemple en comparant vòstra adreça IP amb d’autras per determinar d’ensages de contornament de bandiment e d’autras violéncias.</li>
+        <li>Per enviar periodicament de corrièls &mdash; Podèm utilizar l’adreça qu’avètz donada per vos enviar d’informacions e de notificacions que demandatz tocant de cambiaments dins los subjèctes del forum o en responsa a vòstre nom d’utilizaire, en responsa a una demanda, e/o tota autra question.</li>
+      </ul>
     title: Condicions d’utilizacion e politica de confidencialitat de %{instance}
   themes:
     contrast: Fòrt contrast
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 596d89d81..273103fd6 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -5,17 +5,19 @@ de:
       defaults:
         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: Dieser Account führt hauptsächlich automatische Aktionen aus und wird möglicherweise nicht überwacht
+        bot: Dieses Konto führt lediglich automatisierte Aktionen durch und wird möglicherweise nicht überwacht
         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
+        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
+        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
         setting_theme: Wirkt sich darauf aus, wie Mastodon aussieht, egal auf welchem Gerät du eingeloggt bist.
@@ -23,6 +25,8 @@ de:
         data: CSV-Datei, die aus einer anderen Mastodon-Instanz exportiert wurde
       sessions:
         otp: 'Gib den Zwei-Faktor-Authentisierungscode von deinem Telefon ein oder benutze einen deiner Wiederherstellungscodes:'
+      user:
+        chosen_languages: Wenn dies aktiviert ist, dann werden nur Beiträge in den ausgewählten Sprachen auf der öffentlichen Timeline angezeigt
     labels:
       account:
         fields:
@@ -32,6 +36,7 @@ de:
         autofollow: Einladen, um deinen Account zu folgen
         avatar: Profilbild
         bot: Dies ist ein bot Benutzer
+        chosen_languages: Sprachen filtern
         confirm_new_password: Neues Passwort bestätigen
         confirm_password: Passwort bestätigen
         current_password: Derzeitiges Passwort
@@ -41,26 +46,27 @@ de:
         expires_in: Gültig bis
         fields: Profil-Metadaten
         header: Kopfbild
-        locale: Sprache
+        locale: Sprache der Benutzeroberfläche
         locked: Gesperrtes Profil
-        max_uses: Max Verwendungen
+        max_uses: Maximale Verwendungen
         new_password: Neues Passwort
         note: Über mich
         otp_attempt: Zwei-Faktor-Authentisierungs-Code
         password: Passwort
         setting_auto_play_gif: Animierte GIFs automatisch abspielen
         setting_boost_modal: Bestätigungsdialog anzeigen, bevor ein Beitrag geteilt wird
+        setting_default_language: Beitragssprache
         setting_default_privacy: Beitragssichtbarkeit
         setting_default_sensitive: Medien immer als heikel markieren
         setting_delete_modal: Bestätigungsdialog anzeigen, bevor ein Beitrag gelöscht wird
         setting_display_sensitive_media: Medien, die als heikel markiert sind, immer anzeigen
-        setting_hide_network: Verstecke dein Netzwerk
+        setting_hide_network: Blende dein Netzwerk aus
         setting_noindex: Suchmaschinen-Indexierung verhindern
         setting_reduce_motion: Bewegung in Animationen verringern
         setting_system_font_ui: Standardschriftart des Systems verwenden
         setting_theme: Theme der Website
         setting_unfollow_modal: Bestätigungsdialog anzeigen, bevor jemand entfolgt wird
-        severity: Gewichtung
+        severity: Schweregrad
         type: Importtyp
         username: Profilname
         username_or_email: Profilname oder Email
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index 884c3a989..0d0a717b8 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -12,10 +12,12 @@ eo:
           other: <span class="name-counter">%{count}</span> signoj restas
         fields: Vi povas havi ĝis 4 tabelajn elementojn en via profilo
         header: Formato PNG, GIF aŭ JPG. Ĝis 2MB. Estos malgrandigita al 700x335px
+        locale: La lingvo de la uzant-interfaco, retmesaĝoj kaj puŝ-sciigoj
         locked: Vi devos aprobi ĉiun peton de sekvado mane
         note:
           one: <span class="note-counter">1</span> signo restas
           other: <span class="note-counter">%{count}</span> signoj restas
+        setting_default_language: La lingvo de viaj mesaĝoj povas esti aŭtomate detektitaj, sed tio ne ĉiam ĝustas
         setting_hide_network: Tiuj, kiujn vi sekvas, kaj tiuj, kiuj sekvas vin ne estos videblaj en via profilo
         setting_noindex: Influas vian publikan profilon kaj mesaĝajn paĝojn
         setting_theme: Influas kiel Mastodon aspektas post ensaluto de ajna aparato.
@@ -23,6 +25,8 @@ eo:
         data: CSV-dosiero el alia nodo de Mastodon
       sessions:
         otp: 'Enmetu la kodon de dufaktora aŭtentigo el via telefono aŭ uzu unu el viaj realiraj kodoj:'
+      user:
+        chosen_languages: Kiam estas elekto, nur mesaĝoj en elektitaj lingvoj aperos en publikaj tempolinioj
     labels:
       account:
         fields:
@@ -32,6 +36,7 @@ eo:
         autofollow: Inviti al sekvi vian konton
         avatar: Profilbildo
         bot: Tio estas robota konto
+        chosen_languages: Filtri lingvojn
         confirm_new_password: Konfirmi novan pasvorton
         confirm_password: Konfirmi pasvorton
         current_password: Nuna pasvorto
@@ -41,7 +46,7 @@ eo:
         expires_in: Eksvalidiĝas post
         fields: Profilaj metadatumoj
         header: Fonbildo
-        locale: Lingvo
+        locale: Interfaca lingvo
         locked: Ŝlosi konton
         max_uses: Maksimuma nombro de uzoj
         new_password: Nova pasvorto
@@ -50,6 +55,7 @@ eo:
         password: Pasvorto
         setting_auto_play_gif: Aŭtomate ekigi GIF-ojn
         setting_boost_modal: Montri fenestron por konfirmi antaŭ ol diskonigi
+        setting_default_language: Publikada lingvo
         setting_default_privacy: Mesaĝa videbleco
         setting_default_sensitive: Ĉiam marki aŭdovidaĵojn tiklaj
         setting_delete_modal: Montri fenestron por konfirmi antaŭ ol forigi mesaĝon
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index ff34fdf50..2d60030ec 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -12,10 +12,12 @@ eu:
           other: <span class="name-counter">%{count}</span> karaktere geratzen dira
         fields: 4 elementu bistaratu ditzakezu taula batean zure profilean
         header: PNG, GIF edo JPG. Gehienez 2MB. 700x335px eskalara txikituko da
+        locale: Erabiltzaile-interfazea, e-mail mezuen eta jakinarazpenen hizkuntza
         locked: Jarraitzaileak eskuz onartu behar dituzu
         note:
           one: Karaktere<span class="note-counter">1</span> geratzen da
           other: <span class="note-counter"> %{count}</span> karaktere geratzen dira
+        setting_default_language: Zure toot-en hizkuntza automatikoki antzeman daiteke, baina ez da beti zehatza
         setting_hide_network: Nor jarraitzen duzun eta nork jarraitzen zaituen ez da bistaratuko zure profilean
         setting_noindex: Zure profil publiko eta toot orrietan eragina du
         setting_theme: Edozein gailutik konektatzean Mastodon-en itxuran eragiten du.
@@ -23,6 +25,8 @@ eu:
         data: Beste Mastodon instantzia batetik esportatutako CSV fitxategia
       sessions:
         otp: 'Sartu zure telefonoko aplikazioak sortutako bi faktoreetako kodea, edo erabili zure berreskuratze kodeetako bat:'
+      user:
+        chosen_languages: Ezer markatzekotan, hautatutako hizkuntzetan dauden toot-ak besterik ez dira erakutsiko
     labels:
       account:
         fields:
@@ -32,6 +36,7 @@ eu:
         autofollow: Gonbidatu zure kontua jarraitzera
         avatar: Abatarra
         bot: Hau bot kontu bat da
+        chosen_languages: Iragazi hizkuntzak
         confirm_new_password: Berretsi pasahitz berria
         confirm_password: Berretsi pasahitza
         current_password: Oraingo pasahitza
@@ -41,7 +46,7 @@ eu:
         expires_in: Iraungitzea
         fields: Profilaren metadatuak
         header: Goiburua
-        locale: Hizkuntza
+        locale: Interfazearen hizkuntza
         locked: Giltzapetu kontua
         max_uses: Gehieneko erabiltzaile kopurua
         new_password: Pasahitz berria
@@ -50,6 +55,7 @@ eu:
         password: Pasahitza
         setting_auto_play_gif: Erreproduzitu GIF animatuak automatikoki
         setting_boost_modal: Erakutsi baieztapen elkarrizketa-koadroa bultzada eman aurretik
+        setting_default_language: Argitalpenen hizkuntza
         setting_default_privacy: Mezuen pribatutasuna
         setting_default_sensitive: Beti markatu edukiak hunkigarri gisa
         setting_delete_modal: Erakutsi baieztapen elkarrizketa-koadroa toot bat ezabatu aurretik
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index e8a2c38aa..a2ef8d439 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -12,10 +12,12 @@ fa:
           other: <span class="name-counter">%{count}</span> حرف باقی مانده
         fields: شما می‌توانید تا چهار مورد را در یک جدول در نمایهٔ خود نمایش دهید
         header: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه ۲ مگابایت. تصویر به اندازهٔ ۳۳۵×۷۰۰ پیکسل تبدیل خواهد شد
+        locale: زبان محیط کاربری، ایمیل‌ها، و اعلان‌ها
         locked: باید پیگیران تازه را خودتان تأیید کنید
         note:
           one: <span class="note-counter">1</span> حرف باقی مانده
           other: <span class="note-counter">%{count}</span> حرف باقی مانده
+        setting_default_language: زبان نوشته‌های شما به طور خودکار تشخیص داده می‌شود، ولی این تشخصی همیشه دقیق نیست
         setting_hide_network: فهرست پیگیران شما و فهرست کسانی که شما پی می‌گیرید روی نمایهٔ شما دیده نخواهد شد
         setting_noindex: روی نمایهٔ عمومی و صفحهٔ نوشته‌های شما تأثیر می‌گذارد
         setting_theme: ظاهر ماستدون را وقتی که از هر دستگاهی به آن وارد می‌شوید تعیین می‌کند.
@@ -23,6 +25,8 @@ fa:
         data: پروندهٔ CSV که از سرور ماستدون دیگری برون‌سپاری شده
       sessions:
         otp: 'کد تأیید دومرحله‌ای که اپ روی تلفن شما ساخته را وارد کنید یا یکی از کدهای بازیابی را به کار ببرید:'
+      user:
+        chosen_languages: اگر انتخاب کنید، تنها نوشته‌هایی که به زبان‌های برگزیدهٔ شما نوشته شده‌اند در فهرست نوشته‌های عمومی نشان داده می‌شوند
     labels:
       account:
         fields:
@@ -32,6 +36,7 @@ fa:
         autofollow: دعوت از دیگران برای عضو شدن و پیگیری حساب شما
         avatar: تصویر نمایه
         bot: این حساب یک ربات است
+        chosen_languages: جدا کردن زبان‌ها
         confirm_new_password: تأیید رمز تازه
         confirm_password: تأیید رمز
         current_password: رمز فعلی
@@ -41,7 +46,7 @@ fa:
         expires_in: تاریخ انقضا
         fields: اطلاعات تکمیلی نمایه
         header: تصویر زمینه
-        locale: زبان
+        locale: زبان محیط کاربری
         locked: خصوصی‌کردن حساب
         max_uses: بیشترین شمار استفاده
         new_password: رمز تازه
@@ -50,6 +55,7 @@ fa:
         password: رمز
         setting_auto_play_gif: پخش خودکار تصویرهای متحرک
         setting_boost_modal: نمایش پیغام تأیید پیش از بازبوقیدن
+        setting_default_language: زبان نوشته‌های شما
         setting_default_privacy: حریم خصوصی نوشته‌ها
         setting_default_sensitive: همیشه تصاویر را به عنوان حساس علامت بزن
         setting_delete_modal: نمایش پیغام تأیید پیش از پاک کردن یک نوشته
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 5da562e19..81e10409a 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -12,10 +12,12 @@ fr:
           other: <span class="name-counter">%{count}</span> caractères restants
         fields: Vous pouvez avoir jusqu'à 4 éléments affichés en tant que tableau sur votre profil
         header: Au format PNG, GIF ou JPG. 2 Mo maximum. Sera réduit à 700x335px
+        locale: La langue de l'interface-utilisateur, des courriels, et des notifications
         locked: Vous devrez approuver chaque abonné⋅e et vos statuts ne s’afficheront qu’à vos abonné⋅es
         note:
           one: <span class="note-counter">1</span> caractère restant
           other: <span class="note-counter">%{count}</span> caractères restants
+        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
         setting_theme: Affecte l’apparence de Mastodon quand vous êtes connecté·e depuis n’importe quel appareil.
@@ -23,6 +25,8 @@ fr:
         data: Un fichier CSV généré par une autre instance de Mastodon
       sessions:
         otp: 'Entrez le code d’authentification à deux facteurs généré par votre téléphone ou utilisez un de vos codes de récupération :'
+      user:
+        chosen_languages: Lorsque coché, seuls les pouets dans les langues sélectionnées seront affichés sur les fils publics
     labels:
       account:
         fields:
@@ -32,6 +36,7 @@ fr:
         autofollow: Invitation à suivre votre compte
         avatar: Image de profil
         bot: Ceci est un robot
+        chosen_languages: Filtrer les langues
         confirm_new_password: Confirmation du nouveau mot de passe
         confirm_password: Confirmation du mot de passe
         current_password: Mot de passe actuel
@@ -41,7 +46,7 @@ fr:
         expires_in: Expire après
         fields: Métadonnées du profil
         header: Image d’en-tête
-        locale: Langue
+        locale: Langue de l'interface
         locked: Verrouiller le compte
         max_uses: Nombre maximum d'utilisations
         new_password: Nouveau mot de passe
@@ -50,6 +55,7 @@ fr:
         password: Mot de passe
         setting_auto_play_gif: Lire automatiquement les GIFs animés
         setting_boost_modal: Afficher une fenêtre de confirmation avant de partager
+        setting_default_language: Langue de publication
         setting_default_privacy: Confidentialité des statuts
         setting_default_sensitive: Toujours marquer les médias comme sensibles
         setting_delete_modal: Afficher une fenêtre de confirmation avant de supprimer un pouet
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index f4e1ec640..2bccb2d4f 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -12,10 +12,12 @@ gl:
           other: <span class="name-counter">%{count}</span> caracteres restantes
         fields: Pode ter ate 4 elementos no seu perfil mostrados como unha táboa
         header: PNG, GIF ou JPG. Máximo 2MB. Será reducida a 700x335px
+        locale: O idioma da interface de usuaria, correos e notificacións
         locked: Require que vostede acepte as seguidoras de xeito manual
         note:
           one: <span class="note-counter">1</span> caracter restante
           other: <span class="note-counter">%{count}</span> caracteres restantes
+        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
         setting_theme: Afecta ao aspecto de Mastodon en calquer dispositivo cando está conectada.
@@ -23,6 +25,8 @@ gl:
         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.
+      user:
+        chosen_languages: Si se marca, só os toots nos idiomas seleccionados serán mostrados en liñas temporais públicas
     labels:
       account:
         fields:
@@ -32,6 +36,7 @@ gl:
         autofollow: Convide a seguir a súa conta
         avatar: Avatar
         bot: Esta conta é de un bot
+        chosen_languages: Filtrar idiomas
         confirm_new_password: Confirme o novo contrasinal
         confirm_password: Confirme o contrasinal
         current_password: Contrasinal actual
@@ -41,7 +46,7 @@ gl:
         expires_in: Caducidade despois de
         fields: Metadatos do perfil
         header: Cabeceira
-        locale: Idioma
+        locale: Idioma da interface
         locked: Protexer conta
         max_uses: Número máximo de usos
         new_password: Novo contrasinal
@@ -50,6 +55,7 @@ gl:
         password: Contrasinal
         setting_auto_play_gif: Reprodución automática de GIFs animados
         setting_boost_modal: Pedir confirmación antes de promocionar
+        setting_default_language: Idioma de publicación
         setting_default_privacy: Intimidade da publicación
         setting_default_sensitive: Marcar sempre multimedia como sensible
         setting_delete_modal: Solicitar confirmación antes de eliminar unha mensaxe
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 948343240..ff3d2c002 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -12,10 +12,12 @@ it:
           other: <span class="name-counter">%{count}</span> caratteri rimanenti
         fields: Puoi avere fino a 4 voci visualizzate come una tabella sul tuo profilo
         header: PNG, GIF o JPG. Al massimo 2MB. Verranno scalate a 700x335px
+        locale: La lingua dell'interfaccia utente, di email e notifiche push
         locked: Richiede che approvi i follower manualmente
         note:
           one: <span class="note-counter">1</span> carattere rimanente
           other: <span class="note-counter">%{count}</span> caratteri rimanenti
+        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
         setting_theme: Ha effetto sul modo in cui Mastodon verrà visualizzato quando sarai collegato da qualsiasi dispositivo.
@@ -23,6 +25,8 @@ it:
         data: File CSV esportato da un'altra istanza di Mastodon
       sessions:
         otp: 'Inserisci il codice a due fattori generato dall''app del tuo telefono o usa uno dei codici di recupero:'
+      user:
+        chosen_languages: Quando una o più lingue sono contrassegnate, nelle timeline pubbliche vengono mostrati solo i toot nelle lingue selezionate
     labels:
       account:
         fields:
@@ -32,6 +36,7 @@ it:
         autofollow: Invita a seguire il tuo account
         avatar: Avatar
         bot: Questo account è un bot
+        chosen_languages: Filtra lingue
         confirm_new_password: Conferma nuova password
         confirm_password: Conferma password
         current_password: Password corrente
@@ -41,7 +46,7 @@ it:
         expires_in: Scade dopo
         fields: Metadati del profilo
         header: Header
-        locale: Lingua
+        locale: Lingua dell'interfaccia
         locked: Blocca account
         max_uses: Numero massimo di utilizzi
         new_password: Nuova password
@@ -50,6 +55,7 @@ it:
         password: Password
         setting_auto_play_gif: Play automatico GIF animate
         setting_boost_modal: Mostra dialogo di conferma prima del boost
+        setting_default_language: Lingua dei post
         setting_default_privacy: Privacy dei post
         setting_default_sensitive: Segna sempre i media come sensibili
         setting_delete_modal: Mostra dialogo di conferma prima di eliminare un toot
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index 7ebd26630..8ca33528b 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -19,6 +19,7 @@ sk:
           few: Ostávajú ti <span class="note-counter">%{count}</span> znaky
           one: Ostáva ti <span class="note-counter">1</span> znak
           other: Ostáva ti <span class="note-counter">%{count}</span> znakov
+        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
         setting_theme: Toto ovplyvňuje ako Mastodon vyzerá pri prihlásení z hociakého zariadenia.
@@ -26,6 +27,8 @@ sk:
         data: CSV súbor vyexportovaný z inej Mastodon inštancie
       sessions:
         otp: 'Napíš sem dvoj-faktorový kód z telefónu, alebo použi jeden z tvojích obnovovacích kódov:'
+      user:
+        chosen_languages: Keď je zaškrtnuté, tak iba príspevky vo vybraných jazykoch budú zobrazené vo verejnej osi
     labels:
       account:
         fields:
@@ -54,6 +57,7 @@ sk:
         password: Heslo
         setting_auto_play_gif: Automaticky prehrávať animované GIFy
         setting_boost_modal: Zobrazovať potvrdzovacie okno pred re-toot
+        setting_default_language: Píšeš v jazyku
         setting_default_privacy: Súkromie príspevkov
         setting_default_sensitive: Označ všetky mediálne súbory ako chúlostivé
         setting_delete_modal: Zobrazuj potvrdzovacie okno pred vymazaním toot-u
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index 7a1cae68d..0575c09f8 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -3,6 +3,7 @@ zh-HK:
   simple_form:
     hints:
       defaults:
+        autofollow: 通過邀請網址註冊的用戶將會自動關注你
         avatar: 支援 PNG, GIF 或 JPG 圖片,檔案最大為 2MB,會縮裁成 400x400px
         bot: 提醒用戶本帳號是機械人
         digest: 僅在你長時間未登錄,且收到了私信時發送
@@ -11,10 +12,12 @@ zh-HK:
           other: 尚餘 <span class="name-counter">%{count}</span> 個字
         fields: 個人資料頁可顯示多至 4 個項目
         header: 支援 PNG, GIF 或 JPG 圖片,檔案最大為 2MB,會縮裁成 700x335px
+        locale: 使用者介面、電郵和通知的語言
         locked: 你必須人手核准每個用戶對你的關注請求,而你的文章私隱會被預設為「只有關注你的人能看」
         note:
           one: 尚餘 <span class="note-counter">1</span> 個字
           other: 尚餘 <span class="note-counter">%{count}</span> 個字
+        setting_default_language: 你文章的語言會被自動偵測,但不一定完全準確
         setting_hide_network: 你關注的人和關注你的人將不會在你的個人資料頁上顯示
         setting_noindex: 此設定會影響到你的公開個人資料以及文章頁面
         setting_theme: 此設置會影響到你從任意設備登入時 Mastodon 的顯示樣式。
@@ -22,14 +25,18 @@ zh-HK:
         data: 自其他服務站匯出的 CSV 檔案
       sessions:
         otp: 輸入你手機上生成的雙重認證碼,或者任意一個恢復代碼:
+      user:
+        chosen_languages: 只有被選擇的語言會在公開時間軸內顯示
     labels:
       account:
         fields:
           name: 標籤
           value: 內容
       defaults:
+        autofollow: 邀請別人關注你的賬號
         avatar: 個人頭像
         bot: 這帳號是機械人
+        chosen_languages: 語言過濾
         confirm_new_password: 確認新密碼
         confirm_password: 確認密碼
         current_password: 目前密碼
@@ -39,7 +46,7 @@ zh-HK:
         expires_in: 失效時間
         fields: 資料
         header: 個人頁面頂部
-        locale: 語言
+        locale: 介面語言
         locked: 將用戶轉為「私人」
         max_uses: 最大使用次數
         new_password: 新密碼
@@ -48,6 +55,7 @@ zh-HK:
         password: 密碼
         setting_auto_play_gif: 自動播放 GIF
         setting_boost_modal: 在轉推前詢問我
+        setting_default_language: 文章語言
         setting_default_privacy: 文章預設為
         setting_default_sensitive: 預設我的內容為敏感內容
         setting_delete_modal: 刪推前詢問我
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index a3f6627af..6b1dbae91 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -3,53 +3,86 @@ zh-TW:
   simple_form:
     hints:
       defaults:
-        avatar: 支援 PNG, GIF 或 JPG 圖片,檔案大小上限為 2MB,會被縮小為 400x400px
-        display_name: 最多 30 個字元
-        header: 支援 PNG, GIF 或 JPG 圖片,檔案大小上限為 2MB,會被縮小為 700x335px
-        locked: 您必須手動核准每個使用者對您的關注請求,而您的文章隱私預設為「只有關注您的人能看」
-        note: 最多 160 個字元
+        autofollow: 通過邀請網址註冊的使用者將會自動關注你
+        avatar: 支援 PNG, GIF 或 JPG 圖片,檔案最大為 2MB,會縮裁成 400x400px
+        bot: 這個帳號由程式進行自動式操作
+        digest: 僅在你長時間未登入,並且收到了私訊時發送
+        display_name:
+          one: 尚餘 <span class="name-counter">1</span> 個字
+          other: 尚餘 <span class="name-counter">%{count}</span> 個字
+        fields: 個人資訊頁至多可顯示 4 個項目
+        header: 支援 PNG, GIF 或 JPG 圖片,檔案最大為 2MB,會縮裁成 700x335px
+        locale: 使用者介面、 E-mail 與通知的語言
+        locked: 你必須手動核准每個使用者對你的關注請求,而你的貼文隱私將會被設定為「只有關注你的人能看」
+        note:
+          one: 尚餘 <span class="note-counter">1</span> 個字
+          other: 尚餘 <span class="note-counter">%{count}</span> 個字
+        setting_default_language: 你嘟文的語言會被自動偵測,但不一定完全準確
+        setting_hide_network: 你關注的人與關注你的人將不會在你的個人資料頁上顯示
+        setting_noindex: 此設定會影響到你的公開個人資料與嘟文頁面
+        setting_theme: 此設定會影響到你從任意設備登入 Mastodon 時的顯示樣式。
       imports:
-        data: 自其他服務站匯出的 CSV 檔案
+        data: 自其他站點匯出的 CSV 檔案
+      sessions:
+        otp: 輸入你手機上產生的兩階段認證碼,或著任意一個備用驗證碼:
+      user:
+        chosen_languages: 只有被選擇的語言會在公開時間軸內顯示
     labels:
+      account:
+        fields:
+          name: 標籤
+          value: 內容
       defaults:
-        avatar: 大頭貼
+        autofollow: 邀請別人關注你的帳戶
+        avatar: 頭像
+        bot: 這個帳號是機器人
+        chosen_languages: 語言篩選
         confirm_new_password: 確認新密碼
         confirm_password: 確認密碼
         current_password: 目前密碼
         data: 資料
         display_name: 顯示名稱
-        email: 電子信箱
-        header: 個人頁面頂部
-        locale: 語言
+        email: E-mail
+        expires_in: 失效時間
+        fields: 資料
+        header: 個人頁面圖片
+        locale: 介面語言
         locked: 將帳號轉為「私密」
+        max_uses: 最大使用次數
         new_password: 新密碼
         note: 簡介
-        otp_attempt: 雙因子驗證碼
+        otp_attempt: 兩階段認證碼
         password: 密碼
-        setting_auto_play_gif: 自動播放 GIFs
-        setting_boost_modal: 轉推前跳出確認視窗
-        setting_default_privacy: 文章預設隱私度
-        setting_default_sensitive: 預設我的內容為敏感內容
-        setting_delete_modal: 刪推前跳出確認視窗
-        setting_noindex: 不被搜尋引擎檢索
+        setting_auto_play_gif: 自動播放 GIF
+        setting_boost_modal: 在轉嘟前先詢問我
+        setting_default_language: 嘟文語言
+        setting_default_privacy: 嘟文預設為
+        setting_default_sensitive: 預設我的媒體檔案為敏感內容
+        setting_delete_modal: 刪除嘟文前先詢問我
+        setting_display_sensitive_media: 預設我的媒體為敏感內容
+        setting_hide_network: 隱藏你的社交網路
+        setting_noindex: 阻止搜尋引擎收錄
         setting_reduce_motion: 減低動畫效果
-        setting_system_font_ui: 使用系統預設字體
-        setting_theme: 網站主題
-        setting_unfollow_modal: 取消關注前跳出確認視窗
+        setting_system_font_ui: 使用系統預設字型
+        setting_theme: 主題外觀
+        setting_unfollow_modal: 取消關注前先詢問我
+        severity: 等級
         type: 匯入資料類型
         username: 使用者名稱
+        username_or_email: 使用者名稱或 E-mail
       interactions:
-        must_be_follower: 隱藏沒有關注您的使用者的通知
-        must_be_following: 隱藏您不關注的使用者的通知
+        must_be_follower: 隱藏沒有關注你的使用者通知
+        must_be_following: 隱藏你沒關注的使用者通知
+        must_be_following_dm: 隱藏你沒關注的使用者私訊
       notification_emails:
-        digest: 定期摘要信
-        favourite: 當有使用者喜歡您的文章時,發信通知
-        follow: 當有使用者關注您時,發信通知
-        follow_request: 當有使用者要求關注您時,發信通知
-        mention: 當有使用者在文章提及您時,發信通知
-        reblog: 當有使用者轉推您的文章時,發信通知
+        digest: 定期發送摘要郵件
+        favourite: 當有使用者喜歡你的嘟文時,發送 E-mail 通知
+        follow: 當有使用者關注你時,發送 E-mail 通知
+        follow_request: 當有使用者要求關注你時,發送 E-mail 通知
+        mention: 當有使用者在嘟文提及你時,發送 E-mail 通知
+        reblog: 都有使用者轉嘟你的嘟文時,發送 E-mail 通知
     'no': 否
     required:
       mark: "*"
-      text: 必填
+      text: 必須填寫
     'yes': 是
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 278191599..77726ba08 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -22,7 +22,7 @@ sk:
       not_a_product_title: Si človek, nie produkt
       real_conversation_body: S 500 znakmi a podporou pre varovania pri obrázkoch a videách sa môžeš vyjadriť tak ako budeš chcieť.
       real_conversation_title: Vytvorený pre reálnu konverzáciu
-      within_reach_body: Viacero aplikácií pre iOS, Android a iné platformy, ktoré vďaka jednoduchému API ekosystému vám dovoľujú byť online so svojimi priateľmi kdekoľvek.
+      within_reach_body: Viacero aplikácií pre iOS, Android a iné platformy, ktoré ti vďaka jednoduchému API ekosystému dovoľujú byť online so svojimi priateľmi kdekoľvek.
       within_reach_title: Stále v dosahu
     generic_description: "%{domain} je jeden server v sieti"
     hosted_on: Mastodon hostovaný na %{domain}
@@ -60,7 +60,7 @@ sk:
       delete: Zmazať
       destroyed_msg: Poznámka moderátora bola úspešne zmazaná!
     accounts:
-      are_you_sure: Ste si istý?
+      are_you_sure: Si si istý?
       avatar: Maskot
       by_domain: Doména
       change_email:
@@ -621,11 +621,17 @@ sk:
       firefox: Mozilla Firefox
       generic: Neznámy prehliadač
       ie: Internet Explorer
+      otter: Prehliadač Otter
+      safari: Apple Safari
+      weibo: Sina/Tencent Weibo
     current_session: Aktuálna sezóna
     description: "%{browser} na %{platform}"
     explanation: Tieto sú prehliadače ktoré sú teraz prihlásené na tvoj Mastodon účet.
     ip: IP adresa
     platforms:
+      chrome_os: Google ChromeOS
+      ios: Apple iOS
+      linux: GNU/Linux
       mac: MacOSX
       other: neznáma platforma
     revoke: Zamietni
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index dd6541cc9..503a70a15 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -424,7 +424,7 @@ zh-HK:
     following: 成功!你正在關注:
     post_follow:
       close: 你也可以直接關閉這個頁面。
-      return: 返回至個人資料頁
+      return: 顯示個人資料頁
       web: 返回本站
     title: 關注 %{acct}
   datetime:
@@ -514,6 +514,7 @@ zh-HK:
       '86400': 1 天後
     expires_in_prompt: 永不過期
     generate: 生成邀請連結
+    invited_by: 你的邀請人是:
     max_uses:
       one: 1 次
       other: "%{count} 次"
@@ -671,6 +672,7 @@ zh-HK:
     disallowed_hashtags:
       one: 包含不允許的標籤: %{tags}
       other: 包含不允許的標籤: %{tags}
+    language_detection: 自動偵測語言
     open_in_web: 開啟網頁
     over_character_limit: 超過了 %{max} 字的限制
     pin_errors:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index d8c0f89a9..e2b376a3f 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1,144 +1,431 @@
 ---
 zh-TW:
   about:
-    about_mastodon_html: Mastodon (長毛象)是一個<em>自由、開放原始碼</em>的社群網站。它是一個分散式的服務,避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 服務站,在上面建立帳號,然後您就可以和任一 Mastodon 服務站上的使用者互通,享受無縫的<em>社群網路</em>交流。
-    about_this: 關於本服務站
-    closed_registrations: 本服務站暫時停止接受註冊。
+    about_hashtag_html: 這些是包含「<strong>#%{hashtag}</strong>」標籤的公開文章。只要你有任何 Mastodon 站點、或者其他站點的使用者,便可以與他們互動。
+    about_mastodon_html: Mastodon (長毛象)是一個<em>自由、開放原始碼</em>的社群網站。它是一個分散式的服務,避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 站點,在上面建立帳號,然後您就可以和任一 Mastodon 站點上的使用者互通,享受無縫的<em>社群網路</em>交流。
+    about_this: 關於本站
+    administered_by: 管理者:
+    closed_registrations: 本站暫時停止接受註冊。
     contact: 聯絡我們
-    description_headline: 關於 %{domain}
-    domain_count_after: 個服務站相連
+    contact_missing: 未設定
+    contact_unavailable: 未公開
+    description_headline: 關於 %{domain}?
+    domain_count_after: 個站點相連
     domain_count_before: 與其他
-    other_instances: 其他服務站
+    extended_description_html: |
+      <h3>這裡可以寫一些網站規則</h3>
+      <p>本站點未有詳細介紹</p>
+    features:
+      humane_approach_body: Mastodon 從其他網路的失敗經驗中汲取教訓,以合乎道德的設計對抗社交媒體的濫用問題。
+      humane_approach_title: 以人為本
+      not_a_product_body: Mastodon 不是商業網站。沒有廣告,沒有數據挖掘,也沒有中央機構操控。平台完全開放。
+      not_a_product_title: 你是用戶,不是商品
+      real_conversation_body: Mastodon 的字數限制高達 500 字,並支援仔細的媒體警告選項,令你暢所欲言。
+      real_conversation_title: 為真正的交流而生
+      within_reach_body: 簡易的 API 系統,令用戶可以透過不同的 iOS、Android 及其他平台的應用軟體,與朋友保持聯繫。
+      within_reach_title: 始終觸手可及
+    generic_description: "%{domain} 是 Mastodon 網路中其中一個站點"
+    hosted_on: 在 %{domain} 運作的 Mastodon 站點
+    learn_more: 了解詳細
+    other_instances: 其他站點
     source_code: 原始碼
-    status_count_after: 篇文章
-    status_count_before: 他們共發佈了
-    user_count_after: 位註冊使用者
-    user_count_before: 這裡共有
+    status_count_after: 條嘟嘟
+    status_count_before: 他們共嘟出了
+    user_count_after: 位使用者
+    user_count_before: 這裡共註冊有
+    what_is_mastodon: 什麼是 Mastodon?
   accounts:
     follow: 關注
     followers: 關注者
     following: 正在關注
-    nothing_here: 暫時沒有內容可供顯示
+    media: 媒體
+    moved_html: "%{name} 已經搬遷到 %{new_profile_link}:"
+    network_hidden: 此訊息不可用
+    nothing_here: 暫時沒有內容可供顯示!
     people_followed_by: "%{name} 關注的人"
     people_who_follow: 關注 %{name} 的人
-    posts: 文章
+    posts: 嘟文
+    posts_with_replies: 嘟文與回覆
     remote_follow: 跨站關注
+    reserved_username: 此用戶名已被保留
+    roles:
+      admin: 管理員
+      bot: 機器人
+      moderator: 版主
     unfollow: 取消關注
   admin:
+    account_moderation_notes:
+      create: 記錄
+      created_msg: 已新增管理備忘!
+      delete: 刪除
+      destroyed_msg: 成功刪除管理備忘!
     accounts:
       are_you_sure: 您確定嗎?
-      display_name: 顯示名稱
+      avatar: 頭像
+      by_domain: 網域
+      change_email:
+        changed_msg: E-mail更改成功!
+        current_email: 目前的E-mail
+        label: 更改E-mail
+        new_email: 新的E-mail
+        submit: 更改E-mail
+        title: 為 %{username} 更改E-mail
+      confirm: 確定
+      confirmed: 已確定
+      confirming: 確定
+      demote: 降級
+      disable: 停用
+      disable_two_factor_authentication: 停用兩階段認證
+      disabled: 已停用
+      display_name: 暱稱
       domain: 網域
       edit: 編輯
-      email: 信箱
-      feed_url: Feed URL
-      followers: 追蹤者
-      follows: 追蹤的
+      email: E-mail
+      email_status: E-mail狀態
+      enable: 啟用
+      enabled: 已啟用
+      feed_url: 訂閱 URL
+      followers: 關注者
+      followers_url: 關注者(Followers)URL
+      follows: 正在關注
+      inbox_url: 收件箱 (Inbox) URL
+      ip: IP 位址
       location:
         all: 全部
-        local: 本地
+        local: 本站
         remote: 遠端
         title: 位置
+      login_status: 登入狀態
       media_attachments: 多媒體附件
+      memorialize: 設定為追悼帳戶
       moderation:
         all: 全部
-        silenced: 靜音
-        suspended: 停權
+        silenced: 已靜音
+        suspended: 已停權
         title: 版務
+      moderation_notes: 管理備忘
       most_recent_activity: 最近活動
-      most_recent_ip: 最近 IP
+      most_recent_ip: 最近 IP 位址
       not_subscribed: 未訂閱
       order:
-        alphabetic: 字典序
-        most_recent: 時間序
+        alphabetic: 按字母
+        most_recent: 按時間
         title: 排序
+      outbox_url: 寄件箱 (Outbox) URL
       perform_full_suspension: 進行停權
-      profile_url: 個人檔案網址
+      profile_url: 個人檔案 URL
+      promote: 晉級
+      protocol: 協議
       public: 公開
-      push_subscription_expires: 推播訂閱過期
-      salmon_url: Salmon URL
+      push_subscription_expires: PuSH 訂閱過期
+      redownload: 更新頭像
+      remove_avatar: 取消頭像
+      resend_confirmation:
+        already_confirmed: 此用戶已被確認
+        send: 重新發送驗證信
+        success: 驗證信發送成功!
+      reset: 重設
+      reset_password: 重設密碼
+      resubscribe: 重新訂閱
+      role: 身份
+      roles:
+        admin: 管理員
+        moderator: 版主
+        staff: 管理人員
+        user: 普通用戶
+      salmon_url: Salmon 網址
+      search: 搜尋
+      shared_inbox_url: 公共收件箱 (Shared Inbox) URL
+      show:
+        created_reports: 這個使用者提交的檢舉
+        report: 檢舉
+        targeted_reports: 針對這個使用者的檢舉
       silence: 靜音
-      statuses: 狀態
-      title: 帳號
+      statuses: 嘟文
+      subscribe: 訂閱
+      title: 帳戶
+      unconfirmed_email: 等待驗證的E-mail
       undo_silenced: 取消靜音
       undo_suspension: 取消停權
+      unsubscribe: 取消訂閱
       username: 使用者名稱
-      web: Web
+      web: 頁面
+    action_logs:
+      actions:
+        assigned_to_self_report: "%{name} 接受了檢舉 %{target}"
+        change_email_user: "%{name} 更改了使用者 %{target} 的E-mail"
+        confirm_user: "%{name} 確認了使用者 %{target} 的E-mail"
+        create_custom_emoji: "%{name} 加入自訂表情符號 %{target}"
+        create_domain_block: "%{name} 封鎖了網域 %{target}"
+        create_email_domain_block: "%{name} 封鎖了E-mail %{target}"
+        demote_user: "%{name} 把使用者 %{target} 降級"
+        destroy_domain_block: "%{name} 取消了對網域 %{target} 的封鎖"
+        destroy_email_domain_block: "%{name} 取消了對E-mail %{target} 的封鎖"
+        destroy_status: "%{name} 刪除了 %{target} 的嘟文"
+        disable_2fa_user: "%{name} 停用了使用者 %{target} 的兩階段認證"
+        disable_custom_emoji: "%{name} 停用了自訂表情符號 %{target}"
+        disable_user: "%{name} 將使用者 %{target} 設定為禁止登入"
+        enable_custom_emoji: "%{name} 啟用了自訂表情符號 %{target}"
+        enable_user: "%{name} 將使用者 %{target} 設定為允許登入"
+        memorialize_account: "%{name} 將 %{target} 設定為追悼帳戶"
+        promote_user: "%{name} 對使用者 %{target} 進行了晉級操作"
+        remove_avatar_user: "%{name} 移除了 %{target} 的頭像"
+        reopen_report: "%{name} 重新開啟 %{target} 的檢舉"
+        reset_password_user: "%{name} 重新設定了使用者 %{target} 的密碼"
+        resolve_report: "%{name} 處理了 %{target} 的檢舉"
+        silence_account: "%{name} 靜音了使用者 %{target}"
+        suspend_account: "%{name} 停權了使用者 %{target}"
+        unassigned_report: "%{name} 取消指派 %{target} 的檢舉"
+        unsilence_account: "%{name} 取消了使用者 %{target} 的靜音狀態"
+        unsuspend_account: "%{name} 取消了使用者 %{target} 的停權狀態"
+        update_custom_emoji: "%{name} 更新了自訂表情符號 %{target}"
+        update_status: "%{name} 重整了 %{target} 的嘟文"
+      title: 營運日誌
+    custom_emojis:
+      by_domain: 網域
+      copied_msg: 成功將表情複製到本地
+      copy: 複製
+      copy_failed_msg: 無法將表情複製到本地
+      created_msg: 已新增表情符號!
+      delete: 刪除
+      destroyed_msg: 已刪除表情符號!
+      disable: 停用
+      disabled_msg: 已停用表情符號
+      emoji: 表情符號
+      enable: 啟用
+      enabled_msg: 已啟用表情符號
+      image_hint: PNG 格式, 最大 50KB
+      listed: 已顯示
+      new:
+        title: 加入新的自訂表情符號
+      overwrite: 覆蓋
+      shortcode: 短代碼
+      shortcode_hint: 至少 2 個字元,只能使用字母、數字和下劃線
+      title: 自訂表情符號
+      unlisted: 已隱藏
+      update_failed_msg: 無法更新表情符號
+      updated_msg: 已更新表情符號!
+      upload: 上傳新的表情符號
     domain_blocks:
       add_new: 新增
+      created_msg: 正在進行網域封鎖
+      destroyed_msg: 已撤銷網域封鎖
       domain: 網域
       new:
         create: 新增封鎖
-        hint: 網域封鎖動作並不會阻止帳號紀錄被新增至資料庫,但會自動回溯性地對那些帳號套用特定管理設定。
+        hint: 網域封鎖動作並不會阻止帳戶紀錄被新增至資料庫,但會自動回溯性地對那些帳戶套用特定管理設定。
         severity:
-          desc_html: "<strong>靜音</strong>將使得未追蹤該帳號的使用者無法看見該帳號之貼文。<strong>停權</strong>將移除所有該使用者的帳號內容、多媒體檔案、以及個人檔案。"
-          silence: 靜音
+          desc_html: "「<strong>自動靜音</strong>」令該網域下使用者的嘟文,設定為只對關注者顯示,沒有關注的人會看不到。 「<strong>自動刪除</strong>」會刪除將該網域下使用者的嘟文、媒體檔案和個人資料。「<strong>無</strong>」則會拒絕接收來自該網域的媒體檔案。"
+          noop: 無
+          silence: 自動靜音
           suspend: 停權
-        title: 新封鎖網域
+        title: 新增封鎖網域
+      reject_media: 拒絕媒體檔案
+      reject_media_hint: 刪除本地緩存的媒體檔案,並且不再接收來自該網域的任何媒體檔案。與自動封鎖無關
+      severities:
+        noop: 無
+        silence: 自動靜音
+        suspend: 自動封鎖
       severity: 嚴重度
+      show:
+        affected_accounts:
+          one: 資料庫中有一個使用者受到影響
+          other: 資料庫中有%{count}個使用者受影響
+        retroactive:
+          silence: 對此網域的所有使用者取消靜音
+          suspend: 對此網域的所有使用者取消封鎖
+        title: 撤銷 %{domain} 的網域封鎖
+        undo: 撤銷
       title: 網域封鎖
+      undo: 撤銷
+    email_domain_blocks:
+      add_new: 加入新項目
+      created_msg: 已新增E-mail封鎖
+      delete: 刪除
+      destroyed_msg: 已刪除E-mail封鎖
+      domain: 網域
+      new:
+        create: 新增網域
+        title: 新增E-mail封鎖
+      title: E-mail封鎖
+    instances:
+      account_count: 已知帳戶
+      domain_name: 網域
+      reset: 重設
+      search: 搜尋
+      title: 已知站點
+    invites:
+      filter:
+        all: 全部
+        available: 可用
+        expired: 已失效
+        title: 篩選
+      title: 邀請使用者
+    report_notes:
+      created_msg: 檢舉記錄建立成功!
+      destroyed_msg: 檢舉記錄刪除成功!
     reports:
+      account:
+        note: 條記錄
+        report: 條檢舉
+      action_taken_by: 操作執行者
+      are_you_sure: 你確定嗎?
+      assign_to_self: 指派給自己
+      assigned: 指派負責人
       comment:
         none: 無
+      created_at: 日期
       id: ID
-      mark_as_resolved: 標記為已解決
+      mark_as_resolved: 標記為「已解決」
+      mark_as_unresolved: 標記為「未解決」
+      notes:
+        create: 建立記錄
+        create_and_resolve: 建立記錄並標記為「已解決」
+        create_and_unresolve: 建立記錄並標記「未解決」
+        delete: 刪除
+        placeholder: 記錄已執行的動作,或其他相關的更新...
+      reopen: 重開檢舉
       report: '檢舉 #%{id}'
-      reported_account: 被檢舉帳號
+      report_contents: 檢舉內容
+      reported_account: 被檢舉使用者
       reported_by: 檢舉人
       resolved: 已解決
-      silence_account: 靜音帳號
+      resolved_msg: 檢舉已處理!
+      silence_account: 靜音使用者
       status: 狀態
-      suspend_account: 停權帳號
-      target: 目標
+      suspend_account: 停權使用者
+      target: 對象
       title: 檢舉
+      unassign: 取消指派
       unresolved: 未解決
+      updated_at: 更新
       view: 檢視
     settings:
+      activity_api_enabled:
+        desc_html: 本站使用者發佈的嘟文數量,以及本站的活躍使用者與一週內新使用者數量
+        title: 公開使用者活躍度的統計數據
+      bootstrap_timeline_accounts:
+        desc_html: 以半形逗號分隔多個使用者名。只能加入來自本站且未開啟保護的帳號。如果留空,則預設關注本站所有管理員。
+        title: 新使用者預設關注
       contact_information:
-        email: 請輸入輸入一個公開電子信箱
+        email: 請輸入一個公開E-mail
         username: 請輸入使用者名稱
+      hero:
+        desc_html: 在首頁顯示。推薦最小 600x100px。如果留空,就會預設為站點預覽圖
+        title: 主題圖片
+      peers_api_enabled:
+        desc_html: 現在本站點在網路中已發現的網域
+        title: 公開已知站點的列表
       registrations:
         closed_message:
-          desc_html: 關閉註冊時顯示在首頁的內容,可使用 HTML 標籤。
+          desc_html: 關閉註冊時顯示在首頁的內容,可使用 HTML 標籤
           title: 關閉註冊訊息
+        deletion:
+          desc_html: 允許所有人刪除自己的帳戶
+          title: 開放刪除帳戶的權限
+        min_invite_role:
+          disabled: 沒有人
+          title: 允許發送邀請的身份
         open:
+          desc_html: 允許所有人建立帳戶
           title: 開放註冊
+      show_known_fediverse_at_about_page:
+        desc_html: 如果開啟,就會在時間軸預覽顯示其他站點嘟文,否則就只會顯示本站點嘟文。
+        title: 在時間軸預覽顯示其他站點嘟文
+      show_staff_badge:
+        desc_html: 在個人資料頁面上顯示管理人員標誌
+        title: 顯示管理人員標誌
       site_description:
-        desc_html: 顯示在首頁並且作為 meta 標籤的短文。<br>可使用 HTML 標籤,包括 <code>&lt;a&gt;</code> 及 <code>&lt;em&gt;</code>。
-        title: 網站描述
+        desc_html: "</code>在首頁顯示,及在 meta 標籤中的站點簡介。可以使用 HTML 標籤,包括 <code> 1&lt; 2a&gt; 3</code> 4 and <code> 5&lt; 6em&gt; 7</code> 8."
+        title: 站點描述
       site_description_extended:
-        desc_html: 顯示在資訊頁的長版描述,可使用 HTML 標籤。
-        title: 長版網站描述
-      site_title: 網站標題
+        desc_html: 顯示在資訊頁的長版描述,可使用 HTML 標籤
+        title: 本站詳細資訊
+      site_terms:
+        desc_html: 可以填寫自己的隱私權政策、使用條款或其他法律文本。可以使用 HTML 標籤
+        title: 自訂使用條款
+      site_title: 站點名稱
+      thumbnail:
+        desc_html: 用於在 OpenGraph 和 API 中顯示預覽圖。推薦大小 1200×630px
+        title: 本站縮圖
+      timeline_preview:
+        desc_html: 在主頁顯示本站時間軸
+        title: 時間軸預覽
       title: 網站設定
+    statuses:
+      back_to_account: 返回帳戶訊息頁
+      batch:
+        delete: 刪除
+        nsfw_off: 標記為非敏感內容
+        nsfw_on: 標記為敏感內容
+      failed_to_execute: 執行失敗
+      media:
+        title: 媒體檔案
+      no_media: 不含媒體檔案
+      title: 帳戶嘟文
+      with_media: 含有媒體檔案
     subscriptions:
-      callback_url: Callback URL
+      callback_url: 回傳網址
       confirmed: 已確認
       expires_in: 期限
       last_delivery: 最後遞送
-      title: WebSub
+      title: WebSub 訂閱
       topic: 主題
     title: 管理介面
+  admin_mailer:
+    new_report:
+      body: "%{reporter} 檢舉了使用者 %{target}"
+      body_remote: 來自 %{domain} 的使用者檢舉了使用者 %{target}
+      subject: 來自 %{instance} 的使用者檢舉(#%{id})
   application_mailer:
-    settings: 修改信箱設定︰ %{link}
-    view: 進入瀏覽︰
+    notification_preferences: 更改E-mail設定
+    salutation: "%{name},"
+    settings: 修改E-mail設定︰ %{link}
+    view: '進入瀏覽:'
+    view_profile: 檢視個人資料頁
+    view_status: 檢視嘟文
   applications:
+    created: 已建立應用
+    destroyed: 已刪除應用
     invalid_url: 網址不正確
+    regenerate_token: 重設 token
+    token_regenerated: 已重設 token
+    warning: 警告,不要把它分享給任何人!
+    your_token: 你的 token
   auth:
-    didnt_get_confirmation: 沒有收到驗證信?
+    agreement_html: 註冊即表示你同意遵守<a href="%{rules_path}">本站點的規則</a>和<a href="%{terms_path}">使用條款</a>。
+    change_password: 密碼
+    confirm_email: 確認E-mail
+    delete_account: 刪除帳戶
+    delete_account_html: 如果你想刪除你的帳戶,請<a href="%{path}">點擊這裡繼續</a>。你需要確認你的操作。
+    didnt_get_confirmation: 沒有收到驗證信?
     forgot_password: 忘記密碼?
+    invalid_reset_password_token: 密碼重設 token 無效或已過期。請重新設定密碼。
     login: 登入
     logout: 登出
     migrate_account: 轉移到另一個帳號
-    migrate_account_html: 想要將這個帳號指向另一個帳號可到<a href="%{path}">到這裡設定</a>。
+    migrate_account_html: 如果你希望引導他人關注另一個帳戶,請<a href="%{path}">到這裡設定</a>。
+    or: 或
+    or_log_in_with: 或透過其他方式登入
+    providers:
+      cas: CAS
+      saml: SAML
     register: 註冊
-    resend_confirmation: 重寄驗證信
+    register_elsewhere: 在其他站點註冊
+    resend_confirmation: 重新寄送E-mail
     reset_password: 重設密碼
     security: 登入資訊
     set_new_password: 設定新密碼
   authorize_follow:
-    error: 對不起,搜尋遠端使用者出現錯誤
+    already_following: 你已經關注了這個使用者
+    error: 對不起,搜尋其他站點使用者出現錯誤
     follow: 關注
+    follow_request: 關注請求已經發送給:
+    following: 成功! 你正在關注:
+    post_follow:
+      close: 你也可以直接關閉這個頁面。
+      return: 顯示個人資料頁
+      web: 返回本站
     title: 關注 %{acct}
   datetime:
     distance_in_words:
@@ -149,18 +436,39 @@ zh-TW:
       half_a_minute: 剛剛
       less_than_x_minutes: 小於%{count}分鐘前
       less_than_x_seconds: 剛剛
-      over_x_years: "%{count}y"
+      over_x_years: "%{count}年"
       x_days: "%{count}天"
       x_minutes: "%{count}分"
       x_months: "%{count}個月"
       x_seconds: "%{count}秒"
+  deletes:
+    bad_password_msg: 想得美,駭客! 密碼輸入錯誤
+    confirm_password: 輸入你現在的密碼來驗證身份
+    description_html: 繼續操作將會<strong>永久地、不可還原地</strong>刪除帳戶中的所有內容,然後凍結帳戶。你的用戶名將會被保留,以防有人冒用你的身份。
+    proceed: 刪除帳戶
+    success_msg: 你的帳戶已經成功刪除
+    warning_html: 我們只能保證本站點上的內容將會被徹底刪除。對於已經被廣泛傳播的內容,它們在本站點以外的某些地方可能仍然可見。此外,失去連接的站點以及停止接收訂閱的站點所儲存的數據亦無法刪除。
+    warning_title: 關於已傳播的內容警告
   errors:
+    '403': 你沒有觀看這個頁面的權限。
     '404': 您所尋找的網頁不存在。
     '410': 您所尋找的網頁已不存在。
     '422':
-      content: 安全驗證失敗。請確定有開啟瀏覽器 Cookies 功能。
+      content: 安全驗證失敗。請確定有開啟瀏覽器 Cookies 功能?
       title: 安全驗證失敗
+    '429': 伺服器繁忙
+    '500':
+      content: 抱歉,我們的後台出現問題了。
+      title: 這個頁面有問題
+    noscript_html: 使用 Mastodon 網頁版應用需要啟用 JavaScript。你也可以選擇適用於你的平台的 <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">Mastodon 應用</a>。
   exports:
+    archive_takeout:
+      date: 日期
+      download: 下載檔案
+      hint_html: 你可以下載包含你的<strong>文章和媒體</strong>的檔案。資料以 ActivityPub 格式儲存,可用於相容的軟體。每次允許存檔的間隔至少7天。
+      in_progress: 正在準備你的存檔...
+      request: 下載存檔
+      size: 大小
     blocks: 您封鎖的使用者
     csv: CSV
     follows: 您關注的使用者
@@ -168,58 +476,104 @@ zh-TW:
     storage: 儲存空間大小
   followers:
     domain: 網域
-    explanation_html: 為確保個人隱私,您必須知道有哪些使用者正關注你。<strong>您的私密內容會被發送到所有您有被關注的服務站上</strong>。如果您不信任這些服務站的管理者,您可以選擇檢查或刪除您的關注者。
-    followers_count: 關注者數
-    lock_link: 鎖住你的帳號
+    explanation_html: 為確保個人隱私,您必須知道有哪些使用者正關注你。<strong>您的私密內容會被發送到所有您有被關注的站點上</strong>。如果您不信任這些站點的管理者,您可以選擇檢查或刪除您的關注者。
+    followers_count: 關注者數量
+    lock_link: 將你的帳戶設定為私人
     purge: 移除關注者
-    unlocked_warning_html: 所有人都可以關注並檢索你的隱藏狀態。%{lock_link}以檢查或拒絕關注。
-    unlocked_warning_title: 你的帳號是公開的
+    success:
+      one: 正準備軟性封鎖 1 個網域的關注者……
+      other: 正準備軟性封鎖 %{count} 個網域的關注者……
+    true_privacy_html: 請謹記,唯有<strong>點對點加密方可以真正確保你的隱私</strong>。
+    unlocked_warning_html: 任何人都可以在關注你後立即查看非公開的嘟文。只要%{lock_link},你就可以審核並拒絕關注請求。
+    unlocked_warning_title: 你的帳戶是公開的
   generic:
-    changes_saved_msg: 已成功儲存修改
+    changes_saved_msg: 已成功儲存修改!
     powered_by: 網站由 %{link} 開發
     save_changes: 儲存修改
     validation_errors:
       one: 送出的資料有問題
       other: 送出的資料有 %{count} 個問題
   imports:
-    preface: 您可以在此匯入您在其他服務站所匯出的資料檔,包括關注的使用者、封鎖的使用者名單。
+    preface: 您可以在此匯入您在其他站點所匯出的資料檔,包括關注的使用者、封鎖的使用者名單。
     success: 資料檔上傳成功,正在匯入,請稍候
     types:
       blocking: 您封鎖的使用者名單
       following: 您關注的使用者名單
       muting: 您靜音的使用者名單
     upload: 上傳
-  landing_strip_html: "<strong>%{name}</strong> 是一個在 %{link_to_root_path} 的使用者。只要您有任何 Mastodon 服務站、或者聯盟網站的帳號,便可以跨站關注此站使用者,或者與他們互動。"
-  landing_strip_signup_html: 如果您沒有這些帳號,歡迎在<a href="%{sign_up_path}">這裡註冊</a>。
+  in_memoriam_html: 謹此悼念。
+  invites:
+    delete: 停用
+    expired: 已失效
+    expires_in:
+      '1800': 30 分鐘後
+      '21600': 6 小時後
+      '3600': 1 小時後
+      '43200': 12 小時後
+      '604800': 1 週後
+      '86400': 1 天後
+    expires_in_prompt: 永不過期
+    generate: 建立邀請連結
+    invited_by: 你的邀請人是:
+    max_uses:
+      one: 1 次
+      other: "%{count} 次"
+    max_uses_prompt: 無限制
+    prompt: 建立分享連結,邀請他人在本站點註冊
+    table:
+      expires_at: 失效時間
+      uses: 已使用次數
+    title: 邀請使用者
+  landing_strip_html: "<strong>%{name}</strong> 是一個在 %{link_to_root_path} 的使用者。只要您有任何 Mastodon 站點、或者聯盟站點的帳戶,便可以跨站關注此站使用者,或者與他們互動。"
+  landing_strip_signup_html: 如果您沒有這些帳戶,歡迎在<a href="%{sign_up_path}">這裡註冊</a>。
+  lists:
+    errors:
+      limit: 你所建立的列表數量已經達到上限
   media_attachments:
     validations:
       images_and_video: 無法在已有圖片的文章上加入影片
       too_many: 無法加入超過 4 個檔案
+  migrations:
+    acct: 新帳戶的 使用者名稱@站點網域
+    currently_redirecting: 目前你的個人資料頁顯示的新帳戶是:
+    proceed: 儲存
+    updated_msg: 帳戶搬遷設定更新成功!
+  moderation:
+    title: 營運
   notification_mailer:
     digest:
-      body: 這是自從您在%{since}使用%{instance}以後,您錯過的訊息︰
-      mention: "%{name} 在此提及了您︰"
+      action: 閱覽所有通知
+      body: 以下是自%{since}你最後一次登入以來錯過的訊息摘要
+      mention: "%{name} 在此提及了你:"
       new_followers_summary:
-        one: 您新獲得了 1 位關注者!恭喜!
-        other: 您新獲得了 %{count} 位關注者!好厲害!
+        one: 而且,你不在的時候,有一個人關注你! 耶!
+        other: 而且,你不在的時候,有 %{count} 個人關注你了! 好棒!
       subject:
-        one: "自從上次登入以來,您收到 1 則新的通知 \U0001F418"
-        other: "自從上次登入以來,您收到 %{count} 則新的通知 \U0001F418"
+        one: "自從上次登入以來,你收到 1 則新的通知 \U0001F418"
+        other: "自從上次登入以來,你收到 %{count} 則新的通知 \U0001F418"
+      title: 你不在的時候...
     favourite:
-      body: 您的文章被 %{name} 收藏
-      subject: "%{name} 將您的文章加入了最愛"
+      body: '你的嘟文被 %{name} 加入了最愛:'
+      subject: "%{name} 將你的嘟文加入了最愛"
+      title: 新的最愛
     follow:
-      body: "%{name} 開始關注您!"
-      subject: "%{name} 開始關注您"
+      body: "%{name} 開始關注你!"
+      subject: "%{name} 開始關注你"
+      title: 新的關注者
     follow_request:
-      body: "%{name} 要求關注您"
-      subject: 等待關注您的使用者︰ %{name}
+      action: 處理關注請求
+      body: "%{name} 要求關注你"
+      subject: 等待關注你的使用者︰ %{name}
+      title: 新的關注請求
     mention:
-      body: "%{name} 在文章中提及您︰"
-      subject: "%{name} 在文章中提及您"
+      action: 回覆
+      body: "%{name} 在嘟文中提及你:"
+      subject: "%{name} 在嘟文中提及你"
+      title: 新的提及
     reblog:
-      body: 您的文章被 %{name} 轉推
-      subject: "%{name} 轉推了您的文章"
+      body: '你的嘟文被 %{name} 轉嘟:'
+      subject: "%{name} 轉嘟了你的嘟文"
+      title: 新的轉嘟
   number:
     human:
       decimal_units:
@@ -232,46 +586,114 @@ zh-TW:
           trillion: T
           unit: ''
   pagination:
+    newer: 較新
     next: 下一頁
+    older: 較舊
     prev: 上一頁
-    truncate: "……"
+    truncate: ''
+  preferences:
+    languages: 語言
+    other: 其他
+    publishing: 發佈
+    web: 站內
   remote_follow:
-    acct: 請輸入您的︰使用者名稱@服務點網域
+    acct: 請輸入您的︰使用者名稱@站點網域
     missing_resource: 無法找到資源
     proceed: 下一步
-    prompt: 您希望關注︰
+    prompt: '您希望關注:'
+  remote_unfollow:
+    error: 錯誤
+    title: 標題
+    unfollowed: 取消關注
   sessions:
     activity: 最近活動
     browser: 瀏覽器
+    browsers:
+      alipay: 支付寶
+      blackberry: 黑莓機
+      chrome: Chrome 瀏覽器
+      edge: Microsoft Edge 瀏覽器
+      electron: Electron 瀏覽器
+      firefox: Firefox 瀏覽器
+      generic: 未知的瀏覽器
+      ie: Internet Explorer 瀏覽器
+      micro_messenger: 微信
+      nokia: Nokia S40 Ovi 瀏覽器
+      opera: Opera 瀏覽器
+      otter: Otter 瀏覽器
+      phantom_js: PhantomJS 瀏覽器
+      qq: QQ 瀏覽器
+      safari: Safari 瀏覽器
+      uc_browser: UC 瀏覽器
+      weibo: 新浪微博
     current_session: 目前的 session
     description: "%{platform} 上的 %{browser}"
     explanation: 這些是現在正登入於你的 Mastodon 帳號的瀏覽器。
+    ip: IP 位址
+    platforms:
+      adobe_air: ''
+      linux: ''
+      mac: ''
+      other: 未知平台
     revoke: 取消
-    revoke_success: Session 取消成功。
+    revoke_success: Session 取消成功
+    title: 作業階段
   settings:
     authorized_apps: 已授權應用程式
     back: 回到 Mastodon
+    delete: 刪除帳戶
     development: 開發
-    edit_profile: 修改個人資料
+    edit_profile: 編輯使用者資訊
     export: 匯出
-    followers: 授權追蹤者
+    followers: 授權關注者
     import: 匯入
+    migrate: 帳戶搬遷
     notifications: 通知
     preferences: 偏好設定
     settings: 設定
     two_factor_authentication: 兩階段認證
+    your_apps: 你的應用程式
   statuses:
+    attached:
+      description: 附件: %{attached}
+      image:
+        one: "%{count} 幅圖片"
+        other: "%{count} 幅圖片"
+      video:
+        one: "%{count} 段影片"
+        other: "%{count} 段影片"
+    boosted_from_html: 轉嘟自 %{acct_link}
+    content_warning: 內容警告: %{warning}
+    disallowed_hashtags:
+      one: 包含不允許的標籤: %{tags}
+      other: 包含不允許的標籤: %{tags}
+    language_detection: 自動偵測語言
     open_in_web: 以網頁開啟
     over_character_limit: 超過了 %{max} 字的限制
+    pin_errors:
+      limit: 你所置頂的嘟文數量已經達到上限
+      ownership: 不能置頂他人的嘟文
+      private: 不能置頂非公開的嘟文
+      reblog: 不能置頂轉嘟
     show_more: 顯示更多
+    title: '%{name}: "%{quote}"'
     visibilities:
-      private: 只有關注您的人能看
+      private: 僅關注者
+      private_long: 只有關注你的人能看到
       public: 公開
+      public_long: 所有人都能看到
       unlisted: 公開,但不在公共時間軸顯示
+      unlisted_long: 所有人都能看到,但不會出現在公共時間軸上
   stream_entries:
     click_to_show: 點選顯示
-    reblogged: 轉推
+    pinned: 置頂嘟文
+    reblogged: 轉嘟
     sensitive_content: 敏感內容
+  terms:
+    title: "%{instance} 使用條款和隱私權政策"
+  themes:
+    contrast: 高對比
+    mastodon-light: Mastodon (亮色主題)
   time:
     formats:
       default: "%Y年%-m月%d日 %H:%M"
@@ -280,11 +702,43 @@ zh-TW:
     description_html: 啟用<strong>兩階段認證</strong>後,登入時將需要使手機、或其他種類認證器產生的代碼。
     disable: 停用
     enable: 啟用
+    enabled: 兩階段認證已啟用
     enabled_success: 已成功啟用兩階段認證
+    generate_recovery_codes: 產生備用驗證碼
     instructions_html: "<strong>請用您手機的認證器應用程式(如 Google Authenticator、Authy),掃描這裡的 QR 圖形碼</strong>。在兩階段認證啟用後,您登入時將須要使用此應用程式產生的認證碼。"
-    manual_instructions: 如果您無法掃描 QR 圖形碼,請手動輸入︰
+    lost_recovery_codes: 讓你可以在遺失手機時,使用備用驗證碼登入。如果你遺失了備用驗證碼,可以在這裏產生一批新的,舊有的備用驗證碼將會失效。
+    manual_instructions: '如果您無法掃描 QR 圖形碼,請手動輸入:'
+    recovery_codes: 備份備用驗證碼
+    recovery_codes_regenerated: 成功產生新的備用驗證碼
+    recovery_instructions_html: 如果你的手機無法使用,你可以使用下列任意一個備用驗證碼來重新獲得帳戶的訪問權。<strong>請妥善保管好你的備用驗證碼</strong>(例如,你可以將它們列印出來,與你的其他重要文件放在一起)。
     setup: 設定
-    wrong_code: 您輸入的認證碼並不正確!可能伺服器時間和您手機不一致,請檢查您手機的時間,或與本站管理員聯絡。
+    wrong_code: 您輸入的認證碼無效! 請確認伺服器時間與設備時間是否正確?
+  user_mailer:
+    backup_ready:
+      explanation: 你要求的 Mastodon 帳號完整備份檔案現已就緒,可供下載!
+      subject: 你的備份檔已可供下載
+      title: 檔案匯出
+    welcome:
+      edit_profile_action: 設定個人資料
+      edit_profile_step: 你可以設定你的個人資料,包括上傳頭像、橫幅圖片、更改顯示名稱等等。如果你想在新的關注者關注你之前對他們進行審核,你也可以選擇為你的帳戶設為「私人」。
+      explanation: 下面是幾個小幫助,希望它們能幫到你
+      final_action: 開始嘟嘟
+      final_step: '開始嘟嘟吧! 即使你現在沒有關注者,其他人仍然能在本站時間軸或著話題標籤等地方看到你的公開嘟文。試著用 #introductions 這個話題標籤介紹一下自己吧。'
+      full_handle: 你的完整帳戶名稱
+      full_handle_hint: 你需要把這個告訴你的朋友們,這樣他們就能從另一個站點向你發送訊息或著關注你。
+      review_preferences_action: 更改偏好設定
+      review_preferences_step: 記得調整你的偏好設定,比如你想接收什麼類型的電子郵件,或著你想把你的嘟文可見範圍預設設定什麼級別。如果你沒有暈車的話,考慮一下啟用「自動播放 GIF 動畫」這個選項吧。
+      subject: 歡迎來到 Mastodon
+      tip_bridge_html: 如果你剛從 Twitter 來到這裡,你可以在<a href="%{bridge_url}">橋樑站(bridge app)</a>上尋找你的朋友。當然,前提是他們也登入了橋樑站!
+      tip_federated_timeline: 跨站公共時間軸可以讓你一窺更廣闊的 Mastodon 網路。不過,由於它們只顯示你的鄰居們所訂閱的內容,所以並不是全部。
+      tip_following: 預設情況下,你會自動關注你所在站點的管理員。想結交更多有趣的人的話,記得多逛逛本站時間軸與跨站公共時間軸哦。
+      tip_local_timeline: 本站時間軸可以讓你一窺 %{instance} 上的使用者。他們就是離你最近的鄰居!
+      tip_mobile_webapp: 如果你的行動裝置瀏覽器允許你將 Mastodon 新增到主螢幕,你就能夠接收推送訊息。它就像手機APP一樣好用!
+      tips: 小幫手
+      title: "%{name} 歡迎你的加入!"
   users:
-    invalid_email: 信箱地址格式不正確
+    invalid_email: E-mail格式不正確
     invalid_otp_token: 兩階段認證碼不正確
+    otp_lost_help_html: 如果你無法訪問這兩者,可以通過 %{email} 與我們聯繫
+    seamless_external_login: 由於你是從外部系統登入,所以不能設定密碼與電子郵件。
+    signed_in_as: 目前登入的帳戶: