Merge branch 'asonix/changes' into asonix/downstream

AUTHORS.md

@@ -1,3 +1,6 @@
+Authors
+=======
+
 Mastodon is available on [GitHub](https://github.com/tootsuite/mastodon)
 and provided thanks to the work of the following contributors:
 
@@ -581,3 +584,248 @@ and provided thanks to the work of the following contributors:
 * [雨宮美羽](mailto:k737566@gmail.com)
 
 This document is provided for informational purposes only. Since it is only updated once per release, the version you are looking at may be currently out of date. To see the full list of contributors, consider looking at the [git history](https://github.com/tootsuite/mastodon/graphs/contributors) instead.
+
+## Translators
+
+Following people have contributed to translation of Mastodon:
+
+- **Arabic**
+  - ButterflyOfFire
+- **Asturian**
+  - ButterflyOfFire
+  - Enol P.
+- **Basque**
+  - Aitzol
+  - ButterflyOfFire
+  - Gorka Azkarate
+  - Osoitz
+  - Peru Iparragirre
+- **Bulgarian**
+  - ButterflyOfFire
+- **Catalan**
+  - ButterflyOfFire
+  - Joan Montané
+  - Jose Luis
+  - spla
+- **Chinese (Hong Kong)**
+  - ButterflyOfFire
+  - Luzi Leung
+- **Chinese (Simplified)**
+  - Allen Zhong
+  - ButterflyOfFire
+  - SerCom_KC
+- **Chinese (Traditional)**
+  - ButterflyOfFire
+  - James58899
+  - Jeff Huang
+  - S1ttidoe477
+  - SHA265
+- **Corsican**
+  - Alix D. R.
+  - ButterflyOfFire
+- **Croatian**
+  - ButterflyOfFire
+- **Czech**
+  - ButterflyOfFire
+  - Lorem Ipsum
+  - Marek Ľach
+- **Danish**
+  - ButterflyOfFire
+  - Rasmus Sæderup
+- **Dutch**
+  - ButterflyOfFire
+  - Jelv
+  - jeroenpraat
+  - rscmbbng
+- **English**
+  - ButterflyOfFire
+  - Renato "Lond" Cerqueira
+- **Esperanto**
+  - ButterflyOfFire
+  - Jeong Arm
+  - Martin Bodin
+  - Mélanie Chauvel
+  - Vanege
+  - tuxayo/Victor Grousset
+- **Finnish**
+  - ButterflyOfFire
+  - Jonne Arjoranta
+  - S Heija
+  - Taru Luojola
+- **French**
+  - Alda Marteau-Hardi
+  - Alix D. R.
+  - Baptiste Jonglez
+  - ButterflyOfFire
+  - Franck Paul
+  - Jean-Baptiste Holcroft
+  - Jonathan Chan
+  - Letiteuf55
+  - Martin Bodin
+  - Mélanie Chauvel
+  - Olivier Humbert
+  - Paul Marques Mota
+  - Sylvhem
+  - Technowix
+  - Thibaut Girka
+  - Théodore
+  - azenet
+  - codl
+- **Galician**
+  - ButterflyOfFire
+  - Xose M.
+  - manequim
+- **Georgian**
+  - ButterflyOfFire
+- **German**
+  - Benedikt Geißler
+  - ButterflyOfFire
+  - Daniel
+  - Eugen Rochko
+  - Koyu Berteon
+  - Patrick Figel
+  - Weblate Admin
+  - averageunicorn
+  - ePirat
+  - koyu
+  - larsreineke
+  - lilo
+- **Greek**
+  - Antonis
+  - ButterflyOfFire
+  - Dimitris Maroulidis
+  - Konstantinos Grevenitis
+- **Hebrew**
+  - ButterflyOfFire
+  - Ira
+  - Yaron Shahrabani
+- **Hungarian**
+  - Adam Paszternak
+  - ButterflyOfFire
+  - Tibike Miklós
+- **Ido**
+  - ButterflyOfFire
+- **Indonesian**
+  - Alfiana Sibuea
+  - ButterflyOfFire
+  - Dito Kurnia Pratama
+  - Eirworks
+  - afachri
+  - se7entime
+- **Italian**
+  - Alessandro Levati
+  - ButterflyOfFire
+  - Giuseppe Pignataro
+  - Stefano
+- **Japanese**
+  - ButterflyOfFire
+  - Kumasun Morino
+  - Yamagishi Kazutoshi
+  - mayaeh
+  - osapon
+  - unarist
+  - 小鳥遊まりあ
+  - 森の子リスのミーコの大冒険
+- **Korean**
+  - ButterflyOfFire
+  - Jeong Arm
+  - Minori Hiraoka
+  - Yamagishi Kazutoshi
+- **Malay**
+  - ButterflyOfFire
+  - Muhammad Nur Hidayat (MNH48)
+- **Norwegian (old code)**
+  - ButterflyOfFire
+  - Espen Rønnevik
+  - Tale
+- **Occitan**
+  - ButterflyOfFire
+  - Maxenç
+  - Quenti2
+  - Quentí
+- **Persian**
+  - ButterflyOfFire
+  - Masoud Abkenar
+- **Polish**
+  - ButterflyOfFire
+  - Jakub Mendyk
+  - Marcin Mikołajczak
+  - Marek Ľach
+  - Stasiek Michalski
+  - krkk
+- **Portuguese**
+  - ButterflyOfFire
+  - Hugo Gameiro
+  - manequim
+- **Portuguese (Brazil)**
+  - André Andrade
+  - Anna e só
+  - ButterflyOfFire
+  - Renato "Lond" Cerqueira
+- **Romanian**
+  - ButterflyOfFire
+  - adrianbblk
+- **Russian**
+  - Andrew Zyabin
+  - ButterflyOfFire
+  - Evgeny Petrov
+  - Yaron Shahrabani
+- **Serbian**
+  - Branko Kokanovic
+  - Burekz Finezt
+  - ButterflyOfFire
+- **Serbian (latin)**
+  - ButterflyOfFire
+- **Slovak**
+  - ButterflyOfFire
+  - Ivan Pleva
+  - Lorem Ipsum
+  - Marek Ľach
+  - Peter
+- **Slovenian**
+  - ButterflyOfFire
+  - Kristijan Tkalec
+- **Spanish**
+  - Angeles Broullón
+  - Antón López
+  - ButterflyOfFire
+  - Carlos Mondragon
+  - David Charte
+  - Emmanuel
+  - Lothar Wolf
+  - Pablo de la Concepción Sanz
+- **Swedish**
+  - ButterflyOfFire
+  - Elias Mårtenson
+  - Isak Holmström
+  - Shellkr
+  - Stefan Midjich
+  - Tim Stahel
+- **Telugu**
+  - ButterflyOfFire
+  - Joseph Nuthalapati
+  - Ranjith Tellakula
+  - avndp
+- **Thai**
+  - ButterflyOfFire
+- **Turkish**
+  - ButterflyOfFire
+- **Ukrainian**
+  - ButterflyOfFire
+  - Ivan Verchenko
+  - alexcleac
+- **Welsh**
+  - ButterflyOfFire
+  - Jaz-Michael King
+  - Kevin Beynon
+  - Owain Rhys Lewis
+  - Renato "Lond" Cerqueira
+  - Rhoslyn Prys
+  - carl morris
+- **Armenian**
+  - ButterflyOfFire
+- **Latvian**
+  - ButterflyOfFire
+- **Tamil**
+  - ButterflyOfFire
+  - Prasanna Venkadesh

CHANGELOG.md

@@ -3,328 +3,328 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
-## [Unreleased]
+## [2.7.0] - 2019-01-20
 ### Added
 
-- Add link for adding a user to a list from their profile (#9062)
-- Add joining several hashtags in a single column (#8904)
-- Add volume sliders for videos (#9366)
-- Add a tooltip explaining what a locked account is (#9403)
-- Add preloaded cache for common JSON-LD contexts (#9412)
-- Add profile directory (#9427)
-- Add setting to not group reblogs in home feed (#9248)
-- Add admin ability to remove a user's header image (#9495)
-- Add account hashtags to ActivityPub actor JSON (#9450)
-- Add error message for avatar image that's too large (#9518)
-- Add notification quick-filter bar (#9399)
-- Add new first-time tutorial (#9531)
-- Add moderation warnings (#9519)
-- Add emoji codepoint mappings for v11.0 (#9618)
-- Add REST API for creating an account (#9572)
-- Add support for Malayalam in language filter (#9624)
-- Add exclude_reblogs option to account statuses API (#9640)
-- Add local followers page to admin account UI (#9610)
-- Add healthcheck commands to docker-compose.yml (#9143)
-- Add handler for Move activity to migrate followers (#9629)
-- Add CSV export for lists and domain blocks (#9677)
-- Add `tootctl accounts follow ACCT` (#9414)
-- Add scheduled statuses (#9706)
-- Add immutable caching for S3 objects (#9722)
-- Add cache to custom emojis API (#9732)
-- Add preview cards to non-detailed statuses on public pages (#9714)
-- Add `mod` and `moderator` to list of default reserved usernames (#9713)
-- Add quick links to the admin interface in the web UI (#8545)
-- Add `tootctl domains crawl` (#9809)
-- Add attachment list fallback to public pages (#9780)
-- Add `tootctl --version` (#9835)
-- Add information about how to opt-in to the directory on the directory (#9834)
-- Add timeouts for S3 (#9842)
-- Add support for non-public reblogs from ActivityPub (#9841)
-- Add sending of `Reject` activity when sending a `Block` activity (#9811)
+- Add link for adding a user to a list from their profile ([namelessGonbai](https://github.com/tootsuite/mastodon/pull/9062))
+- Add joining several hashtags in a single column ([gdpelican](https://github.com/tootsuite/mastodon/pull/8904))
+- Add volume sliders for videos ([sumdog](https://github.com/tootsuite/mastodon/pull/9366))
+- Add a tooltip explaining what a locked account is ([pawelngei](https://github.com/tootsuite/mastodon/pull/9403))
+- Add preloaded cache for common JSON-LD contexts ([ThibG](https://github.com/tootsuite/mastodon/pull/9412))
+- Add profile directory ([Gargron](https://github.com/tootsuite/mastodon/pull/9427))
+- Add setting to not group reblogs in home feed ([ThibG](https://github.com/tootsuite/mastodon/pull/9248))
+- Add admin ability to remove a user's header image ([ThibG](https://github.com/tootsuite/mastodon/pull/9495))
+- Add account hashtags to ActivityPub actor JSON ([Gargron](https://github.com/tootsuite/mastodon/pull/9450))
+- Add error message for avatar image that's too large ([sumdog](https://github.com/tootsuite/mastodon/pull/9518))
+- Add notification quick-filter bar ([pawelngei](https://github.com/tootsuite/mastodon/pull/9399))
+- Add new first-time tutorial ([Gargron](https://github.com/tootsuite/mastodon/pull/9531))
+- Add moderation warnings ([Gargron](https://github.com/tootsuite/mastodon/pull/9519))
+- Add emoji codepoint mappings for v11.0 ([Gargron](https://github.com/tootsuite/mastodon/pull/9618))
+- Add REST API for creating an account ([Gargron](https://github.com/tootsuite/mastodon/pull/9572))
+- Add support for Malayalam in language filter ([tachyons](https://github.com/tootsuite/mastodon/pull/9624))
+- Add exclude_reblogs option to account statuses API ([Gargron](https://github.com/tootsuite/mastodon/pull/9640))
+- Add local followers page to admin account UI ([chr-1x](https://github.com/tootsuite/mastodon/pull/9610))
+- Add healthcheck commands to docker-compose.yml ([BenLubar](https://github.com/tootsuite/mastodon/pull/9143))
+- Add handler for Move activity to migrate followers ([Gargron](https://github.com/tootsuite/mastodon/pull/9629))
+- Add CSV export for lists and domain blocks ([Gargron](https://github.com/tootsuite/mastodon/pull/9677))
+- Add `tootctl accounts follow ACCT` ([Gargron](https://github.com/tootsuite/mastodon/pull/9414))
+- Add scheduled statuses ([Gargron](https://github.com/tootsuite/mastodon/pull/9706))
+- Add immutable caching for S3 objects ([nolanlawson](https://github.com/tootsuite/mastodon/pull/9722))
+- Add cache to custom emojis API ([Gargron](https://github.com/tootsuite/mastodon/pull/9732))
+- Add preview cards to non-detailed statuses on public pages ([Gargron](https://github.com/tootsuite/mastodon/pull/9714))
+- Add `mod` and `moderator` to list of default reserved usernames ([Gargron](https://github.com/tootsuite/mastodon/pull/9713))
+- Add quick links to the admin interface in the web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/8545))
+- Add `tootctl domains crawl` ([Gargron](https://github.com/tootsuite/mastodon/pull/9809))
+- Add attachment list fallback to public pages ([ThibG](https://github.com/tootsuite/mastodon/pull/9780))
+- Add `tootctl --version` ([Gargron](https://github.com/tootsuite/mastodon/pull/9835))
+- Add information about how to opt-in to the directory on the directory ([Gargron](https://github.com/tootsuite/mastodon/pull/9834))
+- Add timeouts for S3 ([Gargron](https://github.com/tootsuite/mastodon/pull/9842))
+- Add support for non-public reblogs from ActivityPub ([Gargron](https://github.com/tootsuite/mastodon/pull/9841))
+- Add sending of `Reject` activity when sending a `Block` activity ([ThibG](https://github.com/tootsuite/mastodon/pull/9811))
 
 ### Changed
 
-- Temporarily pause timeline if mouse moved recently (#9200)
-- Change the password form order (#9267)
-- Redesign admin UI for accounts (#9340, #9643)
-- Redesign admin UI for instances/domain blocks (#9645)
-- Swap avatar and header input fields in profile page (#9271)
-- When posting in mobile mode, go back to previous history location (#9502)
-- Split out is_changing_upload from is_submitting (#9536)
-- Back to the getting-started when pins the timeline. (#9561)
-- Allow unauthenticated REST API access to GET /api/v1/accounts/:id/statuses (#9573)
-- Limit maximum visibility of local silenced users to unlisted (#9583)
-- Change API error message for unconfirmed accounts (#9625)
-- Change the icon to "reply-all" when it's a reply to other accounts (#9378)
-- Do not ignore federated reports targetting already-reported accounts (#9534)
-- Upgrade default Ruby version to 2.6.0 (#9688)
-- Change e-mail digest frequency (#9689)
-- Change Docker images for Tor support in docker-compose.yml (#9438)
-- Display fallback link card thumbnail when none is given (#9715)
-- Change account bio length validation to ignore mention domains and URLs (#9717)
-- Use configured contact user for "anonymous" federation activities (#9661)
-- Change remote interaction dialog to use specific actions instead of generic "interact" (#9743)
-- Always re-fetch public key when signature verification fails to support blind key rotation (#9667)
-- Make replies to boosts impossible, connect reply to original status instead (#9129)
-- Change e-mail MX validation to check both A and MX records against blacklist (#9489)
-- Hide floating action button on search and getting started pages (#9826)
-- Redesign public hashtag page to use a masonry layout (#9822)
-- Use `summary` as summary instead of content warning for converted ActivityPub objects (#9823)
-- Display a double reply arrow on public pages for toots that are replies (#9808)
-- Change admin UI right panel size to be wider (#9768)
+- Temporarily pause timeline if mouse moved recently ([lmorchard](https://github.com/tootsuite/mastodon/pull/9200))
+- Change the password form order ([mayaeh](https://github.com/tootsuite/mastodon/pull/9267))
+- Redesign admin UI for accounts ([Gargron](https://github.com/tootsuite/mastodon/pull/9340), [Gargron](https://github.com/tootsuite/mastodon/pull/9643))
+- Redesign admin UI for instances/domain blocks ([Gargron](https://github.com/tootsuite/mastodon/pull/9645))
+- Swap avatar and header input fields in profile page ([ThibG](https://github.com/tootsuite/mastodon/pull/9271))
+- When posting in mobile mode, go back to previous history location ([ThibG](https://github.com/tootsuite/mastodon/pull/9502))
+- Split out is_changing_upload from is_submitting ([ThibG](https://github.com/tootsuite/mastodon/pull/9536))
+- Back to the getting-started when pins the timeline. ([kedamaDQ](https://github.com/tootsuite/mastodon/pull/9561))
+- Allow unauthenticated REST API access to GET /api/v1/accounts/:id/statuses ([Gargron](https://github.com/tootsuite/mastodon/pull/9573))
+- Limit maximum visibility of local silenced users to unlisted ([ThibG](https://github.com/tootsuite/mastodon/pull/9583))
+- Change API error message for unconfirmed accounts ([noellabo](https://github.com/tootsuite/mastodon/pull/9625))
+- Change the icon to "reply-all" when it's a reply to other accounts ([mayaeh](https://github.com/tootsuite/mastodon/pull/9378))
+- Do not ignore federated reports targetting already-reported accounts ([ThibG](https://github.com/tootsuite/mastodon/pull/9534))
+- Upgrade default Ruby version to 2.6.0 ([Gargron](https://github.com/tootsuite/mastodon/pull/9688))
+- Change e-mail digest frequency ([Gargron](https://github.com/tootsuite/mastodon/pull/9689))
+- Change Docker images for Tor support in docker-compose.yml ([Sir-Boops](https://github.com/tootsuite/mastodon/pull/9438))
+- Display fallback link card thumbnail when none is given ([Gargron](https://github.com/tootsuite/mastodon/pull/9715))
+- Change account bio length validation to ignore mention domains and URLs ([Gargron](https://github.com/tootsuite/mastodon/pull/9717))
+- Use configured contact user for "anonymous" federation activities ([yukimochi](https://github.com/tootsuite/mastodon/pull/9661))
+- Change remote interaction dialog to use specific actions instead of generic "interact" ([Gargron](https://github.com/tootsuite/mastodon/pull/9743))
+- Always re-fetch public key when signature verification fails to support blind key rotation ([ThibG](https://github.com/tootsuite/mastodon/pull/9667))
+- Make replies to boosts impossible, connect reply to original status instead ([valerauko](https://github.com/tootsuite/mastodon/pull/9129))
+- Change e-mail MX validation to check both A and MX records against blacklist ([Gargron](https://github.com/tootsuite/mastodon/pull/9489))
+- Hide floating action button on search and getting started pages ([tmm576](https://github.com/tootsuite/mastodon/pull/9826))
+- Redesign public hashtag page to use a masonry layout ([Gargron](https://github.com/tootsuite/mastodon/pull/9822))
+- Use `summary` as summary instead of content warning for converted ActivityPub objects ([Gargron](https://github.com/tootsuite/mastodon/pull/9823))
+- Display a double reply arrow on public pages for toots that are replies ([ThibG](https://github.com/tootsuite/mastodon/pull/9808))
+- Change admin UI right panel size to be wider ([Kjwon15](https://github.com/tootsuite/mastodon/pull/9768))
 
 ### Removed
 
-- Remove links to bridge.joinmastodon.org (non-functional) (#9608)
-- Remove LD-Signatures from activities that do not need them (#9659)
+- Remove links to bridge.joinmastodon.org (non-functional) ([Gargron](https://github.com/tootsuite/mastodon/pull/9608))
+- Remove LD-Signatures from activities that do not need them ([ThibG](https://github.com/tootsuite/mastodon/pull/9659))
 
 ### Fixed
 
-- Remove unused computation of reblog references from updateTimeline (#9244)
-- Fix loaded embeds resetting if a status arrives from API again (#9270)
-- Fix race condition causing shallow status with only a "favourited" attribute (#9272)
-- Remove intermediary arrays when creating hash maps from results (#9291)
-- Extract counters from accounts table to account_stats table to improve performance (#9295)
-- Change identities id column to a bigint (#9371)
-- Fix conversations API pagination (#9407)
-- Improve account suspension speed and completeness (#9290)
-- Fix thread depth computation in statuses_controller (#9426)
-- Fix database deadlocks by moving account stats update outside transaction (#9437)
-- Escape HTML in profile name preview in profile settings (#9446)
-- Use same CORS policy for /@:username and /users/:username (#9485)
-- Make custom emoji domains case insensitive (#9474)
-- Various fixes to scrollable lists and media gallery (#9501)
-- Fix bootsnap cache directory being declared relatively (#9511)
-- Fix timeline pagination in the web UI (#9516)
-- Fix padding on dropdown elements in preferences (#9517)
-- Make avatar and headers respect GIF autoplay settings (#9515)
-- Do no retry Web Push workers if the server returns a 4xx response (#9434)
-- Minor scrollable list fixes (#9551)
-- Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510)
-- Fix `tootctl accounts rotate` not updating public keys (#9556)
-- Fix CSP / X-Frame-Options for media players (#9558)
-- Fix unnecessary loadMore calls when the end of a timeline has been reached (#9581)
-- Skip mailer job retries when a record no longer exists (#9590)
-- Fix composer not getting focus after reply confirmation dialog (#9602)
-- Fix signature verification stoplight triggering on non-timeout errors (#9617)
-- Fix ThreadResolveWorker getting queued with invalid URLs (#9628)
-- Fix crash when clearing uninitialized timeline (#9662)
-- Avoid duplicate work by merging ReplyDistributionWorker into DistributionWorker (#9660)
-- Skip full text search if it fails, instead of erroring out completely (#9654)
-- Fix profile metadata links not verifying correctly sometimes (#9673)
-- Ensure blocked user unfollows blocker if Block/Undo-Block activities are processed out of order (#9687)
-- Fix unreadable text color in report modal for some statuses (#9716)
-- Stop GIFV timeline preview explicitly when it's opened in modal (#9749)
-- Fix scrollbar width compensation (#9824)
-- Fix race conditions when processing deleted toots (#9815)
-- Fix SSO issues on WebKit browsers by disabling Same-Site cookie again (#9819)
-- Fix empty OEmbed error (#9807)
-- Fix drag & drop modal not disappearing sometimes (#9797)
-- Fix statuses with content warnings being displayed in web push notifications sometimes (#9778)
-- Fix scroll-to-detailed status not working on public pages (#9773)
-- Fix media modal loading indicator (#9771)
-- Fix hashtag search results not having a permalink fallback in web UI (#9810)
-- Fix slightly cropped font on settings page dropdowns when using system font (#9839)
-- Fix not being able to drag & drop text into forms (#9840)
+- Remove unused computation of reblog references from updateTimeline ([ThibG](https://github.com/tootsuite/mastodon/pull/9244))
+- Fix loaded embeds resetting if a status arrives from API again ([ThibG](https://github.com/tootsuite/mastodon/pull/9270))
+- Fix race condition causing shallow status with only a "favourited" attribute ([ThibG](https://github.com/tootsuite/mastodon/pull/9272))
+- Remove intermediary arrays when creating hash maps from results ([Gargron](https://github.com/tootsuite/mastodon/pull/9291))
+- Extract counters from accounts table to account_stats table to improve performance ([Gargron](https://github.com/tootsuite/mastodon/pull/9295))
+- Change identities id column to a bigint ([Gargron](https://github.com/tootsuite/mastodon/pull/9371))
+- Fix conversations API pagination ([ThibG](https://github.com/tootsuite/mastodon/pull/9407))
+- Improve account suspension speed and completeness ([Gargron](https://github.com/tootsuite/mastodon/pull/9290))
+- Fix thread depth computation in statuses_controller ([ThibG](https://github.com/tootsuite/mastodon/pull/9426))
+- Fix database deadlocks by moving account stats update outside transaction ([ThibG](https://github.com/tootsuite/mastodon/pull/9437))
+- Escape HTML in profile name preview in profile settings ([pawelngei](https://github.com/tootsuite/mastodon/pull/9446))
+- Use same CORS policy for /@:username and /users/:username ([ThibG](https://github.com/tootsuite/mastodon/pull/9485))
+- Make custom emoji domains case insensitive ([Esteth](https://github.com/tootsuite/mastodon/pull/9474))
+- Various fixes to scrollable lists and media gallery ([ThibG](https://github.com/tootsuite/mastodon/pull/9501))
+- Fix bootsnap cache directory being declared relatively ([Gargron](https://github.com/tootsuite/mastodon/pull/9511))
+- Fix timeline pagination in the web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/9516))
+- Fix padding on dropdown elements in preferences ([ThibG](https://github.com/tootsuite/mastodon/pull/9517))
+- Make avatar and headers respect GIF autoplay settings ([ThibG](https://github.com/tootsuite/mastodon/pull/9515))
+- Do no retry Web Push workers if the server returns a 4xx response ([Gargron](https://github.com/tootsuite/mastodon/pull/9434))
+- Minor scrollable list fixes ([ThibG](https://github.com/tootsuite/mastodon/pull/9551))
+- Ignore low-confidence CharlockHolmes guesses when parsing link cards ([ThibG](https://github.com/tootsuite/mastodon/pull/9510))
+- Fix `tootctl accounts rotate` not updating public keys ([Gargron](https://github.com/tootsuite/mastodon/pull/9556))
+- Fix CSP / X-Frame-Options for media players ([jomo](https://github.com/tootsuite/mastodon/pull/9558))
+- Fix unnecessary loadMore calls when the end of a timeline has been reached ([ThibG](https://github.com/tootsuite/mastodon/pull/9581))
+- Skip mailer job retries when a record no longer exists ([Gargron](https://github.com/tootsuite/mastodon/pull/9590))
+- Fix composer not getting focus after reply confirmation dialog ([ThibG](https://github.com/tootsuite/mastodon/pull/9602))
+- Fix signature verification stoplight triggering on non-timeout errors ([Gargron](https://github.com/tootsuite/mastodon/pull/9617))
+- Fix ThreadResolveWorker getting queued with invalid URLs ([Gargron](https://github.com/tootsuite/mastodon/pull/9628))
+- Fix crash when clearing uninitialized timeline ([ThibG](https://github.com/tootsuite/mastodon/pull/9662))
+- Avoid duplicate work by merging ReplyDistributionWorker into DistributionWorker ([ThibG](https://github.com/tootsuite/mastodon/pull/9660))
+- Skip full text search if it fails, instead of erroring out completely ([Kjwon15](https://github.com/tootsuite/mastodon/pull/9654))
+- Fix profile metadata links not verifying correctly sometimes ([shrft](https://github.com/tootsuite/mastodon/pull/9673))
+- Ensure blocked user unfollows blocker if Block/Undo-Block activities are processed out of order ([ThibG](https://github.com/tootsuite/mastodon/pull/9687))
+- Fix unreadable text color in report modal for some statuses ([Gargron](https://github.com/tootsuite/mastodon/pull/9716))
+- Stop GIFV timeline preview explicitly when it's opened in modal ([kedamaDQ](https://github.com/tootsuite/mastodon/pull/9749))
+- Fix scrollbar width compensation ([ThibG](https://github.com/tootsuite/mastodon/pull/9824))
+- Fix race conditions when processing deleted toots ([ThibG](https://github.com/tootsuite/mastodon/pull/9815))
+- Fix SSO issues on WebKit browsers by disabling Same-Site cookie again ([moritzheiber](https://github.com/tootsuite/mastodon/pull/9819))
+- Fix empty OEmbed error ([renatolond](https://github.com/tootsuite/mastodon/pull/9807))
+- Fix drag & drop modal not disappearing sometimes ([hinaloe](https://github.com/tootsuite/mastodon/pull/9797))
+- Fix statuses with content warnings being displayed in web push notifications sometimes ([ThibG](https://github.com/tootsuite/mastodon/pull/9778))
+- Fix scroll-to-detailed status not working on public pages ([ThibG](https://github.com/tootsuite/mastodon/pull/9773))
+- Fix media modal loading indicator ([ThibG](https://github.com/tootsuite/mastodon/pull/9771))
+- Fix hashtag search results not having a permalink fallback in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/9810))
+- Fix slightly cropped font on settings page dropdowns when using system font ([ariasuni](https://github.com/tootsuite/mastodon/pull/9839))
+- Fix not being able to drag & drop text into forms ([tmm576](https://github.com/tootsuite/mastodon/pull/9840))
 
 ### Security
 
-- Sanitize and sandbox toot embeds in web UI (#9552)
-- Add tombstones for remote statuses to prevent replay attacks (#9830)
+- Sanitize and sandbox toot embeds in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/9552))
+- Add tombstones for remote statuses to prevent replay attacks ([ThibG](https://github.com/tootsuite/mastodon/pull/9830))
 
 ## [2.6.5] - 2018-12-01
 ### Changed
 
-- Change lists to display replies to others on the list and list owner (#9324)
+- Change lists to display replies to others on the list and list owner ([ThibG](https://github.com/tootsuite/mastodon/pull/9324))
 
 ### Fixed
 
-- Fix failures caused by commonly-used JSON-LD contexts being unavailable (#9412)
+- Fix failures caused by commonly-used JSON-LD contexts being unavailable ([ThibG](https://github.com/tootsuite/mastodon/pull/9412))
 
 ## [2.6.4] - 2018-11-30
 ### Fixed
 
-- Fix yarn dependencies not installing due to yanked event-stream package (#9401)
+- Fix yarn dependencies not installing due to yanked event-stream package ([Gargron](https://github.com/tootsuite/mastodon/pull/9401))
 
 ## [2.6.3] - 2018-11-30
 ### Added
 
-- Add hyphen to characters allowed in remote usernames (#9345)
+- Add hyphen to characters allowed in remote usernames ([ThibG](https://github.com/tootsuite/mastodon/pull/9345))
 
 ### Changed
 
-- Change server user count to exclude suspended accounts (#9380)
+- Change server user count to exclude suspended accounts ([Gargron](https://github.com/tootsuite/mastodon/pull/9380))
 
 ### Fixed
 
-- Fix ffmpeg processing sometimes stalling due to overfilled stdout buffer (#9368)
-- Fix missing DNS records raising the wrong kind of exception (#9379)
-- Fix already queued deliveries still trying to reach inboxes marked as unavailable (#9358)
+- Fix ffmpeg processing sometimes stalling due to overfilled stdout buffer ([hugogameiro](https://github.com/tootsuite/mastodon/pull/9368))
+- Fix missing DNS records raising the wrong kind of exception ([Gargron](https://github.com/tootsuite/mastodon/pull/9379))
+- Fix already queued deliveries still trying to reach inboxes marked as unavailable ([Gargron](https://github.com/tootsuite/mastodon/pull/9358))
 
 ### Security
 
-- Fix TLS handshake timeout not being enforced (#9381)
+- Fix TLS handshake timeout not being enforced ([Gargron](https://github.com/tootsuite/mastodon/pull/9381))
 
 ## [2.6.2] - 2018-11-23
 ### Added
 
-- Add Page to whitelisted ActivityPub types (#9188)
-- Add 20px to column width in web UI (#9227)
-- Add amount of freed disk space in `tootctl media remove` (#9229, #9239, #9288)
-- Add "Show thread" link to self-replies (#9228)
+- Add Page to whitelisted ActivityPub types ([mbajur](https://github.com/tootsuite/mastodon/pull/9188))
+- Add 20px to column width in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/9227))
+- Add amount of freed disk space in `tootctl media remove` ([Gargron](https://github.com/tootsuite/mastodon/pull/9229), [Gargron](https://github.com/tootsuite/mastodon/pull/9239), [mayaeh](https://github.com/tootsuite/mastodon/pull/9288))
+- Add "Show thread" link to self-replies ([Gargron](https://github.com/tootsuite/mastodon/pull/9228))
 
 ### Changed
 
-- Change order of Atom and RSS links so Atom is first (#9302)
-- Change Nginx configuration for Nanobox apps (#9310)
-- Change the follow action to appear instant in web UI (#9220)
-- Change how the ActiveRecord connection is instantiated in on_worker_boot (#9238)
-- Change `tootctl accounts cull` to always touch accounts so they can be skipped (#9293)
-- Change mime type comparison to ignore JSON-LD profile (#9179)
+- Change order of Atom and RSS links so Atom is first ([Alkarex](https://github.com/tootsuite/mastodon/pull/9302))
+- Change Nginx configuration for Nanobox apps ([danhunsaker](https://github.com/tootsuite/mastodon/pull/9310))
+- Change the follow action to appear instant in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/9220))
+- Change how the ActiveRecord connection is instantiated in on_worker_boot ([Gargron](https://github.com/tootsuite/mastodon/pull/9238))
+- Change `tootctl accounts cull` to always touch accounts so they can be skipped ([renatolond](https://github.com/tootsuite/mastodon/pull/9293))
+- Change mime type comparison to ignore JSON-LD profile ([valerauko](https://github.com/tootsuite/mastodon/pull/9179))
 
 ### Fixed
 
-- Fix web UI crash when conversation has no last status (#9207)
-- Fix follow limit validator reporting lower number past threshold (#9230)
-- Fix form validation flash message color and input borders (#9235)
-- Fix invalid twitter:player cards being displayed (#9254)
-- Fix emoji update date being processed incorrectly (#9255)
-- Fix playing embed resetting if status is reloaded in web UI (#9270, #9275)
-- Fix web UI crash when favouriting a deleted status (#9272)
-- Fix intermediary arrays being created for hash maps (#9291)
-- Fix filter ID not being a string in REST API (#9303)
+- Fix web UI crash when conversation has no last status ([sammy8806](https://github.com/tootsuite/mastodon/pull/9207))
+- Fix follow limit validator reporting lower number past threshold ([Gargron](https://github.com/tootsuite/mastodon/pull/9230))
+- Fix form validation flash message color and input borders ([Gargron](https://github.com/tootsuite/mastodon/pull/9235))
+- Fix invalid twitter:player cards being displayed ([ThibG](https://github.com/tootsuite/mastodon/pull/9254))
+- Fix emoji update date being processed incorrectly ([ThibG](https://github.com/tootsuite/mastodon/pull/9255))
+- Fix playing embed resetting if status is reloaded in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/9270), [Gargron](https://github.com/tootsuite/mastodon/pull/9275))
+- Fix web UI crash when favouriting a deleted status ([ThibG](https://github.com/tootsuite/mastodon/pull/9272))
+- Fix intermediary arrays being created for hash maps ([Gargron](https://github.com/tootsuite/mastodon/pull/9291))
+- Fix filter ID not being a string in REST API ([Gargron](https://github.com/tootsuite/mastodon/pull/9303))
 
 ### Security
 
-- Fix multiple remote account deletions being able to deadlock the database (#9292)
-- Fix HTTP connection timeout of 10s not being enforced (#9329)
+- Fix multiple remote account deletions being able to deadlock the database ([Gargron](https://github.com/tootsuite/mastodon/pull/9292))
+- Fix HTTP connection timeout of 10s not being enforced ([Gargron](https://github.com/tootsuite/mastodon/pull/9329))
 
 ## [2.6.1] - 2018-10-30
 ### Fixed
 
-- Fix resolving resources by URL not working due to a regression in #9132 (#9171)
-- Fix reducer error in web UI when a conversation has no last status (#9173)
+- Fix resolving resources by URL not working due to a regression in [valerauko](https://github.com/tootsuite/mastodon/pull/9132) ([Gargron](https://github.com/tootsuite/mastodon/pull/9171))
+- Fix reducer error in web UI when a conversation has no last status ([Gargron](https://github.com/tootsuite/mastodon/pull/9173))
 
 ## [2.6.0] - 2018-10-30
 ### Added
 
-- Add link ownership verification (#8703)
-- Add conversations API (#8832)
-- Add limit for the number of people that can be followed from one account (#8807)
-- Add admin setting to customize mascot (#8766)
-- Add support for more granular ActivityPub audiences from other software, i.e. circles (#8950, #9093, #9150)
-- Add option to block all reports from a domain (#8830)
-- Add user preference to always expand toots marked with content warnings (#8762)
-- Add user preference to always hide all media (#8569)
-- Add `force_login` param to OAuth authorize page (#8655)
-- Add `tootctl accounts backup` (#8642, #8811)
-- Add `tootctl accounts create` (#8642, #8811)
-- Add `tootctl accounts cull` (#8642, #8811)
-- Add `tootctl accounts delete` (#8642, #8811)
-- Add `tootctl accounts modify` (#8642, #8811)
-- Add `tootctl accounts refresh` (#8642, #8811)
-- Add `tootctl feeds build` (#8642, #8811)
-- Add `tootctl feeds clear` (#8642, #8811)
-- Add `tootctl settings registrations open` (#8642, #8811)
-- Add `tootctl settings registrations close` (#8642, #8811)
-- Add `min_id` param to REST API to support backwards pagination (#8736)
-- Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893)
-- Add PostgreSQL disk space growth tracking in PGHero (#8906)
-- Add button for disabling local account to report quick actions bar (#9024)
-- Add Czech language (#8594)
-- Add `same-site` (`lax`) attribute to cookies (#8626)
-- Add support for styled scrollbars in Firefox Nightly (#8653)
-- Add highlight to the active tab in web UI profiles (#8673)
-- Add auto-focus for comment textarea in report modal (#8689)
-- Add auto-focus for emoji picker's search field (#8688)
-- Add nginx and systemd templates to `dist/` directory (#8770)
-- Add support for `/.well-known/change-password` (#8828)
-- Add option to override FFMPEG binary path (#8855)
-- Add `dns-prefetch` tag when using different host for assets or uploads (#8942)
-- Add `description` meta tag (#8941)
-- Add `Content-Security-Policy` header (#8957)
-- Add cache for the instance info API (#8765)
-- Add suggested follows to search screen in mobile layout (#9010)
-- Add CORS header to `/.well-known/*` routes (#9083)
-- Add `card` attribute to statuses returned from REST API (#9120)
-- Add in-stream link preview (#9120)
-- Add support for ActivityPub `Page` objects (#9121)
+- Add link ownership verification ([Gargron](https://github.com/tootsuite/mastodon/pull/8703))
+- Add conversations API ([Gargron](https://github.com/tootsuite/mastodon/pull/8832))
+- Add limit for the number of people that can be followed from one account ([Gargron](https://github.com/tootsuite/mastodon/pull/8807))
+- Add admin setting to customize mascot ([ashleyhull-versent](https://github.com/tootsuite/mastodon/pull/8766))
+- Add support for more granular ActivityPub audiences from other software, i.e. circles ([Gargron](https://github.com/tootsuite/mastodon/pull/8950), [Gargron](https://github.com/tootsuite/mastodon/pull/9093), [Gargron](https://github.com/tootsuite/mastodon/pull/9150))
+- Add option to block all reports from a domain ([Gargron](https://github.com/tootsuite/mastodon/pull/8830))
+- Add user preference to always expand toots marked with content warnings ([webroo](https://github.com/tootsuite/mastodon/pull/8762))
+- Add user preference to always hide all media ([fvh-P](https://github.com/tootsuite/mastodon/pull/8569))
+- Add `force_login` param to OAuth authorize page ([Gargron](https://github.com/tootsuite/mastodon/pull/8655))
+- Add `tootctl accounts backup` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl accounts create` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl accounts cull` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl accounts delete` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl accounts modify` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl accounts refresh` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl feeds build` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl feeds clear` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl settings registrations open` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl settings registrations close` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `min_id` param to REST API to support backwards pagination ([Gargron](https://github.com/tootsuite/mastodon/pull/8736))
+- Add a confirmation dialog when hitting reply and the compose box isn't empty ([ThibG](https://github.com/tootsuite/mastodon/pull/8893))
+- Add PostgreSQL disk space growth tracking in PGHero ([Gargron](https://github.com/tootsuite/mastodon/pull/8906))
+- Add button for disabling local account to report quick actions bar ([Gargron](https://github.com/tootsuite/mastodon/pull/9024))
+- Add Czech language ([Aditoo17](https://github.com/tootsuite/mastodon/pull/8594))
+- Add `same-site` (`lax`) attribute to cookies ([sorin-davidoi](https://github.com/tootsuite/mastodon/pull/8626))
+- Add support for styled scrollbars in Firefox Nightly ([sorin-davidoi](https://github.com/tootsuite/mastodon/pull/8653))
+- Add highlight to the active tab in web UI profiles ([rhoio](https://github.com/tootsuite/mastodon/pull/8673))
+- Add auto-focus for comment textarea in report modal ([ThibG](https://github.com/tootsuite/mastodon/pull/8689))
+- Add auto-focus for emoji picker's search field ([ThibG](https://github.com/tootsuite/mastodon/pull/8688))
+- Add nginx and systemd templates to `dist/` directory ([Gargron](https://github.com/tootsuite/mastodon/pull/8770))
+- Add support for `/.well-known/change-password` ([Gargron](https://github.com/tootsuite/mastodon/pull/8828))
+- Add option to override FFMPEG binary path ([sascha-sl](https://github.com/tootsuite/mastodon/pull/8855))
+- Add `dns-prefetch` tag when using different host for assets or uploads ([Gargron](https://github.com/tootsuite/mastodon/pull/8942))
+- Add `description` meta tag ([Gargron](https://github.com/tootsuite/mastodon/pull/8941))
+- Add `Content-Security-Policy` header ([ThibG](https://github.com/tootsuite/mastodon/pull/8957))
+- Add cache for the instance info API ([ykzts](https://github.com/tootsuite/mastodon/pull/8765))
+- Add suggested follows to search screen in mobile layout ([Gargron](https://github.com/tootsuite/mastodon/pull/9010))
+- Add CORS header to `/.well-known/*` routes ([BenLubar](https://github.com/tootsuite/mastodon/pull/9083))
+- Add `card` attribute to statuses returned from REST API ([Gargron](https://github.com/tootsuite/mastodon/pull/9120))
+- Add in-stream link preview ([Gargron](https://github.com/tootsuite/mastodon/pull/9120))
+- Add support for ActivityPub `Page` objects ([mbajur](https://github.com/tootsuite/mastodon/pull/9121))
 
 ### Changed
 
-- Change forms design (#8703)
-- Change reports overview to group by target account (#8674)
-- Change web UI to show "read more" link on overly long in-stream statuses (#8205)
-- Change design of direct messages column (#8832, #9022)
-- Change home timelines to exclude DMs (#8940)
-- Change list timelines to exclude all replies (#8683)
-- Change admin accounts UI default sort to most recent (#8813)
-- Change documentation URL in the UI (#8898)
-- Change style of success and failure messages (#8973)
-- Change DM filtering to always allow DMs from staff (#8993)
-- Change recommended Ruby version to 2.5.3 (#9003)
-- Change docker-compose default to persist volumes in current directory (#9055)
-- Change character counters on edit profile page to input length limit (#9100)
-- Change notification filtering to always let through messages from staff (#9152)
-- Change "hide boosts from user" function also hiding notifications about boosts (#9147)
-- Change CSS `detailed-status__wrapper` class actually wrap the detailed status (#8547)
+- Change forms design ([Gargron](https://github.com/tootsuite/mastodon/pull/8703))
+- Change reports overview to group by target account ([Gargron](https://github.com/tootsuite/mastodon/pull/8674))
+- Change web UI to show "read more" link on overly long in-stream statuses ([lanodan](https://github.com/tootsuite/mastodon/pull/8205))
+- Change design of direct messages column ([Gargron](https://github.com/tootsuite/mastodon/pull/8832), [Gargron](https://github.com/tootsuite/mastodon/pull/9022))
+- Change home timelines to exclude DMs ([Gargron](https://github.com/tootsuite/mastodon/pull/8940))
+- Change list timelines to exclude all replies ([cbayerlein](https://github.com/tootsuite/mastodon/pull/8683))
+- Change admin accounts UI default sort to most recent ([Gargron](https://github.com/tootsuite/mastodon/pull/8813))
+- Change documentation URL in the UI ([Gargron](https://github.com/tootsuite/mastodon/pull/8898))
+- Change style of success and failure messages ([Gargron](https://github.com/tootsuite/mastodon/pull/8973))
+- Change DM filtering to always allow DMs from staff ([qguv](https://github.com/tootsuite/mastodon/pull/8993))
+- Change recommended Ruby version to 2.5.3 ([zunda](https://github.com/tootsuite/mastodon/pull/9003))
+- Change docker-compose default to persist volumes in current directory ([Gargron](https://github.com/tootsuite/mastodon/pull/9055))
+- Change character counters on edit profile page to input length limit ([Gargron](https://github.com/tootsuite/mastodon/pull/9100))
+- Change notification filtering to always let through messages from staff ([Gargron](https://github.com/tootsuite/mastodon/pull/9152))
+- Change "hide boosts from user" function also hiding notifications about boosts ([ThibG](https://github.com/tootsuite/mastodon/pull/9147))
+- Change CSS `detailed-status__wrapper` class actually wrap the detailed status ([trwnh](https://github.com/tootsuite/mastodon/pull/8547))
 
 ### Deprecated
 
-- `GET /api/v1/timelines/direct` → `GET /api/v1/conversations` (#8832)
-- `POST /api/v1/notifications/dismiss` → `POST /api/v1/notifications/:id/dismiss` (#8905)
-- `GET /api/v1/statuses/:id/card` → `card` attributed included in status (#9120)
+- `GET /api/v1/timelines/direct` → `GET /api/v1/conversations` ([Gargron](https://github.com/tootsuite/mastodon/pull/8832))
+- `POST /api/v1/notifications/dismiss` → `POST /api/v1/notifications/:id/dismiss` ([Gargron](https://github.com/tootsuite/mastodon/pull/8905))
+- `GET /api/v1/statuses/:id/card` → `card` attributed included in status ([Gargron](https://github.com/tootsuite/mastodon/pull/9120))
 
 ### Removed
 
-- Remove "on this device" label in column push settings (#8704)
-- Remove rake tasks in favour of tootctl commands (#8675)
+- Remove "on this device" label in column push settings ([rhoio](https://github.com/tootsuite/mastodon/pull/8704))
+- Remove rake tasks in favour of tootctl commands ([Gargron](https://github.com/tootsuite/mastodon/pull/8675))
 
 ### Fixed
 
-- Fix remote statuses using instance's default locale if no language given (#8861)
-- Fix streaming API not exiting when port or socket is unavailable (#9023)
-- Fix network calls being performed in database transaction in ActivityPub handler (#8951)
-- Fix dropdown arrow position (#8637)
-- Fix first element of dropdowns being focused even if not using keyboard (#8679)
-- Fix tootctl requiring `bundle exec` invocation (#8619)
-- Fix public pages not using animation preference for avatars (#8614)
-- Fix OEmbed/OpenGraph cards not understanding relative URLs (#8669)
-- Fix some dark emojis not having a white outline (#8597)
-- Fix media description not being displayed in various media modals (#8678)
-- Fix generated URLs of desktop notifications missing base URL (#8758)
-- Fix RTL styles (#8764, #8767, #8823, #8897, #9005, #9007, #9018, #9021, #9145, #9146)
-- Fix crash in streaming API when tag param missing (#8955)
-- Fix hotkeys not working when no element is focused (#8998)
-- Fix some hotkeys not working on detailed status view (#9006)
-- Fix og:url on status pages (#9047)
-- Fix upload option buttons only being visible on hover (#9074)
-- Fix tootctl not returning exit code 1 on wrong arguments (#9094)
-- Fix preview cards for appearing for profiles mentioned in toot (#6934, #9158)
-- Fix local accounts sometimes being duplicated as faux-remote (#9109)
-- Fix emoji search when the shortcode has multiple separators (#9124)
-- Fix dropdowns sometimes being partially obscured by other elements (#9126)
-- Fix cache not updating when reply/boost/favourite counters or media sensitivity update (#9119)
-- Fix empty display name precedence over username in web UI (#9163)
-- Fix td instead of th in sessions table header (#9162)
-- Fix handling of content types with profile (#9132)
+- Fix remote statuses using instance's default locale if no language given ([Kjwon15](https://github.com/tootsuite/mastodon/pull/8861))
+- Fix streaming API not exiting when port or socket is unavailable ([Gargron](https://github.com/tootsuite/mastodon/pull/9023))
+- Fix network calls being performed in database transaction in ActivityPub handler ([Gargron](https://github.com/tootsuite/mastodon/pull/8951))
+- Fix dropdown arrow position ([ThibG](https://github.com/tootsuite/mastodon/pull/8637))
+- Fix first element of dropdowns being focused even if not using keyboard ([ThibG](https://github.com/tootsuite/mastodon/pull/8679))
+- Fix tootctl requiring `bundle exec` invocation ([abcang](https://github.com/tootsuite/mastodon/pull/8619))
+- Fix public pages not using animation preference for avatars ([renatolond](https://github.com/tootsuite/mastodon/pull/8614))
+- Fix OEmbed/OpenGraph cards not understanding relative URLs ([ThibG](https://github.com/tootsuite/mastodon/pull/8669))
+- Fix some dark emojis not having a white outline ([ThibG](https://github.com/tootsuite/mastodon/pull/8597))
+- Fix media description not being displayed in various media modals ([ThibG](https://github.com/tootsuite/mastodon/pull/8678))
+- Fix generated URLs of desktop notifications missing base URL ([GenbuHase](https://github.com/tootsuite/mastodon/pull/8758))
+- Fix RTL styles ([mabkenar](https://github.com/tootsuite/mastodon/pull/8764), [mabkenar](https://github.com/tootsuite/mastodon/pull/8767), [mabkenar](https://github.com/tootsuite/mastodon/pull/8823), [mabkenar](https://github.com/tootsuite/mastodon/pull/8897), [mabkenar](https://github.com/tootsuite/mastodon/pull/9005), [mabkenar](https://github.com/tootsuite/mastodon/pull/9007), [mabkenar](https://github.com/tootsuite/mastodon/pull/9018), [mabkenar](https://github.com/tootsuite/mastodon/pull/9021), [mabkenar](https://github.com/tootsuite/mastodon/pull/9145), [mabkenar](https://github.com/tootsuite/mastodon/pull/9146))
+- Fix crash in streaming API when tag param missing ([Gargron](https://github.com/tootsuite/mastodon/pull/8955))
+- Fix hotkeys not working when no element is focused ([ThibG](https://github.com/tootsuite/mastodon/pull/8998))
+- Fix some hotkeys not working on detailed status view ([ThibG](https://github.com/tootsuite/mastodon/pull/9006))
+- Fix og:url on status pages ([ThibG](https://github.com/tootsuite/mastodon/pull/9047))
+- Fix upload option buttons only being visible on hover ([Gargron](https://github.com/tootsuite/mastodon/pull/9074))
+- Fix tootctl not returning exit code 1 on wrong arguments ([sascha-sl](https://github.com/tootsuite/mastodon/pull/9094))
+- Fix preview cards for appearing for profiles mentioned in toot ([ThibG](https://github.com/tootsuite/mastodon/pull/6934), [ThibG](https://github.com/tootsuite/mastodon/pull/9158))
+- Fix local accounts sometimes being duplicated as faux-remote ([Gargron](https://github.com/tootsuite/mastodon/pull/9109))
+- Fix emoji search when the shortcode has multiple separators ([ThibG](https://github.com/tootsuite/mastodon/pull/9124))
+- Fix dropdowns sometimes being partially obscured by other elements ([kedamaDQ](https://github.com/tootsuite/mastodon/pull/9126))
+- Fix cache not updating when reply/boost/favourite counters or media sensitivity update ([Gargron](https://github.com/tootsuite/mastodon/pull/9119))
+- Fix empty display name precedence over username in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/9163))
+- Fix td instead of th in sessions table header ([Gargron](https://github.com/tootsuite/mastodon/pull/9162))
+- Fix handling of content types with profile ([valerauko](https://github.com/tootsuite/mastodon/pull/9132))
 
 ## [2.5.2] - 2018-10-12
 ### Security
 
-- Fix XSS vulnerability (#8959)
+- Fix XSS vulnerability ([Gargron](https://github.com/tootsuite/mastodon/pull/8959))
 
 ## [2.5.1] - 2018-10-07
 ### Fixed
 
-- Fix database migrations for PostgreSQL below 9.5 (#8903)
-- Fix class autoloading issue in ActivityPub Create handler (#8820)
-- Fix cache statistics not being sent via statsd when statsd enabled (#8831)
-- Bump puma from 3.11.4 to 3.12.0 (#8883)
+- Fix database migrations for PostgreSQL below 9.5 ([Gargron](https://github.com/tootsuite/mastodon/pull/8903))
+- Fix class autoloading issue in ActivityPub Create handler ([Gargron](https://github.com/tootsuite/mastodon/pull/8820))
+- Fix cache statistics not being sent via statsd when statsd enabled ([ykzts](https://github.com/tootsuite/mastodon/pull/8831))
+- Bump puma from 3.11.4 to 3.12.0 ([dependabot[bot]](https://github.com/tootsuite/mastodon/pull/8883))
 
 ### Security
 
-- Fix some local images not having their EXIF metadata stripped on upload (#8714)
-- Fix being able to enable a disabled relay via ActivityPub Accept handler (#8864)
-- Bump nokogiri from 1.8.4 to 1.8.5 (#8881)
-- Fix being able to report statuses not belonging to the reported account (#8916)
+- Fix some local images not having their EXIF metadata stripped on upload ([ThibG](https://github.com/tootsuite/mastodon/pull/8714))
+- Fix being able to enable a disabled relay via ActivityPub Accept handler ([ThibG](https://github.com/tootsuite/mastodon/pull/8864))
+- Bump nokogiri from 1.8.4 to 1.8.5 ([dependabot[bot]](https://github.com/tootsuite/mastodon/pull/8881))
+- Fix being able to report statuses not belonging to the reported account ([ThibG](https://github.com/tootsuite/mastodon/pull/8916))

app/controllers/directories_controller.rb

@@ -28,7 +28,7 @@ class DirectoriesController < ApplicationController
   end
 
   def set_tags
-    @tags = Tag.discoverable.limit(30)
+    @tags = Tag.discoverable.limit(30).reject { |tag| tag.cached_sample_accounts.empty? }
   end
 
   def set_accounts

app/javascript/mastodon/locales/ar.json

@@ -17,7 +17,7 @@
   "account.follows_you": "يتابعك",
   "account.hide_reblogs": "إخفاء ترقيات @{name}",
   "account.link_verified_on": "تم التحقق مِن مالك هذا الرابط بتاريخ {date}",
-  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.locked_info": "تم تأمين خصوصية هذا الحساب عبر قُفل. فصاحب الحساب يُراجِع يدويا طلبات المتابَعة و الاشتراك بحسابه.",
   "account.media": "وسائط",
   "account.mention": "أُذكُر @{name}",
   "account.moved_to": "{name} إنتقل إلى :",
@@ -155,17 +155,17 @@
   "introduction.federation.home.headline": "Home",
   "introduction.federation.home.text": "سوف تُعرَض منشورات الأشخاص الذين تُتابِعهم على الخيط الرئيسي. بإمكانك متابعة أي حساب أيا كان الخادم الذي هو عليه!",
   "introduction.federation.local.headline": "Local",
-  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.federation.local.text": "المنشورات المُوجّهة للعامة على نفس الخادم الذي أنتم عليه ستظهر على الخيط الزمني المحلي.",
   "introduction.interactions.action": "إنهاء العرض التوضيحي!",
   "introduction.interactions.favourite.headline": "الإضافة إلى المفضلة",
   "introduction.interactions.favourite.text": "يمكِنك إضافة أي تبويق إلى المفضلة و إعلام صاحبه أنك أعجِبت بذاك التبويق.",
   "introduction.interactions.reblog.headline": "الترقية",
   "introduction.interactions.reblog.text": "يمكنكم مشاركة تبويقات الأشخاص الآخرين مع متابِعيكم عن طريق ترقيتها.",
   "introduction.interactions.reply.headline": "الرد",
-  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.interactions.reply.text": "يمكنكم الرد على تبويقاتكم و تبويقات الآخرين على شكل سلسلة محادثة.",
   "introduction.welcome.action": "هيا بنا!",
   "introduction.welcome.headline": "الخطوات الأولى",
-  "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
+  "introduction.welcome.text": "مرحبا بكم على الفيديفيرس! بعد لحظات قليلة ، سيكون بمقدوركم بث رسائل والتحدث إلى أصدقائكم عبر تشكيلة واسعة من الخوادم المختلفة. هذا الخادم ، {domain} ، يستضيف ملفكم الشخصي ، لذا يجب تذكر اسمه جيدا.",
   "keyboard_shortcuts.back": "للعودة",
   "keyboard_shortcuts.blocked": "لفتح قائمة المستخدمين المحظورين",
   "keyboard_shortcuts.boost": "للترقية",
@@ -292,7 +292,7 @@
   "search_results.statuses": "التبويقات",
   "search_results.total": "{count, number} {count, plural, one {result} و {results}}",
   "standalone.public_title": "نظرة على ...",
-  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_account": "افتح الواجهة الإدارية لـ @{name}",
   "status.admin_status": "افتح هذا المنشور على واجهة الإشراف",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "إلغاء الترقية",

app/javascript/mastodon/locales/ca.json

@@ -150,9 +150,9 @@
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostes",
   "introduction.federation.action": "Següent",
-  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.headline": "Federada",
   "introduction.federation.federated.text": "Les publicacions públiques d'altres servidors del fedivers apareixeran a la línia de temps federada.",
-  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.headline": "Inici",
   "introduction.federation.home.text": "Les publicacions de les persones que segueixes apareixeran a la línia de temps Inici. Pots seguir qualsevol persona de qualsevol servidor!",
   "introduction.federation.local.headline": "Local",
   "introduction.federation.local.text": "Les publicacions públiques de les persones del teu mateix servidor apareixeran a la línia de temps local.",

app/javascript/mastodon/locales/cs.json

@@ -145,7 +145,7 @@
   "hashtag.column_settings.tag_mode.all": "Všechny z těchto",
   "hashtag.column_settings.tag_mode.any": "Jakékoliv z těchto",
   "hashtag.column_settings.tag_mode.none": "Žádné z těchto",
-  "hashtag.column_settings.tag_toggle": "Zahrnout v tomto sloupci dodatečné hashtagy",
+  "hashtag.column_settings.tag_toggle": "Zahrnout v tomto sloupci dodatečné tagy",
   "home.column_settings.basic": "Základní",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",

app/javascript/mastodon/locales/de.json

@@ -92,7 +92,7 @@
   "confirmations.mute.confirm": "Stummschalten",
   "confirmations.mute.message": "Bist du dir sicher, dass du {name} stummschalten möchtest?",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
-  "confirmations.redraft.message": "Bist du dir sicher, dass du diesen Status löschen und neu machen möchtest? Favoriten und Boosts werden verloren gehen und Antworten zu diesem Post werden verwaist sein.",
+  "confirmations.redraft.message": "Bist du dir sicher, dass du diesen Beitrag löschen und neu machen möchtest? Favoriten und Boosts werden verloren gehen und Antworten zu diesem Beitrag werden verwaist sein.",
   "confirmations.reply.confirm": "Antworten",
   "confirmations.reply.message": "Wenn du jetzt antwortest wird es die gesamte Nachricht verwerfen, die du gerade schreibst. Möchtest du wirklich fortfahren?",
   "confirmations.unfollow.confirm": "Entfolgen",
@@ -316,7 +316,7 @@
   "status.reblog": "Teilen",
   "status.reblog_private": "An das eigentliche Publikum teilen",
   "status.reblogged_by": "{name} teilte",
-  "status.reblogs.empty": "Diesen Beitrag hat noch niemand geboostet. Sobald es jemand tun, wird er hier angezeigt.",
+  "status.reblogs.empty": "Diesen Beitrag hat noch niemand geteilt. Sobald es jemand tut, wird die Person hier angezeigt.",
   "status.redraft": "Löschen und neu erstellen",
   "status.reply": "Antworten",
   "status.replyAll": "Auf Thread antworten",

app/javascript/mastodon/locales/ja.json

@@ -293,7 +293,7 @@
   "search_results.total": "{count, number}件の結果",
   "standalone.public_title": "今こんな話をしています...",
   "status.admin_account": "@{name} のモデレーション画面を開く",
-  "status.admin_status": "この投稿をモデレーション画面で開く",
+  "status.admin_status": "このトゥートをモデレーション画面で開く",
   "status.block": "@{name}さんをブロック",
   "status.cancel_reblog_private": "ブースト解除",
   "status.cannot_reblog": "この投稿はブーストできません",

app/services/post_status_service.rb

@@ -49,6 +49,8 @@ class PostStatusService < BaseService
     @visibility   = :unlisted if @visibility == :public && @account.silenced
     @scheduled_at = @options[:scheduled_at]&.to_datetime
     @scheduled_at = nil if scheduled_in_the_past?
+  rescue ArgumentError
+    raise ActiveRecord::RecordInvalid
   end
 
   def process_status!

app/workers/publish_scheduled_status_worker.rb

@@ -3,6 +3,8 @@
 class PublishScheduledStatusWorker
   include Sidekiq::Worker
 
+  sidekiq_options unique: :until_executed
+
   def perform(scheduled_status_id)
     scheduled_status = ScheduledStatus.find(scheduled_status_id)
     scheduled_status.destroy!

config/locales/ar.yml

@@ -88,6 +88,7 @@ ar:
   admin:
     account_actions:
       action: تنفيذ الاجراء
+      title: اتخاذ إجراء إشراف على %{acct}
     account_moderation_notes:
       create: إترك ملاحظة
       created_msg: تم إنشاء ملاحظة الإشراف بنجاح !
@@ -107,6 +108,7 @@ ar:
       confirm: تأكيد
       confirmed: مؤكَّد
       confirming: التأكد
+      deleted: تمت إزالته
       demote: إنزال الرُتبة الوظيفية
       disable: تعطيل
       disable_two_factor_authentication: تعطيل المصادقة بخطوتين
@@ -124,7 +126,9 @@ ar:
       follows: يتابع
       header: الرأسية
       inbox_url: رابط صندوق الوارد
+      invited_by: تمت دعوته مِن طرف
       ip: عنوان الإيبي
+      joined: انضم
       location:
         all: الكل
         local: المحلي
@@ -184,6 +188,7 @@ ar:
       undo_suspension: إلغاء تعليق الحساب
       unsubscribe: إلغاء الاشتراك
       username: إسم المستخدم
+      warn: تحذير
       web: الويب
     action_logs:
       actions:
@@ -282,6 +287,9 @@ ar:
       reject_media: رفض ملفات الوسائط
       reject_media_hint: يزيل ملفات الوسائط المخزنة محليًا ويرفض تنزيل أي ملفات في المستقبل. غير ذي صلة للتعليق
       reject_reports: رفض التقارير
+      severity:
+        silence: تم كتمه
+        suspend: تم تعليقه
       show:
         affected_accounts:
           few: "%{count} حسابات معنية في قاعدة البيانات"
@@ -308,8 +316,24 @@ ar:
       title: القائمة السوداء للبريد الإلكتروني
     followers:
       back_to_account: العودة إلى الحساب
+      title: "%{acct} مُتابِعون"
     instances:
+      known_accounts:
+        few: "%{count} حسابات معروفة"
+        many: "%{count} حسابات معروفة"
+        one: حساب معروف %{count}
+        other: "%{count} حسابات معروفة"
+        two: "%{count} حسابات معروفة"
+        zero: "%{count} حسابات معروفة"
+      moderation:
+        all: كافتها
+        title: الإشراف
       title: الفديرالية
+      total_blocked_by_us: المحجوبة مِن طرفنا
+      total_followed_by_them: يُتابِعونها
+      total_followed_by_us: التي نُتابِعها
+      total_reported: تقارير عنهم
+      total_storage: الوسائط المُرفَقة
     invites:
       deactivate_all: تعطيلها كافة
       filter:
@@ -541,6 +565,7 @@ ar:
     warning_title: توافر المحتوى المنشور و المبعثَر
   directories:
     directory: سِجلّ الحسابات
+    enabled: إنّ حسابك الآن ضمن فهرس المستخدِمين.
     explanation: استكشف مستخدِمين آخرين حسب المواضيع التي تهمهم
     explore_mastodon: استكشف %{title}
     people:
@@ -573,6 +598,7 @@ ar:
     blocks: قمت بحظر
     csv: CSV
     follows: أنت تتبع
+    lists: القوائم
     mutes: قُمتَ بكتم
     storage: ذاكرة التخزين
   filters:
@@ -669,11 +695,17 @@ ar:
       action: معاينة كافة الإشعارات
       body: هذا هو مُلَخَّص الرسائل التي فاتتك وذلك منذ آخر زيارة لك في  %{since}
       mention: "%{name} أشار إليك في :"
-      new_followers_summary: رائع، لقد قام بمتابعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون !
+      new_followers_summary:
+        few: رائع، لقد قام بمتابَعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون!
+        many: رائع، لقد قام بمتابَعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون!
+        one: و لقد تحصّلتَ كذلك على مُتابِع آخَر بينما كنتَ غائبًا! هذا شيء رائع!
+        other: رائع، لقد قام بمتابَعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون!
+        two: رائع، لقد قام بمتابَعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون!
+        zero: رائع، لقد قام بمتابَعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون!
       subject:
         few: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
         many: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
-        one: "إشعار واحد منذ آخر زيارة لك لـ \U0001F418"
+        one: "إشعار واحد 1 منذ آخر زيارة لك لـ \U0001F418"
         other: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
         two: "إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
         zero: "إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"

config/locales/ca.yml

@@ -106,7 +106,6 @@ ca:
       enabled: Habilitat
       feed_url: URL del canal
       followers: Seguidors
-      followers_local: "(%{local} locals)"
       followers_url: URL dels seguidors
       follows: Segueix
       header: Capçalera
@@ -554,8 +553,11 @@ ca:
     warning_title: Disponibilitat de contingut disseminat
   directories:
     directory: Directori de perfils
+    enabled: Actualment estàs inclòs al directori.
+    enabled_but_waiting: Has optat per aparèixer al directori però encara no tens el nombre mínim de seguidors (%{min_followers}) per ser-hi.
     explanation: Descobreix usuaris segons els seus interessos
     explore_mastodon: Explora %{title}
+    how_to_enable: Actualment no tens activat ser al directori. Pots optar-hi a continuació. Utilitza etiquetes en el teu text bio per incloure't sota etiquetes especifiques!
     people:
       one: "%{count} persona"
       other: "%{count} gent"

config/locales/co.yml

@@ -106,7 +106,6 @@ co:
       enabled: Attivatu
       feed_url: URL di u flussu
       followers: Abbunati
-      followers_local: "(%{local} lucali)"
       followers_url: URL di l’abbunati
       follows: Abbunamenti
       header: Intistatura

config/locales/cs.yml

@@ -110,7 +110,6 @@ cs:
       enabled: Povoleno
       feed_url: URL proudu
       followers: Sledovatelé
-      followers_local: "(%{local} místních)"
       followers_url: URL sledovatelů
       follows: Sledovaní
       header: Hlavička
@@ -560,8 +559,11 @@ cs:
     warning_title: Dostupnost rozšířeného obsahu
   directories:
     directory: Adresář profilů
+    enabled: Aktuálně jste v adresáři uveden/a.
+    enabled_but_waiting: Přihlásil/a jste se k uvedení v adresáři, ale ještě nemáte minimální počet sledovatelů (%{min_followers}) pro uvedení.
     explanation: Objevujte uživatele podle jejich zájmů
     explore_mastodon: Prozkoumejte %{title}
+    how_to_enable: Aktuálně nejste přihlášen/a do adresáře. Přihlásit se můžete níže. Použijte ve svém popisu profilu hashtagy, abyste mohl/a být uveden/a pod konkrétními hashtagy!
     people:
       few: "%{count} lidé"
       one: "%{count} člověk"

config/locales/de.yml

@@ -106,7 +106,6 @@ de:
       enabled: Freigegeben
       feed_url: Feed-URL
       followers: Folgende
-      followers_local: "(%{local} lokal)"
       followers_url: URL des Folgenden
       follows: Folgt
       header: Header
@@ -554,8 +553,11 @@ de:
     warning_title: Verfügbarkeit verstreuter Inhalte
   directories:
     directory: Profilverzeichnis
+    enabled: Du bist gerade in dem Verzeichnis gelistet.
+    enabled_but_waiting: Du bist damit einverstanden im Verzeichnis gelistet zu werden, aber du hast nicht die minimale Anzahl an Folgenden (%{min_followers}), damit es passiert.
     explanation: Entdecke Benutzer basierend auf deren Interessen
     explore_mastodon: Entdecke %{title}
+    how_to_enable: Du hast dich gerade nicht dazu entschieden im Verzeichnis gelistet zu werden. Du kannst dich unten dafür eintragen. Benutze Hashtags in deiner Profilbeschreibung, um unter spezifischen Hashtags gelistet zu werden!
     people:
       one: "%{count} Person"
       other: "%{count} Leute"

config/locales/devise.sk.yml

@@ -60,22 +60,22 @@ sk:
       signed_up: Vitaj! Tvoja registrácia bola úspešná.
       signed_up_but_inactive: Registrácia bola úspešná. Avšak, účet ešte nebol aktivovaný, takže ťa nemôžeme prihlásiť.
       signed_up_but_locked: Prihlasovanie úspešné. Avšak tvoj účet je zamknutý, takže ťa nieje možné prihlásiť.
-      signed_up_but_unconfirmed: Správa s odkazom potvrdzujúcim registráciu bola poslaná na váš email. Pre aktváciu účtu, kliknite na daný odkaz.
-      update_needs_confirmation: Účet bol úspešne zmenený ale ešte potrebujeme overiť vašu novú emailovú adresu. Pre overenie prosím kliknite na link v správe ktorú sme vám poslali na email.
-      updated: Váš účet bol úspešne aktualizovaný.
+      signed_up_but_unconfirmed: Správa s odkazom na potvrdenie registrácie bola odoslaná na tvoj email. Pre aktváciu účtu, klikni prosím na daný odkaz. Takisto ale skontroluj aj svoju spam zložku, pokiaľ sa ti zdá, že si tento email nedostal/a.
+      update_needs_confirmation: Účet bol úspešne zmenený ale ešte potrebujeme overiť tvoju novú emailovú adresu. Pre overenie prosím klikni na link v správe ktorú si dostal/a na email. Takisto ale skontroluj aj svoju spam zložku, ak sa ti zdá, že si tento email nedostal/a.
+      updated: Tvoj účet bol úspešne aktualizovaný.
     sessions:
-      already_signed_out: Odhlásenie bolo úspešné.
-      signed_in: Prihlásenie úspešné.
-      signed_out: Odhlásenie úspešné.
+      already_signed_out: Odhlásil/a si sa úspešné.
+      signed_in: Prihlásil/a si sa úspešné.
+      signed_out: Odhlásil/a si sa úspešné.
     unlocks:
-      send_instructions: O niekoľko minút obdržíte email s inštrukciami ako nastaviť nové heslo.
-      send_paranoid_instructions: Ak váš účet existuje, o niekoľko minút obdržíte email s inštrukciami ako ho odomknúť.
-      unlocked: Váš účet bol úspešne odomknutý. Prosím prihláste sa.
+      send_instructions: O niekoľko minút obdržíš email s pokynmi, ako nastaviť nové heslo. Prosím, skontroluj ale aj svoju spam zložku, pokiaľ sa ti zdá, že si tento email nedostal/a.
+      send_paranoid_instructions: Ak tvoj účet existuje, o niekoľko minút obdržíš email s pokynmi ako si ho odomknúť. Prosím, skontroluj ale aj svoju spam zložku, pokiaľ sa ti zdá, že si tento email nedostal/a.
+      unlocked: Tvoj účet bol úspešne odomknutý. Pre pokračovanie sa prosím prihlás.
   errors:
     messages:
-      already_confirmed: bol už potvrdený, skúste sa prihlásiť
-      confirmation_period_expired: musí byť potvrdený do %{period}, prosím požiadajte o nový
-      expired: expiroval, prosím, vyžiadajte si nový
+      already_confirmed: bol už potvrdený, skús sa prihlásiť
+      confirmation_period_expired: musí byť potvrdený do %{period}, prosím požiadaj o nový
+      expired: vypŕšal, prosím, vyžiadaj si nový
       not_found: nenájdený
       not_locked: nebol uzamknutý
       not_saved:

config/locales/devise.sr.yml

@@ -41,7 +41,7 @@ sr:
       reset_password_instructions:
         action: Лозинка промењена
         explanation: Затражили сте нову лозинку за ваш налог.
-        extra: Ако нисте затражили ово, молимо игноришите ову е-пошту. Ваша лозинка неће бити промењена док не приступите повезници/линку изнад и не направите нову.
+        extra: Ако нисте затражили ово, молимо игноришите ову е-пошту. Ваша лозинка неће бити промењена док не приступите повезници/вези изнад и не направите нову.
         subject: 'Мастодонт: Упутство за ресетовање лозинке'
         title: Лозинка ресетована
       unlock_instructions:

config/locales/el.yml

@@ -106,7 +106,6 @@ el:
       enabled: Ενεργοποιημένο
       feed_url: URL ροής
       followers: Ακόλουθοι
-      followers_local: "(%{local} τοπικοί)"
       followers_url: URL ακολούθων
       follows: Ακολουθεί
       header: Επικεφαλίδα
@@ -554,8 +553,11 @@ el:
     warning_title: Διαθεσιμότητα ήδη διανεμημένου περιεχομένου
   directories:
     directory: Κατάλογος λογαριασμών
+    enabled: Περιλαμβάνεσαι στον κατάλογο.
+    enabled_but_waiting: Έχεις επιλέξει να εμφανίζεσαι στον κατάλογο μεν, αλλά ακόμα δεν έχεις τον ελάχιστο αριθμό ακόλουθων (%{min_followers}) που απαιτείται για να συμπεριληφθείς.
     explanation: Βρες χρήστες βάσει των ενδιαφερόντων τους
     explore_mastodon: Εξερεύνησε %{title}
+    how_to_enable: Δεν έχεις επιλέξει να συμπεριληφθείς στον καταλογο. Μπορείς να επιλέξεις παρακάτω. Χρησιμοποίησε ταμπέλες στο κείμενο του βιογραφικού σου για να εμφανίζεσαι κάτω από συγκεκριμένες ταμπέλες!
     people:
       one: "%{count} άτομο"
       other: "%{count} άτομα"
@@ -730,7 +732,7 @@ el:
     missing_resource: Δεν βρέθηκε το απαιτούμενο URL ανακατεύθυνσης για το λογαριασμό σου
     no_account_html: Δεν έχεις λογαριασμό; Μπορείς <a href='%{sign_up_path}' target='_blank'>να γραφτείς εδώ</a>
     proceed: Συνέχισε για να ακολουθήσεις
-    prompt: 'Θα ακολουθήσεις:'
+    prompt: 'Ετοιμάζεσαι να ακολουθήσεις:'
     reason_html: "<strong>Γιατί χρειάζεται αυτό το βήμα;</strong> Το <code>%{instance}</code> πορεία να μην είναι ο κόμβος που είσαι γραμμένος, έτσι πρέπει να σε ανακατευθύνουμε στο δικό σου."
   remote_interaction:
     favourite:

config/locales/eu.yml

@@ -105,7 +105,6 @@ eu:
       enabled: Gaituta
       feed_url: Jarioaren URL-a
       followers: Jarraitzaileak
-      followers_local: "(%{local} lokala)"
       followers_url: Jarraitzaileen URL-a
       follows: Jarraitzen du
       header: Goiburua

config/locales/fr.yml

@@ -106,7 +106,6 @@ fr:
       enabled: Activé
       feed_url: URL du flux
       followers: Abonné⋅e⋅s
-      followers_local: "(%{local} local)"
       followers_url: URL des abonné·e·s
       follows: Abonnements
       header: Entête
@@ -551,8 +550,11 @@ fr:
     warning_title: Disponibilité du contenu disséminé
   directories:
     directory: Annuaire des profils
+    enabled: Vous êtes actuellement listé dans l'annuaire.
+    enabled_but_waiting: Vous avez choisi d'être listé dans l'annuaire, mais vous n'avez pas encore le nombre minimum de suiveurs (%{min_followers}) pour y être inscrit.
     explanation: Découvrir des utilisateurs en se basant sur leurs centres d'intérêt
     explore_mastodon: Explorer %{title}
+    how_to_enable: Vous n'êtes pas encore inscrit dans l'annuaire. Vous pouvez vous inscrire ci-dessous. Utilisez des hashtags dans votre texte biographique pour être listé sous des hashtags spécifiques !
     people:
       one: "%{count} personne"
       other: "%{count} personne"
@@ -733,6 +735,8 @@ fr:
   remote_interaction:
     favourite:
       prompt: 'Vous souhaitez mettre ce pouet en favori :'
+    reblog:
+      prompt: 'Vous souhaitez repartager ce pouet :'
     reply:
       prompt: 'Vous souhaitez répondre à ce pouet :'
   remote_unfollow:

config/locales/gl.yml

@@ -106,7 +106,6 @@ gl:
       enabled: Habilitado
       feed_url: URL fonte
       followers: Seguidoras
-      followers_local: "(local %{local})"
       followers_url: URL das seguidoras
       follows: Segue
       header: Cabeceira
@@ -554,8 +553,11 @@ gl:
     warning_title: Dispoñibilidade do contido espallado
   directories:
     directory: Directorio de perfil
+    enabled: Vostede está actualmente na lista do directorio.
+    enabled_but_waiting: Vostede optou por ser incluída no directorio, mais por agora non ten o número mínimo de seguidoras (%{min_followers}) para aparecer.
     explanation: Descubra usuarias según o seu interese
     explore_mastodon: Explorar %{title}
+    how_to_enable: Actualmente non solicitou ser incluída no directorio, pode facelo abaixo. Utilice etiquetas no texto de biografía para ser incluída baixo etiquetas específicas!
     people:
       one: "%{count} persoa"
       other: "%{count} persoas"

config/locales/ja.yml

@@ -18,7 +18,7 @@ ja:
     features:
       humane_approach_body: 他の SNS の失敗から学び、Mastodon はソーシャルメディアが誤った使い方をされることの無いように倫理的な設計を目指しています。
       humane_approach_title: より思いやりのある設計
-      not_a_product_body: Mastodon は営利的な SNS ではありません。広告や、データの収集・解析は無く、またユーザーの囲い込みもありません。ここには中央権力はありません。
+      not_a_product_body: Mastodon は営利的な SNS ではありません。広告や、データの収集・解析によるターゲティングは無く、またユーザーの囲い込みもありません。ここには中央権力はありません。
       not_a_product_title: あなたは人間であり、商品ではありません
       real_conversation_body: 好きなように書ける500文字までの投稿や、文章やメディアの内容に警告をつけられる機能で、思い通りに自分自身を表現することができます。
       real_conversation_title: 本当のコミュニケーションのために
@@ -106,7 +106,6 @@ ja:
       enabled: 有効
       feed_url: フィードURL
       followers: フォロワー数
-      followers_local: "(%{local} ローカル)"
       followers_url: Followers URL
       follows: フォロー数
       header: ヘッダー
@@ -554,8 +553,11 @@ ja:
     warning_title: 共有されたコンテンツについて
   directories:
     directory: ディレクトリ
-    explanation: 興味のある人を見つけよう
+    enabled: あなたはディレクトリに掲載されています。
+    enabled_but_waiting: あなたはディレクトリへの掲載を選択しましたが、掲載に必要な最小フォロワー数 (%{min_followers} 人) を満たしていません。
+    explanation: 関心を軸にユーザーを発見しよう
     explore_mastodon: "%{title}を探索"
+    how_to_enable: あなたはディレクトリへの掲載を選択していません。下記から選択できます。ハッシュタグカラムに掲載するにはプロフィール文にハッシュタグを使用してください。
     people:
       one: "%{count} 人"
       other: "%{count} 人"
@@ -731,6 +733,7 @@ ja:
     no_account_html: アカウントをお持ちではないですか？<a href='%{sign_up_path}' target='_blank'>こちら</a>からサインアップできます
     proceed: フォローする
     prompt: 'フォローしようとしています:'
+    reason_html: "<strong>なぜこの手順が必要でしょうか？</strong><code>%{instance}</code>はあなたが登録されているサーバーではないかもしれないので、まずあなたのサーバーに転送する必要があります。"
   remote_interaction:
     favourite:
       proceed: お気に入り登録する
@@ -745,6 +748,10 @@ ja:
     error: エラー
     title: タイトル
     unfollowed: フォロー解除しました
+  scheduled_statuses:
+    over_daily_limit: その日予約できる投稿数 %{limit} を超えています
+    over_total_limit: 予約できる投稿数 %{limit} を超えています
+    too_soon: より先の時間を指定してください
   sessions:
     activity: 最後のアクティビティ
     browser: ブラウザ

config/locales/ko.yml

@@ -106,7 +106,6 @@ ko:
       enabled: 활성
       feed_url: 피드 URL
       followers: 팔로워 수
-      followers_local: "(%{local} 로컬)"
       followers_url: 팔로워 URL
       follows: 팔로잉 수
       header: 헤더
@@ -556,8 +555,11 @@ ko:
     warning_title: 공유된 컨텐츠에 대해서
   directories:
     directory: 프로필 디렉토리
+    enabled: 당신은 디렉터리에 표시 되고 있습니다.
+    enabled_but_waiting: 디렉터리에 표시 되기 위해서는 수동으로 참여해야 합니다, 하지만 디렉터리에 표시 되기 위한 최소 팔로워(%{min_followers})수에 미치지 못했습니다.
     explanation: 관심사에 대한 유저들을 발견합니다
     explore_mastodon: "%{title} 탐사하기"
+    how_to_enable: 아직 디렉터리에 참여하지 않았습니다. 아래에서 참여할 수 있습니다. 바이오 텍스트에 해시태그를 사용해 특정 해시태그 디렉터리에 표시 될 수 있습니다!
     people:
       one: "%{count}명"
       other: "%{count}명"

config/locales/nl.yml

@@ -106,7 +106,6 @@ nl:
       enabled: Ingeschakeld
       feed_url: Feed-URL
       followers: Volgers
-      followers_local: "(%{local} lokaal)"
       followers_url: Volgers-URL
       follows: Volgt
       header: Omslagfoto
@@ -554,8 +553,11 @@ nl:
     warning_title: Verwijdering gegevens op andere servers
   directories:
     directory: Gebruikersgids
+    enabled: Je staat momenteel in de gebruikersgids vermeldt.
+    enabled_but_waiting: Je hebt er voor gekozen om in de gebruikersgids te worden vermeldt, maar je hebt daarvoor nog niet het minimaal aantal volgers (%{min_followers}).
     explanation: Ontdek gebruikers aan de hand van hun interesses
     explore_mastodon: "%{title} verkennen"
+    how_to_enable: Je geeft momenteel geen toestemming om in de gebruikersgids te worden vermeldt. Je kunt hieronder toestemming geven. Gebruik hashtags in de tekst van jouw bio, om onder bepaalde hashtags te worden vermeldt!
     people:
       one: "%{count} gebruikers"
       other: "%{count} gebruikers"

config/locales/oc.yml

@@ -106,7 +106,6 @@ oc:
       enabled: Activat
       feed_url: Flux URL
       followers: Seguidors
-      followers_local: "(%{local} local)"
       followers_url: URL dels seguidors
       follows: Abonaments
       header: Bandièra
@@ -610,8 +609,11 @@ oc:
     warning_title: Disponibilitat del contengut difusat
   directories:
     directory: Annuari de perfils
+    enabled: Sètz actualament listat dins l'annuari.
+    enabled_but_waiting: Avètz causit d'èsser listat dins l'annuari mas avètz pas encara lo nombre minimum de seguidors (%{min_followers}) per i èsser listat.
     explanation: Trobar d’utilizaires segon lor interèsses
     explore_mastodon: Explorar %{title}
+    how_to_enable: Sètz pas actualament listat dins l’annuari. Podètz cambiar aquò çai-jos. Utilizatz d'etiquetas dins vòstre tèxt de bio per èsser listat amb d’etiquetas especificas !
     people:
       one: "%{count} persona"
       other: "%{count} personas"

config/locales/pl.yml

@@ -114,7 +114,6 @@ pl:
       enabled: Aktywowano
       feed_url: Adres kanału
       followers: Śledzący
-      followers_local: "(%{local} lokalnych)"
       followers_url: Adres śledzących
       follows: Śledzeni
       header: Nagłówek

config/locales/pt-BR.yml

@@ -106,7 +106,6 @@ pt-BR:
       enabled: Ativado
       feed_url: URL do feed
       followers: Seguidores
-      followers_local: "(%{local} local)"
       followers_url: URL de seguidores
       follows: Segue
       header: Cabeçalho

config/locales/simple_form.ar.yml

@@ -6,6 +6,8 @@ ar:
         text: بإمكانك استخدام نفس القواعد التي نجدها في التبويقات كعناوين الروابط والوسوم والإشارات
       admin_account_action:
         send_email_notification: سوف يتلقى المستخدم رسالة تُفسِّر ما حدث على حسابه
+        type_html: اختر ما تود إجراؤه على <strong>%{acct}</strong>
+        warning_preset_id: اختياري. يمكنك إضافة نص مخصص إلى نهاية النموذج
       defaults:
         autofollow: سوف يتابعك تلقائيًا الأشخاص الذين يقومون بالتسجيل من خلال الدعوة
         avatar: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px
@@ -22,6 +24,7 @@ ar:
         password: يُنصح باستخدام 8 أحرف على الأقل
         phrase: سوف يتم العثور عليه مهما كان نوع النص أو حتى و إن كان داخل الويب فيه تحذير عن المحتوى
         scopes: ما هي المجالات المسموح بها في التطبيق ؟ إن قمت باختيار أعلى المجالات فيمكنك الإستغناء عن الخَيار اليدوي.
+        setting_aggregate_reblogs: لا تقم بعرض المشارَكات الجديدة لتبويقات قد قُمتَ بمشاركتها سابقا (هذا الإجراء يعني المشاركات الجديدة فقط التي تلقيتَها)
         setting_default_language: يمكن الكشف التلقائي للّغة اللتي استخدمتها في تحرير تبويقاتك ، غيرَ أنّ العملية ليست دائما دقيقة
         setting_display_media_default: إخفاء الوسائط المُعيَّنة كحساسة
         setting_display_media_hide_all: إخفاء كافة الوسائط دائمًا
@@ -41,6 +44,8 @@ ar:
         fields:
           name: التسمية
           value: المحتوى
+      account_warning_preset:
+        text: نموذج نصي
       admin_account_action:
         send_email_notification: إشعار المستخدِم عبر البريد الإلكتروني
         text: تحذير مخصص
@@ -50,6 +55,7 @@ ar:
           none: لا تفعل شيئا
           silence: كتم
           suspend: تعليق و حذف كافة بيانات الحساب
+        warning_preset_id: استخدم نموذج تنبيه
       defaults:
         autofollow: إرسال دعوة لمتابعة حسابك
         avatar: الصورة الرمزية

config/locales/simple_form.fr.yml

@@ -58,7 +58,7 @@ fr:
           none: Ne rien faire
           silence: Silence
           suspend: Suspendre et effacer les données du compte de manière irréversible
-        warning_preset_id: Utiliser une présélection d'attention
+        warning_preset_id: Utiliser un modèle d'avertissement
       defaults:
         autofollow: Invitation à suivre votre compte
         avatar: Image de profil

config/locales/simple_form.nl.yml

@@ -39,7 +39,7 @@ nl:
       imports:
         data: CSV-bestand dat op een andere Mastodonserver werd geëxporteerd
       sessions:
-        otp: Voer de tweestaps-aanmeldcode vanaf jouw mobiele telefoon in of gebruik een van jouw herstelcodes.
+        otp: 'Voer de tweestaps-aanmeldcode vanaf jouw mobiele telefoon in of gebruik een van jouw herstelcodes:'
       user:
         chosen_languages: Alleen toots in de aangevinkte talen worden op de openbare tijdlijnen getoond
     labels:

config/locales/simple_form.sr.yml

@@ -28,9 +28,13 @@ sr:
         scopes: Којим API-јима ће апликација дозволити приступ. Ако изаберете опсег највишег нивоа, не морате одабрати појединачне.
         setting_aggregate_reblogs: Не показуј нова дељења за трубе које су недавно подељене (утиче само на недавно примљена дељења)
         setting_default_language: Језик ваших труба може бити аутоматски откривен, али није увек прецизан
+        setting_display_media_default: Сакриј медије означене као осетљиве
+        setting_display_media_hide_all: Увек сакриј све медије
+        setting_display_media_show_all: Увек прикажи медије означене као осетљиве
         setting_hide_network: Кога пратите и ко вас прати неће бити приказано на вашем профилу
         setting_noindex: Утиче на Ваш јавни профил и статусне стране
         setting_theme: Утиче како ће Мастодонт изгледати када сте пријављени са било ког уређаја.
+        username: Ваш надимак ће бити јединствен на %{domain}
         whole_word: Када је кључна реч или фраза искључиво алфанумеричка, биће примењена само ако се подудара са целом речи
       imports:
         data: CSV фајл извезен са друге Мастодонт инстанце
@@ -46,6 +50,14 @@ sr:
       account_warning_preset:
         text: Текст пресета
       admin_account_action:
+        send_email_notification: Обавести корисника преко е-поште
+        text: Прилагођено упозорење
+        type: Радња
+        types:
+          disable: Онемогући
+          none: Не ради ништа
+          silence: Утишај
+          suspend: Обуставите и неповратно избришите податке о налогу
         warning_preset_id: Користи упозоравајући пресет
       defaults:
         autofollow: Позовите да прати ваш налог
@@ -57,6 +69,7 @@ sr:
         context: Филтрирај контексте
         current_password: Тренутна лозинка
         data: Подаци
+        discoverable: Наведите овај налог у фасцикли
         display_name: Име за приказ
         email: Адреса е-поште
         expires_in: Истиче након
@@ -72,12 +85,18 @@ sr:
         otp_attempt: Двофакторски код
         password: Лозинка
         phrase: Кључна реч или фраза
+        setting_aggregate_reblogs: Групиши дељења у временским линијама
         setting_auto_play_gif: Аутоматски пуштај анимиране GIF-ове
         setting_boost_modal: Прикажи дијалог за потврду пре давања подршке
         setting_default_language: Језик објављивања
         setting_default_privacy: Приватност објава
         setting_default_sensitive: Увек означи мултимедију као осетљиву
         setting_delete_modal: Прикажи дијалог за потврду пре брисања тута
+        setting_display_media: Приказ медија
+        setting_display_media_default: Подразумевано
+        setting_display_media_hide_all: Сакриј све
+        setting_display_media_show_all: Прикажи све
+        setting_expand_spoilers: Увек прошити трубе које су означене упозорењем садржаја
         setting_hide_network: Сакриј своју мрежу
         setting_noindex: Одјави се од индексирања search engine-а
         setting_reduce_motion: Смањи покрете у анимацијама

config/locales/sk.yml

@@ -110,7 +110,6 @@ sk:
       enabled: Povolený
       feed_url: URL časovej osi
       followers: Sledujúci
-      followers_local: "(%{local} local)"
       followers_url: URL sledujúcich
       follows: Sledovania
       header: Hlavička
@@ -560,8 +559,11 @@ sk:
     warning_title: Dostupnosť rozšírovaného obsahu
   directories:
     directory: Katalóg profilov
+    enabled: Momentálne si uvedený/á na zozname profilov.
+    enabled_but_waiting: Vyjadril/a si záujem o uvedenie na zozname profilov, lenže ešte nemáš minimálny vyžadovaný počet následovateľov (%{min_followers}), aby si tam bol/a uveden/á.
     explanation: Pátraj po užívateľoch podľa ich záujmov
     explore_mastodon: Prebádaj %{title}
+    how_to_enable: Momentálne niesi zaradený/á do verejnej profilovej databázy. Prihlásiť sa môžeš nižšie. Použi haštagy vo svojom biografickom popise na profile, ak chceš byť uvedený/á aj pod konkrétnými haštagmi!
     people:
       few: "%{count} ľudia"
       one: "%{count} človek"

config/locales/sr.yml

@@ -54,6 +54,7 @@ sr:
       other: Пратиоци
     following: Пратим
     joined: Придружио/ла се %{date}
+    last_active: последњи активни
     link_verified_on: Власништво над овом везом је проверено %{date}
     media: Медији
     moved_html: "%{name} је прешао на %{new_profile_link}:"
@@ -77,6 +78,9 @@ sr:
       moderator: Модератор
     unfollow: Отпрати
   admin:
+    account_actions:
+      action: Извршите радњу
+      title: Извршите модераторске радње на %{acct}
     account_moderation_notes:
       create: Оставите белешку
       created_msg: Модераторска белешка успешно направљена!
@@ -88,14 +92,15 @@ sr:
       by_domain: Домен
       change_email:
         changed_msg: Е-пошта налога успешно промењена!
-        current_email: Тренутна Е-пошта
-        label: Промените Е-пошту
-        new_email: Нова Е-пошта
-        submit: Промените Е-пошту
-        title: Промените Е-пошту за %{username}
+        current_email: Тренутна е-пошта
+        label: Промените е-пошту
+        new_email: Нова e-пошта
+        submit: Промените e-пошту
+        title: Промените e-пошту за %{username}
       confirm: Потврди
       confirmed: Потврђено
       confirming: Потврдување
+      deleted: Избрисано
       demote: Ражалуј
       disable: Искључи
       disable_two_factor_authentication: Искључи 2FA
@@ -104,15 +109,18 @@ sr:
       domain: Домен
       edit: Измени
       email: Е-пошта
-      email_status: Е-пошта статус
+      email_status: Статус е-поште
       enable: Омогући
       enabled: Укључено
       feed_url: Адреса довода
       followers: Пратиоци
       followers_url: Адреса пратиоца
       follows: Праћени
+      header: Заглавље
       inbox_url: Адреса сандучета
+      invited_by: Позван од стране
       ip: IP
+      joined: Придружио се
       location:
         all: Све
         local: Локалне
@@ -122,6 +130,7 @@ sr:
       media_attachments: Мултимедијални прилози
       memorialize: Пребаци у in memoriam
       moderation:
+        active: Активан
         all: Сви
         silenced: Ућуткани
         suspended: Суспендовани
@@ -138,8 +147,9 @@ sr:
       protocol: Протокол
       public: Јавно
       push_subscription_expires: PuSH претплата истиче
-      redownload: Освежи аватар
+      redownload: Освежи профил
       remove_avatar: Уклони аватар
+      remove_header: Одстрани заглавље
       resend_confirmation:
         already_confirmed: Овој корисник е веќе потврден
         send: Препрати го е-мајлот за потврда
@@ -157,25 +167,27 @@ sr:
       search: Претрага
       shared_inbox_url: Адреса дељеног сандучета
       show:
-        created_reports: Пријаве које је направио овај налог
-        targeted_reports: Пријаве направљене о овом налогу
+        created_reports: Направљени извештаји
+        targeted_reports: Пријаве од стране других
       silence: Ућуткај
       silenced: Ућуткан
       statuses: Статуси
       subscribe: Претплати се
       suspended: Суспендовани
       title: Налози
-      unconfirmed_email: Непотврђена Е-пошта
+      unconfirmed_email: Непотврђена е-пошта
       undo_silenced: Укини ћутање
       undo_suspension: Укини суспензију
       unsubscribe: Укини претплату
       username: Корисничко име
+      warn: Упозори
       web: Веб
     action_logs:
       actions:
         assigned_to_self_report: "%{name} је доделио/ла извештај %{target} себи"
         change_email_user: "%{name} је променио/ла адресу Е-поште коисника/це %{target}"
         confirm_user: "%{name} је потврдио адресу е-поште корисника %{target}"
+        create_account_warning: "%{name} је послао пријаву %{target}"
         create_custom_emoji: "%{name} је отпремио нови емоџи %{target}"
         create_domain_block: "%{name} је блокирао домен %{target}"
         create_email_domain_block: "%{name} је ставио на црну листу домен е-поште %{target}"
@@ -234,6 +246,7 @@ sr:
       config: Конфигурација
       feature_deletions: Брисање налога
       feature_invites: Позивнице
+      feature_profile_directory: Фасцикла профила
       feature_registrations: Регистрација
       feature_relay: Федеративни релеј
       features: Карактеристике
@@ -251,7 +264,7 @@ sr:
       week_users_active: активно ове недеље
       week_users_new: корисника ове недеље
     domain_blocks:
-      add_new: Додај нови
+      add_new: Додај нови блок домена
       created_msg: Блокирање домена се обрађује
       destroyed_msg: Блокирање домена је опозвано
       domain: Домен
@@ -268,6 +281,11 @@ sr:
       reject_media_hint: Уклања локално ускладиштене мултимедијске фајлове и одбија да их скида убудуће. Небитно је за суспензију
       reject_reports: Одбаци извештај
       reject_reports_hint: Игнориши све извештаје који долазе са овог домена. Небитно је за суспензије
+      rejecting_media: одбацивање медијских датотека
+      rejecting_reports: одбацивање пријава
+      severity:
+        silence: ућуткани
+        suspend: суспендовани
       show:
         affected_accounts:
           few: Утиче на %{count} налога у бази
@@ -279,7 +297,7 @@ sr:
           suspend: Уклони суспензије за све постојеће налоге са овог домена
         title: Поништи блокаду домена за %{domain}
         undo: Поништи
-      undo: Поништи
+      undo: Поништи блок домена
     email_domain_blocks:
       add_new: Додај нови
       created_msg: Успешно додао домен Е-поште на црну листу
@@ -290,8 +308,25 @@ sr:
         create: Додај домен
         title: Нова ставка е-поштe у црној листи
       title: Црна листа E-поште
+    followers:
+      back_to_account: Назад на налог
+      title: "%{acct} Пратиоци"
     instances:
-      title: Познате инстанце
+      delivery_available: Достава је доступна
+      known_accounts:
+        few: "%{count} знаних налога"
+        many: "%{count} знаних налога"
+        one: "%{count} знан налог"
+        other: "%{count} знаних налога"
+      moderation:
+        all: Све
+        limited: Ограничено
+        title: Модерација
+      title: Федерација
+      total_blocked_by_us: Блокирано од стране нас
+      total_followed_by_them: Праћени од стране њих
+      total_followed_by_us: Праћени од стране нас
+      total_reported: Пријаве везане за њих
     invites:
       deactivate_all: Деактивирај све
       filter:
@@ -373,6 +408,9 @@ sr:
       preview_sensitive_media:
         desc_html: Преглед веза на другим веб страницама ће приказати иконицу чак и ако је медиј означен као осетљиво
         title: Покажи осетљив медиј у ОпенГраф прегледу
+      profile_directory:
+        desc_html: Дозволи корисницима да буду откривени
+        title: Омогући профил фасцикле
       registrations:
         closed_message:
           desc_html: Приказује се на главној страни када је инстанца затворена за регистрације. Можете користити HTML тагове
@@ -432,7 +470,21 @@ sr:
       last_delivery: Последња достава
       title: WebSub
       topic: Topic
+    tags:
+      accounts: Налози
+      hidden: Скривено
+      hide: Сакриј од фасцикле
+      name: Тараба
+      title: Тараба
+      unhide: Прикажи у фасцикли
+      visible: Видљиво
     title: Администрација
+    warning_presets:
+      add_new: Додај нови
+      delete: Избриши
+      edit: Уреди
+      edit_preset: Уреди пресет упозорења
+      title: Управљај пресетима упозорења
   admin_mailer:
     new_report:
       body: "%{reporter} је пријавио %{target}"
@@ -510,6 +562,16 @@ sr:
     success_msg: Ваш налог је успешно обрисан
     warning_html: Гарантовано је само брисање садржаја са ове инстанце. Садржај који је дељен даље ће вероватно да остави неке трагове. Недоступни и угашени сервери, као и сервери који су одјављени од примања статуса од Вас, неће ажурирати своје базе.
     warning_title: Доступност расејаног садржаја
+  directories:
+    directory: Профил фасцикле
+    enabled: Ви сте тренутно видљиви у фасцикли.
+    explanation: Откријте кориснике на основу њихових интереса
+    explore_mastodon: Истражи %{title}
+    people:
+      few: "%{count} људе"
+      many: "%{count} људе"
+      one: "%{count} особу"
+      other: "%{count} људе"
   errors:
     '403': Немате дозвола да видите ову страну.
     '404': Страна коју сте тражили не постоји.
@@ -532,7 +594,9 @@ sr:
       size: Величина
     blocks: Блокирали сте
     csv: CSV
+    domain_blocks: Блокови домена
     follows: Пратите
+    lists: Листе
     mutes: Ућуткали сте
     storage: Мултимедијално складиште
   filters:
@@ -691,10 +755,22 @@ sr:
     no_account_html: Немате налог? Можете се <a href='%{sign_up_path}' target='_blank'>пријавити овде</a>
     proceed: Наставите да би сте запратили
     prompt: 'Запратићете:'
+    reason_html: "<strong>Зашто је овај корак неопходан?</strong><code>%{instance}</code> можда није сервер на којем сте регистровани, тако да прво морамо да вас преусмеримо на ваш сервер."
+  remote_interaction:
+    reblog:
+      proceed: Наставите да бисте поделили
+      prompt: 'Желите да делите ову трубу:'
+    reply:
+      proceed: Наставите да бисте одговорили
+      prompt: 'Желите да одговорите на ову трубу:'
   remote_unfollow:
     error: Грешка
     title: Наслов
     unfollowed: Отпраћени
+  scheduled_statuses:
+    over_daily_limit: Прекорачили сте границу од %{limit} планираних труба за тај дан
+    over_total_limit: Прекорачили сте границу од %{limit} планираних труба
+    too_soon: Планирани датум мора бити у будућности
   sessions:
     activity: Последња активност
     browser: Веб читач
@@ -824,6 +900,22 @@ sr:
       explanation: Тражили сте потпуну резервну копију вашег Мастодон рачуна. Спремна за преузимање!
       subject: Ваша архива је спремна за преузимање
       title: Извоз архиве
+    warning:
+      explanation:
+        disable: Док је ваш рачун замрзнут, подаци о вашем рачуну остају нетакнути, али не можете вршити никакве радње док се не откључа.
+        silence: Иако је ваш налог ограничен, само људи који вас већ прате ће видети ваше трубе на овом серверу, и можда ћете бити искључени из различитих јавних листа. Међутим, други вас могу и даље ручно пратити.
+        suspend: Ваш налог је суспендован, а све ваше трубе и учитане медијске датотеке неповратно су уклоњени са овог сервера и сервера на којима сте имали следбенике.
+      review_server_policies: Прегледај политику сервера
+      subject:
+        disable: Ваш налог %{acct} је замрзнут
+        none: Упозорење за %{acct}
+        silence: Ваш налог %{acct} је ограничен
+        suspend: Ваш налог %{acct} је суспендован
+      title:
+        disable: Налог замрзнут
+        none: Упозорење
+        silence: Налог ограничен
+        suspend: Налог суспендован
     welcome:
       edit_profile_action: Подеси профил
       edit_profile_step: Профил можете прилагодити постављањем аватара, заглавља, променом имена и још много тога. Ако желите да прегледате нове пратиоце пре него што буду дозвољени да вас прате, можете закључати свој налог.

config/locales/te.yml

@@ -105,7 +105,6 @@ te:
       enabled: చేతనం చేయబడింది
       feed_url: ఫీడ్ URL
       followers: అనుచరులు
-      followers_local: "(%{local} local)"
       followers_url: అనుచరుల URL
       follows: అనుసరిస్తున్నారు
       header: Header

lib/mastodon/accounts_cli.rb

@@ -176,7 +176,7 @@ module Mastodon
       end
 
       say("Deleting user with #{account.statuses_count} statuses, this might take a while...")
-      SuspendAccountService.new.call(account, remove_user: true)
+      SuspendAccountService.new.call(account, including_user: true)
       say('OK', :green)
     end
 

lib/mastodon/version.rb

@@ -21,7 +21,7 @@ module Mastodon
     end
 
     def flags
-      'rc3'
+      ''
     end
 
     def to_a

lib/tasks/repo.rake

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 namespace :repo do
-  desc 'Generate the authors.md file'
+  desc 'Generate the AUTHORS.md file'
   task :authors do
-    file = File.open('AUTHORS.md', 'w')
+    file = File.open(Rails.root.join('AUTHORS.md'), 'w')
     file << <<~HEADER
+      Authors
+      =======
+
       Mastodon is available on [GitHub](https://github.com/tootsuite/mastodon)
       and provided thanks to the work of the following contributors:
 
@@ -27,4 +30,50 @@ namespace :repo do
       This document is provided for informational purposes only. Since it is only updated once per release, the version you are looking at may be currently out of date. To see the full list of contributors, consider looking at the [git history](https://github.com/tootsuite/mastodon/graphs/contributors) instead.
     FOOTER
   end
+
+  desc 'Replace pull requests with authors in the CHANGELOG.md file'
+  task :changelog do
+    path = Rails.root.join('CHANGELOG.md')
+    tmp  = Tempfile.new
+
+    HttpLog.config.compact_log = true
+
+    begin
+      File.open(path, 'r') do |file|
+        file.each_line do |line|
+          if line.start_with?('-')
+            new_line = line.gsub(/#([[:digit:]]+)*/) do |pull_request_reference|
+              pull_request_number = pull_request_reference[1..-1]
+              response = nil
+
+              loop do
+                response = HTTP.headers('Authorization' => "token #{ENV['GITHUB_API_TOKEN']}").get("https://api.github.com/repos/tootsuite/mastodon/pulls/#{pull_request_number}")
+
+                if response.code == 403
+                  sleep_for = (response.headers['X-RateLimit-Reset'].to_i - Time.now.to_i).abs
+                  puts "Sleeping for #{sleep_for} seconds to get over rate limit"
+                  sleep sleep_for
+                else
+                  break
+                end
+              end
+
+              pull_request = Oj.load(response.to_s)
+              "[#{pull_request['user']['login']}](#{pull_request['html_url']})"
+            end
+
+            tmp.puts new_line
+          else
+            tmp.puts line
+          end
+        end
+      end
+
+      tmp.close
+      FileUtils.mv(tmp.path, path)
+    ensure
+      tmp.close
+      tmp.unlink
+    end
+  end
 end