Weblate translations 20180503 (#7325)

* Translated using Weblate (German) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Slovak) Currently translated at 92.3% (578 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Added translation using Weblate (Greek) * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Added translation using Weblate (Greek) * Added translation using Weblate (Malay) * Translated using Weblate (Greek) Currently translated at 0.6% (2 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 1.3% (4 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 2.0% (6 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 2.3% (7 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 2.7% (8 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 3.0% (9 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 4.3% (27 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 4.7% (30 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 4.7% (30 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 5.1% (32 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 5.2% (33 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Swedish) Currently translated at 95.1% (59 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.3% (622 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Greek) Currently translated at 23.8% (70 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Catalan) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Slovak) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 94.0% (589 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Added translation using Weblate (Telugu) * Translated using Weblate (German) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 98.3% (61 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (Telugu) Currently translated at 0.3% (2 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/te/ * Translated using Weblate (German) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 98.3% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/ * Translated using Weblate (German) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/ * Translated using Weblate (German) Currently translated at 99.5% (623 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Spanish) Currently translated at 93.2% (584 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 93.2% (584 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 93.2% (584 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 93.2% (584 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 99.8% (625 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Slovak) Currently translated at 95.0% (595 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Greek) Currently translated at 24.1% (71 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 24.1% (71 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (French) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Italian) Currently translated at 54.6% (342 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Slovak) Currently translated at 95.3% (597 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 99.8% (625 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (German) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Galician) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Swedish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Swedish) Currently translated at 99.5% (623 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused * Add back file removed by weblate
2018-05-03 12:12:09 +02:00 · 2018-05-03 12:12:09 +02:00 · dfa6bccb64
commit dfa6bccb64
parent 58852695c8
27 changed files with 700 additions and 107 deletions
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@ -18,7 +18,7 @@
  "account.mute_notifications": "Benachrichtigungen von @{name} verbergen",
  "account.muted": "Stummgeschaltet",
  "account.posts": "Beiträge",
-  "account.posts_with_replies": "Beiträge mit Antworten",
+  "account.posts_with_replies": "Beiträge und Antworten",
  "account.report": "@{name} melden",
  "account.requested": "Warte auf Erlaubnis. Klicke zum Abbrechen",
  "account.share": "Profil von @{name} teilen",
@ -29,8 +29,8 @@
  "account.unmute": "@{name} nicht mehr stummschalten",
  "account.unmute_notifications": "Benachrichtigungen von @{name} einschalten",
  "account.view_full_profile": "Vollständiges Profil anzeigen",
-  "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Oops!",
+  "alert.unexpected.message": "Ein unerwarteter Fehler ist aufgetreten.",
+  "alert.unexpected.title": "Hoppla!",
  "boost_modal.combo": "Du kannst {combo} drücken, um dies beim nächsten Mal zu überspringen",
  "bundle_column_error.body": "Etwas ist beim Laden schiefgelaufen.",
  "bundle_column_error.retry": "Erneut versuchen",
@ -40,8 +40,8 @@
  "bundle_modal_error.retry": "Erneut versuchen",
  "column.blocks": "Blockierte Profile",
  "column.community": "Lokale Zeitleiste",
-  "column.direct": "Direct messages",
-  "column.domain_blocks": "Hidden domains",
+  "column.direct": "Direktnachrichten",
+  "column.domain_blocks": "Versteckte Domains",
  "column.favourites": "Favoriten",
  "column.follow_requests": "Folgeanfragen",
  "column.home": "Startseite",
@ -59,17 +59,17 @@
  "column_header.unpin": "Lösen",
  "column_subheading.navigation": "Navigation",
  "column_subheading.settings": "Einstellungen",
-  "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
+  "compose_form.direct_message_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.",
  "compose_form.hashtag_warning": "Dieser Beitrag wird nicht unter einen dieser Hashtags sichtbar sein, solange er ungelistet ist. Bei einer Suche kann er nicht gefunden werden.",
  "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.",
  "compose_form.lock_disclaimer.lock": "gesperrt",
  "compose_form.placeholder": "Worüber möchtest du schreiben?",
  "compose_form.publish": "Tröt",
  "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.sensitive.marked": "Medien sind als heikel markiert",
+  "compose_form.sensitive.unmarked": "Medien sind nicht als heikel markiert",
+  "compose_form.spoiler.marked": "Text ist hinter einer Warnung versteckt",
+  "compose_form.spoiler.unmarked": "Text ist nicht versteckt",
  "compose_form.spoiler_placeholder": "Inhaltswarnung",
  "confirmation_modal.cancel": "Abbrechen",
  "confirmations.block.confirm": "Blockieren",
@ -101,7 +101,7 @@
  "emoji_button.symbols": "Symbole",
  "emoji_button.travel": "Reisen und Orte",
  "empty_column.community": "Die lokale Zeitleiste ist leer. Schreibe einen öffentlichen Beitrag, um den Ball ins Rollen zu bringen!",
-  "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": "Du hast noch keine Direktnachrichten erhalten. Wenn du eine sendest oder empfängst, wird sie hier zu sehen sein.",
  "empty_column.hashtag": "Unter diesem Hashtag gibt es noch nichts.",
  "empty_column.home": "Deine Startseite ist leer! Besuche {public} oder nutze die Suche, um loszulegen und andere Leute zu finden.",
  "empty_column.home.public_timeline": "die öffentliche Zeitleiste",
@ -130,12 +130,12 @@
  "keyboard_shortcuts.enter": "um den Status zu öffnen",
  "keyboard_shortcuts.favourite": "um zu favorisieren",
  "keyboard_shortcuts.heading": "Tastenkombinationen",
-  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.hotkey": "Tastenkürzel",
  "keyboard_shortcuts.legend": "um diese Übersicht anzuzeigen",
  "keyboard_shortcuts.mention": "um Autor_in zu erwähnen",
  "keyboard_shortcuts.reply": "um zu antworten",
  "keyboard_shortcuts.search": "um die Suche zu fokussieren",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_hidden": "um den Text hinter einer Inhaltswarnung zu verstecken oder ihn anzuzeigen",
  "keyboard_shortcuts.toot": "um einen neuen Toot zu beginnen",
  "keyboard_shortcuts.unfocus": "um das Textfeld/die Suche nicht mehr zu fokussieren",
  "keyboard_shortcuts.up": "sich in der Liste hinauf bewegen",
@ -157,8 +157,8 @@
  "mute_modal.hide_notifications": "Benachrichtigungen von diesem Account verbergen?",
  "navigation_bar.blocks": "Blockierte Profile",
  "navigation_bar.community_timeline": "Lokale Zeitleiste",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.direct": "Direktnachrichten",
+  "navigation_bar.domain_blocks": "Versteckte Domains",
  "navigation_bar.edit_profile": "Profil bearbeiten",
  "navigation_bar.favourites": "Favoriten",
  "navigation_bar.follow_requests": "Folgeanfragen",
@ -191,8 +191,8 @@
  "onboarding.page_four.home": "Die Startseite zeigt dir Beiträge von Leuten, denen du folgst.",
  "onboarding.page_four.notifications": "Wenn jemand mit dir interagiert, bekommst du eine Mitteilung.",
  "onboarding.page_one.federation": "Mastodon ist ein soziales Netzwerk, das aus unabhängigen Servern besteht. Diese Server nennen wir auch Instanzen.",
-  "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.full_handle": "Dein vollständiger Benutzername",
+  "onboarding.page_one.handle_hint": "Das ist das, was du deinen Freunden sagst, um nach dir zu suchen.",
  "onboarding.page_one.welcome": "Willkommen bei Mastodon!",
  "onboarding.page_six.admin": "Für deine Instanz ist {admin} zuständig.",
  "onboarding.page_six.almost_done": "Fast fertig …",
@ -215,50 +215,50 @@
  "privacy.public.short": "Öffentlich",
  "privacy.unlisted.long": "Nicht in öffentlichen Zeitleisten anzeigen",
  "privacy.unlisted.short": "Nicht gelistet",
-  "regeneration_indicator.label": "Loading…",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "regeneration_indicator.label": "Laden…",
+  "regeneration_indicator.sublabel": "Deine Heimzeitleiste wird gerade vorbereitet!",
  "relative_time.days": "{number}d",
  "relative_time.hours": "{number}h",
-  "relative_time.just_now": "now",
+  "relative_time.just_now": "jetzt",
  "relative_time.minutes": "{number}m",
  "relative_time.seconds": "{number}s",
  "reply_indicator.cancel": "Abbrechen",
-  "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": "An {target} weiterleiten",
+  "report.forward_hint": "Dieses Konto ist von einem anderen Server. Soll eine anonymisierte Kopie des Berichts auch dorthin geschickt werden?",
+  "report.hint": "Der Bericht wird an die Moderatoren deiner Instanz geschickt. Du kannst hier eine Erklärung angeben, warum du dieses Konto meldest:",
  "report.placeholder": "Zusätzliche Kommentare",
  "report.submit": "Absenden",
  "report.target": "{target} melden",
  "search.placeholder": "Suche",
-  "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.search_format": "Fortgeschrittenes Suchformat",
+  "search_popout.tips.full_text": "Simpler Text gibt Beiträge, die du geschrieben, favorisiert und geteilt hast zurück. Außerdem auch Beiträge in denen du erwähnt wurdest, als auch passende Nutzernamen, Anzeigenamen oder 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_popout.tips.text": "Einfacher Text gibt Anzeigenamen, Benutzernamen und Hashtags zurück",
+  "search_popout.tips.user": "Nutzer",
+  "search_results.accounts": "Personen",
  "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
+  "search_results.statuses": "Beiträge",
  "search_results.total": "{count, number} {count, plural, one {Ergebnis} other {Ergebnisse}}",
  "standalone.public_title": "Ein kleiner Einblick …",
  "status.block": "Block @{name}",
-  "status.cancel_reblog_private": "Unboost",
+  "status.cancel_reblog_private": "Nicht mehr teilen",
  "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
  "status.delete": "Löschen",
-  "status.direct": "Direct message @{name}",
+  "status.direct": "Direktnachricht @{name}",
  "status.embed": "Einbetten",
  "status.favourite": "Favorisieren",
  "status.load_more": "Weitere laden",
  "status.media_hidden": "Medien versteckt",
  "status.mention": "@{name} erwähnen",
  "status.more": "Mehr",
-  "status.mute": "Mute @{name}",
+  "status.mute": "@{name} stummschalten",
  "status.mute_conversation": "Thread stummschalten",
  "status.open": "Diesen Beitrag öffnen",
  "status.pin": "Im Profil anheften",
-  "status.pinned": "Pinned toot",
+  "status.pinned": "Angehefteter Beitrag",
  "status.reblog": "Teilen",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "An das eigentliche Publikum teilen",
  "status.reblogged_by": "{name} teilte",
  "status.reply": "Antworten",
  "status.replyAll": "Auf Thread antworten",
@ -267,21 +267,21 @@
  "status.sensitive_warning": "Heikle Inhalte",
  "status.share": "Teilen",
  "status.show_less": "Weniger anzeigen",
-  "status.show_less_all": "Show less for all",
+  "status.show_less_all": "Zeige weniger für alles",
  "status.show_more": "Mehr anzeigen",
-  "status.show_more_all": "Show more for all",
+  "status.show_more_all": "Zeige mehr für alles",
  "status.unmute_conversation": "Stummschaltung von Thread aufheben",
  "status.unpin": "Vom Profil lösen",
  "tabs_bar.federated_timeline": "Föderation",
  "tabs_bar.home": "Startseite",
  "tabs_bar.local_timeline": "Lokal",
  "tabs_bar.notifications": "Mitteilungen",
-  "tabs_bar.search": "Search",
-  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "tabs_bar.search": "Suchen",
+  "ui.beforeunload": "Dein Entwurf geht verloren, wenn du Mastodon verlässt.",
  "upload_area.title": "Zum Hochladen hereinziehen",
  "upload_button.label": "Mediendatei hinzufügen",
  "upload_form.description": "Für Menschen mit Sehbehinderung beschreiben",
-  "upload_form.focus": "Crop",
+  "upload_form.focus": "Zuschneiden",
  "upload_form.undo": "Entfernen",
  "upload_progress.label": "Wird hochgeladen …",
  "video.close": "Video schließen",
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@ -0,0 +1,296 @@
+{
+  "account.block": "Απόκλεισε τον/την @{name}",
+  "account.block_domain": "Απόκρυψε τα πάντα από τον/την",
+  "account.blocked": "Αποκλεισμένος/η",
+  "account.direct": "Απευθείας μήνυμα προς @{name}",
+  "account.disclaimer_full": "Οι παρακάτω πληροφορίες μπορει να μην αντανακλούν το προφίλ του χρήστη επαρκως.",
+  "account.domain_blocked": "Domain hidden",
+  "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": "Unblock @{name}",
+  "account.unblock_domain": "Αποκάλυψε το {domain}",
+  "account.unfollow": "Unfollow",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.view_full_profile": "Δες το πλήρες προφίλ",
+  "alert.unexpected.message": "Προέκυψε απροσδόκητο σφάλμα.",
+  "alert.unexpected.title": "Εεπ!",
+  "boost_modal.combo": "You can press {combo} to skip this next time",
+  "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": "Hidden domains",
+  "column.favourites": "Αγαπημένα",
+  "column.follow_requests": "Αιτήματα παρακολούθησης",
+  "column.home": "Αρχική",
+  "column.lists": "Λίστες",
+  "column.mutes": "Αποσιωπημένοι χρήστες",
+  "column.notifications": "Ειδοποιήσεις",
+  "column.pins": "Καρφιτσωμένα τουτ",
+  "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.navigation": "Πλοήγηση",
+  "column_subheading.settings": "Ρυθμίσεις",
+  "compose_form.direct_message_warning": "Αυτό το τουτ θα εμφανίζεται μόνο σε όλους τους αναφερόμενους χρήστες.",
+  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+  "compose_form.lock_disclaimer": "Ο λογαριασμός σου δεν είναι {locked}. Οποιοσδήποτε μπορεί να σε ακολουθήσει για να δει τις δημοσιεύσεις σας προς τους ακολούθους σας.",
+  "compose_form.lock_disclaimer.lock": "κλειδωμένος",
+  "compose_form.placeholder": "Τι σκέφτεσαι;",
+  "compose_form.publish": "Τουτ",
+  "compose_form.publish_loud": "{publish}!",
+  "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": "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.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.appsshort": "Apps",
+  "getting_started.faq": "FAQ",
+  "getting_started.heading": "Getting started",
+  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+  "getting_started.userguide": "User Guide",
+  "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",
+  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toot": "to start a brand new toot",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "Close",
+  "lightbox.next": "Next",
+  "lightbox.previous": "Previous",
+  "lists.account.add": "Add to list",
+  "lists.account.remove": "Remove from list",
+  "lists.delete": "Delete list",
+  "lists.edit": "Edit list",
+  "lists.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Your lists",
+  "loading_indicator.label": "Loading...",
+  "media_gallery.toggle_visible": "Toggle visibility",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.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.pins": "Pinned toots",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "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",
+  "onboarding.done": "Done",
+  "onboarding.next": "Next",
+  "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
+  "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
+  "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
+  "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
+  "onboarding.page_one.full_handle": "Your full handle",
+  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
+  "onboarding.page_one.welcome": "Welcome to Mastodon!",
+  "onboarding.page_six.admin": "Your instance's admin is {admin}.",
+  "onboarding.page_six.almost_done": "Almost done...",
+  "onboarding.page_six.appetoot": "Bon Appetoot!",
+  "onboarding.page_six.apps_available": "There are {apps} available for iOS, Android and other platforms.",
+  "onboarding.page_six.github": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
+  "onboarding.page_six.guidelines": "community guidelines",
+  "onboarding.page_six.read_guidelines": "Please read {domain}'s {guidelines}!",
+  "onboarding.page_six.various_app": "mobile apps",
+  "onboarding.page_three.profile": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
+  "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
+  "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
+  "onboarding.skip": "Skip",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Post to mentioned users only",
+  "privacy.direct.short": "Direct",
+  "privacy.private.long": "Post to followers only",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Post to public timelines",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.short": "Unlisted",
+  "regeneration_indicator.label": "Loading…",
+  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "relative_time.days": "{number}d",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "now",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "reply_indicator.cancel": "Cancel",
+  "report.forward": "Forward to {target}",
+  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.placeholder": "Additional comments",
+  "report.submit": "Submit",
+  "report.target": "Report {target}",
+  "search.placeholder": "Search",
+  "search_popout.search_format": "Advanced search format",
+  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "status",
+  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search_popout.tips.user": "user",
+  "search_results.accounts": "People",
+  "search_results.hashtags": "Hashtags",
+  "search_results.statuses": "Toots",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
+  "status.block": "Block @{name}",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.delete": "Delete",
+  "status.direct": "Direct message @{name}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.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.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",
+  "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"
+}
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@ -40,7 +40,7 @@
  "bundle_modal_error.retry": "Réessayer",
  "column.blocks": "Comptes bloqués",
  "column.community": "Fil public local",
-  "column.direct": "Direct messages",
+  "column.direct": "Messages directs",
  "column.domain_blocks": "Domaines cachés",
  "column.favourites": "Favoris",
  "column.follow_requests": "Demandes de suivi",
@ -101,7 +101,7 @@
  "emoji_button.symbols": "Symboles",
  "emoji_button.travel": "Lieux & Voyages",
  "empty_column.community": "Le fil public local est vide. Écrivez donc quelque chose pour le remplir !",
-  "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": "Vous n'avez pas encore de messages directs. Lorsque vous en enverrez ou recevrez un, il s'affichera ici.",
  "empty_column.hashtag": "Il n’y a encore aucun contenu associé à ce hashtag.",
  "empty_column.home": "Vous ne suivez encore personne. Visitez {public} ou bien utilisez la recherche pour vous connecter à d’autres personnes.",
  "empty_column.home.public_timeline": "le fil public",
@ -135,7 +135,7 @@
  "keyboard_shortcuts.mention": "pour mentionner l'auteur",
  "keyboard_shortcuts.reply": "pour répondre",
  "keyboard_shortcuts.search": "pour cibler la recherche",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_hidden": "pour afficher/cacher un texte derrière CW",
  "keyboard_shortcuts.toot": "pour démarrer un tout nouveau pouet",
  "keyboard_shortcuts.unfocus": "pour recentrer composer textarea/search",
  "keyboard_shortcuts.up": "pour remonter dans la liste",
@ -157,7 +157,7 @@
  "mute_modal.hide_notifications": "Masquer les notifications de cette personne ?",
  "navigation_bar.blocks": "Comptes bloqués",
  "navigation_bar.community_timeline": "Fil public local",
-  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.direct": "Messages directs",
  "navigation_bar.domain_blocks": "Domaines cachés",
  "navigation_bar.edit_profile": "Modifier le profil",
  "navigation_bar.favourites": "Favoris",
@ -242,7 +242,7 @@
  "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
  "standalone.public_title": "Un aperçu …",
  "status.block": "Block @{name}",
-  "status.cancel_reblog_private": "Unboost",
+  "status.cancel_reblog_private": "Dé-booster",
  "status.cannot_reblog": "Cette publication ne peut être boostée",
  "status.delete": "Effacer",
  "status.direct": "Message direct @{name}",
@ -258,7 +258,7 @@
  "status.pin": "Épingler sur le profil",
  "status.pinned": "Pouet épinglé",
  "status.reblog": "Partager",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Booster vers l'audience originale",
  "status.reblogged_by": "{name} a partagé :",
  "status.reply": "Répondre",
  "status.replyAll": "Répondre au fil",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@ -243,7 +243,7 @@
  "standalone.public_title": "Ollada dentro...",
  "status.block": "Block @{name}",
  "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "Esta mensaxe non pode ser promocionada",
+  "status.cannot_reblog": "Esta mensaxe non pode ser promovida",
  "status.delete": "Eliminar",
  "status.direct": "Direct message @{name}",
  "status.embed": "Incrustar",
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@ -1,7 +1,7 @@
 {
  "account.block": "Blocca @{name}",
  "account.block_domain": "Hide everything from {domain}",
-  "account.blocked": "Blocked",
+  "account.blocked": "Bloccato",
  "account.direct": "Direct Message @{name}",
  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
  "account.domain_blocked": "Domain hidden",
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@ -135,7 +135,7 @@
  "keyboard_shortcuts.mention": "spomenúť autora",
  "keyboard_shortcuts.reply": "odpovedať",
  "keyboard_shortcuts.search": "zamerať sa na vyhľadávanie",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_hidden": "ukáž/skry text za CW",
  "keyboard_shortcuts.toot": "začať úplne novú hlášku",
  "keyboard_shortcuts.unfocus": "nesústrediť sa na písaciu plochu, alebo hľadanie",
  "keyboard_shortcuts.up": "posunúť sa vyššie v zozname",
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@ -715,9 +715,9 @@ ca:

      <ul>
        <li><em>Informació bàsica del compte</em>: Si et registres en aquest servidor, se´t pot demanar que introdueixis un nom d'usuari, una adreça de correu electrònic i una contrasenya. També pots introduir informació de perfil addicional, com ara un nom de visualització i una biografia, i carregar una imatge de perfil i de capçalera. El nom d'usuari, el nom de visualització, la biografia, la imatge de perfil i la imatge de capçalera sempre apareixen públicament.</li>
-        <li><em>Publicacions, seguiment i altra informació pública</em>: La llista de persones que segueixes s'enumeren públicament i el mateix passa amb els teus seguidors. Quan envies un missatge, la data i l'hora s'emmagatzemen, així com l'aplicació que va enviar el missatge. Els missatges poden contenir multimèdia, com ara imatges i vídeos. Els toots públics i no llistats estan disponibles públicament. En quan tinguis un toot en el teu perfil, aquest també és informació pública. Les teves entrades es lliuren als teus seguidors que en alguns casos significa que es lliuren a diferents servidors i s'hi emmagatzemen còpies. Quan suprimeixes publicacions, també es lliurarà als vostres seguidors. L'acció d'impulsar o marcar com a favorit una publicació sempre és pública.</li>
-        <li><em>Toots directes i per a només seguidors</em>: Totes les publicacions s'emmagatzemen i processen al servidor. Els toots per a només seguidors només es lliuren als teus seguidors i als usuaris que s'esmenten en ells i els toots directes només es lliuren als usuaris esmentats. En alguns casos, significa que es lliuren a diferents servidors i s'hi emmagatzemen còpies. Fem un esforç de bona fe per limitar l'accés a aquestes publicacions només a les persones autoritzades, però és possible que altres servidors no ho facin. Per tant, és important revisar els servidors als quals pertanyen els teus seguidors. Pots canviar d'opció per aprovar i rebutjar els nous seguidors manualment a la configuració.  <em>Tingues en compte que els operadors del servidor i qualsevol servidor receptor poden visualitzar aquests missatges</em> i els destinataris poden fer una captura de pantalla, copiar-los o tornar-los a compartir.  <em>No comparteixis cap informació perillosa a Mastodon.</em></li>
-        <li><em>IPs i altres metadades</em>: Quan inicies sessió registrem l'adreça IP en què has iniciat la sessió, així com el nom de l'aplicació o navegador. Totes les sessions registrades estan disponibles per a la teva revisió i revocació a la configuració. L'última adreça IP utilitzada s'emmagatzema durant un màxim de 12 mesos. També podrem conservar els registres del servidor que inclouen l'adreça IP de cada sol·licitud al nostre servidor.</li>
+        <li><em>Publicacions, seguiment i altra informació pública</em>: La llista de persones que segueixes s'enumeren públicament i el mateix passa amb els teus seguidors. Quan envies un missatge, la data i l'hora s'emmagatzemen, així com l'aplicació que va enviar el missatge. Els missatges poden contenir multimèdia, com ara imatges i vídeos. Els toots públics i no llistats estan disponibles públicament. En quan tinguis un toot en el teu perfil, aquest també és informació pública. Les teves entrades es lliuren als teus seguidors que en alguns casos significa que es lliuren a diferents servidors en els quals s'hi emmagatzemen còpies. Quan suprimeixes publicacions, també es lliuraran als teus seguidors. L'acció d'impulsar o marcar com a favorit una publicació sempre és pública.</li>
+        <li><em>Toots directes i per a només seguidors</em>: Totes les publicacions s'emmagatzemen i processen al servidor. Els toots per a només seguidors només es lliuren als teus seguidors i als usuaris que s'esmenten en ells i els toots directes només es lliuren als usuaris esmentats. En alguns casos, significa que es lliuren a diferents servidors i s'hi emmagatzemen còpies. Fem un esforç de bona fe per limitar l'accés a aquestes publicacions només a les persones autoritzades, però és possible que altres servidors no ho facin. Per tant, és important revisar els servidors als quals pertanyen els teus seguidors. Pots canviar la opció de aprovar o rebutjar els nous seguidors manualment a la configuració.  <em>Tingues en compte que els operadors del servidor i qualsevol servidor receptor poden visualitzar aquests missatges</em> i els destinataris poden fer una captura de pantalla, copiar-los o tornar-los a compartir.  <em>No comparteixis cap informació perillosa a Mastodon.</em></li>
+        <li><em>IPs i altres metadades</em>: Quan inicies sessió registrem l'adreça IP en que l'has iniciat, així com el nom de l'aplicació o navegador. Totes les sessions registrades estan disponibles per a la teva revisió i revocació a la configuració. L'última adreça IP utilitzada s'emmagatzema durant un màxim de 12 mesos. També podrem conservar els registres que inclouen l'adreça IP de cada sol·licitud al nostre servidor.</li>
      </ul>

      <hr class="spacer" />
@ -728,15 +728,15 @@ ca:

      <ul>
        <li>Per proporcionar la funcionalitat bàsica de Mastodon. Només pots interactuar amb el contingut d'altres persones i publicar el teu propi contingut quan hàgis iniciat la sessió. Per exemple, pots seguir altres persones per veure les publicacions combinades a la teva pròpia línia de temps personalitzada.</li>
-        <li>Per ajudar a la moderació de la comunitat, per exemple comparar la teva adreça IP amb altres conegudes per determinar l'evasió de la prohibició o altres infraccions.</li>
-        <li>L'adreça electrònica que proporciones pot utilitzar-se per enviar-te informació, notificacions sobre altres persones que interactuen amb el teu contingut o t'envien missatges, i per respondre a les consultes i / o altres sol·licituds o preguntes.</li>
+        <li>Per ajudar a la moderació de la comunitat, per exemple comparar la teva adreça IP amb altres conegudes per determinar l'evasió de prohibicions o altres infraccions.</li>
+        <li>L'adreça electrònica que ens proporciones pot utilitzar-se per enviar-te informació, notificacions sobre altres persones que interactuen amb el teu contingut o t'envien missatges, i per respondre a les consultes i / o altres sol·licituds o preguntes.</li>
      </ul>

      <hr class="spacer" />

      <h3 id="protect">Com protegim la teva informació</h3>

-      <p>Implementem diverses mesures per mantenir la seguretat de la teva informació personal quan introdueixes, envies o accedeixes a la teva informació personal. Entre altres coses, la sessió del teu navegador així com el trànsit entre les teves aplicacions i l'API estan protegides amb SSL i la teva contrasenya es codifica utilitzant un algoritme de direcció única. Pots habilitar l'autenticació de dos factors per a garantir l'accés segur al teu compte.</p>
+      <p>Implementem diverses mesures per mantenir la seguretat quan introdueixes, envies o accedeixes a la teva informació personal. Entre altres mesures, la sessió del teu navegador així com el trànsit entre les teves aplicacions i l'API estan protegides amb SSL i la teva contrasenya es codifica utilitzant un algoritme de direcció única. Pots habilitar l'autenticació de dos factors per a garantir l'accés segur al teu compte.</p>

      <hr class="spacer" />

@ -745,19 +745,19 @@ ca:
      <p>Farem un esforç de bona fe per:</p>

      <ul>
-        <li>Conservar els registres del servidor que continguin l'adreça IP de totes les sol·licituds a aquest servidor, tenint em compte que aquests registres es mantenen no més de 90 dies.</li>
+        <li>Conservar els registres del servidor que continguin l'adreça IP de totes les sol·licituds que rebi, tenint em compte que aquests registres es mantenen no més de 90 dies.</li>
        <li>Conservar les adreces IP associades als usuaris registrats no més de 12 mesos.</li>
      </ul>

      <p>Pots sol·licitar i descarregar un arxiu del teu contingut incloses les publicacions, els fitxers adjunts multimèdia, la imatge de perfil i la imatge de capçalera.</p>

-      <p>Pots eliminar el compte de forma irreversible en qualsevol moment.</p>
+      <p>Pots eliminar el teu compte de forma irreversible en qualsevol moment.</p>

      <hr class="spacer"/>

      <h3 id="cookies">Utilitzem cookies?</h3>

-      <p>Sí. Les cookies són petits fitxers que un lloc o el proveïdor de serveis transfereix al disc dur del teu ordinador a través del navegador web (si ho permet). Aquestes galetes permeten al lloc reconèixer el teu navegador i, si teniu un compte registrat, associar-lo al teu compte registrat.</p>
+      <p>Sí. Les cookies són petits fitxers que un lloc o el proveïdor de serveis transfereix al disc dur del teu ordinador a través del navegador web (si ho permet). Aquestes galetes permeten al lloc reconèixer el teu navegador i, si tens un compte registrat, associar-lo al teu compte registrat.</p>

      <p>Utilitzem cookies per entendre i guardar les teves preferències per a futures visites.</p>

@ -765,9 +765,9 @@ ca:

      <h3 id="disclose">Revelem informació a terceres parts?</h3>

-      <p>No venem, comercialitzem ni transmetem a tercers la teva informació d'identificació personal. Això no inclou tercers de confiança que ens ajuden a operar el nostre lloc, a dur a terme el nostre negoci o a servir-te, sempre que aquestes parts acceptin mantenir confidencial aquesta informació. També podem publicar la teva informació quan creiem que l'alliberament és apropiat per complir amb la llei, fer complir les polítiques del nostre lloc o protegir els nostres drets o altres drets, propietat o seguretat.</p>
+      <p>No venem, comercialitzem ni transmetem a tercers la teva informació d'identificació personal. Això no inclou tercers de confiança que ens ajuden a operar el nostre lloc, a dur a terme el nostre servei o a servir-te, sempre que aquestes parts acceptin mantenir confidencial aquesta informació. També podem publicar la teva informació quan creiem que l'alliberament és apropiat per complir amb la llei, fer complir les polítiques del nostre lloc o protegir els nostres drets o altres drets, propietat o seguretat.</p>

-      <p>Els altres servidors de la teva xarxa poden descarregar contingut públic. Els teus toots públics i per a només seguidors es lliuren als servidors on resideixen els teus seguidors i els missatges directes s'envien als servidors dels destinataris, sempre que aquests seguidors o destinataris resideixin en un servidor diferent d'això.</p>
+      <p>Els altres servidors de la teva xarxa poden descarregar contingut públic. Els teus toots públics i per a només seguidors es lliuren als servidors on resideixen els teus seguidors i els missatges directes s'envien als servidors dels destinataris, sempre que aquests seguidors o destinataris resideixin en un servidor diferent d'aquest.</p>

      <p>Quan autoritzes una aplicació a utilitzar el teu compte, segons l'abast dels permisos que aprovis, pot accedir a la teva informació de perfil pública, a la teva llista de seguits, als teus seguidors, a les teves llistes, a totes les teves publicacions i als teus favorits. Les aplicacions mai no poden accedir a la teva adreça de correu electrònic o contrasenya.</p>

@ -775,7 +775,7 @@ ca:

      <h3 id="coppa">Compliment de la Llei de protecció de la privacitat en línia dels nens</h3>

-      <p>El nostre lloc, productes i serveis estan dirigits a persones que tenen almenys 13 anys. Si aquest servidor es troba als EUA, i teniu menys de 13 anys, segons els requisits de COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) no utilitzis aquest lloc.</p>
+      <p>El nostre lloc, productes i serveis estan dirigits a persones que tenen almenys 13 anys. Si aquest servidor es troba als EUA, i tens menys de 13 anys, segons els requisits de COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) no utilitzis aquest lloc.</p>

      <hr class="spacer" />

--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -4,6 +4,7 @@ de:
    about_hashtag_html: Dies sind öffentliche Beiträge, die mit <strong>#%{hashtag}</strong> getaggt wurden. Wenn du ein Konto irgendwo im Fediversum besitzt, kannst du mit ihnen interagieren.
    about_mastodon_html: Mastodon ist ein soziales Netzwerk. Es basiert auf offenen Web-Protokollen und freier, quelloffener Software. Es ist dezentral (so wie E-Mail!).
    about_this: Über diese Instanz
+    administered_by: 'Administriert von:'
    closed_registrations: Die Registrierung auf dieser Instanz ist momentan geschlossen. Aber du kannst dein Konto auch auf einer anderen Instanz erstellen! Von dort hast du genauso Zugriff auf das Mastodon-Netzwerk.
    contact: Kontakt
    contact_missing: Nicht angegeben
@ -60,7 +61,15 @@ de:
      destroyed_msg: Moderationsnotiz erfolgreich gelöscht!
    accounts:
      are_you_sure: Bist du sicher?
+      avatar: Profilbild
      by_domain: Domäne
+      change_email:
+        changed_msg: E-Mail-Adresse des Kontos erfolgreich geändert!
+        current_email: Aktuelle E-Mail-Adresse
+        label: E-Mail-Adresse ändern
+        new_email: Neue E-Mail-Adresse
+        submit: E-Mail-Adresse ändern
+        title: E-Mail-Adresse für %{username} ändern
      confirm: Bestätigen
      confirmed: Bestätigt
      demote: Degradieren
@ -75,9 +84,9 @@ de:
      enabled: Freigegeben
      feed_url: Feed-URL
      followers: Folger
-      followers_url: Followers URL
+      followers_url: URL des Folgenden
      follows: Folgt
-      inbox_url: Inbox URL
+      inbox_url: Posteingangs-URL
      ip: IP-Adresse
      location:
        all: Alle
@ -100,7 +109,7 @@ de:
        alphabetic: Alphabetisch
        most_recent: Neueste
        title: Sortierung
-      outbox_url: Outbox URL
+      outbox_url: Postausgangs-URL
      perform_full_suspension: Vollständige Sperre durchführen
      profile_url: Profil-URL
      promote: Befördern
@ -108,6 +117,7 @@ de:
      public: Öffentlich
      push_subscription_expires: PuSH-Abonnement läuft aus
      redownload: Avatar neu laden
+      remove_avatar: Profilbild entfernen
      reset: Zurücksetzen
      reset_password: Passwort zurücksetzen
      resubscribe: Wieder abonnieren
@ -128,6 +138,7 @@ de:
      statuses: Beiträge
      subscribe: Abonnieren
      title: Konten
+      unconfirmed_email: Unbestätigte E-Mail-Adresse
      undo_silenced: Stummschaltung zurücknehmen
      undo_suspension: Sperre zurücknehmen
      unsubscribe: Abbestellen
@ -135,6 +146,8 @@ de:
      web: Web
    action_logs:
      actions:
+        assigned_to_self_report: "%{name} hat sich die Meldung %{target} selbst zugewiesen"
+        change_email_user: "%{name} hat die E-Mail-Adresse des Nutzers %{target} geändert"
        confirm_user: "%{name} hat die E-Mail-Adresse von %{target} bestätigt"
        create_custom_emoji: "%{name} hat neues Emoji %{target} hochgeladen"
        create_domain_block: "%{name} hat die Domain %{target} blockiert"
@ -150,10 +163,13 @@ de:
        enable_user: "%{name} hat die Anmeldung für den Benutzer %{target} aktiviert"
        memorialize_account: "%{name} hat %{target}s Profil in eine Gedenkseite umgewandelt"
        promote_user: "%{name} hat %{target} befördert"
+        remove_avatar_user: "%{name} hat das Profilbild von %{target} entfernt"
+        reopen_report: "%{name} hat die Meldung %{target} wieder geöffnet"
        reset_password_user: "%{name} hat das Passwort für den Benutzer %{target} zurückgesetzt"
-        resolve_report: "%{name} hat die Meldung %{target} abgelehnt"
+        resolve_report: "%{name} hat die Meldung %{target} bearbeitet"
        silence_account: "%{name} hat %{target}s Account stummgeschaltet"
        suspend_account: "%{name} hat %{target}s Account gesperrt"
+        unassigned_report: "%{name} hat die Zuweisung der Meldung %{target} entfernt"
        unsilence_account: "%{name} hat die Stummschaltung von %{target}s Account aufgehoben"
        unsuspend_account: "%{name} hat die Sperrung von %{target}s Account aufgehoben"
        update_custom_emoji: "%{name} hat das %{target} Emoji aktualisiert"
@ -177,7 +193,7 @@ de:
      new:
        title: Eigenes Emoji hinzufügen
      overwrite: Überschreiben
-      shortcode: Shortcode
+      shortcode: Kürzel
      shortcode_hint: Mindestens 2 Zeichen, nur Buchstaben, Ziffern und Unterstriche
      title: Eigene Emojis
      unlisted: Ungelistet
@ -239,28 +255,48 @@ de:
        expired: Ausgelaufen
        title: Filter
      title: Einladungen
+    report_notes:
+      created_msg: Meldungs-Kommentar erfolgreich erstellt!
+      destroyed_msg: Meldungs-Kommentar erfolgreich gelöscht!
    reports:
+      account:
+        note: Notiz
+        report: Meldung
      action_taken_by: Maßnahme ergriffen durch
      are_you_sure: Bist du dir sicher?
+      assign_to_self: Mir zuweisen
+      assigned: Zugewiesener Moderator
      comment:
        none: Kein
+      created_at: Gemeldet
      delete: Löschen
      id: ID
      mark_as_resolved: Als gelöst markieren
+      mark_as_unresolved: Als ungelöst markieren
+      notes:
+        create: Kommentar hinzufügen
+        create_and_resolve: Mit Kommentar lösen
+        create_and_unresolve: Mit Kommentar wieder öffnen
+        delete: Löschen
+        placeholder: Beschreibe, welche Maßnahmen ergriffen wurden oder andere Neuigkeiten zu dieser Meldung…
      nsfw:
        'false': Medienanhänge wieder anzeigen
        'true': Medienanhänge verbergen
+      reopen: Meldung wieder öffnen
      report: 'Meldung #%{id}'
      report_contents: Inhalt
      reported_account: Gemeldetes Konto
      reported_by: Gemeldet von
      resolved: Gelöst
+      resolved_msg: Meldung erfolgreich gelöst!
      silence_account: Konto stummschalten
      status: Status
      suspend_account: Konto sperren
      target: Ziel
      title: Meldungen
+      unassign: Zuweisung entfernen
      unresolved: Ungelöst
+      updated_at: Aktualisiert
      view: Ansehen
    settings:
      activity_api_enabled:
@ -318,8 +354,8 @@ de:
      back_to_account: Zurück zum Konto
      batch:
        delete: Löschen
-        nsfw_off: NSFW aus
-        nsfw_on: NSFW ein
+        nsfw_off: Als nicht heikel markieren
+        nsfw_on: Als heikel markieren
      execute: Ausführen
      failed_to_execute: Ausführen fehlgeschlagen
      media:
@ -381,6 +417,7 @@ de:
    security: Sicherheit
    set_new_password: Neues Passwort setzen
  authorize_follow:
+    already_following: Du folgst diesem Konto bereits
    error: Das Profil konnte nicht geladen werden
    follow: Folgen
    follow_request: 'Du hast eine Folgeanfrage gesendet an:'
@ -473,6 +510,7 @@ de:
      '21600': 6 Stunden
      '3600': 1 Stunde
      '43200': 12 Stunden
+      '604800': 1 Woche
      '86400': 1 Tag
    expires_in_prompt: Nie
    generate: Generieren
@ -576,6 +614,10 @@ de:
    missing_resource: Die erforderliche Weiterleitungs-URL für dein Konto konnte nicht gefunden werden
    proceed: Weiter
    prompt: 'Du wirst dieser Person folgen:'
+  remote_unfollow:
+    error: Fehler
+    title: Titel
+    unfollowed: Entfolgt
  sessions:
    activity: Letzte Aktivität
    browser: Browser
@ -633,6 +675,18 @@ de:
    two_factor_authentication: Zwei-Faktor-Auth
    your_apps: Deine Anwendungen
  statuses:
+    attached:
+      description: 'Angehängt: %{attached}'
+      image:
+        one: "%{count} Bild"
+        other: "%{count} Bilder"
+      video:
+        one: "%{count} Video"
+        other: "%{count} Videos"
+    content_warning: 'Inhaltswarnung: %{warning}'
+    disallowed_hashtags:
+      one: 'Enthält den unerlaubten Hashtag: %{tags}'
+      other: 'Enthält die unerlaubten Hashtags: %{tags}'
    open_in_web: Im Web öffnen
    over_character_limit: Zeichenlimit von %{max} überschritten
    pin_errors:
@ -654,6 +708,11 @@ de:
    pinned: Angehefteter Beitrag
    reblogged: teilte
    sensitive_content: Heikle Inhalte
+  terms:
+    title: "%{instance} Nutzungsbedingungen und Datenschutzerklärung"
+  themes:
+    contrast: Hoher Kontrast
+    default: Mastodon
  time:
    formats:
      default: "%d.%m.%Y %H:%M"
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@ -3,8 +3,8 @@ de:
  devise:
    confirmations:
      confirmed: Deine E-Mail-Adresse wurde bestätigt.
-      send_instructions: Du erhältst in wenigen Minuten eine E-Mail. Darin wird erklärt, wie du deine E-Mail-Adresse bestätigen kannst. Schau bitte auch in deinen Spam-Ordner!
-      send_paranoid_instructions: Falls deine E-Mail-Adresse in unserer Datenbank hinterlegt ist, erhältst du in wenigen Minuten eine E-Mail. Darin wird erklärt, wie du deine E-Mail-Adresse bestätigen kannst. Schau bitte auch in deinen Spam-Ordner!
+      send_instructions: Du wirst in wenigen Minuten eine E-Mail erhalten. Darin wird erklärt, wie du deine E-Mail-Adresse bestätigen kannst. Schau bitte auch in deinem Spam-Ordner nach, wenn du diese E-Mail nicht erhalten hast.
+      send_paranoid_instructions: Falls deine E-Mail-Adresse in unserer Datenbank hinterlegt ist, wirst du in wenigen Minuten eine E-Mail erhalten. Darin wird erklärt, wie du deine E-Mail-Adresse bestätigen kannst. Schau bitte auch in deinem Spam-Ordner nach, wenn du diese E-Mail nicht erhalten hast.
    failure:
      already_authenticated: Du bist bereits angemeldet.
      inactive: Dein Konto wurde noch nicht aktiviert.
@ -73,10 +73,10 @@ de:
  errors:
    messages:
      already_confirmed: wurde bereits bestätigt, bitte versuche dich anzumelden
-      confirmation_period_expired: muss innerhalb %{period} bestätigt werden, bitte fordere einen neuen Link an.
-      expired: ist abgelaufen, bitte neu anfordern.
-      not_found: wurde nicht gefunden.
+      confirmation_period_expired: muss innerhalb %{period} bestätigt werden, bitte fordere einen neuen Link an
+      expired: ist abgelaufen, bitte neu anfordern
+      not_found: nicht gefunden
      not_locked: ist nicht gesperrt
      not_saved:
-        one: 'Konnte %{resource} nicht speichern: ein Fehler.'
-        other: 'Konnte %{resource} nicht speichern: %{count} Fehler.'
+        one: '1 Fehler hat verhindert, dass %{resource} gespeichert wurde:'
+        other: "%{count} Fehler verhinderten, dass %{resource} gespeichert wurde:"
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@ -29,7 +29,7 @@ de:
      edit:
        title: Anwendung bearbeiten
      form:
-        error: Hoppla! Bitte überprüfe das Formular auf Fehler!
+        error: Hoppla! Bitte überprüfe das Formular auf mögliche Fehler
      help:
        native_redirect_uri: "%{native_redirect_uri} für lokale Tests benutzen"
        redirect_uri: Bitte benutze eine Zeile pro URI
@ -59,7 +59,7 @@ de:
      error:
        title: Ein Fehler ist aufgetreten
      new:
-        able_to: 'Sie wird folgende Befugnisse haben:'
+        able_to: Es wird in der Lage sein zu
        prompt: Die Anwendung %{client_name} verlangt Zugriff auf dein Konto
        title: Autorisierung erforderlich
      show:
@ -83,7 +83,7 @@ de:
        invalid_grant: Die beigefügte Autorisierung ist ungültig, abgelaufen, wurde widerrufen, einem anderen Client ausgestellt oder der Weiterleitungs-URI stimmt nicht mit der Autorisierungs-Anfrage überein.
        invalid_redirect_uri: Der beigefügte Weiterleitungs-URI ist ungültig.
        invalid_request: Die Anfrage enthält ein nicht-unterstütztes Argument, ein Parameter fehlt, oder sie ist anderweitig fehlerhaft.
-        invalid_resource_owner: Die angegebenen Zugangsdaten für den »resource owner« sind ungültig, oder dieses Profil existiert nicht.
+        invalid_resource_owner: Die angegebenen Zugangsdaten für den Ressourcenbesitzer sind ungültig oder der Ressourcenbesitzer kann nicht gefunden werden
        invalid_scope: Die angeforderte Befugnis ist ungültig, unbekannt oder fehlerhaft.
        invalid_token:
          expired: Der Zugriffs-Token ist abgelaufen
--- a/config/locales/doorkeeper.zh-HK.yml
+++ b/config/locales/doorkeeper.zh-HK.yml
@ -12,10 +12,10 @@ zh-HK:
        doorkeeper/application:
          attributes:
            redirect_uri:
-              fragment_present: URI 不可包含 "#fragment" 部份
-              invalid_uri: 必需有正確的 URI.
-              relative_uri: 必需為完整 URI.
-              secured_uri: 必需使用有 HTTPS/SSL 加密的 URI.
+              fragment_present: URI 不可包含 "#fragment" 部份。
+              invalid_uri: 必需有正確的 URI。
+              relative_uri: 必需為完整 URI。
+              secured_uri: 必需使用有 HTTPS/SSL 加密的 URI。
  doorkeeper:
    applications:
      buttons:
@ -33,7 +33,7 @@ zh-HK:
      help:
        native_redirect_uri: 使用 %{native_redirect_uri} 作局部測試
        redirect_uri: 每行輸入一個 URI
-        scopes: 請用半形空格分開權限範圍 (scope)。留空表示使用預設的權限範圍
+        scopes: 請用半形空格分開權限範圍 (scope)。留空表示使用預設的權限範圍。
      index:
        application: 應用
        callback_url: 回傳網址
@ -83,7 +83,7 @@ zh-HK:
        invalid_grant: 授權申請 (authorization grant) 不正確、過期、已被取消，或者無法對應授權請求 (authorization request) 內的轉接 URI，或者屬於別的用戶程式。
        invalid_redirect_uri: 不正確的轉接網址。
        invalid_request: 請求缺少了必要的參數、包含了不支援的參數、或者其他輸入錯誤。
-        invalid_resource_owner: 資源擁有者的登入資訊錯誤、或者無法找到該資源擁有者。
+        invalid_resource_owner: 資源擁有者的登入資訊錯誤、或者無法找到該資源擁有者
        invalid_scope: 請求的權限範圍 (scope) 不正確、未有定義、或者輸入錯誤。
        invalid_token:
          expired: access token 已經過期
@ -94,7 +94,7 @@ zh-HK:
        temporarily_unavailable: 認證伺服器由於臨時負荷過重或者維護，目前未能處理請求。
        unauthorized_client: 用戶程式無權用此方法 (method) 請行這個請求。
        unsupported_grant_type: 授權伺服器不支援這個授權類型 (grant type)。
-        unsupported_response_type: 授權伺服器不支援這個回應類型 (response type).
+        unsupported_response_type: 授權伺服器不支援這個回應類型 (response type)。
    flash:
      applications:
        create:
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@ -0,0 +1,40 @@
+---
+el:
+  about:
+    about_mastodon_html: Το Mastodon είναι ένα κοινωνικό δίκτυο που βασίζεται σε ανοιχτά δικτυακά πρωτόκολλα και ελεύθερο λογισμικό ανοιχτού κώδικα. Είναι αποκεντρωμένο όπως το e-mail.
+    about_this: Σχετικά
+    administered_by: 'Διαχειρίζεται από:'
+    closed_registrations: Αυτή τη στιγμή οι εγγραφές σε αυτό τον διακομιστή είναι κλειστές. Αλλά! Μπορείς να βρεις έναν άλλο διακομιστή για να ανοίξεις λογαριασμό και να έχεις πρόσβαση από εκεί στο ίδιο ακριβώς δίκτυο.
+    contact: Επικοινωνία
+    contact_missing: Δεν έχει οριστεί
+    domain_count_after: άλλοι διακομιστές
+    domain_count_before: Συνδέεται με
+    extended_description_html: |
+      <h3>Ένα καλό σημείο για κανόνες</h3>
+      <p>Η αναλυτική περιγραφή δεν έχει ακόμα οριστεί</p>
+    features:
+      humane_approach_body: Μαθαίνοντας από τις αποτυχίες άλλων δικτύων, το Mastodon στοχεύει να κάνει σχεδιαστικά ηθικές επιλογές για να καταπολεμήσει την κακόβουλη χρήση των κοινωνικών δικτύων.
+      humane_approach_title: Μια πιο ανθρώπινη προσέγγιση
+      not_a_product_title: Είσαι άτομο, όχι προϊόν
+      real_conversation_title: Φτιαγμένο για αληθινή συζήτηση
+      within_reach_body: Οι πολλαπλές εφαρμογές για το iOS, το Android και τις υπόλοιπες πλατφόρμες, χάρη σε ένα φιλικό προς τους προγραμματιστές οικοσύστημα API, σου επιτρέπουν να κρατάς επαφή με τους φίλους και τις φίλες σου οπουδήποτε.
+    generic_description: "%{domain} είναι ένας εξυπηρετητής στο δίκτυο"
+    hosted_on: Το Mastodon φιλοξενείται στο %{domain}
+    learn_more: Μάθε περισσότερα
+    other_instances: Λίστα διακομιστών
+    source_code: Πηγαίος κώδικας
+    status_count_after: καταστάσεις
+    status_count_before: Ποιός συνέγραψε
+    user_count_after: χρήστες
+    what_is_mastodon: Τι είναι το Mastodon;
+  accounts:
+    follow: Ακολούθησε
+    followers: Ακόλουθοι
+    following: Ακολουθεί
+    media: Πολυμέσα
+    moved_html: 'Ο/Η %{name} μετακόμισε στο %{new_profile_link}:'
+    nothing_here: Δεν υπάρχει τίποτα εδώ!
+    people_followed_by: Χρήστες που ακολουθεί ο/η %{name}
+    people_who_follow: Χρήστες που ακολουθούν τον/την %{name}
+    posts: Τουτ
+    posts_with_replies: Τουτ και απαντήσεις
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@ -4,6 +4,7 @@ es:
    about_hashtag_html: Estos son toots públicos etiquetados con <strong>#%{hashtag}</strong>. Puedes interactuar con ellos si tienes una cuenta en cualquier parte del fediverso.
    about_mastodon_html: Mastodon es un servidor de red social <em>libre y de código abierto</em>. Una alternativa <em>descentralizada</em> a plataformas comerciales, que evita el riesgo de que una única compañía monopolice tu comunicación. Cualquiera puede ejecutar Mastodon y participar sin problemas en la <em>red social</em>.
    about_this: Acerca de esta instancia
+    administered_by: 'Administrado por:'
    closed_registrations: Los registros están actualmente cerrados en esta instancia.
    contact: Contacto
    contact_missing: No especificado
@ -60,7 +61,15 @@ es:
      destroyed_msg: "¡Nota de moderación destruida con éxito!"
    accounts:
      are_you_sure: "¿Estás seguro?"
+      avatar: Avatar
      by_domain: Dominio
+      change_email:
+        changed_msg: "¡El correo electrónico se ha actualizado correctamente!"
+        current_email: Correo electrónico actual
+        label: Cambiar el correo electrónico
+        new_email: Nuevo correo electrónico
+        submit: Cambiar el correo electrónico
+        title: Cambiar el correo electrónico de %{username}
      confirm: Confirmar
      confirmed: Confirmado
      demote: Degradar
@ -108,6 +117,7 @@ es:
      public: Público
      push_subscription_expires: Expiración de la suscripción PuSH
      redownload: Refrescar avatar
+      remove_avatar: Eliminar el avatar
      reset: Reiniciar
      reset_password: Reiniciar contraseña
      resubscribe: Re-suscribir
@ -128,6 +138,7 @@ es:
      statuses: Estados
      subscribe: Suscribir
      title: Cuentas
+      unconfirmed_email: Correo electrónico sin confirmar
      undo_silenced: Des-silenciar
      undo_suspension: Des-suspender
      unsubscribe: Desuscribir
@ -135,6 +146,8 @@ es:
      web: Web
    action_logs:
      actions:
+        assigned_to_self_report: "%{name} se ha asignado la denuncia %{target} a sí mismo"
+        change_email_user: "%{name} ha cambiado la dirección de correo del usuario %{target}"
        confirm_user: "%{name} confirmó la dirección de correo del usuario %{target}"
        create_custom_emoji: "%{name} subió un nuevo emoji %{target}"
        create_domain_block: "%{name} bloqueó el dominio %{target}"
@ -150,10 +163,13 @@ es:
        enable_user: "%{name} habilitó el acceso del usuario %{target}"
        memorialize_account: "%{name} convirtió la cuenta de %{target} en una página de memorial"
        promote_user: "%{name} promoción al usuario %{target}"
+        remove_avatar_user: "%{name} ha eliminado el avatar de %{target}"
+        reopen_report: "%{name} ha reabierto la denuncia %{target}"
        reset_password_user: "%{name} restauró la contraseña del usuario %{target}"
-        resolve_report: "%{name} desestimó el reporte %{target}"
+        resolve_report: "%{name} ha resuelto la denuncia %{target}"
        silence_account: "%{name} silenció la cuenta de %{target}"
        suspend_account: "%{name} suspendió la cuenta de %{target}"
+        unassigned_report: "%{name} ha desasignado la denuncia %{target}"
        unsilence_account: "%{name} desactivó el silenciado de la cuenta de %{target}"
        unsuspend_account: "%{name} desactivó la suspensión de la cuenta de %{target}"
        update_custom_emoji: "%{name} actualizó el emoji %{target}"
@ -239,28 +255,48 @@ es:
        expired: Expiradas
        title: Filtrar
      title: Invitaciones
+    report_notes:
+      created_msg: "¡El registro de la denuncia se ha creado correctamente!"
+      destroyed_msg: "¡El registro de la denuncia se ha borrado correctamente!"
    reports:
+      account:
+        note: nota
+        report: denuncia
      action_taken_by: Acción tomada por
      are_you_sure: "¿Estás seguro?"
+      assign_to_self: Asignármela a mí
+      assigned: Moderador asignado
      comment:
        none: Ninguno
+      created_at: Denunciado
      delete: Eliminar
      id: ID
      mark_as_resolved: Marcar como resuelto
+      mark_as_unresolved: Marcar como no resuelto
+      notes:
+        create: Añadir una nota
+        create_and_resolve: Resolver con una nota
+        create_and_unresolve: Reabrir con una nota
+        delete: Eliminar
+        placeholder: Especificar qué acciones se han tomado o cualquier otra novedad respecto a esta denuncia…
      nsfw:
        'false': Mostrar multimedia
        'true': Ocultar multimedia
+      reopen: Reabrir denuncia
      report: 'Reportar #%{id}'
      report_contents: Contenido
      reported_account: Cuenta reportada
      reported_by: Reportado por
      resolved: Resuelto
+      resolved_msg: "¡La denuncia se ha resuelto correctamente!"
      silence_account: Silenciar cuenta
      status: Estado
      suspend_account: Suspender cuenta
      target: Objetivo
      title: Reportes
+      unassign: Desasignar
      unresolved: No resuelto
+      updated_at: Actualizado
      view: Ver
    settings:
      activity_api_enabled:
@ -318,8 +354,8 @@ es:
      back_to_account: Volver a la cuenta
      batch:
        delete: Eliminar
-        nsfw_off: NSFW OFF
-        nsfw_on: NSFW ON
+        nsfw_off: Marcar contenido como no sensible
+        nsfw_on: Marcar contenido como sensible
      execute: Ejecutar
      failed_to_execute: Falló al ejecutar
      media:
@ -381,6 +417,7 @@ es:
    security: Cambiar contraseña
    set_new_password: Establecer nueva contraseña
  authorize_follow:
+    already_following: Ya estás siguiendo a esta cuenta
    error: Desafortunadamente, ha ocurrido un error buscando la cuenta remota
    follow: Seguir
    follow_request: 'Tienes una solicitud de seguimiento de:'
@ -473,6 +510,7 @@ es:
      '21600': 6 horas
      '3600': 1 hora
      '43200': 12 horas
+      '604800': 1 semana
      '86400': 1 día
    expires_in_prompt: Nunca
    generate: Generar
@ -576,6 +614,10 @@ es:
    missing_resource: No se pudo encontrar la URL de redirección requerida para tu cuenta
    proceed: Proceder a seguir
    prompt: 'Vas a seguir a:'
+  remote_unfollow:
+    error: Error
+    title: Título
+    unfollowed: Ha dejado de seguirse
  sessions:
    activity: Última actividad
    browser: Navegador
@ -642,6 +684,9 @@ es:
        one: "%{count} vídeo"
        other: "%{count} vídeos"
    content_warning: 'Alerta de contenido: %{warning}'
+    disallowed_hashtags:
+      one: 'contenía un hashtag no permitido: %{tags}'
+      other: 'contenía los hashtags no permitidos: %{tags}'
    open_in_web: Abrir en web
    over_character_limit: Límite de caracteres de %{max} superado
    pin_errors:
@ -666,6 +711,7 @@ es:
  terms:
    title: Términos del Servicio y Políticas de Privacidad de %{instance}
  themes:
+    contrast: Alto contraste
    default: Mastodon
  time:
    formats:
@ -693,7 +739,7 @@ es:
      title: Descargar archivo
    welcome:
      edit_profile_action: Configurar el perfil
-      edit_profile_step: Puedes personalizar tu perfil subiendo un avatar, cabecera, cambiando tu nombre para mostrar y más. Si te gustaría revisar seguidores antes de autorizarlos a que te sigan, puedes bloquear tu cuenta.
+      edit_profile_step: Puedes personalizar tu perfil subiendo un avatar, una cabecera, cambiando tu nombre de usuario y más cosas. Si quieres revisar a tus nuevos seguidores antes de que se les permita seguirte, puedes bloquear tu cuenta.
      explanation: Aquí hay algunos consejos para empezar
      final_action: Empezar a publicar
      final_step: '¡Empieza a publicar! Incluso sin seguidores, tus mensajes públicos pueden ser vistos por otros, por ejemplo en la linea de tiempo local y con "hashtags". Podrías querer introducirte con el "hashtag" #introductions.'
@ -703,7 +749,7 @@ es:
      review_preferences_step: Asegúrate de poner tus preferencias, como que correos te gustaría recibir, o que nivel de privacidad te gustaría que tus publicaciones tengan por defecto. Si no tienes mareos, podrías elegir habilitar la reproducción automática de "GIFs".
      subject: Bienvenido a Mastodon
      tip_bridge_html: Si esta viniendo desde Twitter, puedes encontrar a tus amigos en Mastodon usando la <a href="%{bridge_url}">aplicación puente</a>. Aunque solo funciona si ellos también usaron la aplicación puente!
-      tip_federated_timeline: La historia federada es una vista de toda la red Mastodon conocida. Sólo incluye gente a la que se han suscrito personas de tu instancia, así que no está completa.
+      tip_federated_timeline: La línea de tiempo federada es una vista de la red de Mastodon. Pero solo incluye gente que tus vecinos están siguiendo, así que no está completa.
      tip_following: Sigues a tus administradores de servidor por defecto. Para encontrar más gente interesante, revisa las lineas de tiempo local y federada.
      tip_local_timeline: La linea de tiempo local is una vista de la gente en %{instance}. Estos son tus vecinos inmediatos!
      tip_mobile_webapp: Si el navegador de tu dispositivo móvil ofrece agregar Mastodon a tu página de inicio, puedes recibir notificaciones. Actúa como una aplicación nativa en muchas formas!
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@ -354,8 +354,8 @@ fr:
      back_to_account: Retour à la page du compte
      batch:
        delete: Supprimer
-        nsfw_off: NSFW OFF
-        nsfw_on: NSFW ON
+        nsfw_off: Marquer comme non-sensible
+        nsfw_on: Marquer comme sensible
      execute: Exécuter
      failed_to_execute: Erreur d’exécution
      media:
@ -684,6 +684,9 @@ fr:
        one: "%{count} vidéo"
        other: "%{count} vidéos"
    content_warning: 'Attention au contenu : %{warning}'
+    disallowed_hashtags:
+      one: 'contient un hashtag désactivé : %{tags}'
+      other: 'contient les hashtag désactivés : %{tags}'
    open_in_web: Ouvrir sur le web
    over_character_limit: limite de caractères dépassée de %{max} caractères
    pin_errors:
@ -708,6 +711,7 @@ fr:
  terms:
    title: "%{instance} Conditions d’utilisations et politique de confidentialité"
  themes:
+    contrast: Contraste élevé
    default: Mastodon
  time:
    formats:
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@ -706,7 +706,7 @@ gl:
  stream_entries:
    click_to_show: Pulse para mostrar
    pinned: Mensaxe fixada
-    reblogged: promocionada
+    reblogged: promovida
    sensitive_content: Contido sensible
  terms:
    body_html: |
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@ -12,11 +12,16 @@ it:
    domain_count_after: altri server
    domain_count_before: Connesso a
    features:
+      humane_approach_body: Imparando dai fallimenti degli altri networks, Mastodon mira a fare scelte di design etico per combattere l'abuso dei social media.
      humane_approach_title: Un approccio più umano
      not_a_product_body: Mastodon non è una rete commerciale. Niente pubblicità, niente data mining, nessun giardino murato. Non c'è nessuna autorità centrale.
      not_a_product_title: Tu sei una persona, non un prodotto
+      real_conversation_body: Con 500 caratteri a disposizione, un supporto per i contenuti granulari ed avvisi sui media potrai esprimerti nel modo desiderato.
      real_conversation_title: Creato per conversazioni reali
+      within_reach_body: Apps per iOS, Android ed altre piattaforme, realizzate grazie ad un ecosistema di API adatto agli sviluppatori, ti consentono di poter stare ovunque al passo con i tuoi amici.
+      within_reach_title: Sempre a portata di mano
    generic_description: "%{domain} è un server nella rete"
+    hosted_on: Mastodon ospitato su %{domain}
    learn_more: Scopri altro
    other_instances: Elenco istanze
    source_code: Codice sorgente
@ -30,6 +35,7 @@ it:
    followers: Seguaci
    following: Seguiti
    media: Media
+    moved_html: "%{name} è stato spostato su %{new_profile_link}:"
    nothing_here: Qui non c'è nulla!
    people_followed_by: Persone seguite da %{name}
    people_who_follow: Persone che seguono %{name}
@ -109,6 +115,7 @@ it:
      remove_avatar: Rimuovi avatar
      reset: Reimposta
      reset_password: Reimposta password
+      resubscribe: Riscriversi
      role: Permessi
      roles:
        admin: Amministratore
@ -123,10 +130,12 @@ it:
      unconfirmed_email: Email non confermata
      undo_silenced: Rimuovi silenzia
      undo_suspension: Rimuovi sospensione
+      unsubscribe: Annulla l'iscrizione
      username: Nome utente
      web: Web
    action_logs:
      actions:
+        change_email_user: "%{name} ha cambiato l'indirizzo e-mail per l'utente %{target}"
        confirm_user: "%{name} ha confermato l'indirizzo email per l'utente %{target}"
        create_custom_emoji: "%{name} ha caricato un nuovo emoji %{target}"
        create_domain_block: "%{name} ha bloccato il dominio %{target}"
@ -171,14 +180,20 @@ it:
        silence: Silenzia
        suspend: Sospendi
      severity: Severità
+      show:
+        undo: Annulla
      title: Blocchi dominio
+      undo: Annulla
    email_domain_blocks:
      add_new: Aggiungi nuovo
+      created_msg: Dominio e-mail aggiunto con successo alla lista nera
      delete: Elimina
+      destroyed_msg: Dominio e-mail cancellato con successo dalla lista nera
      domain: Dominio
      new:
        create: Aggiungi dominio
    instances:
+      account_count: Accounts conosciuti
      domain_name: Dominio
      reset: Reimposta
      search: Cerca
@ -193,8 +208,10 @@ it:
    reports:
      account:
        note: note
+      action_taken_by: Azione intrapresa da
      are_you_sure: Sei sicuro?
      assign_to_self: Assegna a me
+      assigned: Moderatore assegnato
      comment:
        none: Nessuno
      delete: Elimina
@ -206,9 +223,14 @@ it:
        create_and_resolve: Risolvi con nota
        create_and_unresolve: Riapri con nota
        delete: Elimina
+      nsfw:
+        'false': Mostra gli allegati multimediali
+        'true': Nascondi allegati multimediali
      report_contents: Contenuti
      resolved: Risolto
-      status: Stati
+      silence_account: Silenzia account
+      status: Stato
+      suspend_account: Sospendi account
      target: Obbiettivo
      unassign: Non assegnare
      unresolved: Non risolto
@ -217,11 +239,18 @@ it:
    settings:
      activity_api_enabled:
        title: Pubblica statistiche aggregate circa l'attività dell'utente
+      contact_information:
+        username: Nome utente del contatto
      peers_api_enabled:
        title: Pubblica elenco di istanze scoperte
      registrations:
+        deletion:
+          desc_html: Consenti a chiunque di cancellare il proprio account
+          title: Apri la cancellazione dell'account
        min_invite_role:
          disabled: Nessuno
+        open:
+          desc_html: Consenti a chiunque di creare un account
      show_staff_badge:
        title: Mostra badge staff
      site_description:
@ -403,6 +432,7 @@ it:
    wrong_code: Il codice inserito non è corretto! Assicurati che l'orario del server e l'orario del telefono siano corretti.
  user_mailer:
    welcome:
+      tips: Suggerimenti
      title: Benvenuto a bordo, %{name}!
  users:
    invalid_email: L'indirizzo e-mail inserito non è valido
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@ -354,8 +354,8 @@ ja:
      back_to_account: アカウントページに戻る
      batch:
        delete: 削除
-        nsfw_off: NSFW オフ
-        nsfw_on: NSFW オン
+        nsfw_off: 閲覧注意のマークを取り除く
+        nsfw_on: 閲覧注意としてマークする
      execute: 実行
      failed_to_execute: 実行に失敗しました
      media:
@ -788,6 +788,7 @@ ja:
      <p>オリジナルの出典: <a href="https://github.com/discourse/discourse">Discourse privacy policy</a></p>
    title: "%{instance} 利用規約・プライバシーポリシー"
  themes:
+    contrast: ハイコントラスト
    default: Mastodon
  time:
    formats:
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@ -0,0 +1 @@
+{}
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@ -708,6 +708,83 @@ pt-BR:
    reblogged: compartilhou
    sensitive_content: Conteúdo sensível
  terms:
+    body_html: |
+      <h2>Política de privacidade</h2>
+      <h3 id="collect">Que informação nós coletamos?</h3>
+
+      <ul>
+        <li><em>Informação básica de conta</em>: Se você se registrar nesse servidor, podemos pedir que você utilize um nome de usuário, um e-mail e uma senha. Você também pode adicionar informações extras como um nome de exibição e biografia; enviar uma imagem de perfil e imagem de cabeçalho. O nome de usuário, nome de exibição, biografia, imagem de perfil e imagem de cabeçalho são sempre listadas publicamente.</li>
+        <li><em>Posts, informação de seguidores e outras informações públicas</em>: A lista de pessoas que você segue é listada publicamente, o mesmo é verdade para quem te segue. Quando você envia uma mensagem, a data e o horário são armazenados, assim como a aplicação que você usou para enviar a mensagem. Mensagens podem conter mídias anexadas, como imagens e vídeos. Posts públicos e não-listados estão disponíveis publicamente. Quando você destaca um post no seu perfil, isso também é uma informação pública. Seus posts são entregues aos seus seguidores e em alguns casos isso significa que eles são enviados para servidores diferentes e cópias são armazenadas nesses servidores. Quando você remove posts, essa informação também é entregue aos seus seguidores. O ato de compartilhar ou favoritar um outro post é sempre público.<li>
+        <li><em>Mensagens diretas e posts somente para seguidores</em>: Todos os posts são armazenados e processados no servidor. Posts somente para seguidores são entregues aos seus seguidores e usuários que são mencionados neles; mensagens diretas são entregues somente aos usuários mencionados nelas. Em alguns casos isso significa que as mensagens são entregues para servidores diferentes e cópias são armazenadas nesses servidores. Nós fazemos esforços substanciais para limitar o acesso dessas mensagens somente para as pessoas autorizadas, mas outros servidores podem não fazer o mesmo. É importante portanto revisar os servidores à qual seus seguidores pertencem. Você pode usar uma opção para aprovar ou rejeitar novos seguidores manualmente nas configurações. <em>Por favor tenha em mente que os operadores do servidor e de qualquer servidores do destinatário podem ver tais mensagens</em>, e que os destinatários podem fazer capturas de tela, copiar ou de outra maneira compartilhar as mensagens. <em>Não compartilhe informação confidencial pelo Mastodon.</em></li>
+        <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
+      </ul>
+
+      <hr class="spacer" />
+
+      <h3 id="use">What do we use your information for?</h3>
+
+      <p>Any of the information we collect from you may be used in the following ways:</p>
+
+      <ul>
+        <li>To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.</li>
+        <li>To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.</li>
+        <li>The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.</li>
+      </ul>
+
+      <hr class="spacer" />
+
+      <h3 id="protect">How do we protect your information?</h3>
+
+      <p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="data-retention">What is our data retention policy?</h3>
+
+      <p>We will make a good faith effort to:</p>
+
+      <ul>
+        <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
+        <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
+      </ul>
+
+      <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>
+
+      <p>You may irreversibly delete your account at any time.</p>
+
+      <hr class="spacer"/>
+
+      <h3 id="cookies">Do we use cookies?</h3>
+
+      <p>Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.</p>
+
+      <p>We use cookies to understand and save your preferences for future visits.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="disclose">Do we disclose any information to outside parties?</h3>
+
+      <p>We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.</p>
+
+      <p>Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.</p>
+
+      <p>When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="coppa">Children's Online Privacy Protection Act Compliance</h3>
+
+      <p>Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="changes">Changes to our Privacy Policy</h3>
+
+      <p>If we decide to change our privacy policy, we will post those changes on this page.</p>
+
+      <p>This document is CC-BY-SA. It was last updated March 7, 2018.</p>
+
+      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
    title: "%{instance} Termos de Serviço e Política de Privacidade"
  themes:
    contrast: Alto contraste
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@ -8,6 +8,7 @@ de:
        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
        locked: Wer dir folgen möchte, muss um deine Erlaubnis bitten
        note:
@ -22,6 +23,10 @@ de:
      user:
        filtered_languages: Ausgewählte Sprachen werden aus deinen öffentlichen Zeitleisten gefiltert
    labels:
+      account:
+        fields:
+          name: Bezeichnung
+          value: Inhalt
      defaults:
        avatar: Profilbild
        confirm_new_password: Neues Passwort bestätigen
@ -31,6 +36,7 @@ de:
        display_name: Anzeigename
        email: E-Mail-Adresse
        expires_in: Gültig bis
+        fields: Profil-Metadaten
        filtered_languages: Gefilterte Sprachen
        header: Kopfbild
        locale: Sprache
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@ -38,7 +38,7 @@ gl:
        expires_in: Caducidade despois de
        fields: Metadatos do perfil
        filtered_languages: Idiomas filtrados
-        header: Cabezallo
+        header: Cabeceira
        locale: Idioma
        locked: Protexer conta
        max_uses: Número máximo de usos
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@ -29,8 +29,8 @@ sk:
          value: Obsah
      defaults:
        avatar: Avatar
-        confirm_new_password: Opäť vaše nové heslo pre potvrdenie
-        confirm_password: Potvrďte heslo
+        confirm_new_password: Znovu tvoje nové heslo, pre potvrdenie
+        confirm_password: Potvrď heslo
        current_password: Súčasné heslo
        data: Dáta
        display_name: Meno
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@ -8,6 +8,7 @@ sv:
        display_name:
          one: <span class="name-counter">1</span> tecken kvar
          other: <span class="name-counter">%{count}</span> tecken kvar
+        fields: Du kan ha upp till 4 objekt visade som en tabell på din profil
        header: NG, GIF eller JPG. Högst 2 MB. Kommer nedskalas till 700x335px
        locked: Kräver att du manuellt godkänner följare
        note:
@ -22,6 +23,10 @@ sv:
      user:
        filtered_languages: Kontrollerade språk filtreras från offentliga tidslinjer för dig
    labels:
+      account:
+        fields:
+          name: Etikett
+          value: Innehåll
      defaults:
        avatar: Avatar
        confirm_new_password: Bekräfta nytt lösenord
@ -31,6 +36,7 @@ sv:
        display_name: Visningsnamn
        email: E-postadress
        expires_in: Förfaller efter
+        fields: Profil-metadata
        filtered_languages: Filtrerade språk
        header: Bakgrundsbild
        locale: Språk
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@ -5,19 +5,23 @@ zh-HK:
      defaults:
        avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 2MB，會縮裁成 400x400px
        digest: 僅在你長時間未登錄，且收到了私信時發送
-        display_name: 最多 30 個字元
+        display_name:
+          one: 尚餘 <span class="name-counter">1</span> 個字
+          other: 尚餘 <span class="name-counter">%{count}</span> 個字
        fields: 個人資料頁可顯示多至 4 個項目
        header: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 2MB，會縮裁成 700x335px
        locked: 你必須人手核准每個用戶對你的關注請求，而你的文章私隱會被預設為「只有關注你的人能看」
-        note: 最多 160 個字元
+        note:
+          one: 尚餘 <span class="note-counter">1</span> 個字
+          other: 尚餘 <span class="note-counter">%{count}</span> 個字
        setting_noindex: 此設定會影響到你的公開個人資料以及文章頁面
-        setting_theme: 此設置會影響到你從任意設備登入時 Mastodon 的顯示樣式
+        setting_theme: 此設置會影響到你從任意設備登入時 Mastodon 的顯示樣式。
      imports:
        data: 自其他服務站匯出的 CSV 檔案
      sessions:
        otp: 輸入你手機上生成的雙重認證碼，或者任意一個恢復代碼。
      user:
-        filtered_languages: 下面被選擇的語言的文章將不會出現在你的公共時間軸上。
+        filtered_languages: 下面被選擇的語言的文章將不會出現在你的公共時間軸上
    labels:
      account:
        fields:
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@ -263,28 +263,39 @@ sk:
        report: nahlás
      action_taken_by: Zákrok vykonal/a
      are_you_sure: Ste si istý/á?
-      assign_to_self: ''
-      assigned: ''
+      assign_to_self: Priraď sebe
+      assigned: Priradený moderátor
      comment:
        none: Žiadne
-      created_at: ''
+      created_at: Nahlásené
      delete: Vymazať
      id: Identifikácia
      mark_as_resolved: Označiť ako vyriešené
+      mark_as_unresolved: Označ ako nevyriešené
+      notes:
+        create: Pridaj poznámku
+        create_and_resolve: Vyrieš s poznámkou
+        create_and_unresolve: Otvor znovu, s poznámkou
+        delete: Vymaž
+        placeholder: Opíš aké opatrenia boli urobené, alebo akékoľvek iné aktualizácie k tomuto nahláseniu…
      nsfw:
        'false': Odkryť mediálne prílohy
        'true': Skryť mediálne prílohy
+      reopen: Znovu otvor report
      report: Nahlásiť
      report_contents: Obsah
      reported_account: Nahlásený účet
      reported_by: Nahlásené užívateľom
      resolved: Vyriešené
+      resolved_msg: Hlásenie úspešne vyriešené!
      silence_account: Zamĺčať účet
      status: Stav
      suspend_account: Pozastaviť účet
      target: Cieľ
      title: Reporty
+      unassign: Odobrať
      unresolved: Nevyriešené
+      updated_at: Aktualizované
      view: Zobraziť
    settings:
      activity_api_enabled:
@ -405,6 +416,7 @@ sk:
    security: Zabezpečenie
    set_new_password: Nastaviť nové heslo
  authorize_follow:
+    already_following: Tento účet už následuješ
    error: Naneštastie nastala chyba pri hľadaní vzdialeného účtu
    follow: Následovať
    follow_request: 'Poslali ste požiadavku následovať užívateľa:'
@ -496,6 +508,7 @@ sk:
      '21600': 6 hodín
      '3600': 1 hodina
      '43200': 12 hodín
+      '604800': 1 týždeň
      '86400': 1 deň
    expires_in_prompt: Nikdy
    generate: Vygeneruj
@ -598,6 +611,10 @@ sk:
    missing_resource: Nemôžeme nájsť potrebnú presmerovaciu adresu k tvojmu účtu
    proceed: Začni následovať
    prompt: 'Budeš sledovať:'
+  remote_unfollow:
+    error: Chyba
+    title: Názov
+    unfollowed: Už nesleduješ
  sessions:
    activity: Najnovšia aktivita
    browser: Prehliadač
@ -667,6 +684,7 @@ sk:
  terms:
    title: Podmienky užívania, a pravidlá o súkromí pre %{instance}
  themes:
+    contrast: Vysoký kontrast
    default: Mastodon
  time:
    formats:
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@ -49,7 +49,7 @@ sv:
    reserved_username: Användarnamnet är reserverat
    roles:
      admin: Admin
-      moderator: Moderera
+      moderator: Moderator
    unfollow: Sluta följa
  admin:
    account_moderation_notes:
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@ -0,0 +1,5 @@
+---
+te:
+  about:
+    about_this: గురించి
+    contact: సంప్రదించండి