Merge branch 'master' into feature/discussion-post-markdown

.env.dusk.local.example

···
 APP_KEY=
 APP_ENV=testing
 
-APP_URL=http://nginx
-NOTIFICATION_ENDPOINT=/home/notifications/feed-dusk
+APP_URL=http://localhost:8000
+NOTIFICATION_ENDPOINT=ws://notification-server-dusk:2345
 
 DB_DATABASE=osu_test
 DB_DATABASE_CHAT=osu_chat_test

.env.example

···
 
 # OAUTH_MAX_USER_CLIENTS=1
 
+# USER_REPORT_NOTIFICATION_ENDPOINT_CHEATING=
+# default if nothing specified for specific type
 # USER_REPORT_NOTIFICATION_ENDPOINT_MODERATION=
-# USER_REPORT_NOTIFICATION_ENDPOINT_CHEATING=
+
+# USER_REPORT_NOTIFICATION_ENDPOINT_BEATMAPSET=
+# USER_REPORT_NOTIFICATION_ENDPOINT_BEATMAPSET_DISCUSSION=
+# USER_REPORT_NOTIFICATION_ENDPOINT_CHAT=
+# USER_REPORT_NOTIFICATION_ENDPOINT_COMMENT=
+# USER_REPORT_NOTIFICATION_ENDPOINT_FORUM=
+# USER_REPORT_NOTIFICATION_ENDPOINT_USER=
 
 # LOG_CHANNEL=single
 

.env.testing.example

···
-DB_DATABASE=osu_test
 DB_DATABASE_CHAT=osu_chat_test
 DB_DATABASE_MP=osu_mp_test
 DB_DATABASE_STORE=osu_store_test
 DB_DATABASE_UPDATES=osu_updates_test
 DB_DATABASE_CHARTS=osu_charts_test
 
+# match with docker-compose.yml
+DB_DATABASE=osu_test
 ES_INDEX_PREFIX=test_
+SCHEMA=test
 
 PAYMENT_SANDBOX=true

.github/workflows/tests.yml

···
         run: ./bin/phpunit.sh
 
       # TODO: workaround things (beatmaps) being indexed during test above and not cleaned up.
-      # This results in:
-      # 1. ranked beatmapset with null approved date being indexed
-      # 2. ES then returns Long.MIN_VALUE for null dates cursor
-      # 3. and finally ES parser fails when parsing the Long.MIN_VALUE back when passed as cursor
+      # This used to cause beatmap listing returning cursor with Long.MIN_VALUE for null timetamp
+      # and errors out when trying to get the next page (es can't parse such value for timestamp)
+      # but has since been fixed.
+      # Something should still be done regarding es index between tests though.
       - name: Clean indexes
         run: php artisan es:index-documents --yes
 

README.md

···
 
 While we have standards in place, nothing is set in stone. If you have an issue with the way code is structured; with any libraries we are using; with any processes involved with contributing, *please* bring it up. We welcome all feedback so we can make contributing to this project as pain-free as possible.
 
-For those interested, we love to reward quality contributions via [bounties](https://docs.google.com/spreadsheets/d/1jNXfj_S3Pb5PErA-czDdC9DUu4IgUbe1Lt8E7CYUJuE/view?&rm=minimal#gid=523803337), paid out via paypal or osu! supporter tags. Don't hesitate to [request a bounty](https://docs.google.com/forms/d/e/1FAIpQLSet_8iFAgPMG526pBZ2Kic6HSh7XPM3fE8xPcnWNkMzINDdYg/viewform) for your work on this project.
+We love to reward quality contributions. If you have made a large contribution or are a regular contributor, you are welcome to [submit an expense via opencollective](https://opencollective.com/ppy/expenses/new). If you have any questions, feel free to [reach out to peppy](mailto:[e-mail]) before doing so.
 
 ## Seeking Help
 

SETUP.md

···
 or if using Docker:
 
 ```
+# `compose exec` doesn't work here due to port conflict with dev instance
 docker compose run --rm php test browser
 ```
 

app/Http/Controllers/Forum/PostsController.php

···
         $text = $post->bodyRaw;
 
         if (Request::input('quote') === '1') {
-            $text = sprintf('[quote="%s"]%s[/quote]', $post->userNormalized()->username, $text);
+            $text = sprintf("[quote=\"%s\"]\n%s\n[/quote]\n", $post->userNormalized()->username, $text);
         }
 
         return $text;

app/Http/Middleware/SetLocale.php

···
 
         App::setLocale($locale);
         // Carbon setLocale normalizes the locale
-        Carbon::setLocale($locale);
+        Carbon::setLocale($locale === 'sr' ? 'sr_Cyrl' : $locale);
     }
 
     private function localeFromHeader(Request $request): string

app/Libraries/BBCodeForDB.php

···
 
 class BBCodeForDB
 {
+    const EXTRA_ESCAPES = [
+        '[' => '[',
+        ']' => ']',
+        '.' => '.',
+        ':' => ':',
+        "\n" => '
',
+        '@' => '@',
+    ];
+
     public $text;
     public $uid;
 
···
 
     public function extraEscapes($text)
     {
-        return strtr(
-            $text,
-            [
-                '[' => '[',
-                ']' => ']',
-                '.' => '.',
-                ':' => ':',
-                "\n" => '
',
-                '@' => '@',
-            ],
-        );
+        return strtr($text, static::EXTRA_ESCAPES);
+    }
+
+    public static function extraUnescape(string $text): string
+    {
+        static $mapping;
+        $mapping ??= array_flip(static::EXTRA_ESCAPES);
+
+        return strtr($text, $mapping);
     }
 
     public function __construct($text = '')
···
 
     public function parseBox($text)
     {
-        $text = preg_replace('#\[box=([^]]*?)\]#s', "[box=\\1:{$this->uid}]", $text);
-        $text = str_replace('[/box]', "[/box:{$this->uid}]", $text);
-        $text = str_replace('[spoilerbox]', "[spoilerbox:{$this->uid}]", $text);
-        $text = str_replace('[/spoilerbox]', "[/spoilerbox:{$this->uid}]", $text);
+        $text = preg_replace('#\[box=((\\\[\[\]]|[^][]|\[(\\\[\[\]]|[^][]|(?R))*\])*?)\]#s', "[box=\\1:{$this->uid}]", $text);
 
-        return $text;
+        return strtr($text, [
+            '[/box]' => "[/box:{$this->uid}]",
+            '[spoilerbox]' => "[spoilerbox:{$this->uid}]",
+            '[/spoilerbox]' => "[/spoilerbox:{$this->uid}]",
+        ]);
     }
 
     public function parseCode($text)
···
         return $text;
     }
 
+    public function parseImagemap($text)
+    {
+        return preg_replace_callback(
+            '#\[imagemap\](.+?)\[/imagemap\]#s',
+            function ($m) {
+                $escapedMap = $this->extraEscapes($m[1]);
+
+                return "[imagemap]{$escapedMap}[/imagemap]";
+            },
+            $text
+        );
+    }
+
     /**
      * Handles:
      * - Code (c)
···
 
         // internal url
         $text = preg_replace(
-            "#{$spaces[0]}({$internalUrl}/([^\s]+?)){$spaces[1]}#",
-            "\\1<!-- m --><a href='\\2' rel='nofollow'>\\3</a><!-- m -->\\4",
+            "#{$spaces[0]}({$internalUrl}/([^\s]+?))(?={$spaces[1]})#",
+            "\\1<!-- m --><a href='\\2' rel='nofollow'>\\3</a><!-- m -->",
             $text
         );
 
         // plain http/https/ftp
         $text = preg_replace(
-            "#{$spaces[0]}((?:https?|ftp)://[^\s]+?){$spaces[1]}#",
-            "\\1<!-- m --><a href='\\2' rel='nofollow'>\\2</a><!-- m -->\\3",
+            "#{$spaces[0]}((?:https?|ftp)://[^\s]+?)(?={$spaces[1]})#",
+            "\\1<!-- m --><a href='\\2' rel='nofollow'>\\2</a><!-- m -->",
             $text
         );
 
         // www
         $text = preg_replace(
-            "#{$spaces[0]}(www\.[^\s]+){$spaces[1]}#",
-            "\\1<!-- w --><a href='http://\\2' rel='nofollow'>\\2</a><!-- w -->\\3",
+            "#{$spaces[0]}(www\.[^\s]+)(?={$spaces[1]})#",
+            "\\1<!-- w --><a href='http://\\2' rel='nofollow'>\\2</a><!-- w -->",
             $text
         );
 
         // emails
         $text = preg_replace(
-            "#{$spaces[0]}([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z-]+){$spaces[1]}#",
-            "\\1<!-- e --><a href='mailto:\\2' rel='nofollow'>\\2</a><!-- e -->\\3",
+            "#{$spaces[0]}([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z-]+)(?={$spaces[1]})#",
+            "\\1<!-- e --><a href='mailto:\\2' rel='nofollow'>\\2</a><!-- e -->",
             $text
         );
 
···
         $text = htmlentities($this->text, ENT_QUOTES, 'UTF-8', true);
 
         $text = $this->unifyNewline($text);
+        $text = $this->parseImagemap($text);
         $text = $this->parseCode($text);
         $text = $this->parseNotice($text);
         $text = $this->parseBox($text);

app/Libraries/BBCodeFromDB.php

···
         }
     }
 
-    public function clearSpacesBetweenTags($text)
-    {
-        return preg_replace('/([^-][^-]>)\s*</', '\1<', $text);
-    }
-
     public function parseAudio($text)
     {
         preg_match_all("#\[audio:{$this->uid}\](?<url>[^[]+)\[/audio:{$this->uid}\]#", $text, $matches, PREG_SET_ORDER);
···
 
     public function parseBox($text)
     {
-        $text = preg_replace("#\[box=([^]]*?):{$this->uid}\]\n*#s", $this->parseBoxHelperPrefix('\\1'), $text);
+        $text = preg_replace("#\[box=((\\\[\[\]]|[^][]|\[(\\\[\[\]]|[^][]|(?R))*\])*?):{$this->uid}\]\n*#s", $this->parseBoxHelperPrefix('\\1'), $text);
         $text = preg_replace("#\n*\[/box:{$this->uid}]\n?#s", $this->parseBoxHelperSuffix(), $text);
 
         $text = preg_replace("#\[spoilerbox:{$this->uid}\]\n*#s", $this->parseBoxHelperPrefix(), $text);
···
     public function parseHeading($text)
     {
         $text = str_replace("[heading:{$this->uid}]", '<h2>', $text);
-        $text = str_replace("[/heading:{$this->uid}]", '</h2>', $text);
+        $text = preg_replace("#\[/heading:{$this->uid}\]\n?#", '</h2>', $text);
 
         return $text;
     }
 
+    public function parseImagemap($text)
+    {
+        return preg_replace_callback(
+            '#(\[imagemap\].+?\[/imagemap\]\n?)#',
+            function ($m) {
+                return preg_replace_callback(
+                    '#\[imagemap\]\n(?<imageUrl>https?://.+)\n(?<links>(?:(?:[0-9.]+ ){4}(?:\#|https?://[^ ]+|mailto:[^ ]+)(?: .+)?\n)+)\[/imagemap\]\n?#',
+                    function ($map) {
+                        $links = array_map(
+                            fn ($rawLink) => explode(' ', $rawLink, 6),
+                            explode("\n", $map['links']),
+                        );
+                        array_pop($links); // remove the empty string from last newline
+
+                        $linksHtml = implode('', array_map(
+                            fn ($link) => tag($link[4] === '#' ? 'span' : 'a', [
+                                'class' => 'imagemap__link',
+                                'href' => $link[4],
+                                'style' => implode(';', [
+                                    "left: {$link[0]}%",
+                                    "top: {$link[1]}%",
+                                    "width: {$link[2]}%",
+                                    "height: {$link[3]}%",
+                                ]),
+                                'title' => $link[5] ?? '',
+                            ]),
+                            $links,
+                        ));
+
+                        $imageUrl = proxy_media($map['imageUrl']);
+                        $imageAttributes = [
+                            'class' => 'imagemap__image',
+                            'loading' => 'lazy',
+                            'src' => $imageUrl,
+                        ];
+                        $imageSize = fast_imagesize($imageUrl);
+                        if ($imageSize !== null) {
+                            $imageAttributes['width'] = $imageSize[0];
+                            $imageAttributes['height'] = $imageSize[1];
+                        }
+                        $imageHtml = tag('img', $imageAttributes);
+
+                        return tag('div', ['class' => 'imagemap'], $imageHtml.$linksHtml);
+                    },
+                    html_entity_decode_better(BBCodeForDB::extraUnescape($m[1])),
+                );
+            },
+            $text,
+        );
+    }
+
     public function parseItalic($text)
     {
         $text = str_replace("[i:{$this->uid}]", '<em>', $text);
···
         $text = preg_replace("#\[list:{$this->uid}\]\s*\[\*:{$this->uid}\]#", '<ol class="unordered"><li>', $text);
 
         // convert list items.
-        $text = preg_replace("#\[/\*(:m)?:{$this->uid}\]\n?#", '</li>', $text);
-        $text = str_replace("[*:{$this->uid}]", '<li>', $text);
+        $text = preg_replace("#\[/\*(:m)?:{$this->uid}\]\n?\n?#", '</li>', $text);
+        $text = preg_replace("#\s*\[\*:{$this->uid}\]#", '<li>', $text);
 
         // close list tags.
-        $text = str_replace("[/list:o:{$this->uid}]", '</ol>', $text);
-        $text = str_replace("[/list:u:{$this->uid}]", '</ol>', $text);
+        $text = preg_replace("#\s*\[/list:(o|u):{$this->uid}\]\n?\n?#", '</ol>', $text);
 
         // list with "title", with it being just a list without style.
         $text = preg_replace("#\[list=[^]]+:{$this->uid}\](.+?)(<li>|</ol>)#s", '<ul class="bbcode__list-title"><li>$1</li></ul><ol>$2', $text);
···
     {
         $text = preg_replace("#\[quote=&quot;([^:]+)&quot;:{$this->uid}\]\s*#", '<blockquote><h4>\\1 wrote:</h4>', $text);
         $text = preg_replace("#\[quote:{$this->uid}\]\s*#", '<blockquote>', $text);
-        $text = preg_replace("#\s*\[/quote:{$this->uid}\]\s*#", '</blockquote>', $text);
+        $text = preg_replace("#\s*\[/quote:{$this->uid}\]\n?\n?#", '</blockquote>', $text);
 
         return $text;
     }
 
     // stolen from: www/forum/includes/functions.php:2845
-
     public function parseSmilies($text)
     {
         return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img class="smiley" src="'.osu_url('smilies').'/\2 />', $text);
···
         $text = $this->text;
 
         // block
+        $text = $this->parseImagemap($text);
         $text = $this->parseBox($text);
         $text = $this->parseCode($text);
         $text = $this->parseList($text);
         $text = $this->parseNotice($text);
         $text = $this->parseQuote($text);
         $text = $this->parseHeading($text);
-        $text = $this->clearSpacesBetweenTags($text);
 
         // inline
         $text = $this->parseAudio($text);

app/Libraries/CleanHTML.php

···
         $config->set('Cache.SerializerPath', $cachePath);
         $config->set('Attr.AllowedRel', ['nofollow']);
         $config->set('HTML.Trusted', true);
+        $config->set('CSS.Trusted', true);
 
         $def = $config->getHTMLDefinition(true);
 

app/Libraries/LocaleMeta.php

···
             'flag' => 'BG',
             'name' => 'Български',
         ],
+        'ca' => [
+            'flag' => 'AD', // ES-CA in crowdin
+            'name' => 'català',
+        ],
         'cs' => [
             'flag' => 'CZ',
             'name' => 'Česky',
···
             'flag' => 'FI',
             'name' => 'Suomi',
         ],
+        'fil' => [
+            'flag' => 'PH',
+            'name' => 'Wikang Filipino',
+        ],
         'fr' => [
             'flag' => 'FR',
             'name' => 'français',
+        ],
+        'he' => [
+            'flag' => 'IL',
+            'name' => 'עִבְרִית‎',
         ],
         'hu' => [
             'flag' => 'HU',
···
             'flag' => 'KR',
             'name' => '한국어',
         ],
+        'lt' => [
+            'flag' => 'LT',
+            'name' => 'lietuvių kalba',
+        ],
         'nl' => [
             'flag' => 'NL',
             'name' => 'Nederlands',
···
         'sk' => [
             'flag' => 'SK',
             'name' => 'Slovenčina',
+        ],
+        'sl' => [
+            'flag' => 'SI',
+            'name' => 'slovenščina',
+        ],
+        'sr' => [
+            'flag' => 'RS',
+            'moment' => 'sr-cyrl',
+            'name' => 'српски',
         ],
         'sv' => [
             'flag' => 'SE',

app/Libraries/MorphMap.php

···
 use App\Models\Beatmapset;
 use App\Models\Build;
 use App\Models\Chat\Channel;
+use App\Models\Chat\Message;
 use App\Models\Comment;
 use App\Models\Forum;
 use App\Models\LegacyMatch;
···
         Forum\Post::class => 'forum_post',
         Forum\Topic::class => 'forum_topic',
         LegacyMatch\Score::class => 'legacy_match_score',
+        Message::class => 'message',
         NewsPost::class => 'news_post',
         Score\Best\Fruits::class => 'score_best_fruits',
         Score\Best\Mania::class => 'score_best_mania',

app/Libraries/Search/BeatmapsetSearch.php

···
 use App\Models\Beatmapset;
 use App\Models\Follow;
 use App\Models\Score;
+use App\Models\User;
 
 class BeatmapsetSearch extends RecordSearch
 {
···
         $this->addRecommendedFilter($nested);
 
         $this->addSimpleFilters($query, $nested);
+        $this->addCreatorFilter($query, $nested);
         $this->addTextFilter($query, 'artist', ['artist', 'artist_unicode']);
-        $this->addTextFilter($query, 'creator', ['creator']);
 
         $query->filter([
             'nested' => [
···
     private function addBlockedUsersFilter($query)
     {
         $query->mustNot(['terms' => ['user_id' => $this->params->blockedUserIds()]]);
+    }
+
+    private function addCreatorFilter(BoolQuery $query, BoolQuery $nested): void
+    {
+        $value = $this->params->creator;
+
+        if (!present($value)) {
+            return;
+        }
+
+        $user = User::lookup($value);
+
+        if ($user === null) {
+            $this->addTextFilter($query, 'creator', ['creator']);
+        } else {
+            $nested->filter(['term' => ['beatmaps.user_id' => $user->getKey()]]);
+        }
     }
 
     private function addExtraFilter($query)

app/Libraries/Search/BeatmapsetSearchRequestParams.php

···
 use App\Libraries\Elasticsearch\Sort;
 use App\Libraries\Elasticsearch\Utils\SearchAfterParam;
 use App\Models\Beatmap;
+use App\Models\Beatmapset;
 use App\Models\Genre;
 use App\Models\Language;
 use App\Models\User;
···
 
         // generic tie-breaker.
         $this->sorts[] = new Sort('id', $sort->order);
+
+        foreach ($this->sorts as $sort) {
+            if ((Beatmapset::CASTS[$sort->field] ?? null) === 'datetime') {
+                $sort->extras['missing'] = 0;
+            }
+        }
     }
 }

app/Libraries/Search/MultiSearch.php

···
     private $options;
     private $query;
     private $searches;
-    private $request;
+    private array $request;
 
     public function __construct(Request $request, array $options = [])
     {
-        $this->query = trim($request['query']);
+        $this->request = $request->all();
+        $this->query = trim(get_string($this->request['query'] ?? null) ?? '');
         $this->options = $options;
-        $this->request = $request;
     }
 
     public function getMode()
     {
-        return presence($this->request['mode']) ?? 'all';
+        return presence($this->request['mode'] ?? null) ?? 'all';
     }
 
     public function hasQuery()
     {
-        return present($this->query);
+        return present($this->query)
+            || ($this->getMode() === 'forum_post' && present(get_string($this->request['username'] ?? null)));
     }
 
     public function searches()
···
                 $class = $settings['type'];
                 $paramsClass = $settings['paramsType'];
 
-                $params = new $paramsClass($this->request->all(), $this->options['user']);
+                $params = new $paramsClass($this->request, $this->options['user']);
                 $search = new $class($params);
                 if ($search instanceof BeatmapsetSearch) {
                     $search->source(false);

app/Libraries/User/UserSignatures.php

···
+<?php
+
+// Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace App\Libraries\User;
+
+use App\Models\User;
+
+class UserSignatures
+{
+    private array $html = [];
+
+    public function get(User $user): ?string
+    {
+        $userId = $user->getKey();
+
+        if (!array_key_exists($userId, $this->html)) {
+            $sig = $user->user_sig;
+
+            $this->html[$userId] = present($sig)
+                ? bbcode($user->user_sig, $user->user_sig_bbcode_uid)
+                : null;
+        }
+
+        return $this->html[$userId];
+    }
+}

app/Models/BeatmapDiscussionPost.php

···
                 $this->validationErrors()->add('message', 'required');
             }
 
-            if (optional($this->beatmapDiscussion)->timestamp !== null && mb_strlen($this->message) > static::MESSAGE_LIMIT_TIMELINE) {
-                $this->validationErrors()->add('message', 'too_long', ['limit' => static::MESSAGE_LIMIT_TIMELINE]);
+            if ($this->beatmapDiscussion?->timestamp !== null) {
+                $this->validateDbFieldLength(static::MESSAGE_LIMIT_TIMELINE, 'message');
             }
         }
 

app/Models/Beatmapset.php

···
 {
     use Memoizes, SoftDeletes, Traits\CommentableDefaults, Traits\Es\BeatmapsetSearch, Traits\Reportable, Validatable;
 
-    protected $_storage = null;
-    protected $table = 'osu_beatmapsets';
-    protected $primaryKey = 'beatmapset_id';
-
-    protected $casts = [
+    const CASTS = [
         'active' => 'boolean',
         'approved_date' => 'datetime',
         'comment_locked' => 'boolean',
···
         'video' => 'boolean',
     ];
 
-    public $timestamps = false;
+    const HYPEABLE_STATES = [-1, 0, 3];
 
     const STATES = [
         'graveyard' => -2,
···
         'qualified' => 3,
         'loved' => 4,
     ];
-    const HYPEABLE_STATES = [-1, 0, 3];
+
+    public $timestamps = false;
+
+    protected $_storage = null;
+    protected $casts = self::CASTS;
+    protected $primaryKey = 'beatmapset_id';
+    protected $table = 'osu_beatmapsets';
 
     public static function coverSizes()
     {

app/Models/Chat/Channel.php

···
             $this->validationErrors()->add('name', 'required');
         }
 
-        foreach (static::MAX_FIELD_LENGTHS as $field => $limit) {
-            if ($this->isDirty($field)) {
-                $val = $this->$field;
-                if ($val !== null && mb_strlen($val) > $limit) {
-                    $this->validationErrors()->add($field, 'too_long', ['limit' => $limit]);
-                }
-            }
-        }
+        $this->validateDbFieldLengths();
 
         return $this->validationErrors()->isEmpty();
     }

app/Models/Chat/Message.php

···
 
 namespace App\Models\Chat;
 
+use App\Models\Traits\Reportable;
+use App\Models\Traits\ReportableInterface;
 use App\Models\User;
 
 /**
···
  * @property \Carbon\Carbon $timestamp
  * @property int $user_id
  */
-class Message extends Model
+class Message extends Model implements ReportableInterface
 {
+    use Reportable;
+
     public ?string $uuid = null;
 
     protected $primaryKey = 'message_id';
···
             'timestamp_json' => $this->getJsonTimeFast($key),
 
             'channel',
+            'reportedIn',
             'sender' => $this->getRelationValue($key),
         };
+    }
+
+    public function trashed(): bool
+    {
+        return false;
+    }
+
+    protected function newReportableExtraParams(): array
+    {
+        return [
+            'reason' => 'Spam',
+            'user_id' => $this->user_id,
+        ];
     }
 }

app/Models/Comment.php

···
         MorphMap::MAP[NewsPost::class],
     ];
 
-    // FIXME: decide on good number.
-    // some people seem to put song lyrics in comment which inflated the size.
-    const MESSAGE_LIMIT = 10000;
+    const MAX_FIELD_LENGTHS = [
+        // FIXME: decide on good number.
+        // some people seem to put song lyrics in comment which inflated the size.
+        'message' => 10000,
+    ];
 
     const SORTS = [
         'new' => [
···
 
     public function setMessageAttribute($value)
     {
-        return $this->attributes['message'] = unzalgo($value);
+        return $this->attributes['message'] = trim(unzalgo($value));
     }
 
     public function votes()
···
     {
         $this->validationErrors()->reset();
 
-        $messageLength = mb_strlen(trim($this->message));
-
         if ($this->isDirty('pinned') && $this->pinned && $this->parent_id !== null) {
             $this->validationErrors()->add('pinned', '.top_only');
         }
 
-        if ($messageLength === 0) {
+        if (!present($this->message)) {
             $this->validationErrors()->add('message', 'required');
         }
 
-        if ($messageLength > static::MESSAGE_LIMIT) {
-            $this->validationErrors()->add('message', 'too_long', ['limit' => static::MESSAGE_LIMIT]);
-        }
+        $this->validateDbFieldLengths();
 
         if ($this->isDirty('parent_id') && $this->parent_id !== null) {
             if ($this->parent === null) {

app/Models/Forum/Forum.php

···
 
 use App\Models\User;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
 
 /**
  * @property bool $allow_topic_covers
···
     public function scopeDisplayList($query)
     {
         $query->orderBy('left_id');
+    }
+
+    public function scopeSearchable(Builder $query): Builder
+    {
+        return $query->where('enable_indexing', true);
     }
 
     public function setForumParentsAttribute($value)

app/Models/Forum/Post.php

···
             }
         }
 
-        if ($this->isDirty('post_text') && mb_strlen($this->body_raw) > config('osu.forum.max_post_length')) {
-            $this->validationErrors()->add('post_text', 'too_long', ['limit' => config('osu.forum.max_post_length')]);
-        }
+        $this->validateDbFieldLength(config('osu.forum.max_post_length'), 'post_text', 'body_raw');
 
         if (!$this->skipBeatmapPostRestrictions) {
             // don't forget to sync with views.forum.topics._posts

app/Models/Forum/Topic.php

···
             $this->validationErrors()->add('topic_title', 'required');
         }
 
-        foreach (static::MAX_FIELD_LENGTHS as $field => $limit) {
-            if ($this->isDirty($field)) {
-                $val = $this->$field;
-
-                if (mb_strlen($val) > $limit) {
-                    $this->validationErrors()->add($field, 'too_long', ['limit' => $limit]);
-                }
-            }
-        }
+        $this->validateDbFieldLengths();
 
         return $this->validationErrors()->isEmpty();
     }

app/Models/Forum/TopicPoll.php

···
     private $params;
     private $votedBy = [];
 
+    public function __get(string $field)
+    {
+        return $this->params[$field];
+    }
+
     public function canEdit()
     {
         return $this->topic->topic_time > Carbon::now()->subHours(config('osu.forum.poll_edit_hours'));
···
                 $this->validationErrors()->add('title', 'required');
             }
 
-            if (mb_strlen($this->params['title']) > 255) {
-                $this->validationErrors()->add('title', 'too_long', ['limit' => 255]);
-            }
+            $this->validateFieldLength(255, 'title');
 
             if (count($this->params['options']) > count(array_unique($this->params['options']))) {
                 $this->validationErrors()->add('options', '.duplicate_options');

app/Models/User.php

···
             }
         }
 
-        foreach (self::MAX_FIELD_LENGTHS as $field => $limit) {
-            if ($this->isDirty($field)) {
-                $val = $this->$field;
-                if ($val && mb_strlen($val) > $limit) {
-                    $this->validationErrors()->add($field, '.too_long', ['limit' => $limit]);
-                }
-            }
-        }
+        $this->validateDbFieldLengths();
 
         if ($this->isDirty('group_id') && app('groups')->byId($this->group_id) === null) {
             $this->validationErrors()->add('group_id', 'invalid');

app/Models/UserReport.php

···
     use RoutesNotifications, Validatable;
 
     const BEATMAPSET_TYPE_REASONS = ['UnwantedContent', 'Other'];
-    const MAX_LENGTH = 2000;
+    const MAX_FIELD_LENGTHS = [
+        'comments' => 2000,
+    ];
     const POST_TYPE_REASONS = ['Insults', 'Spam', 'UnwantedContent', 'Nonsense', 'Other'];
     const SCORE_TYPE_REASONS = ['Cheating', 'MultipleAccounts', 'Other'];
 
···
         MorphMap::MAP[Best\Mania::class] => self::SCORE_TYPE_REASONS,
         MorphMap::MAP[Best\Osu::class] => self::SCORE_TYPE_REASONS,
         MorphMap::MAP[Best\Taiko::class] => self::SCORE_TYPE_REASONS,
+        MorphMap::MAP[Chat\Message::class] => self::POST_TYPE_REASONS,
         MorphMap::MAP[Comment::class] => self::POST_TYPE_REASONS,
         MorphMap::MAP[Forum\Post::class] => self::POST_TYPE_REASONS,
         MorphMap::MAP[Solo\Score::class] => self::SCORE_TYPE_REASONS,
···
         ) {
             return config('osu.user_report_notification.endpoint_cheating');
         } else {
-            return config('osu.user_report_notification.endpoint_moderation');
+            $type = match ($reportableModel::class) {
+                BeatmapDiscussionPost::class => 'beatmapset_discussion',
+                Beatmapset::class => 'beatmapset',
+                Chat\Message::class => 'chat',
+                Comment::class => 'comment',
+                Forum\Post::class => 'forum',
+                User::class => 'user',
+            };
+
+            return config("osu.user_report_notification.endpoint.{$type}")
+                ?? config('osu.user_report_notification.endpoint_moderation');
         }
     }
 
···
     {
         $this->validationErrors()->reset();
 
-        if (!present(trim($this->comments))) {
+        if (!present(trim($this->comments)) && (!($this->reportable instanceof Chat\Message) || $this->reason === 'Other')) {
             $this->validationErrors()->add('comments', 'required');
         }
 
···
             );
         }
 
-        $allowedReasons = static::ALLOWED_REASONS[$this->reportable_type] ?? null;
-        if ($allowedReasons !== null) {
-            if (!in_array($this->reason, $allowedReasons, true)) {
-                $this->validationErrors()->add(
-                    'reason',
-                    '.reason_not_valid',
-                    ['reason' => $this->reason]
-                );
-            }
-        }
+        $allowedReasons = static::ALLOWED_REASONS[$this->reportable_type] ?? [
+            ...static::BEATMAPSET_TYPE_REASONS,
+            ...static::POST_TYPE_REASONS,
+            ...static::SCORE_TYPE_REASONS,
+        ];
 
-        if ($this->reportable instanceof Beatmapset && $this->reportable->isScoreable()) {
+        if (!in_array($this->reason, $allowedReasons, true)) {
             $this->validationErrors()->add(
                 'reason',
-                '.no_ranked_beatmapset'
+                '.reason_not_valid',
+                ['reason' => $this->reason]
             );
         }
 
-        if (mb_strlen($this->comments) > static::MAX_LENGTH) {
+        if ($this->reportable instanceof Beatmapset && $this->reportable->isScoreable()) {
             $this->validationErrors()->add(
-                'comments',
-                'too_long',
-                ['limit' => static::MAX_LENGTH]
+                'reason',
+                '.no_ranked_beatmapset'
             );
         }
+
+        $this->validateDbFieldLengths();
 
         return $this->validationErrors()->isEmpty();
     }

app/Notifications/UserReportNotification.php

···
                     ->color('warning')
                     ->content($notifiable->comments)
                     ->fields([
-                        'Reporter' => "<{$this->reporter->url()}|{$this->reporter->username}>",
+                        'Reporter' => $this->discordMarkdownLink($this->reporter->url(), $this->reporter->username),
                         'Reported' => $reportedText,
-                        'User' => "<{$userUrl}|{$user}>",
+                        'User' => $this->discordMarkdownLink($userUrl, $user),
                         'Reason' => $notifiable->reason,
                     ]);
             });
···
     public function via($notifiable)
     {
         return ['slack'];
+    }
+
+    private function discordMarkdownLink(string $url, string $text): string
+    {
+        // I couldn't find any way to escape them so this seems to be the next best thing.
+        // The alternative characters were taken from https://github.com/python-discord/sir-lancebot/pull/820
+        $text = strtr($text, ['[' => '⦋', ']' => '⦌']);
+
+        return "[{$text}]({$url})";
     }
 }

app/Traits/Validatable.php

···
 
         return $this->_validationErrors;
     }
+
+    private function validateDbFieldLength(int $limit, string $dbField, ?string $checkField = null): void
+    {
+        if ($this->isDirty($dbField)) {
+            $this->validateFieldLength($limit, $dbField, $checkField);
+        }
+    }
+
+    private function validateDbFieldLengths(): void
+    {
+        foreach (static::MAX_FIELD_LENGTHS as $field => $limit) {
+            $this->validateDbFieldLength($limit, $field, $field);
+        }
+    }
+
+    private function validateFieldLength(int $limit, string $field, ?string $checkField = null): void
+    {
+        $checkField ??= $field;
+        $val = $this->$checkField;
+        if ($val !== null && mb_strlen($val) > $limit) {
+            $this->validationErrors()->add($field, 'too_long', ['limit' => $limit]);
+        }
+    }
 }

app/helpers.php

···
     return $formatter->format($datetime);
 }
 
+function i18n_date_auto(DateTimeInterface $date, string $skeleton): string
+{
+    $locale = App::getLocale();
+    $generator = new IntlDatePatternGenerator($locale);
+    $pattern = $generator->getBestPattern($skeleton);
+
+    return IntlDateFormatter::formatObject($date, $pattern, $locale);
+}
+
 function i18n_number_format($number, $style = null, $pattern = null, $precision = null, $locale = null)
 {
     if ($style === null && $pattern === null && $precision === null) {
···
 }
 
 // e.g. 100634983048665 -> 100.63 trillion
-function suffixed_number_format($number)
+function suffixed_number_format(float|int $number, ?string $locale = null): string
 {
-    $suffixes = ['', 'k', 'million', 'billion', 'trillion']; // TODO: localize
-    $k = 1000;
+    $locale ??= App::getLocale();
 
-    if ($number < $k) {
-        return $number;
-    }
+    static $formatters = [];
 
-    $i = floor(log($number) / log($k));
+    if (!isset($formatters[$locale])) {
+        $formatters[$locale] = new NumberFormatter($locale, NumberFormatter::PADDING_POSITION);
+        $formatters[$locale]->setAttribute(NumberFormatter::FRACTION_DIGITS, 2);
+    }
 
-    return number_format($number / pow($k, $i), 2).' '.$suffixes[$i];
+    return $formatters[$locale]->format($number);
 }
 
 function suffixed_number_format_tag($number)

config/app.php

···
 
     /*
      * Make sure to check locale name mapping for other components.
-     * Carbon is in Http\Middleware\SetLocale (no helper... yet?).
+     * carbon is in Http\Middleware\SetLocale (no helper... yet?).
      * html, momentjs, and laravel are in LocaleMeta.
+     * php (IntlDateFormatter etc) isn't mapped at the moment.
      * Check respective packages for supported list of languages.
+     *
+     * carbon: list in vendor/nesbot/carbon/src/Carbon/Lang/
+     * html: lang attribute in html tag. Mainly for uppercasing country code if used.
+     * laravel: list in vendor/laravel/framework/src/Illuminate/Translation/MessageSelector.php
+     * momentjs: list in node_modules/moment/locale/
      */
     'available_locales' => [
         // separate the default
···
         'ar',
         'be',
         'bg',
+        'ca',
         'cs',
         'da',
         'de',
         'el',
         'es',
         'fi',
+        'fil',
         'fr',
+        'he',
         'hu',
         'id',
         'it',
         'ja',
         'ko',
+        'lt',
         'nl',
         'no',
         'pl',
···
         'ro',
         'ru',
         'sk',
+        'sl',
+        'sr',
         'sv',
         'th',
         'tr',

config/osu.php

···
         'ban_persist_days' => get_int(env('BAN_PERSIST_DAYS')) ?? 28,
     ],
     'user_report_notification' => [
+        'endpoint_cheating' => presence(env('USER_REPORT_NOTIFICATION_ENDPOINT_CHEATING')),
         'endpoint_moderation' => presence(env('USER_REPORT_NOTIFICATION_ENDPOINT_MODERATION')),
-        'endpoint_cheating' => presence(env('USER_REPORT_NOTIFICATION_ENDPOINT_CHEATING')),
+
+        'endpoint' => [
+            'beatmapset_discussion' => presence(env('USER_REPORT_NOTIFICATION_ENDPOINT_BEATMAPSET_DISCUSSION')),
+            'beatmapset' => presence(env('USER_REPORT_NOTIFICATION_ENDPOINT_BEATMAPSET')),
+            'chat' => presence(env('USER_REPORT_NOTIFICATION_ENDPOINT_CHAT')),
+            'comment' => presence(env('USER_REPORT_NOTIFICATION_ENDPOINT_COMMENT')),
+            'forum' => presence(env('USER_REPORT_NOTIFICATION_ENDPOINT_FORUM')),
+            'user' => presence(env('USER_REPORT_NOTIFICATION_ENDPOINT_USER')),
+        ],
     ],
     'wiki' => [
         'branch' => presence(env('WIKI_BRANCH'), 'master'),

crowdin.yml

···
         ar: ar
         be: be
         bg: bg
+        ca: ca
         cs: cs
         da: da
         de: de
···
         es-ES: es
         fi-FI: fi
         fi: fi
+        fil: fil
         fr: fr
+        he: he
         hu: hu
         id: id
         it: it
         ja: ja
         ko: ko
+        lt: lt
         nl: nl
         'no': 'no'
         pl: pl
···
         ro: ro
         ru: ru
         sk: sk
+        sl: sl
+        sr: sr
         sv-SE: sv
         th: th
         tr: tr

database/factories/ArtistFactory.php

···
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-$factory->define(App\Models\Artist::class, function (Faker\Generator $faker) {
-    return [
-        'name' => function () use ($faker) {
-            return $faker->lastName().' '.$faker->colorName();
-        },
-        'description' => function () use ($faker) {
-            return $faker->realText();
-        },
-        'website' => function () use ($faker) {
-            return $faker->safeEmailDomain();
-        },
-        'cover_url' => '/images/headers/generic.jpg',
-        'header_url' => '/images/headers/generic.jpg',
-        'visible' => 1,
-    ];
-});
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use App\Models\Artist;
+
+class ArtistFactory extends Factory
+{
+    protected $model = Artist::class;
+
+    public function definition(): array
+    {
+        return [
+            'name' => fn() => "{$this->faker->lastName()} {$this->faker->colorName()}",
+            'description' => fn() => $this->faker->realText(),
+            'website' => fn() => $this->faker->safeEmailDomain(),
+            'cover_url' => '/images/headers/generic.jpg',
+            'header_url' => '/images/headers/generic.jpg',
+            'visible' => 1,
+        ];
+    }
+}

database/factories/BanchoStatsFactory.php

···
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-/*
-|--------------------------------------------------------------------------
-| Model Factories
-|--------------------------------------------------------------------------
-|
-| Here you may define all of your model factories. Model factories give
-| you a convenient way to create models for testing and seeding your
-| database. Just tell the factory how a default model should look.
-|
-*/
+declare(strict_types=1);
+
+namespace Database\Factories;
 
+use App\Models\BanchoStats;
 use Carbon\Carbon;
 
-$factory->define(App\Models\BanchoStats::class, function (Faker\Generator $faker) {
-    return [
-        'users_irc' => 100 + $faker->randomNumber(2),
-        'users_osu' => 10000 + $faker->randomNumber(4),
-        'multiplayer_games' => 200 + $faker->randomNumber(3),
-        'date' => new Carbon(),
-    ];
-});
+class BanchoStatsFactory extends Factory
+{
+    protected $model = BanchoStats::class;
+
+    public function definition(): array
+    {
+        return [
+            'users_irc' => fn() => 100 + $this->faker->randomNumber(2),
+            'users_osu' => fn() => 10000 + $this->faker->randomNumber(4),
+            'multiplayer_games' => fn() => 200 + $this->faker->randomNumber(3),
+            'date' => fn() => Carbon::now(),
+        ];
+    }
+}

database/factories/BeatmapFailtimesFactory.php

···
 
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
-$factory->define(App\Models\BeatmapFailtimes::class, function (Faker\Generator $faker) {
-    $array = [];
+
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use App\Models\BeatmapFailtimes;
+
+class BeatmapFailtimesFactory extends Factory
+{
+    protected $model = BeatmapFailtimes::class;
+
+    public function definition(): array
+    {
+        $array = [];
+
+        for ($i = 1; $i <= 100; $i++) {
+            $field = 'p'.strval($i);
+            $array[$field] = rand(1, 10000);
+        }
 
-    for ($i = 1; $i <= 100; $i++) {
-        $field = 'p'.strval($i);
-        $array = array_merge($array, [$field => rand(1, 10000)]);
+        return $array;
     }
 
-    return $array;
-});
+    public function fail(): static
+    {
+        return $this->state(['type' => 'fail']);
+    }
 
-$factory->state(App\Models\BeatmapFailtimes::class, 'fail', ['type' => 'fail']);
-
-$factory->state(App\Models\BeatmapFailtimes::class, 'retry', ['type' => 'exit']);
+    public function retry(): static
+    {
+        return $this->state(['type' => 'exit']);
+    }
+}

database/factories/BeatmapMirrorFactory.php

···
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
+declare(strict_types=1);
+
+namespace Database\Factories;
+
 use App\Models\BeatmapMirror;
 
-$factory->define(BeatmapMirror::class, function (Faker\Generator $faker) {
-    return [
-        'base_url' => 'http://beatmap-download.test/',
-        'traffic_used' => rand(0, pow(2, 32)),
-        'secret_key' => function () use ($faker) {
-            return $faker->password();
-        },
-        'provider_user_id' => 2,
-        'enabled' => 1,
-        'version' => BeatmapMirror::MIN_VERSION_TO_USE,
-    ];
-});
+class BeatmapMirrorFactory extends Factory
+{
+    protected $model = BeatmapMirror::class;
+
+    public function default(): static
+    {
+        return $this->state([
+            'mirror_id' => config('osu.beatmap_processor.mirrors_to_use')[0],
+        ]);
+    }
 
-$factory->state(BeatmapMirror::class, 'default', function () {
-    return [
-        'mirror_id' => config('osu.beatmap_processor.mirrors_to_use')[0],
-    ];
-});
+    public function definition(): array
+    {
+        return [
+            'base_url' => 'http://beatmap-download.test/',
+            'traffic_used' => rand(0, pow(2, 32)),
+            'secret_key' => fn() => $this->faker->password(),
+            'provider_user_id' => 2,
+            'enabled' => 1,
+            'version' => BeatmapMirror::MIN_VERSION_TO_USE,
+        ];
+    }
+}

database/factories/ChangelogFactory.php

···
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-/*
-|--------------------------------------------------------------------------
-| Model Factories
-|--------------------------------------------------------------------------
-|
-| Here you may define all of your model factories. Model factories give
-| you a convenient way to create models for testing and seeding your
-| database. Just tell the factory how a default model should look.
-|
-*/
+declare(strict_types=1);
+
+namespace Database\Factories;
 
+use App\Models\Changelog;
 use App\Models\User;
 
-$factory->define(App\Models\Changelog::class, function (Faker\Generator $faker) {
-    return [
-        'user_id' => function () {
-            $u = User::inRandomOrder()->first() ?? User::factory()->create();
+class ChangelogFactory extends Factory
+{
+    protected $model = Changelog::class;
 
-            return $u->getKey();
-        },
-        'prefix' => $faker->randomElement(['*', '+', '?']),
-        'category' => $faker->randomElement(['Web', 'Audio', 'Code', 'Editor', 'Gameplay', 'Graphics']),
-        'message' => $faker->catchPhrase,
-        'checksum' => $faker->md5,
-        'date' => $faker->dateTimeBetween('-6 weeks', 'now'),
-    ];
-});
+    public function definition(): array
+    {
+        return [
+            'user_id' => User::factory(),
+            'prefix' => fn() => $this->faker->randomElement(['*', '+', '?']),
+            'category' => fn() => $this->faker->randomElement(['Web', 'Audio', 'Code', 'Editor', 'Gameplay', 'Graphics']),
+            'message' => fn() => $this->faker->catchPhrase(),
+            'checksum' => fn() => $this->faker->md5,
+            'date' => fn() => $this->faker->dateTimeBetween('-6 weeks'),
+        ];
+    }
+}

database/factories/ChatFilterFactory.php

···
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-$factory->define(App\Models\ChatFilter::class, function (Faker\Generator $faker) {
-    return [
-        'match' => $faker->unique()->word,
-        'replacement' => $faker->word,
-    ];
-});
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use App\Models\ChatFilter;
+
+class ChatFilterFactory extends Factory
+{
+    protected $model = ChatFilter::class;
+
+    public function definition(): array
+    {
+        return [
+            'match' => fn() => $this->faker->unique()->word,
+            'replacement' => fn() => $this->faker->word,
+        ];
+    }
+}

database/factories/ContestEntryFactory.php

···
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-$factory->define(App\Models\ContestEntry::class, function (Faker\Generator $faker) {
-    return [
-        'user_id' => function () {
-            return App\Models\User::factory()->create()->user_id;
-        },
-        'entry_url' => '/images/headers/generic.jpg',
-        'name' => $faker->words(3, true),
-        'masked_name' => $faker->words(3, true),
-    ];
-});
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use App\Models\ContestEntry;
+use App\Models\User;
+
+class ContestEntryFactory extends Factory
+{
+    protected $model = ContestEntry::class;
+
+    public function definition(): array
+    {
+        return [
+            'user_id' => User::factory(),
+            'entry_url' => '/images/headers/generic.jpg',
+            'name' => fn() => $this->faker->words(3, true),
+            'masked_name' => fn() => $this->faker->words(3, true),
+        ];
+    }
+}

database/factories/ContestFactory.php

···
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-$factory->define(App\Models\Contest::class, function (Faker\Generator $faker) {
-    return [
-        'name' => function () use ($faker) {
-            return $faker->sentence();
-        },
-        'description_enter' => function () use ($faker) {
-            return $faker->paragraph();
-        },
-        'description_voting' => function () use ($faker) {
-            return $faker->paragraph();
-        },
-        'type' => 'art',
-        'header_url' => '/images/headers/generic.jpg',
-        'visible' => 1,
-    ];
-});
+declare(strict_types=1);
+
+namespace Database\Factories;
 
-$factory->state(App\Models\Contest::class, 'pending', function (Faker\Generator $faker) {
-    return [
-        'entry_starts_at' => Carbon\Carbon::now()->addMonths(1),
-        'entry_ends_at' => Carbon\Carbon::now()->addMonths(2),
-        'voting_starts_at' => Carbon\Carbon::now()->addMonths(3),
-        'voting_ends_at' => Carbon\Carbon::now()->addMonths(4),
-    ];
-});
+use App\Models\Contest;
+use Carbon\Carbon;
+
+class ContestFactory extends Factory
+{
+    protected $model = Contest::class;
+
+    public function completed(): static
+    {
+        return $this->state([
+            'entry_starts_at' => fn() => Carbon::now()->subMonths(4),
+            'entry_ends_at' => fn() => Carbon::now()->subMonths(3),
+            'voting_starts_at' => fn() => Carbon::now()->subMonths(2),
+            'voting_ends_at' => fn() => Carbon::now()->subMonths(1),
+        ]);
+    }
+
+    public function definition(): array
+    {
+        return [
+            'name' => fn() => $this->faker->sentence(),
+            'description_enter' => fn() => $this->faker->paragraph(),
+            'description_voting' => fn() => $this->faker->paragraph(),
+            'type' => 'art',
+            'header_url' => '/images/headers/generic.jpg',
+            'visible' => 1,
+        ];
+    }
 
-$factory->state(App\Models\Contest::class, 'entry', function (Faker\Generator $faker) {
-    return [
-        'entry_starts_at' => Carbon\Carbon::now()->subMonths(1),
-        'entry_ends_at' => Carbon\Carbon::now()->addMonths(1),
-        'voting_starts_at' => Carbon\Carbon::now()->addMonths(2),
-        'voting_ends_at' => Carbon\Carbon::now()->addMonths(3),
-    ];
-});
+    public function entry(): static
+    {
+        return $this->state([
+            'entry_starts_at' => fn() => Carbon::now()->subMonths(1),
+            'entry_ends_at' => fn() => Carbon::now()->addMonths(1),
+            'voting_starts_at' => fn() => Carbon::now()->addMonths(2),
+            'voting_ends_at' => fn() => Carbon::now()->addMonths(3),
+        ]);
+    }
 
-$factory->state(App\Models\Contest::class, 'voting', function (Faker\Generator $faker) {
-    return [
-        'entry_starts_at' => Carbon\Carbon::now()->subMonths(3),
-        'entry_ends_at' => Carbon\Carbon::now()->subMonths(2),
-        'voting_starts_at' => Carbon\Carbon::now()->subMonths(1),
-        'voting_ends_at' => Carbon\Carbon::now()->addMonths(1),
-    ];
-});
+    public function pending(): static
+    {
+        return $this->state([
+            'entry_starts_at' => fn() => Carbon::now()->addMonths(1),
+            'entry_ends_at' => fn() => Carbon::now()->addMonths(2),
+            'voting_starts_at' => fn() => Carbon::now()->addMonths(3),
+            'voting_ends_at' => fn() => Carbon::now()->addMonths(4),
+        ]);
+    }
 
-$factory->state(App\Models\Contest::class, 'completed', function (Faker\Generator $faker) {
-    return [
-        'entry_starts_at' => Carbon\Carbon::now()->subMonths(4),
-        'entry_ends_at' => Carbon\Carbon::now()->subMonths(3),
-        'voting_starts_at' => Carbon\Carbon::now()->subMonths(2),
-        'voting_ends_at' => Carbon\Carbon::now()->subMonths(1),
-    ];
-});
+    public function voting(): static
+    {
+        return $this->state([
+            'entry_starts_at' => fn() => Carbon::now()->subMonths(3),
+            'entry_ends_at' => fn() => Carbon::now()->subMonths(2),
+            'voting_starts_at' => fn() => Carbon::now()->subMonths(1),
+            'voting_ends_at' => fn() => Carbon::now()->addMonths(1),
+        ]);
+    }
+}

database/factories/GroupFactory.php

···
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-$factory->define(App\Models\Group::class, function (Faker\Generator $faker) {
-    return [
-        'group_name' => function () use ($faker) {
-            return $faker->colorName().' '.$faker->domainWord();
-        },
-        'group_desc' => function () use ($faker) {
-            return $faker->sentence();
-        },
-    ];
-});
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use App\Models\Group;
+
+class GroupFactory extends Factory
+{
+    protected $model = Group::class;
+
+    public function definition(): array
+    {
+        return [
+            'group_name' => fn() => "{$this->faker->colorName()} {$this->faker->domainWord()}",
+            'group_desc' => fn() => $this->faker->sentence(),
+        ];
+    }
+}

database/migrations/2023_03_22_000000_add_chat_message_to_report_types.php

···
+<?php
+
+// Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::statement("ALTER TABLE osu_user_reports
+                       MODIFY COLUMN reportable_type
+                       enum('user', 'comment', 'score_best_osu', 'score_best_taiko', 'score_best_fruits', 'score_best_mania', 'beatmapset_discussion_post', 'forum_post', 'beatmapset', 'solo_score', 'message')");
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        DB::statement("ALTER TABLE osu_user_reports
+                       MODIFY COLUMN reportable_type
+                       enum('user', 'comment', 'score_best_osu', 'score_best_taiko', 'score_best_fruits', 'score_best_mania', 'beatmapset_discussion_post', 'forum_post', 'beatmapset', 'solo_score')");
+    }
+};

database/mods.json

···
         "ValidForMultiplayerAsFreeMod": true
       },
       {
+        "Acronym": "SG",
+        "Name": "Single Tap",
+        "Description": "One key for dons, one key for kats.",
+        "Type": "Conversion",
+        "Settings": [],
+        "IncompatibleMods": [
+          "AT",
+          "CN",
+          "RX"
+        ],
+        "RequiresConfiguration": false,
+        "UserPlayable": true,
+        "ValidForMultiplayer": true,
+        "ValidForMultiplayerAsFreeMod": true
+      },
+      {
         "Acronym": "AT",
         "Name": "Autoplay",
         "Description": "Watch a perfect automated play through the song.",
···
           "SD",
           "PF",
           "AC",
+          "SG",
           "CN",
           "RX",
           "AS"
···
           "SD",
           "PF",
           "AC",
+          "SG",
           "AT",
           "CN",
           "RX",
···
           "SD",
           "PF",
           "AC",
+          "SG",
           "AT",
           "CN"
         ],

database/seeders/ModelSeeders/BanchoStatsSeeder.php

···
 {
     /**
      * Run the database seeds.
-     *
-     * @return void
      */
-    public function run()
+    public function run(): void
     {
-        $date = new Carbon();
+        $timestamp = Carbon::now();
 
-        //Create 500 new data points
-        factory(BanchoStats::class, 500)->make()->each(function ($stat) use ($date) {
-            $stat->date = $date;
-            $stat->save();
+        // Create 500 new data points
+        for ($i = 0; $i < 500; $i++) {
+            BanchoStats::factory()->create(['date' => $timestamp]);
 
-            //Increment the dates by 5 each time
-            $date->addMinutes(5);
-        });
+            // Increment the timestamp by 5 each time
+            $timestamp->addMinutes(5);
+        }
     }
 }

database/seeders/ModelSeeders/BeatmapSeeder.php

···
         BeatmapFailtimes::where('beatmap_id', $beatmap->beatmap_id)->delete();
 
         $beatmap->failtimes()->saveMany([
-            factory(BeatmapFailtimes::class)->states('fail')->make(),
-            factory(BeatmapFailtimes::class)->states('retry')->make(),
+            BeatmapFailtimes::factory()->fail()->make(),
+            BeatmapFailtimes::factory()->retry()->make(),
         ]);
     }
 

database/seeders/ModelSeeders/ChangelogSeeder.php

···
             ->merge(Build::factory()->count(5)->create(['stream_id' => $fallback->stream_id]));
 
         foreach ($builds as $build) {
-            factory(Changelog::class, 5)->create([
+            Changelog::factory()->count(5)->create([
                 'build' => $build->version,
                 'stream_id' => $build->stream_id,
             ]);
         }
 
         // create some buildless changes
-        factory(Changelog::class, 15)->create([
+        Changelog::factory()->count(15)->create([
             'build' => null,
             'stream_id' => 5,
         ]);
 
-        factory(Changelog::class, 5)->create([
+        Changelog::factory()->count(5)->create([
             'build' => null,
             'stream_id' => 1,
         ]);

docker-compose.yml

···
 
 x-env: &x-env
   APP_KEY: "${APP_KEY}"
-  BEATMAPS_DIFFICULTY_CACHE_SERVER_URL: http://beatmap-difficulty-lookup-cache:5000
+  BEATMAPS_DIFFICULTY_CACHE_SERVER_URL: http://beatmap-difficulty-lookup-cache
   BROADCAST_DRIVER: redis
   CACHE_DRIVER: redis
   DB_CONNECTION_STRING: Server=db;Database=osu;Uid=osuweb;
···
     environment:
       <<: *x-env
       SCHEMA: "${SCHEMA:-1}"
+
+  score-indexer-test:
+    image: pppy/osu-elastic-indexer
+    command: ["queue", "watch", "--force-version"]
+    depends_on:
+      redis:
+        condition: service_healthy
+      db:
+        condition: service_healthy
+      elasticsearch:
+        condition: service_healthy
+    environment:
+      <<: *x-env
+      # match with .env.testing.example
+      DB_CONNECTION_STRING: Server=db;Database=osu_test;Uid=osuweb;
+      ES_INDEX_PREFIX: test_
+      SCHEMA: test
 
 volumes:
   database:

docker/development/entrypoint.sh

···
     fi
 
     case "$command" in
-        browser) _rexec php /app/artisan dusk --verbose "$@";;
+        browser) _test_browser "$@";;
         js) _rexec yarn karma start --single-run --browsers ChromeHeadless "$@";;
         phpunit) _rexec ./bin/phpunit.sh "$@";;
     esac
 }
+
+_test_browser() {
+    export APP_ENV=dusk.local
+    export OCTANE_STATE_FILE=/app/storage/logs/octane-server-state-dusk.json
+    _rexec ./bin/run_dusk.sh "$@"
+}
+
 
 _watch() {
     _run yarn --network-timeout 100000

resources/css/bem-index.less

···
 @import "bem/header-v4";
 @import "bem/icon-dropdown-menu";
 @import "bem/icon-stack";
+@import "bem/imagemap";
 @import "bem/input-container";
 @import "bem/js-accordion";
 @import "bem/js-flash-border";

resources/css/bem/bbcode-spoilerbox.less

···
     .link-default();
     text-align: left;
     display: flex;
+    flex-wrap: wrap;
+    overflow-wrap: anywhere;
     font-weight: bold;
 
     &:hover {

resources/css/bem/beatmapset-header.less

···
 // See the LICENCE file in the repository root for full licence text.
 
 .beatmapset-header {
-  @header-height: 350px;
+  display: grid;
+  gap: 20px;
+  padding: 10px @gutter-beatmapset 0;
+  min-height: 350px;
+  position: relative;
 
-  .default-box-shadow();
+  @media @desktop {
+    padding: 20px @gutter-beatmapset-desktop 0;
+    grid-template-columns: 1fr @beatmapset-float-box-width;
+  }
 
   &__box {
     display: flex;
     flex-direction: column;
 
-    padding: 20px 10px 25px;
     position: relative;
 
     &--main {
-      align-self: stretch;
-      min-width: 0;
-
       @media @desktop {
-        flex: 1;
+        padding-bottom: 25px;
       }
     }
 
     &--stats {
-      padding-bottom: 0;
-      align-self: stretch;
       justify-content: space-between;
     }
   }
···
     margin-top: 10px;
   }
 
-  &__content {
-    display: flex;
-    flex-direction: column;
-    padding: 0 30px;
-    min-height: @header-height;
-    position: relative;
-
-    @media @desktop {
-      align-items: flex-end;
-      flex-direction: row;
-    }
-
-  }
-
   &__availability-info {
     font-size: @font-size--title-small;
     padding: 10px;
···
   &__cover {
     --border-radius: 0;
     .light-header-overlay();
+    display: contents;
   }
 
   &__details-text {
···
   &__diff-name {
     font-size: 17px;
     font-weight: 600;
+    overflow-wrap: anywhere;
 
     color: hsl(var(--hsl-c1));
 

resources/css/bem/beatmapset-info.less

···
 
 .beatmapset-info {
   @_top: beatmapset-info;
-  @min-height: 220px;
-  @max-height: 320px;
+  @min-height: 200px;
+  @max-height: 300px;
   @box-margin--top: 15px;
-  @header-margin--top: 15px;
-  @header-margin--bottom: 5px;
 
   font-size: @font-size--normal;
-  color: white;
 
-  display: flex;
-  flex-direction: column;
+  display: grid;
+  gap: 20px;
 
-  padding: 0 30px 0;
+  padding: 10px @gutter-beatmapset 0;
   background-color: hsl(var(--hsl-b4));
+  -webkit-overflow-scrolling: touch;
 
   @media @desktop {
-    flex-direction: row;
-    min-height: @min-height;
-    max-height: @max-height;
+    padding: 15px @gutter-beatmapset-desktop 0;
+    grid-template-columns: 1fr 175px @beatmapset-float-box-width;
   }
 
   &__box {
-    margin: @box-margin--top 10px 0;
-    flex: none;
-
-    &--description {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      flex-direction: column;
-      position: relative;
-    }
+    min-width: 0;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    padding-top: 10px;
 
-    &--meta {
-      position: relative;
-
-      @media @desktop {
-        width: 175px;
-        overflow: hidden;
-        margin-bottom: 10px;
-      }
+    @media @desktop {
+      min-height: @min-height;
+      max-height: @max-height;
     }
 
     &--success-rate {
-      @media @desktop {
-        width: @beatmapset-float-box-width;
-      }
+      padding-top: 0;
     }
   }
 
-  &__description {
-    -webkit-overflow-scrolling: touch;
-    overflow-y: auto;
-    padding-right: 10px;
-
-    // to prevent overflow from extending container box
-    @media @desktop {
-      .full-size();
-    }
-    @media @mobile {
-      max-height: @max-height;
-    }
-  }
-
-  &__description-container {
-    min-height: 0;
-    max-height: @max-height;
-    flex: 1;
-    position: relative;
-  }
-
   &__edit-button {
     position: absolute;
     top: 5px;
···
     }
   }
 
-  &__half-box {
+  &__row {
     display: flex;
+    flex-direction: column;
+    padding-top: 5px;
+    padding-bottom: 10px;
+
+    &--half {
+      flex-direction: row;
+    }
+
+    &--value-overflow {
+      padding-bottom: 0;
+      min-height: 0;
+    }
   }
 
   &__half-entry {
-    flex: 1;
-    max-width: 50%;
+    flex: none;
+    width: 50%;
   }
 
   &__header {
···
     font-weight: bold;
     font-style: normal;
     padding: 0;
-    margin: @header-margin--top 0 @header-margin--bottom;
+    margin: 0 0 5px;
   }
 
   &__link {
     overflow-wrap: break-word;
+  }
+
+  &__value-overflow {
+    min-height: 0;
+    max-height: @max-height;
+    flex: 1;
+
+    overflow-y: auto;
+    padding-bottom: 10px;
   }
 }

resources/css/bem/beatmapset-stats.less

···
 // See the LICENCE file in the repository root for full licence text.
 
 .beatmapset-stats {
-  color: #fff;
   font-size: 12px;
-
-  @media @desktop {
-    width: @beatmapset-float-box-width;
-  }
 
   &__elapsed-bar {
     position: absolute;

resources/css/bem/form-select.less

···
   font-weight: initial;
   line-height: normal;
   margin: 0;
+  min-width: 0;
 
   display: flex;
   align-items: baseline;
···
     flex: 1;
     background-color: inherit;
     border-radius: inherit;
+    max-width: 100%;
   }
 }

resources/css/bem/forum-post.less

···
       padding-right: @gutter-v2-desktop;
     }
 
+    &--blocked {
+      padding-top: @_padding-content;
+      font-size: @font-size--title-small;
+    }
+
     &--footer {
       color: @osu-colour-c2;
     }

resources/css/bem/imagemap.less

···
+// Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+.imagemap {
+  position: relative;
+  overflow: hidden;
+
+  &__image {
+    width: auto;
+    height: auto;
+    object-fit: contain;
+    max-width: 100%;
+  }
+
+  &__link {
+    display: block;
+    position: absolute;
+  }
+}

resources/css/bem/mp-history-player-score.less

···
     font-weight: 700;
 
     padding-right: 20px;
-
-    display: none;
-
-    @media (min-width: @width) {
-      display: initial;
-    }
   }
 
   &__mods {

resources/css/bem/news-post-preview.less

···
   }
 
   &__post-date {
-    flex: 0 0 60px;
+    flex: none;
+    width: 70px;
     border-right: 1px solid @osu-colour-l1;
     margin: 10px;
     display: flex;
···
     align-items: flex-end;
     color: @osu-colour-l1;
     padding-right: 10px;
-    overflow: hidden;
     text-align: right;
 
     .@{top}--collapsed & {
···
       justify-content: flex-end;
       align-items: baseline;
       margin: 0px 10px;
-      padding: 5px 10px;
+      padding: 5px 10px 5px 0;
     }
   }
 

resources/css/bem/page-mode.less

···
 
   &--profile-page-extra {
     .default-gutter-v2();
-    padding-top: 0;
-    padding-bottom: 0;
-    height: 40px;
+    padding-top: 10px;
+    padding-bottom: $padding-top;
     display: flex;
     align-items: center;
     gap: 20px;
     font-size: @font-size--title-small;
+    overflow-x: auto;
   }
 
   &--ranking {

resources/css/bem/search-entry.less

···
   padding: 10px 10px 15px;
   position: relative; // for entries which link is full-sized child element
   box-shadow: inset 0 0 0 var(--border-size) var(--border-colour);
+  min-width: 0;
   --border-colour: hsl(var(--hsl-l1));
   --border-size: 0;
 

resources/css/bem/simple-form.less

···
   }
 
   &__row {
-    flex: 1 0 100%;
+    flex: 1 0 auto;
+    width: 100%;
     display: flex;
     margin-bottom: 10px;
     text-transform: none;
···
     }
 
     &--half {
-      flex-basis: 50%;
+      flex: 50%;
     }
 
     &--title {

resources/css/bem/supporter-quote.less

···
     margin: 0;
     padding: 0;
     border: none;
+    // avoid right quote mark from overlapping the content in rare case
+    position: relative;
   }
 
   &__quote-mark {

resources/js/beatmap-discussions-history/main.coffee

···
         relatedDiscussions: props.relatedDiscussions
 
 
-  componentDidMount: =>
-    $.subscribe "beatmapsetDiscussions:update.#{@eventId}", @discussionUpdate
-    $(document).on "ajax:success.#{@eventId}", '.js-beatmapset-discussion-update', @ujsDiscussionUpdate
-
-
   componentWillUnmount: =>
-    $.unsubscribe ".#{@eventId}"
-    $(window).off ".#{@eventId}"
-
     $(window).stop()
 
 
-  discussionUpdate: (_e, options) =>
-    {beatmapset} = options
-    return unless beatmapset?
-
-    discussions = [@state.discussions...]
-    users = [@state.users...]
-    relatedDiscussions = [@state.relatedDiscussions...]
-
-    discussionIds = _.map discussions, 'id'
-    userIds = _.map users, 'id'
-
-    # Due to the entire hierarchy of discussions being sent back when a post is updated (instead of just the modified post),
-    #   we need to iterate over each discussion and their posts to extract the updates we want.
-    _.each beatmapset.discussions, (newDiscussion) ->
-      if discussionIds.includes(newDiscussion.id)
-        discussion = _.find discussions, id: newDiscussion.id
-        discussions = _.reject discussions, id: newDiscussion.id
-        newDiscussion = _.merge(discussion, newDiscussion)
-        # The discussion list shows discussions started by the current user, so it can be assumed that the first post is theirs
-        newDiscussion.starting_post = newDiscussion.posts[0]
-        discussions.push(newDiscussion)
-      else
-        relatedDiscussions.push(newDiscussion)
-
-    _.each beatmapset.related_users, (newUser) ->
-      if userIds.includes(newUser.id)
-        users = _.reject users, id: newUser.id
-
-      users.push(newUser)
-
-    @cache.users = @cache.discussions = @cache.beatmaps = @cache.beatmapsets = @state.relatedDiscussions = null
-    @setState
-      discussions: _.reverse(_.sortBy(discussions, (d) -> Date.parse(d.starting_post.created_at)))
-      users: users
-      relatedDiscussions: relatedDiscussions
-
-
   discussions: =>
     # skipped discussions
     # - not privileged (deleted discussion)
···
                       currentUser: currentUser
                       beatmapset: beatmapsets[discussion.beatmapset_id]
                       isTimelineVisible: false
-                      visible: false
+                      readonly: true
                       showDeleted: true
                       preview: true
 
···
       @cache.users[null] = @cache.users[undefined] = deletedUser.toJson()
 
     @cache.users
-
-
-  ujsDiscussionUpdate: (_e, data) =>
-    # to allow ajax:complete to be run
-    Timeout.set 0, => @discussionUpdate(null, beatmapset: data)

resources/js/beatmap-discussions/discussion.tsx

···
   currentBeatmap: BeatmapExtendedJson | null;
   isTimelineVisible: boolean;
   parentDiscussion?: BeatmapsetDiscussionJson | null;
+  readonly: boolean;
   readPostIds?: Set<number>;
   showDeleted: boolean;
   users: Partial<Record<number | string, UserJson>>;
···
   static contextType = DiscussionsStateContext;
   static defaultProps = {
     preview: false,
+    readonly: false,
   };
 
   declare context: React.ContextType<typeof DiscussionsStateContext>;
···
         discussion={this.props.discussion}
         post={post}
         read={this.isRead(post)}
+        readonly={this.props.readonly}
         resolvedSystemPostId={this.resolvedSystemPostId}
         type={type}
         user={user}

resources/js/beatmap-discussions/editor-discussion-component.tsx

···
     const classMods = canEdit ? [] : ['read-only'];
 
     const timestampTooltipType = this.props.element.beatmapId != null ? 'diff' : 'all-diff';
-
     const timestampTooltip = trans(`beatmaps.discussions.review.embed.timestamp.${timestampTooltipType}`, {
+      // TODO: remove after translations are updated without the key
       type: trans(`beatmaps.discussions.message_type.${this.discussionType()}`),
     });
 

resources/js/beatmap-discussions/nominations.coffee

···
 import { onError } from 'utils/ajax'
 import { canModeratePosts, makeUrl } from 'utils/beatmapset-discussion-helper'
 import { nominationsCount } from 'utils/beatmapset-helper'
-import { joinComponents, trans } from 'utils/lang'
+import { joinComponents, trans, transExists } from 'utils/lang'
 import { hideLoadingOverlay, showLoadingOverlay } from 'utils/loading-overlay'
 import { pageChange } from 'utils/page-change'
 import { presence } from 'utils/string'
···
         rankingETA = @props.beatmapset.nominations.ranking_eta
         date =
           if rankingETA?
-            moment(rankingETA).format(dateFormat)
+            # TODO: remove after translations are updated
+            if transExists 'beatmaps.nominations.rank_estimate.on'
+              trans 'beatmaps.nominations.rank_estimate.on',
+                date: moment(rankingETA).format(dateFormat)
+            else
+              moment(rankingETA).format(dateFormat)
           else
             trans 'beatmaps.nominations.rank_estimate.soon'
 

resources/js/beatmap-discussions/post.tsx

···
   discussion: BeatmapsetDiscussionJson;
   post: BeatmapsetDiscussionMessagePostJson;
   read: boolean;
+  readonly: boolean;
   resolvedSystemPostId: number;
   type: string;
   user: UserJson;
···
         && this.props.post.id > this.props.resolvedSystemPostId
         && !this.props.beatmapset.discussion_locked
       );
+  }
+
+  private get canDelete() {
+    return this.props.type === 'discussion'
+      ? this.props.discussion.current_user_attributes?.can_destroy
+      : this.canModerate || this.canEdit;
+  }
+
+  private get canModerate() {
+    return canModeratePosts();
   }
 
   @computed
···
 
 
   private renderMessageViewerActions() {
-    const canModerate = canModeratePosts();
-    const canDelete = this.props.type === 'discussion' ? this.props.discussion.current_user_attributes?.can_destroy : canModerate || this.canEdit;
-
     return (
       <div className={`${bn}__actions`}>
         <div className={`${bn}__actions-group`}>
···
               valueAsUrl
             />
           </span>
-          {this.canEdit && (
-            <button
-              className={`${bn}__action ${bn}__action--button`}
-              onClick={this.editStart}
-            >
-              {trans('beatmaps.discussions.edit')}
-            </button>
-          )}
 
-          {this.deleteModel.deleted_at == null && canDelete && (
-            <a
-              className={`js-beatmapset-discussion-update ${bn}__action ${bn}__action--button`}
-              data-confirm={trans('common.confirmation')}
-              data-method='DELETE'
-              data-remote
-              href={this.deleteHref('destroy')}
-            >
-              {trans('beatmaps.discussions.delete')}
-            </a>
-          )}
+          {!this.props.readonly && (
+            <>
+              {this.canEdit && (
+                <button
+                  className={`${bn}__action ${bn}__action--button`}
+                  onClick={this.editStart}
+                >
+                  {trans('beatmaps.discussions.edit')}
+                </button>
+              )}
 
-          {this.deleteModel.deleted_at != null && canModerate && (
-            <a
-              className={`js-beatmapset-discussion-update ${bn}__action ${bn}__action--button`}
-              data-confirm={trans('common.confirmation')}
-              data-method='POST'
-              data-remote
-              href={this.deleteHref('restore')}
-            >
-              {trans('beatmaps.discussions.restore')}
-            </a>
-          )}
+              {this.deleteModel.deleted_at == null && this.canDelete && (
+                <a
+                  className={`js-beatmapset-discussion-update ${bn}__action ${bn}__action--button`}
+                  data-confirm={trans('common.confirmation')}
+                  data-method='DELETE'
+                  data-remote
+                  href={this.deleteHref('destroy')}
+                >
+                  {trans('beatmaps.discussions.delete')}
+                </a>
+              )}
 
-          {this.props.type === 'discussion' && this.props.discussion.current_user_attributes?.can_moderate_kudosu && (
-            this.props.discussion.can_grant_kudosu
-              ? this.renderKudosuAction('deny')
-              : this.props.discussion.kudosu_denied && this.renderKudosuAction('allow')
+              {this.deleteModel.deleted_at != null && this.canModerate && (
+                <a
+                  className={`js-beatmapset-discussion-update ${bn}__action ${bn}__action--button`}
+                  data-confirm={trans('common.confirmation')}
+                  data-method='POST'
+                  data-remote
+                  href={this.deleteHref('restore')}
+                >
+                  {trans('beatmaps.discussions.restore')}
+                </a>
+              )}
+
+              {this.props.type === 'discussion' && this.props.discussion.current_user_attributes?.can_moderate_kudosu && (
+                this.props.discussion.can_grant_kudosu
+                  ? this.renderKudosuAction('deny')
+                  : this.props.discussion.kudosu_denied && this.renderKudosuAction('allow')
+              )}
+            </>
           )}
 
           {this.canReport && (

resources/js/beatmaps/beatmapset-card-size-selector.tsx

···
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-import { BeatmapsetCardSize } from 'components/beatmapset-panel';
+import { BeatmapsetCardSize } from 'beatmapset-panel';
 import { computed, makeObservable } from 'mobx';
 import { observer } from 'mobx-react';
 import core from 'osu-core-singleton';

resources/js/beatmaps/search-content.tsx

···
 
 import BeatmapsetCardSizeSelector from 'beatmaps/beatmapset-card-size-selector';
 import VirtualListMeta from 'beatmaps/virtual-list-meta';
-import BeatmapsetPanel, { beatmapsetCardSizes } from 'components/beatmapset-panel';
+import BeatmapsetPanel, { beatmapsetCardSizes } from 'beatmapset-panel';
 import Img2x from 'components/img2x';
 import StringWithComponent from 'components/string-with-component';
 import { route } from 'laroute';

resources/js/beatmaps/search-sort.tsx

···
 
   private readonly renderField = (field: Sort) => {
     const active = this.filters.searchSort.field === field;
+    const arrow = active && this.filters.searchSort.order === 'asc' ? 'up' : 'down';
 
     return (
       <a
···
       >
         {trans(`beatmaps.listing.search.sorting.${field}`)}
         <span className='sort__item-arrow'>
-          <i className={`fas fa-caret-${this.filters.searchSort.order === 'asc' ? 'up' : 'down'}`} />
+          <i className={`fas fa-caret-${arrow}`} />
         </span>
       </a>
     );

resources/js/beatmapsets-show/header.tsx

···
 
     return (
       <div className='beatmapset-header'>
-        <div className='beatmapset-header__content'>
-          <div className='beatmapset-header__cover'>
-            <BeatmapsetCover
-              beatmapset={this.controller.beatmapset}
-              forceShowVisual // check already covered by parent component
-              modifiers='full'
-              size='cover'
-            />
-          </div>
+        <div className='beatmapset-header__cover'>
+          <BeatmapsetCover
+            beatmapset={this.controller.beatmapset}
+            forceShowVisual // check already covered by parent component
+            modifiers='full'
+            size='cover'
+          />
+        </div>
 
-          <div className='beatmapset-header__box beatmapset-header__box--main'>
-            <div className='beatmapset-header__beatmap-picker-box'>
-              <BeatmapPicker controller={this.controller} />
+        <div className='beatmapset-header__box beatmapset-header__box--main'>
+          <div className='beatmapset-header__beatmap-picker-box'>
+            <BeatmapPicker controller={this.controller} />
 
-              {this.renderBeatmapVersion()}
+            {this.renderBeatmapVersion()}
 
-              <div>
-                <span className='beatmapset-header__value' title={trans('beatmapsets.show.stats.playcount')}>
-                  <span className='beatmapset-header__value-icon'><span className='fas fa-play-circle' /></span>
-                  <span className='beatmapset-header__value-name'>{formatNumber(this.controller.beatmapset.play_count)}</span>
-                </span>
+            <div>
+              <span className='beatmapset-header__value' title={trans('beatmapsets.show.stats.playcount')}>
+                <span className='beatmapset-header__value-icon'><span className='fas fa-play-circle' /></span>
+                <span className='beatmapset-header__value-name'>{formatNumber(this.controller.beatmapset.play_count)}</span>
+              </span>
 
-                {this.controller.beatmapset.status === 'pending' &&
-                  <span className='beatmapset-header__value' title={trans('beatmapsets.show.stats.nominations')}>
-                    <span className='beatmapset-header__value-icon'><span className='fas fa-thumbs-up' /></span>
-                    <span className='beatmapset-header__value-name'>
-                      {formatNumber(this.controller.beatmapset.nominations_summary.current)}
-                    </span>
-                  </span>
-                }
-
-                <span
-                  ref={this.favouriteIconRef}
-                  className={classWithModifiers('beatmapset-header__value', { 'has-favourites': this.controller.beatmapset.favourite_count > 0 })}
-                  onMouseOver={this.onEnterFavouriteIcon}
-                  onTouchStart={this.onEnterFavouriteIcon}
-                >
-                  <span className='beatmapset-header__value-icon'>
-                    <span className='fas fa-heart' />
-                  </span>
+              {this.controller.beatmapset.status === 'pending' &&
+                <span className='beatmapset-header__value' title={trans('beatmapsets.show.stats.nominations')}>
+                  <span className='beatmapset-header__value-icon'><span className='fas fa-thumbs-up' /></span>
                   <span className='beatmapset-header__value-name'>
-                    {formatNumber(this.controller.beatmapset.favourite_count)}
+                    {formatNumber(this.controller.beatmapset.nominations_summary.current)}
                   </span>
                 </span>
-              </div>
-            </div>
+              }
 
-            <span className='beatmapset-header__details-text beatmapset-header__details-text--title'>
-              <a
-                className='beatmapset-header__details-text-link'
-                href={route('beatmapsets.index', { q: getTitle(this.controller.beatmapset) })}
+              <span
+                ref={this.favouriteIconRef}
+                className={classWithModifiers('beatmapset-header__value', { 'has-favourites': this.controller.beatmapset.favourite_count > 0 })}
+                onMouseOver={this.onEnterFavouriteIcon}
+                onTouchStart={this.onEnterFavouriteIcon}
               >
-                {getTitle(this.controller.beatmapset)}
-              </a>
-              <BeatmapsetBadge
-                beatmapset={this.controller.beatmapset}
-                type='nsfw'
-              />
-              <BeatmapsetBadge
-                beatmapset={this.controller.beatmapset}
-                type='spotlight'
-              />
-            </span>
+                <span className='beatmapset-header__value-icon'>
+                  <span className='fas fa-heart' />
+                </span>
+                <span className='beatmapset-header__value-name'>
+                  {formatNumber(this.controller.beatmapset.favourite_count)}
+                </span>
+              </span>
+            </div>
+          </div>
 
-            <span className='beatmapset-header__details-text beatmapset-header__details-text--artist'>
-              <a
-                className='beatmapset-header__details-text-link'
-                href={route('beatmapsets.index', { q: getArtist(this.controller.beatmapset) })}
-              >
-                {getArtist(this.controller.beatmapset)}
-              </a>
-              <BeatmapsetBadge
-                beatmapset={this.controller.beatmapset}
-                type='featured_artist'
-              />
-            </span>
+          <span className='beatmapset-header__details-text beatmapset-header__details-text--title'>
+            <a
+              className='beatmapset-header__details-text-link'
+              href={route('beatmapsets.index', { q: getTitle(this.controller.beatmapset) })}
+            >
+              {getTitle(this.controller.beatmapset)}
+            </a>
+            <BeatmapsetBadge
+              beatmapset={this.controller.beatmapset}
+              type='nsfw'
+            />
+            <BeatmapsetBadge
+              beatmapset={this.controller.beatmapset}
+              type='spotlight'
+            />
+          </span>
 
-            <BeatmapsetMapping beatmapset={this.controller.beatmapset} />
+          <span className='beatmapset-header__details-text beatmapset-header__details-text--artist'>
+            <a
+              className='beatmapset-header__details-text-link'
+              href={route('beatmapsets.index', { q: getArtist(this.controller.beatmapset) })}
+            >
+              {getArtist(this.controller.beatmapset)}
+            </a>
+            <BeatmapsetBadge
+              beatmapset={this.controller.beatmapset}
+              type='featured_artist'
+            />
+          </span>
+
+          <BeatmapsetMapping beatmapset={this.controller.beatmapset} />
 
-            {this.renderAvailabilityInfo()}
+          {this.renderAvailabilityInfo()}
 
-            <div className='beatmapset-header__buttons'>
-              {core.currentUser != null &&
-                <BigButton
-                  icon={favouriteButton.icon}
-                  modifiers={['beatmapset-header-square', `beatmapset-header-square-${favouriteButton.action}`]}
-                  props={{
-                    onClick: this.onClickFavourite,
-                    title: trans(`beatmapsets.show.details.${favouriteButton.action}`),
-                  }}
-                />
-              }
+          <div className='beatmapset-header__buttons'>
+            {core.currentUser != null &&
+              <BigButton
+                icon={favouriteButton.icon}
+                modifiers={['beatmapset-header-square', `beatmapset-header-square-${favouriteButton.action}`]}
+                props={{
+                  onClick: this.onClickFavourite,
+                  title: trans(`beatmapsets.show.details.${favouriteButton.action}`),
+                }}
+              />
+            }
 
-              {this.renderDownloadButtons()}
-              {this.renderLoginButton()}
+            {this.renderDownloadButtons()}
+            {this.renderLoginButton()}
 
-              {!this.controller.beatmapset.is_scoreable && core.currentUser != null && core.currentUser.id !== this.controller.beatmapset.user_id &&
-                <div className='beatmapset-header__more'>
-                  <div className='btn-circle btn-circle--page-toggle btn-circle--page-toggle-detail'>
-                    <BeatmapsetMenu beatmapset={this.controller.beatmapset} />
-                  </div>
+            {!this.controller.beatmapset.is_scoreable && core.currentUser != null && core.currentUser.id !== this.controller.beatmapset.user_id &&
+              <div className='beatmapset-header__more'>
+                <div className='btn-circle btn-circle--page-toggle btn-circle--page-toggle-detail'>
+                  <BeatmapsetMenu beatmapset={this.controller.beatmapset} />
                 </div>
-              }
-            </div>
+              </div>
+            }
           </div>
+        </div>
 
-          <div className='beatmapset-header__box beatmapset-header__box--stats'>
-            {this.renderStatusBar()}
+        <div className='beatmapset-header__box beatmapset-header__box--stats'>
+          {this.renderStatusBar()}
 
-            <Stats controller={this.controller} />
-          </div>
+          <Stats controller={this.controller} />
         </div>
       </div>
     );

resources/js/beatmapsets-show/info.tsx

···
   render() {
     const tags = this.controller.beatmapset.tags
       .split(' ')
-      .filter(present)
-      .slice(0, 21);
-
-    const tagsOverload = tags.length === 21;
-
-    if (tagsOverload) {
-      tags.pop();
-    }
+      .filter(present);
 
     return (
-      <div className='beatmapset-info'>
+      <div className='beatmapset-info u-fancy-scrollbar'>
         {this.isEditingDescription &&
           <Modal onClose={this.handleCloseDescriptionEditor}>
             <div className='osu-page'>
···
           </Modal>
         }
 
-        <div className='beatmapset-info__box beatmapset-info__box--description'>
+        <div className='beatmapset-info__box'>
           {this.withEditDescription && this.renderEditDescriptionButton()}
 
-          <h3 className='beatmapset-info__header'>
-            {trans('beatmapsets.show.info.description')}
-          </h3>
+          <div className='beatmapset-info__row beatmapset-info__row--value-overflow'>
+            <h3 className='beatmapset-info__header'>
+              {trans('beatmapsets.show.info.description')}
+            </h3>
 
-          <div className='beatmapset-info__description-container u-fancy-scrollbar'>
             <div
-              className='beatmapset-info__description'
+              className='beatmapset-info__value-overflow'
               dangerouslySetInnerHTML={{
                 __html: this.controller.beatmapset.description.description ?? '',
               }}
···
           </div>
         </div>
 
-        <div className='beatmapset-info__box beatmapset-info__box--meta'>
+        <div className='beatmapset-info__box'>
           {this.withEditMetadata && this.renderEditMetadataButton()}
 
           {this.nominators.length > 0 &&
-            <>
+            <div className='beatmapset-info__row'>
               <h3 className='beatmapset-info__header'>
                 {trans('beatmapsets.show.info.nominators')}
               </h3>
···
                   </React.Fragment>
                 ))}
               </div>
-            </>
+            </div>
           }
 
           {present(this.controller.beatmapset.source) &&
-            <>
+            <div className='beatmapset-info__row'>
               <h3 className='beatmapset-info__header'>
                 {trans('beatmapsets.show.info.source')}
               </h3>
···
               >
                 {this.controller.beatmapset.source}
               </a>
-            </>
+            </div>
           }
 
-          <div className='beatmapset-info__half-box'>
+          <div className='beatmapset-info__row beatmapset-info__row--half'>
             <div className='beatmapset-info__half-entry'>
               <h3 className='beatmapset-info__header'>
                 {trans('beatmapsets.show.info.genre')}
···
           </div>
 
           {tags.length > 0 &&
-            <>
+            <div className='beatmapset-info__row beatmapset-info__row--value-overflow'>
               <h3 className='beatmapset-info__header'>
                 {trans('beatmapsets.show.info.tags')}
               </h3>
-              <div>
+              <div className='beatmapset-info__value-overflow'>
                 {tags.map((tag, i) => (
                   <React.Fragment key={`${tag}-${i}`}>
                     <a
···
                     {' '}
                   </React.Fragment>
                 ))}
-                {tagsOverload && '...'}
               </div>
-            </>
+            </div>
           }
         </div>
 

resources/js/components/beatmapset-panel.tsx resources/js/beatmapset-panel/index.tsx

···
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-import BeatmapsPopup from 'beatmapset-panel/beatmaps-popup';
 import BeatmapsetBadge from 'components/beatmapset-badge';
 import BeatmapsetCover from 'components/beatmapset-cover';
 import { CircularProgress } from 'components/circular-progress';
+import StringWithComponent from 'components/string-with-component';
+import TimeWithTooltip from 'components/time-with-tooltip';
+import UserLink from 'components/user-link';
 import BeatmapJson from 'interfaces/beatmap-json';
 import BeatmapsetExtendedJson from 'interfaces/beatmapset-extended-json';
 import BeatmapsetJson, { BeatmapsetStatus } from 'interfaces/beatmapset-json';
···
 import { formatNumber, formatNumberSuffixed } from 'utils/html';
 import { trans } from 'utils/lang';
 import { beatmapsetDownloadDirect } from 'utils/url';
-import StringWithComponent from './string-with-component';
-import TimeWithTooltip from './time-with-tooltip';
-import UserLink from './user-link';
+import BeatmapsPopup from './beatmaps-popup';
 
 export const beatmapsetCardSizes = ['normal', 'extra'] as const;
 export type BeatmapsetCardSize = typeof beatmapsetCardSizes[number];
···
     <span className='beatmapset-panel__stats-item-icon'>
       <i className={`fa-fw ${icon}`} />
     </span>
-    <span>{formatNumberSuffixed(value, undefined, { maximumFractionDigits: 1, minimumFractionDigits: 0 })}</span>
+    <span>{formatNumberSuffixed(value)}</span>
   </div>
 );
 

resources/js/components/comment-editor.coffee

···
-# Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
-# See the LICENCE file in the repository root for full licence text.
-
-import BigButton from './big-button'
-import { Spinner } from './spinner'
-import UserAvatar from './user-avatar'
-import { route } from 'laroute'
-import core from 'osu-core-singleton'
-import * as React from 'react'
-import TextareaAutosize from 'react-autosize-textarea'
-import { button, div, span } from 'react-dom-factories'
-import { onErrorWithCallback } from 'utils/ajax'
-import { classWithModifiers } from 'utils/css'
-import { InputEventType, makeTextAreaHandler } from 'utils/input-handler'
-import { trans } from 'utils/lang'
-
-el = React.createElement
-
-bn = 'comment-editor'
-
-export class CommentEditor extends React.PureComponent
-  constructor: (props) ->
-    super props
-
-    @textarea = React.createRef()
-
-    @handleKeyDown = makeTextAreaHandler @handleKeyDownCallback
-
-    @state =
-      message: @props.message ? ''
-      posting: false
-
-
-  componentDidMount: =>
-    if @props.focus ? true
-      @textarea.current?.selectionStart = -1
-      @textarea.current?.focus()
-
-
-  componentWillUnmount: =>
-    @xhr?.abort()
-
-
-  render: =>
-    mode = @mode()
-    canComment = @canComment()
-
-    placeholder =
-      if mode in ['new', 'reply'] && !canComment
-        @props.commentableMeta.current_user_attributes?.can_new_comment_reason ? trans('authorization.comment.store.disabled')
-      else
-        trans("comments.placeholder.#{mode}")
-
-    blockClass = classWithModifiers bn, @props.modifiers, fancy: mode == 'new'
-
-    div className: blockClass,
-      if mode == 'new'
-        div className: "#{bn}__avatar",
-          el UserAvatar, user: currentUser, modifiers: ['full-circle']
-
-      el TextareaAutosize,
-        className: "#{bn}__message"
-        ref: @textarea
-        value: @state.message
-        placeholder: placeholder
-        onChange: @onChange
-        onKeyDown: @handleKeyDown
-        disabled: !canComment || @state.posting
-      div
-        className: "#{bn}__footer"
-        div className: "#{bn}__footer-item #{bn}__footer-item--notice hidden-xs",
-          if canComment
-            trans 'comments.editor.textarea_hint._',
-              action: trans("comments.editor.textarea_hint.#{mode}")
-
-        if @props.close?
-          div className: "#{bn}__footer-item",
-            el BigButton,
-              disabled: @state.posting
-              modifiers: 'comment-editor'
-              props:
-                onClick: @props.close
-              text: trans('common.buttons.cancel')
-
-        if currentUser.id?
-          div className: "#{bn}__footer-item",
-            el BigButton,
-              disabled: @state.posting || !@isValid()
-              isBusy: @state.posting
-              modifiers: 'comment-editor'
-              props:
-                onClick: @post
-              text:
-                top:
-                  if @state.posting
-                    el Spinner, modifiers: 'center-inline'
-                  else
-                    @buttonText()
-        else
-          div className: "#{bn}__footer-item",
-            el BigButton,
-              extraClasses: ['js-user-link']
-              modifiers: 'comment-editor'
-              text: trans("comments.guest_button.#{mode}")
-
-
-  buttonText: =>
-    key =
-      switch @mode()
-        when 'reply' then 'reply'
-        when 'edit' then 'save'
-        when 'new' then 'post'
-
-    trans("common.buttons.#{key}")
-
-
-  canComment: =>
-    return false if !core.currentUser?
-
-    if @mode() in ['new', 'reply']
-      @props.commentableMeta.current_user_attributes? && !@props.commentableMeta.current_user_attributes?.can_new_comment_reason?
-    else
-      true
-
-
-  close: =>
-    return unless @props.close?
-
-    initialMessage = @props.message ? ''
-
-    return if initialMessage != @state.message && !confirm(trans('common.confirmation_unsaved'))
-
-    @props.close()
-
-
-  handleKeyDownCallback: (type, event) =>
-    switch type
-      when InputEventType.Cancel
-        @close()
-      when InputEventType.Submit
-        @post()
-
-
-  isValid: =>
-    @state.message? && @state.message.length > 0
-
-
-  mode: =>
-    if @props.parent?
-      'reply'
-    else if @props.id?
-      'edit'
-    else
-      'new'
-
-
-  onChange: (e) =>
-    @setState message: e.target.value
-
-
-  post: =>
-    return if @xhr?
-    return @props.close?() if @mode() == 'edit' && @state.message == @props.message
-
-    @setState posting: true
-
-    data = comment: message: @state.message
-
-    switch @mode()
-      when 'reply', 'new'
-        url = route 'comments.store'
-        method = 'POST'
-        data.comment.commentable_type = @props.commentableMeta.type
-        data.comment.commentable_id = @props.commentableMeta.id
-        data.comment.parent_id = @props.parent?.id
-
-        onDone = (data) =>
-          @setState message: ''
-          $.publish 'comments:new', data
-      when 'edit'
-        url = route 'comments.update', comment: @props.id
-        method = 'PUT'
-
-        onDone = (data) ->
-          $.publish 'comment:updated', data
-
-    @xhr = $.ajax url, {method, data}
-    .always =>
-      @setState posting: false
-    .done (data) =>
-      onDone(data)
-      @props.onPosted?(@mode())
-      @props.close?()
-    .fail onErrorWithCallback(@post)
-    .always =>
-      @xhr = null

resources/js/components/comment-editor.tsx

···
+// Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+import { CommentableMetaJson } from 'interfaces/comment-json';
+import { route } from 'laroute';
+import { action, computed, makeObservable, observable, runInAction } from 'mobx';
+import { observer } from 'mobx-react';
+import { Comment } from 'models/comment';
+import core from 'osu-core-singleton';
+import * as React from 'react';
+import TextareaAutosize from 'react-autosize-textarea';
+import { onErrorWithCallback } from 'utils/ajax';
+import { classWithModifiers, Modifiers } from 'utils/css';
+import { InputEventType, makeTextAreaHandler, TextAreaCallback } from 'utils/input-handler';
+import { trans } from 'utils/lang';
+import { switchNever } from 'utils/switch-never';
+import BigButton from './big-button';
+import { Spinner } from './spinner';
+import UserAvatar from './user-avatar';
+
+type Mode = 'edit' | 'new' | 'reply';
+
+interface CommentPostParams {
+  comment: {
+    commentable_id?: number;
+    commentable_type?: string;
+    message: string;
+    parent_id?: number;
+  };
+}
+
+interface Props {
+  close?: () => void;
+  commentableMeta?: CommentableMetaJson;
+  focus?: boolean;
+  id?: number;
+  message?: string;
+  modifiers?: Modifiers;
+  onPosted?: (mode: Mode) => void;
+  parent?: Comment;
+}
+
+const bn = 'comment-editor';
+
+const buttonTextKey: Record<Mode, string> = {
+  edit: 'save',
+  new: 'post',
+  reply: 'reply',
+};
+
+@observer
+export default class CommentEditor extends React.Component<Props> {
+  private readonly handleKeyDown;
+  @observable private message: string;
+  @observable private posting = false;
+  private readonly textarea = React.createRef<HTMLTextAreaElement>();
+  private xhr: JQuery.jqXHR<unknown> | null = null;
+
+  @computed
+  private get canComment() {
+    if (core.currentUser == null) return false;
+
+    return this.mode === 'edit' || this.canNewCommentReason == null;
+  }
+
+  private get canNewCommentReason() {
+    return this.props.commentableMeta == null
+      ? null
+      : 'current_user_attributes' in this.props.commentableMeta
+        ? this.props.commentableMeta.current_user_attributes.can_new_comment_reason
+        : trans('authorization.comment.store.disabled');
+  }
+
+  private get isValid() {
+    return this.message.length > 0;
+  }
+
+  private get initialMessage() {
+    return this.props.message ?? '';
+  }
+
+  @computed
+  private get mode() {
+    return this.props.parent != null
+      ? 'reply'
+      : this.props.id != null
+        ? 'edit'
+        : 'new';
+  }
+
+  @computed
+  private get placeholder() {
+    return this.canComment
+      ? trans(`comments.placeholder.${this.mode}`)
+      : (this.canNewCommentReason ?? undefined);
+  }
+
+  constructor(props: Props) {
+    super(props);
+
+    this.handleKeyDown = makeTextAreaHandler(this.handleKeyDownCallback);
+    this.message = this.initialMessage;
+
+    makeObservable(this);
+  }
+
+  componentDidMount() {
+    if ((this.props.focus ?? true) && this.textarea.current != null) {
+      this.textarea.current.selectionStart = -1;
+      this.textarea.current.focus();
+    }
+  }
+
+  componentWillUnmount() {
+    this.xhr?.abort();
+  }
+
+  render() {
+    const blockClass = classWithModifiers(bn, this.props.modifiers, { fancy: this.mode === 'new' });
+
+    return (
+      <div className={blockClass}>
+        {this.mode === 'new' &&
+          <div className={`${bn}__avatar`}>
+            <UserAvatar modifiers='full-circle' user={core.currentUser} />
+          </div>
+        }
+
+        <TextareaAutosize
+          ref={this.textarea}
+          className={`${bn}__message`}
+          disabled={!this.canComment || this.posting}
+          onChange={this.onChange}
+          onKeyDown={this.handleKeyDown}
+          placeholder={this.placeholder}
+          value={this.message}
+        />
+        <div className={`${bn}__footer`}>
+          <div className={`${bn}__footer-item ${bn}__footer-item--notice hidden-xs`}>
+            {this.canComment && trans('comments.editor.textarea_hint._', {
+              action: trans(`comments.editor.textarea_hint.${this.mode}`),
+            })}
+          </div>
+
+          {this.props.close != null &&
+            <div className={`${bn}__footer-item`}>
+              <BigButton
+                disabled={this.posting}
+                modifiers='comment-editor'
+                props={{ onClick: this.props.close }}
+                text={trans('common.buttons.cancel')}
+              />
+            </div>
+          }
+
+          {core.currentUser != null
+            ? (
+              <div className={`${bn}__footer-item`}>
+                <BigButton
+                  disabled={this.posting || !this.isValid}
+                  isBusy={this.posting}
+                  modifiers='comment-editor'
+                  props={{ onClick: this.post }}
+                  text={{
+                    top: this.posting
+                      ? <Spinner modifiers='center-inline' />
+                      : trans(`common.buttons.${buttonTextKey[this.mode]}`),
+                  }}
+                />
+              </div>
+            ) : (
+              <div className={`${bn}__footer-item`}>
+                <BigButton
+                  extraClasses={['js-user-link']}
+                  modifiers='comment-editor'
+                  text={trans(`comments.guest_button.${this.mode}`)}
+                />
+              </div>
+            )
+          }
+        </div>
+      </div>
+    );
+  }
+
+  private readonly close = () => {
+    if (this.props.close == null) return;
+
+    if (this.initialMessage !== this.message && !confirm(trans('common.confirmation_unsaved'))) return;
+
+    this.props.close();
+  };
+
+  private readonly handleKeyDownCallback: TextAreaCallback = (type) => {
+    if (type === InputEventType.Cancel) {
+      this.close();
+    } else if (type === InputEventType.Submit) {
+      this.post();
+    }
+  };
+
+  @action
+  private readonly onChange = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+    this.message = e.currentTarget.value;
+  };
+
+  private readonly post = () => {
+    if (this.posting) return;
+
+    if (this.mode === 'edit' && this.message === (this.props.message ?? '')) {
+      this.props.close?.();
+
+      return;
+    }
+
+    this.posting = true;
+    const params: CommentPostParams = {
+      comment: { message: this.message },
+    };
+
+    let url = route('comments.store');
+    let method = 'POST';
+    let resetMessage = true;
+    let publishEvent = 'comments:new';
+
+    switch (this.mode) {
+      case 'edit':
+        if (this.props.id == null) {
+          throw new Error('missing post id in edit mode');
+        }
+        url = route('comments.update', { comment: this.props.id });
+        method = 'PUT';
+        resetMessage = false;
+        publishEvent = 'comment:updated';
+        break;
+
+      case 'new':
+        if (this.props.commentableMeta == null || !('id' in this.props.commentableMeta)) {
+          throw new Error('missing commentable meta in new mode');
+        }
+        params.comment.commentable_type = this.props.commentableMeta.type;
+        params.comment.commentable_id = this.props.commentableMeta.id;
+        break;
+
+      case 'reply':
+        if (this.props.parent == null) {
+          throw new Error('missing parent in reply mode');
+        }
+        params.comment.parent_id = this.props.parent.id;
+        break;
+
+      default:
+        switchNever(this.mode);
+    }
+
+    this.xhr = $.ajax(url, { data: params, method });
+    this.xhr
+      .always(action(() => {
+        this.posting = false;
+      })).done((data) => runInAction(() => {
+        if (resetMessage) {
+          this.message = '';
+        }
+        $.publish(publishEvent, data);
+        this.props.onPosted?.(this.mode);
+        this.props.close?.();
+      })).fail(onErrorWithCallback(this.post));
+  };
+}

resources/js/components/comment.coffee

···
 import { createClickCallback, formatNumberSuffixed } from 'utils/html'
 import { trans, transChoice } from 'utils/lang'
 import ClickToCopy from './click-to-copy'
-import { CommentEditor } from './comment-editor'
+import CommentEditor from './comment-editor'
 import CommentShowMore from './comment-show-more'
 import DeletedCommentsCount from './deleted-comments-count'
 import { ReportReportable } from './report-reportable'
···
       onClick: @voteToggle
       disabled: @state.postingVote || !@props.comment.canVote
       span className: 'comment-vote__text',
-        "+#{formatNumberSuffixed(@props.comment.votesCount, null, maximumFractionDigits: 1)}"
+        "+#{formatNumberSuffixed(@props.comment.votesCount)}"
       if @state.postingVote
         span className: 'comment-vote__spinner', el Spinner
       hover

resources/js/components/comments.coffee

···
 import { formatNumber } from 'utils/html'
 import { trans } from 'utils/lang'
 import { Comment } from './comment'
-import { CommentEditor } from './comment-editor'
+import CommentEditor from './comment-editor'
 import CommentShowMore from './comment-show-more'
 import { CommentsSort } from './comments-sort'
 import DeletedCommentsCount from './deleted-comments-count'

resources/js/components/report-form.tsx

···
   @observable private selectedReason = this.options[0];
   private timeout: number | undefined;
 
+  private get canSubmit() {
+    return !this.disabled && this.comments.length > 0;
+  }
+
   private get groupKey() {
     return reportableTypeToGroupKey[this.props.reportableType];
   }
···
         <div className={`${bn}__row ${bn}__row--buttons`}>
           <button
             className={`${bn}__button ${bn}__button--report`}
-            disabled={this.disabled || this.comments.length === 0}
+            disabled={!this.canSubmit}
             onClick={this.handleSubmit}
             type='button'
           >

resources/js/core-legacy/forum-topic-reply.coffee

···
     $input = @$input()
 
     currentInput = $input.val()
-    data = "#{currentInput}\n\n#{data}" if currentInput
+    data = "#{currentInput}\n#{data}" if currentInput
 
     $input.val(data).trigger('input')
     $input[0].selectionStart = data.length

resources/js/interfaces/user-preferences-json.ts

···
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-import { BeatmapsetCardSize } from 'components/beatmapset-panel';
+import { BeatmapsetCardSize } from 'beatmapset-panel';
 import { ViewMode } from 'components/user-card';
 import { Filter, SortMode } from 'components/user-list';
 

resources/js/modding-profile/discussions.tsx

···
           discussion={discussion}
           isTimelineVisible={false}
           preview
+          readonly
           showDeleted
           users={this.props.users}
         />

resources/js/modding-profile/main.coffee

···
   componentDidMount: =>
     $.subscribe "user:update.#{@eventId}", @userUpdate
     $.subscribe "profile:page:jump.#{@eventId}", @pageJump
-    $.subscribe "beatmapsetDiscussions:update.#{@eventId}", @discussionUpdate
-    $(document).on "ajax:success.#{@eventId}", '.js-beatmapset-discussion-update', @ujsDiscussionUpdate
     $(window).on "scroll.#{@eventId}", @pageScan
 
     pageChange()
···
   componentWillUnmount: =>
     $.unsubscribe ".#{@eventId}"
     $(window).off ".#{@eventId}"
-    $(document).off ".#{@eventId}"
 
     $(window).stop()
     Timeout.clear @modeScrollTimeout
     @disposers.forEach (disposer) => disposer?()
-
-
-  discussionUpdate: (_e, options) =>
-    {beatmapset} = options
-    return unless beatmapset?
-
-    discussions = @state.discussions
-    posts = @state.posts
-    users = @state.users
-
-    discussionIds = _.map discussions, 'id'
-    postIds = _.map posts, 'id'
-    userIds = _.map users, 'id'
-
-    # Due to the entire hierarchy of discussions being sent back when a post is updated (instead of just the modified post),
-    #   we need to iterate over each discussion and their posts to extract the updates we want.
-    _.each beatmapset.discussions, (newDiscussion) ->
-      if discussionIds.includes(newDiscussion.id)
-        discussion = _.find discussions, id: newDiscussion.id
-        discussions = _.reject discussions, id: newDiscussion.id
-        newDiscussion = _.merge(discussion, newDiscussion)
-
-      newDiscussion.starting_post = newDiscussion.posts[0]
-      discussions.push(newDiscussion)
-
-      _.each newDiscussion.posts, (newPost) ->
-        if postIds.includes(newPost.id)
-          post = _.find posts, id: newPost.id
-          posts = _.reject posts, id: newPost.id
-          posts.push(_.merge(post, newPost))
-
-    _.each beatmapset.related_users, (newUser) ->
-      if userIds.includes(newUser.id)
-        users = _.reject users, id: newUser.id
-
-      users.push(newUser)
-
-    @cache.users = @cache.discussions = @cache.userDiscussions = @cache.beatmaps = @cache.beatmapsets = null
-    @setState
-      discussions: _.reverse(_.sortBy(discussions, (d) -> Date.parse(d.starting_post.created_at)))
-      posts: _.reverse(_.sortBy(posts, (p) -> Date.parse(p.created_at)))
-      users: users
 
 
   discussions: =>
···
       @cache.userDiscussions = _.filter @state.discussions, (d) => d.user_id == @state.user.id
 
     @cache.userDiscussions
-
-
-  ujsDiscussionUpdate: (_e, data) =>
-    # to allow ajax:complete to be run
-    Timeout.set 0, => @discussionUpdate(null, beatmapset: data)

resources/js/modding-profile/posts.coffee

···
                       users: @props.users
                       user: @props.users[post.user_id]
                       read: true
+                      readonly: true
                       lastEditor: @props.users[post.last_editor_id] ? @props.users[null] if post.last_editor_id?
-                      # FIXME: These permissions are more restrictive than the correct ones in discussion
-                      # because they don't have the right data to check.
-                      canBeEdited: currentUser.is_admin
-                      canBeDeleted: canModerate
-                      canBeRestored: canModerate
                       currentUser: currentUser
             a
               key: 'show-more'

resources/js/notifications-index/main.tsx

···
     }));
   }
 
+  private get type() {
+    return this.controller.type;
+  }
+
   constructor(props: Record<string, never>, context: NotificationContextData) {
     super(props);
 
···
 
         <div className='osu-page osu-page--generic-compact'>
           <div className='notification-index'>
-            <div className='notification-index__actions'>
-              {this.renderMarkAsReadButton()}
-              {this.renderDeleteButton()}
-            </div>
+            {!this.type.isEmpty &&
+              <div className='notification-index__actions'>
+                {this.renderMarkAsReadButton()}
+                {this.renderDeleteButton()}
+              </div>
+            }
 
             {this.renderLegacyPm()}
 
-            <div className='notification-stacks'>
-              {this.renderStacks()}
-              {this.renderShowMore()}
-            </div>
+            {this.type.isEmpty
+              ? this.type.isLoading
+                ? null
+                : trans('notifications.none')
+              : this.renderStacks()
+            }
+
+            {this.renderShowMore()}
           </div>
         </div>
       </div>
···
   }
 
   renderShowMore() {
-    const type = this.controller.type;
-
     return (
       <ShowMoreLink
         callback={this.handleShowMore}
-        hasMore={type?.hasMore}
-        loading={type?.isLoading}
-        modifiers={['notification-group', 'notification-list']}
+        hasMore={this.type.hasMore}
+        loading={this.type.isLoading}
+        modifiers='notification-group'
       />
     );
   }
 
   renderStacks() {
-    const nodes: React.ReactNode[] = [];
-    for (const stack of this.controller.stacks) {
-      nodes.push(<Stack key={stack.id} stack={stack} />);
-    }
-
-    return nodes;
+    return (
+      <div className='notification-stacks'>
+        {this.controller.stacks.map((stack) => (
+          <Stack key={stack.id} stack={stack} />
+        ))}
+      </div>
+    );
   }
 
   private handleDelete = () => {
-    this.controller.type.delete();
+    this.type.delete();
   };
 
   private handleLinkClick = (event: React.MouseEvent<HTMLAnchorElement>) => {
···
   };
 
   private renderDeleteButton() {
-    const type = this.controller.type;
-
-    if (type.isEmpty) return null;
-
     return (
       <NotificationDeleteButton
-        isDeleting={type.isDeleting}
+        isDeleting={this.type.isDeleting}
         onDelete={this.handleDelete}
-        text={trans('notifications.delete', { type: trans(`notifications.action_type.${type.name ?? '_'}`) })}
+        text={trans('notifications.delete', { type: trans(`notifications.action_type.${this.type.name ?? '_'}`) })}
       />
     );
   }
 
   private renderMarkAsReadButton() {
-    const type = this.controller.type;
-
-    if (type.isEmpty) return null;
-
     return (
       <NotificationReadButton
-        isMarkingAsRead={type.isMarkingAsRead}
+        isMarkingAsRead={this.type.isMarkingAsRead}
         onMarkAsRead={this.handleMarkAsRead}
-        text={trans('notifications.mark_read', { type: trans(`notifications.action_type.${type.name ?? '_'}`) })}
+        text={trans('notifications.mark_read', { type: trans(`notifications.action_type.${this.type.name ?? '_'}`) })}
       />
     );
   }

resources/js/profile-page/beatmapsets.tsx

···
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-import BeatmapsetPanel from 'components/beatmapset-panel';
+import BeatmapsetPanel from 'beatmapset-panel';
 import LazyLoad from 'components/lazy-load';
 import ProfilePageExtraSectionTitle from 'components/profile-page-extra-section-title';
 import ShowMoreLink from 'components/show-more-link';

resources/js/profile-page/detail-bar.tsx

···
           userId={this.props.user.id}
         />
 
-        {this.renderNonBotButtons()}
+        {this.props.user.is_bot ? this.renderMessageButton() : this.renderNonBotButtons()}
       </div>
     );
   }
 
-  private renderNonBotButtons() {
-    if (this.props.user.is_bot) return null;
+  private renderMessageButton() {
+    if (!this.showMessageButton) return null;
 
     return (
+      // extra div to allow using same user-action-button--profile-page
+      // like other buttons without resorting to additional styling
+      <div>
+        <a
+          className='user-action-button user-action-button--profile-page'
+          href={route('messages.users.show', { user: this.props.user.id })}
+          title={trans('users.card.send_message')}
+        >
+          <i className='fas fa-envelope' />
+        </a>
+      </div>
+    );
+  }
+
+  private renderNonBotButtons() {
+    return (
       <>
         <FollowUserMappingButton
           alwaysVisible
···
           userId={this.props.user.id}
         />
 
-        {this.showMessageButton &&
-          // extra div to allow using same user-action-button--profile-page
-          // like other buttons without resorting to additional styling
-          <div>
-            <a
-              className='user-action-button user-action-button--profile-page'
-              href={route('messages.users.show', { user: this.props.user.id })}
-              title={trans('users.card.send_message')}
-            >
-              <i className='fas fa-envelope' />
-            </a>
-          </div>
-        }
+        {this.renderMessageButton()}
 
         {showExtraMenu(this.props.user) && <ExtraMenu user={this.props.user} />}
 

resources/js/profile-page/main.tsx

···
   }
 
   private get stickyHeaderOffset() {
-    return core.windowSize.isDesktop
-      ? core.stickyHeader.headerHeight + (this.pagesOffset?.getBoundingClientRect().height ?? 0)
-      : core.stickyHeader.headerHeight;
+    return core.stickyHeader.headerHeight + (this.pagesOffset?.getBoundingClientRect().height ?? 0);
   }
 
   constructor(props: Props) {
···
             <Detail controller={this.controller} />
           </div>
 
-          <div ref={this.pagesOffsetRef} className='hidden-xs page-extra-tabs'>
+          <div ref={this.pagesOffsetRef} className='page-extra-tabs'>
             {this.displayExtraTabs &&
               <div ref={this.tabs} className='page-mode page-mode--profile-page-extra'>
                 {this.displayedExtraPages.map((m) => (

resources/js/profile-page/parse-event.tsx

···
 // See the LICENCE file in the repository root for full licence text.
 
 import EventJson from 'interfaces/event-json';
+import core from 'osu-core-singleton';
 import * as React from 'react';
 import { Modifiers } from 'utils/css';
 import { trans } from 'utils/lang';
···
         },
       };
 
-    case 'beatmapsetDelete':
+    case 'beatmapsetDelete': {
+      const canView = core.currentUser != null && (core.currentUser.is_bng || core.currentUser.is_moderator);
+
       return {
         badge: <span className='far fa-trash-alt' />,
         iconModifiers: 'danger',
         mappings: {
-          beatmapset: event.beatmapset.title,
+          beatmapset: canView
+            ? <a href={event.beatmapset.url}>{event.beatmapset.title}</a>
+            : event.beatmapset.title,
         },
       };
+    }
 
     case 'beatmapsetRevive':
       return {

resources/js/register-components.tsx

···
 // Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
+import BeatmapsetPanel, { Props as BeatmapsetPanelProps } from 'beatmapset-panel';
 import BeatmapsetEvents, { Props as BeatmapsetEventsProps } from 'components/beatmapset-events';
-import BeatmapsetPanel, { Props as BeatmapsetPanelProps } from 'components/beatmapset-panel';
 import BlockButton from 'components/block-button';
 import ChatIcon from 'components/chat-icon';
 import { Comments } from 'components/comments';

resources/js/utils/html.ts

···
 
 const byteSuffixes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
 const kilo = 1000;
-const numberSuffixes = ['', 'k', 'm', 'b', 't'];
 
 export function bottomPage() {
   return bottomPageDistance() === 0;
···
   return num.toLocaleString(locale ?? window.currentLocale, options);
 }
 
-export function formatNumberSuffixed(num?: number, precision?: number, options?: Intl.NumberFormatOptions) {
-  if (num == null) return;
-
-  const format = (n: number) => {
-    options ??= {};
-
-    if (precision != null) {
-      options.minimumFractionDigits = precision;
-      options.maximumFractionDigits = precision;
-    }
-
-    return n.toLocaleString('en', options);
-  };
-
-  if (num < kilo) return format(num);
-
-  const i = Math.min(numberSuffixes.length - 1, Math.floor(Math.log(num) / Math.log(kilo)));
+const defaultSuffixedNumberOptions = {
+  maximumFractionDigits: 1,
+  minimumFractionDigits: 0,
+  notation: 'compact',
+} as const;
+const defaultSuffixedNumberFormatter = new Intl.NumberFormat(window.currentLocale, defaultSuffixedNumberOptions);
 
-  return `${format(num / Math.pow(kilo, i))}${numberSuffixes[i]}`;
+export function formatNumberSuffixed(num?: number) {
+  return num == null
+    ? undefined
+    : defaultSuffixedNumberFormatter.format(num);
 }
 
 export function htmlElementOrNull(thing: unknown) {

resources/lang/ar/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'مجموعات خرائط محزومة-مسبقا مبنية على اساس موضوع مشهور.',
+        'empty' => '',
         'nav_title' => 'القائمة',
         'title' => 'حُزَم الخرائِط',
 

resources/lang/ar/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'هذه الخريطة مقدرة بأن تصبح Ranked في :date إذا لم يتم العثور على أي مشاكل. انها#:position في :queue.',
+            'on' => '',
             'queue' => 'قائمة انتظار الترتيب',
             'soon' => 'قريبًا',
         ],

resources/lang/be/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Папярэднія запакаваныя калекцыі бітмап, створаныя на агульных тэмах.',
+        'empty' => '',
         'nav_title' => 'спіс',
         'title' => 'Пакет бітмап',
 

resources/lang/be/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Гэтая карта cможа маць рэйтынг :date, калі праблем не знойдзена. Гэта #:position у :queue.',
+            'on' => '',
             'queue' => 'чаргу ў рэйтынг',
             'soon' => 'хутка',
         ],

resources/lang/bg/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'Този бийтмап е заключен за дискусии.',
 
         'metadata' => [
             'nominated' => 'Не може да се променят метаданните на номиниран бийтмап. Свържете се с номинатор или NAT член ако смятате, че са зададени грешно.',

resources/lang/bg/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Предварително пакетирани колекции от бийтмапове, базирани на обща тема.',
+        'empty' => '',
         'nav_title' => 'пакети',
         'title' => 'Бийтмап пакети',
 
···
     'mode' => [
         'artist' => 'Автор / Албум',
         'chart' => 'Под прожекторите',
-        'featured' => '',
+        'featured' => 'Представени автори',
         'standard' => 'Стандартни',
         'theme' => 'Тема',
     ],

resources/lang/bg/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Този бийтмап ще бъде класиран на :date ако не открием проблеми. Той е #:position на :queue.',
+            'on' => '',
             'queue' => 'опашката',
             'soon' => 'скоро',
         ],

resources/lang/bg/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Форуми',
         'latest_post' => 'Последна публикация',
 
         'index' => [
···
         'confirm_restore' => 'Наистина ли искате да възстановите публикацията?',
         'edited' => 'Последно редактирано от :user :when, общо :count_delimited път.|Последно редактирано от :user :when, общо :count_delimited пъти.',
         'posted_at' => 'публикувано :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'публикувано от :username в :forum',
 
         'actions' => [
             'destroy' => 'Изтриване на публикация',

resources/lang/bg/notifications.php

···
     'verifying' => 'Моля, потвърдете сесията, за преглед на известия',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => 'всички',
+        'beatmapset' => 'бийтмапове',
+        'build' => 'промени',
+        'channel' => 'чат',
+        'forum_topic' => 'форум',
+        'news_post' => 'новини',
+        'user' => 'профил',
     ],
 
     'filters' => [

resources/lang/bg/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Създадена',
         'feature_votes' => 'Приоритет по звезди',
         'new' => 'Последен отговор',
     ],

resources/lang/ca-ES/beatmappacks.php resources/lang/ca/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Col·leccions preempaquetades de beatmaps basades en un tema comú.',
+        'empty' => '',
         'nav_title' => 'llistat',
         'title' => 'Paquets de beatmaps',
 

resources/lang/ca-ES/beatmaps.php resources/lang/ca/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'S\'estima que aquest mapa es classificarà en :date si no es troben problemes. És el número :position a la :queue.',
+            'on' => '',
             'queue' => 'cua de classificació',
             'soon' => 'aviat',
         ],

resources/lang/cs/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Kolekce beatmap s podobnou tématikou.',
+        'empty' => '',
         'nav_title' => 'seznam',
         'title' => 'Balíčky beatmap',
 

resources/lang/cs/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Odhaduje se, že tato mapa bude schválena :date, pokud nejsou nalezeny žádné problémy. Aktuálně je #:position ve :queue.',
+            'on' => '',
             'queue' => 'frontě schválení',
             'soon' => 'brzy',
         ],

resources/lang/cs/notifications.php

···
 
     'action_type' => [
         '_' => '',
-        'beatmapset' => '',
+        'beatmapset' => 'beatmapy',
         'build' => '',
         'channel' => '',
         'forum_topic' => '',
         'news_post' => '',
-        'user' => '',
+        'user' => 'profil',
     ],
 
     'filters' => [

resources/lang/da/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Færdigpakkede samlinger af beatmaps bygget op omkring et fælles tema.',
+        'empty' => '',
         'nav_title' => 'katalog',
         'title' => 'Beatmap Pakker',
 

resources/lang/da/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Dette kort anslås at være rangeret :date , hvis ingen problemer findes. Det er #:position i :queue.',
+            'on' => '',
             'queue' => 'rangering kø',
             'soon' => 'snart',
         ],

resources/lang/de/accounts.php

···
 return [
     'edit' => [
         'title_compact' => 'Einstellungen',
-        'username' => 'benutzername',
+        'username' => 'Benutzername',
 
         'avatar' => [
             'title' => 'Avatar',
···
         ],
 
         'email' => [
-            'new' => 'neue e-mail',
+            'new' => 'Neue E-Mail',
             'new_confirmation' => 'E-Mail bestätigen',
             'title' => 'E-Mail',
         ],
···
         'password' => [
             'current' => 'Aktuelles Passwort',
             'new' => 'neues passwort',
-            'new_confirmation' => 'Passwort bestätigen',
+            'new_confirmation' => 'passwort bestätigen',
             'title' => 'Passwort',
         ],
 
···
 
             'user' => [
                 'user_discord' => '',
-                'user_from' => 'aktueller standort',
+                'user_from' => 'Aktueller Standort',
                 'user_interests' => 'Interessen',
                 'user_occ' => 'Beschäftigung',
                 'user_twitter' => '',
-                'user_website' => 'Webseite',
+                'user_website' => 'webseite',
             ],
         ],
 
···
             '_' => 'Bevorzugter Betmap-Download Typ',
             'all' => 'mit Video, falls verfügbar',
             'direct' => 'in osu!direct öffnen',
-            'no_video' => 'ohne Video',
+            'no_video' => 'ohne video',
         ],
     ],
 

resources/lang/de/artist.php

···
     ],
 
     'index' => [
-        'description' => 'Featured Artists sind Künstler, mit denen wir zusammenarbeiten, um neue und einzigartige Musik für osu! zur Verfügung zu stellen. Ihrer Lieder wurden vom osu!-Team handverlesen, weil sie großartige Werke sind und sich wunderbar für das Mapping eignen. Einige dieser Lieder wurden sogar exklusiv für osu! geschaffen.<br><br>Für alle Lieder steht eine Vorlage mit fertigem Timing als .osz Datei zum Download bereit. Außerdem sind sie offiziell für die Verwendung in osu! und für dazu in Bezug stehenden Inhalten lizenziert.',
+        'description' => 'Featured Artists sind Künstler, mit denen wir zusammenarbeiten, um neue und einzigartige Musik für osu! zur Verfügung zu stellen. Ihre Lieder wurden vom osu!-Team handverlesen, weil sie großartige Werke sind und sich wunderbar für das Mapping eignen. Einige dieser Lieder wurden sogar exklusiv für osu! geschaffen.<br><br>Für alle Lieder steht eine Vorlage mit fertigem Timing als .osz-Datei zum Download bereit. Außerdem sind sie offiziell für die Verwendung in osu! und für dazu in Bezug stehenden Inhalten lizenziert.',
     ],
 
     'links' => [
···
 
     'songs' => [
         '_' => 'Songs',
-        'count' => ':count_delimited Songs|:count_delimited Songs',
+        'count' => ':count_delimited Song|:count_delimited Songs',
         'original' => 'osu! original',
         'original_badge' => 'ORIGINAL',
     ],

resources/lang/de/authorization.php

···
             'exhausted' => 'Dein Nominierungslimit für heute wurde erreicht, bitte versuche es morgen erneut.',
             'incorrect_state' => 'Beim Ausführen dieser Aktion ist ein Fehler aufgetreten. Bitte Seite neu laden.',
             'owner' => "Eigene Beatmaps können nicht nominiert werden.",
-            'set_metadata' => 'Du musst den Genre und die Sprache einstellen, bevor nominiert werden kann.',
+            'set_metadata' => 'Vor der Nominierung müssen Genre und Sprache festgelegt werden.',
         ],
         'resolve' => [
             'not_owner' => 'Nur der Thread- oder Beatmapersteller kann die Diskussion für gelöst erklären.',
···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'Diese Beatmap-Diskussion ist gesperrt.',
 
         'metadata' => [
             'nominated' => 'Du kannst die Metadaten einer nominierten Map nicht ändern. Wenn du glaubst, dass sie falsch sind, wende dich an ein BN- oder NAT-Mitglied.',

resources/lang/de/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Fertig gepackte Sammlungen an Beatmaps, die auf einem gemeinsamen Thema basieren.',
+        'empty' => '',
         'nav_title' => 'Liste',
         'title' => 'Beatmap-Packs',
 
···
     'mode' => [
         'artist' => 'Künstler/Album',
         'chart' => 'Spotlights',
-        'featured' => '',
+        'featured' => 'Featured Artist',
         'standard' => 'Standard',
         'theme' => 'Thema',
     ],

resources/lang/de/beatmaps.php

···
     ],
 
     'discussions' => [
-        'allow_kudosu' => 'kudosu erlauben',
+        'allow_kudosu' => 'Kudosu erlauben',
         'beatmap_information' => 'Beatmap-Seite',
         'delete' => 'löschen',
         'deleted' => 'Von :editor gelöscht (:delete_time).',
-        'deny_kudosu' => 'kudosu verweigern',
+        'deny_kudosu' => 'Kudosu ablehnen',
         'edit' => 'bearbeiten',
         'edited' => 'Zuletzt bearbeitet von :editor (:update_time).',
-        'guest' => 'Gästeschwierigkeit von :user',
-        'kudosu_denied' => 'Dir wurde kudosu verweigert.',
-        'message_placeholder_deleted_beatmap' => 'Diese Schwierigkeitsstufe wurde gelöscht und kann nicht mehr diskutiert werden.',
+        'guest' => 'Guest-Difficulty von :user',
+        'kudosu_denied' => 'Kudosu-Annahme abgelehnt.',
+        'message_placeholder_deleted_beatmap' => 'Diese Difficulty wurde gelöscht und kann nicht mehr diskutiert werden.',
         'message_placeholder_locked' => 'Die Diskussion für diese Beatmap wurde deaktiviert.',
-        'message_placeholder_silenced' => "Posten der Diskussion nicht möglich, während du stummgeschaltet bist.",
-        'message_type_select' => 'Kommentartyp auswählen',
+        'message_placeholder_silenced' => "Posten in der Diskussion nicht möglich, während du stummgeschaltet bist.",
+        'message_type_select' => 'Bemerkungs-Art auswählen',
         'reply_notice' => 'Zum Antworten Enter drücken.',
         'reply_placeholder' => 'Antwort hier eingeben',
-        'require-login' => 'Zum Beitragen oder Antworten bitte einloggen',
+        'require-login' => 'Zum Posten oder Antworten bitte einloggen',
         'resolved' => 'Gelöst',
         'restore' => 'wiederherstellen',
         'show_deleted' => 'Gelöschte anzeigen',
···
 
         'empty' => [
             'empty' => 'Es gibt noch keine Diskussionen!',
-            'hidden' => 'Keine Diskussion entspricht dem ausgewählten Filter.',
+            'hidden' => 'Keine Diskussion passt zum ausgewählten Filter.',
         ],
 
         'lock' => [
···
 
             'prompt' => [
                 'lock' => 'Grund für die Sperrung',
-                'unlock' => 'Willst du wirklich freigeben?',
+                'unlock' => 'Willst du das wirklich entsperren?',
             ],
         ],
 
         'message_hint' => [
-            'in_general' => 'Dieser Beitrag wird den generellen Beatmapdiskussionen hinzugefügt. Um diese Beatmap zu modden, beginne die Nachricht mit einem Zeitstempel (z.B. 00:12:345).',
-            'in_timeline' => 'Um an mehreren Zeitpunkten zu modden, musst du mehrere Beiträge erstellen (ein Beitrag pro Timestamp).',
+            'in_general' => 'Dieser Post wird zu den generellen Beatmap-Diskussionen hinzugefügt. Beginne die Nachricht mit einem Zeitstempel (z.B. 00:12:345), um diese Beatmap zu modden.',
+            'in_timeline' => 'Du musst mehrere Posts erstellen, um an mehreren Zeitstempeln zu modden (ein Post pro Zeitstempel).',
         ],
 
         'message_placeholder' => [
-            'general' => 'Hier tippen um auf General zu posten (:version)',
-            'generalAll' => 'Hier tippen um auf General zu posten (Alle Schwierigkeitsstufen)',
-            'review' => 'Tippe hier, um eine Rezension zu posten',
-            'timeline' => 'Hier tippen um auf die Timeline zu posten (:version)',
+            'general' => 'Hier schreiben, um in General zu posten (:version)',
+            'generalAll' => 'Hier schreiben, um in General zu posten (Alle Difficulties)',
+            'review' => 'Hier schreiben, um eine Kurzfassung zu posten',
+            'timeline' => 'Hier schreiben, um in der Timeline zu posten (:version)',
         ],
 
         'message_type' => [
···
             'praise' => 'Lob',
             'problem' => 'Problem',
             'problem_warning' => 'Problem melden',
-            'review' => 'Bewertung',
+            'review' => 'Kurzfassung',
             'suggestion' => 'Vorschlag',
         ],
 
         'mode' => [
             'events' => 'Verlauf',
             'general' => 'Allgemein :scope',
-            'reviews' => 'Rezensionen',
+            'reviews' => 'Überblick',
             'timeline' => 'Timeline',
             'scopes' => [
-                'general' => 'Diese Schwierigkeitsstufe',
-                'generalAll' => 'Alle Schwierigkeitsstufen',
+                'general' => 'Diese Difficulty',
+                'generalAll' => 'Alle Difficulties',
             ],
         ],
 
         'new' => [
             'pin' => 'Anheften',
-            'timestamp' => 'Timestamp',
-            'timestamp_missing' => 'Strg-C im Editor und in deine Nachricht einfügen, um eine Timestamp hinzuzufügen!',
+            'timestamp' => 'Zeitstempel',
+            'timestamp_missing' => 'Drücke Strg+C im Editor und füge es in deine Nachricht ein, um einen Zeitstempel hinzuzufügen!',
             'title' => 'Neue Diskussion',
-            'unpin' => 'Lösen',
+            'unpin' => 'Aufheben',
         ],
 
         'review' => [
-            'new' => 'Neue Rezension',
+            'new' => 'Neue Kurzfassung',
             'embed' => [
                 'delete' => 'Löschen',
                 'missing' => '[DISKUSSION GELÖSCHT]',
···
             'insert-block' => [
                 'paragraph' => 'absatz einfügen',
                 'praise' => 'lob einfügen',
-                'problem' => 'problem einfügen',
-                'suggestion' => 'vorschlag einfügen',
+                'problem' => 'Problem einfügen',
+                'suggestion' => 'Vorschlag einfügen',
             ],
         ],
 
         'show' => [
-            'title' => ':title, erstellt von :mapper',
+            'title' => ':title erstellt von :mapper',
         ],
 
         'sort' => [
···
 
         'status-messages' => [
             'approved' => 'Diese Beatmap wurde am :date approved!',
-            'graveyard' => "Diese Beatmap wurde seit dem :date nicht mehr aktualisiert und deshalb begraben...",
+            'graveyard' => "Diese Beatmap wurde seit dem :date nicht mehr aktualisiert und wurde wahrscheinlich vom Ersteller aufgegeben...",
             'loved' => 'Diese Beatmap wurde am :date loved!',
             'ranked' => 'Diese Beatmap wurde am :date ranked!',
-            'wip' => 'Anmerkung: Diese Beatmap ist vom Ersteller als \'Work-In-Progress\' gekennzeichnet',
+            'wip' => 'Anmerkung: Diese Beatmap wurde vom Ersteller als Work-In-Progress gekennzeichnet.',
         ],
 
         'votes' => [
···
 
     'hype' => [
         'button' => 'Beatmap hypen!',
-        'button_done' => 'Schon gehypt!',
+        'button_done' => 'Schon gehyped!',
         'confirm' => "Sicher? Dies wird eins deiner letzten :n Hypes verwenden und kann nicht rückgängig gemacht werden.",
         'explanation' => 'Hype diese Beatmap, um sie für Nominierungen und Ranking sichtbarer zu machen!',
-        'explanation_guest' => 'Einloggen und diese Beatmap hypen, um sie für Nominierungen und ranked sichtbarer zu machen!',
+        'explanation_guest' => 'Logge dich ein und hype diese Beatmap, um sie für Nominierungen und Ranking sichtbarer zu machen!',
         'new_time' => "Um :new_time wirst du deinen nächsten Hype erhalten.",
         'remaining' => 'Du hast noch :remaining Hypes übrig.',
         'required_text' => 'Hype: :current/:required',
-        'section_title' => 'Hype Train',
+        'section_title' => 'Hype-Train',
         'title' => 'Hype',
     ],
 
···
 
     'nominations' => [
         'delete' => 'Löschen',
-        'delete_own_confirm' => 'Bist du sicher? Die Beatmap wird gelöscht und du wirst auf dein Profil zurückgeleitet.',
-        'delete_other_confirm' => 'Bist du sicher? Die Beatmap wird gelöscht und du wirst auf das Profil zurückgeleitet.',
+        'delete_own_confirm' => 'Bist du sicher? Die Beatmap wird gelöscht und du wirst auf dein Profil weitergeleitet.',
+        'delete_other_confirm' => 'Bist du sicher? Die Beatmap wird gelöscht und du wirst auf das Profil weitergeleitet.',
         'disqualification_prompt' => 'Grund für die Disqualifizierung?',
         'disqualified_at' => 'Disqualifiziert :time_ago (:reason).',
-        'disqualified_no_reason' => 'kein grund angegeben',
+        'disqualified_no_reason' => 'keinen Grund angegeben',
         'disqualify' => 'Disqualifizieren',
         'incorrect_state' => 'Ein Fehler ist aufgetreten, versuche die Seite zu aktualisieren.',
-        'love' => 'Liebe',
-        'love_choose' => 'Schwierigkeitsstufe für Loved wählen',
+        'love' => 'Love',
+        'love_choose' => 'Difficulty für Loved wählen',
         'love_confirm' => 'Liebst du diese Beatmap?',
         'nominate' => 'Nominieren',
         'nominate_confirm' => 'Diese Beatmap nominieren?',
···
         'unresolved_issues' => 'Es existieren noch Vorschläge/Probleme, die gelöst werden müssen.',
 
         'rank_estimate' => [
-            '_' => 'Diese Map wird voraussichtlich (am) :date ranked. Sie befindet sich aktuell an Position :position der :queue.',
+            '_' => 'Diese Map wird voraussichtlich am :date ranked. Sie befindet sich aktuell an Position :position der :queue.',
+            'on' => '',
             'queue' => 'Warteschlange',
             'soon' => 'bald',
         ],
 
         'reset_at' => [
             'nomination_reset' => 'Nominierungsprozess zurückgesetzt vor :time_ago von :user mit dem Problem :discussion (:message).',
-            'disqualify' => 'Disqualifiziert :time_ago von :user mit der Erstellung des Problems :discussion (:message).',
+            'disqualify' => 'Vor :time_ago disqualifiziert von :user mit einem neuen Problem :discussion (:message).',
         ],
 
         'reset_confirm' => [
-            'disqualify' => 'Bist du sicher? Dadurch wird die Beatmap aus der Qualifizierung entfernt und der Nominierungsprozess zurückgesetzt.',
+            'disqualify' => 'Bist du sicher? Das wird die Beatmap von der Qualifiezierung entfernen und den Nominierungsprozess zurücksetzen.',
             'nomination_reset' => 'Bist du dir sicher? Der Nominierungsprozess wird durch das neue Problem zurückgesetzt.',
             'problem_warning' => 'Bist du sicher, dass du ein Problem in dieser Beatmap melden möchtest? Dies wird die Beatmap Nominators alarmieren.',
         ],
···
 
     'listing' => [
         'search' => [
-            'prompt' => 'stichwörter eingeben...',
+            'prompt' => 'Stichwörter eingeben...',
             'login_required' => 'Melde dich an, um zu suchen.',
             'options' => 'Mehr Suchoptionen',
-            'supporter_filter' => 'Filtern nach :filters benötigt ein aktives osu!supporter-Tag',
-            'not-found' => 'keine ergebnisse',
+            'supporter_filter' => 'Um nach :filters zu filtern, benötigt es ein aktives osu!supporter-Tag',
+            'not-found' => 'keine Ergebnisse',
             'not-found-quote' => '... nope, nichts gefunden.',
             'filters' => [
                 'extra' => 'Extra',
-                'general' => 'Generell',
+                'general' => 'Allgemein',
                 'genre' => 'Genre',
                 'language' => 'Sprache',
                 'mode' => 'Modus',
···
         'leaderboard' => 'Hat Ranglisten',
         'loved' => 'Loved',
         'mine' => 'Meine Maps',
-        'pending' => 'Ausstehend & WIP',
+        'pending' => 'Ausstehend',
         'wip' => 'WIP',
         'qualified' => 'Qualifiziert',
         'ranked' => 'Ranked',
···
         'unplayed' => 'Ungespielt',
     ],
     'extra' => [
-        'video' => 'Hat Video',
-        'storyboard' => 'Hat Storyboard',
+        'video' => 'Hat ein Video',
+        'storyboard' => 'Hat ein Storyboard',
     ],
     'rank' => [
         'any' => 'Alle',
···
         'D' => '',
     ],
     'panel' => [
-        'playcount' => 'Anzahl der Spiele: :count',
+        'playcount' => 'Anzahl der Plays: :count',
         'favourites' => 'Favoriten: :count',
     ],
     'variant' => [

resources/lang/de/beatmapset_discussion_votes.php

···
 
 return [
     'index' => [
-        'title' => 'Beatmapdiskussion: Abstimmung',
+        'title' => 'Beatmap-Diskussions-Stimmen',
     ],
 
     'item' => [
-        'score' => 'Punktzahl',
+        'score' => 'Ergebnis',
     ],
 ];

resources/lang/de/beatmapset_events.php

···
 return [
     'event' => [
         'approve' => 'Approved.',
-        'beatmap_owner_change' => 'Besitzer der Schwierigkeit :beatmap wurde auf :new_user geändert.',
+        'beatmap_owner_change' => 'Besitzer der Difficulty :beatmap wurde zu :new_user geändert.',
         'discussion_delete' => 'Ein Moderator hat die Diskussion :discussion gelöscht.',
         'discussion_lock' => 'Die Diskussion für diese Beatmap wurde deaktiviert. (:text)',
         'discussion_post_delete' => 'Ein Moderator hat einen Beitrag der Diskussion :discussion gelöscht.',
         'discussion_post_restore' => 'Ein Moderator hat einen Beitrag der Diskussion :discussion wiederhergestellt.',
         'discussion_restore' => 'Ein Moderator hat die Diskussion :discussion wiederhergestellt.',
         'discussion_unlock' => 'Die Diskussion für diese Beatmap wurde aktiviert.',
-        'disqualify' => 'Von :user disqualifiziert mit der Begründung: :discussion (:text).',
-        'disqualify_legacy' => 'Von :user disqualifiziert mit der Begründung: :text.',
+        'disqualify' => 'Von :user disqualifiziert. Grund: :discussion (:text).',
+        'disqualify_legacy' => 'Von :user disqualifiziert. Grund: :text.',
         'genre_edit' => 'Genre wurde von :old zu :new geändert.',
-        'issue_reopen' => 'Gelöstes Problem :discussion von :discussion_user durch :user wiedereröffnet.',
-        'issue_resolve' => 'Vorschlag/Problem :discussion als gelöst gekennzeichnet.',
-        'kudosu_allow' => 'Das kudosu-Verbot für Diskussion :discussion wurde entfernt.',
-        'kudosu_deny' => 'Diskussion :discussion wurde das kudosu verwehrt.',
+        'issue_reopen' => 'Gelöstes Problem :discussion von :discussion_user wurde durch :user wiedereröffnet.',
+        'issue_resolve' => 'Problem :discussion von :discussion_user wurde durch :user als gelöst gekennzeichnet.',
+        'kudosu_allow' => 'Kudosu-Ablehnung für die Diskussion :discussion wurde entfernt.',
+        'kudosu_deny' => 'Kudosu werden in der Diskussion :discussion abgelehnt.',
         'kudosu_gain' => 'Die Diskussion :discussion von :user hat genug Stimmen für Kudosu erhalten.',
-        'kudosu_lost' => 'Die Diskussion :discussion von :user hat an Stimmen verloren und kudosu wurde entfernt.',
-        'kudosu_recalculate' => 'Das verteilte kudosu der Diskussion :discussion wurde neu berechnet.',
+        'kudosu_lost' => 'Die Diskussion :discussion von :user hat an Stimmen verloren und erteilte Kudosu wurden abgelehnt.',
+        'kudosu_recalculate' => 'Erteilte Kudosu der Diskussion :discussion wurden neu berechnet.',
         'language_edit' => 'Sprache wurde von :old zu :new geändert.',
-        'love' => 'Nominiert von :user',
+        'love' => 'Loved von :user.',
         'nominate' => 'Von :user nominiert.',
         'nominate_modes' => 'Nominiert von :user (:modes).',
-        'nomination_reset' => 'Neues Problem :discussion hat die Nominierung zurückgesetzt.',
+        'nomination_reset' => 'Ein neues Problem :discussion hat die Nominierung zurückgesetzt (:text).',
         'nomination_reset_received' => 'Nominierung von :user wurde von :source_user zurückgesetzt (:text)',
         'nomination_reset_received_profile' => 'Nominierung wurde von :user zurückgesetzt (:text)',
         'offset_edit' => 'Online-Offset wurde von :old zu :new geändert.',
···
 
     'type' => [
         'approve' => 'Approval',
-        'beatmap_owner_change' => 'Schwierigkeitsstufenbesitzeränderung',
+        'beatmap_owner_change' => 'Besitzerwechsel der Difficulty',
         'discussion_delete' => 'Diskussion löschen',
-        'discussion_post_delete' => 'Löschen der Diskussionsantwort',
-        'discussion_post_restore' => 'Diskussionsantwort wiederherstellen',
+        'discussion_post_delete' => 'Antwort in der Diskussion entfernen',
+        'discussion_post_restore' => 'Antwort in der Diskussion wiederherstellen',
         'discussion_restore' => 'Diskussion wiederherstellen',
         'disqualify' => 'Disqualifikation',
         'genre_edit' => 'Genre-Änderung',
-        'issue_reopen' => 'Diskussion wieder öffnen',
+        'issue_reopen' => 'Diskussion wiedereröffnen',
         'issue_resolve' => 'Diskussion lösen',
         'kudosu_allow' => 'Kudosu erlauben',
-        'kudosu_deny' => 'Kudosu-Verweigerung',
-        'kudosu_gain' => 'Kudosu-Erhalt',
+        'kudosu_deny' => 'Kudosu ablehnen',
+        'kudosu_gain' => 'Kudosu erhalten',
         'kudosu_lost' => 'Kudosu-Verlust',
         'kudosu_recalculate' => 'Kudosu-Neuberechnung',
         'language_edit' => 'Sprachänderung',
         'love' => 'Love',
         'nominate' => 'Nominierung',
         'nomination_reset' => 'Nominierung zurücksetzten',
-        'nomination_reset_received' => 'Nomination Reset erhalten',
+        'nomination_reset_received' => 'Nomination-Reset erhalten',
         'nsfw_toggle' => 'Explizit-Markierung',
         'offset_edit' => 'Offset bearbeiten',
         'qualify' => 'Qualifikation',
         'rank' => 'Rangliste',
-        'remove_from_loved' => 'Loved-Entfernung',
+        'remove_from_loved' => 'Loved entfernen',
     ],
 ];

resources/lang/de/beatmapset_watches.php

···
 
 return [
     'index' => [
-        'description' => 'Dies sind deine beobachteten Diskussionen. Du wirst über neue Beiträge und Updates informiert.',
-        'title_compact' => 'beobachtete moddingthreads',
+        'description' => 'Dies sind deine gefolgten Beatmap-Diskussionen. Du wirst über neue Posts und Aktualisierungen benachrichtigt.',
+        'title_compact' => 'Merkliste von Beatmap-Diskussionen',
 
         'counts' => [
-            'total' => 'Beobachtete Beatmaps',
+            'total' => 'Gefolgte Beatmaps',
             'unread' => 'Beatmaps mit neuer Aktivität',
         ],
 
         'table' => [
-            'empty' => 'Du beobachtest keine Diskussionen.',
+            'empty' => 'Du folgst keiner Beatmap-Diskussion.',
             'last_update' => 'Letzte Aktualisierung',
-            'open_issues' => 'Offene Vorschläge/Probleme',
+            'open_issues' => 'Offene Probleme',
             'state' => 'Status',
             'title' => 'Titel',
         ],

resources/lang/de/beatmapsets.php

···
     ],
 
     'index' => [
-        'title' => 'Beatmaps: Liste',
+        'title' => 'Beatmap-Auflistung',
         'guest_title' => 'Beatmaps',
     ],
 
     'panel' => [
-        'empty' => 'keine beatmaps',
+        'empty' => 'keine Beatmaps',
 
         'download' => [
             'all' => 'herunterladen',
···
     ],
 
     'nominate' => [
-        'hybrid_requires_modes' => 'Für ein Hybrid-Beatmapset musst du mindestens einen Spielmodus auswählen, für den du nominieren möchtest.',
-        'incorrect_mode' => 'Du hast keine Berechtigung, für diesen Modus zu nominieren: :mode',
-        'full_bn_required' => 'Du musst ein vollwertiger Nominator sein, um diese qualifizierende Nominierung durchzuführen.',
+        'hybrid_requires_modes' => 'Für ein Hybrid-Beatmapset musst du mindestens einen Spielmodus auswählen, den du nominieren möchtest.',
+        'incorrect_mode' => 'Du hast keine Berechtigung diesen Modus zu nominieren: :mode',
+        'full_bn_required' => 'Du musst ein vollständiger Nominator sein, um diese qualifizierende Nominierung durchzuführen.',
         'too_many' => 'Nominierungsvoraussetzung bereits erfüllt.',
 
         'dialog' => [
             'confirmation' => 'Bist du sicher, dass du diese Beatmap nominieren möchtest?',
             'header' => 'Beatmap nominieren',
-            'hybrid_warning' => 'hinweis: du kannst nur einmal nominieren, also stelle bitte sicher, dass du für alle spielmodi nominierst, die du beabsichtigst',
-            'which_modes' => 'Für welche Modi nominieren?',
+            'hybrid_warning' => 'Hinweis: du kannst nur einmalig nominieren, also stelle bitte sicher, dass du für alle Spielmodi nominierst, die du beabsichtigst',
+            'which_modes' => 'Für welche Modi willst du nominieren?',
         ],
     ],
 
···
 
         'details' => [
             'by_artist' => 'von :artist',
-            'favourite' => 'Dieses Beatmapset zu deinen Favoriten hinzufügen',
+            'favourite' => 'Diese Beatmap zu deinen Favoriten hinzufügen',
             'favourite_login' => 'Melde dich an, um diese Beatmap zu favorisieren',
-            'logged-out' => 'Zum Herunterladen von Beatmaps muss man eingeloggt sein!',
+            'logged-out' => 'Du musst eingeloggt sein, bevor du Beatmaps herunterladen kannst!',
             'mapped_by' => 'erstellt von :mapper',
-            'mapped_by_guest' => 'Gastschwierigkeit von :mapper',
-            'unfavourite' => 'Dieses Beatmapset von deinen Favoriten entfernen',
-            'updated_timeago' => 'zuletzt aktualisiert :timeago',
+            'mapped_by_guest' => 'Guest-Difficulty von :mapper',
+            'unfavourite' => 'Diese Beatmap von deinen Favoriten entfernen',
+            'updated_timeago' => 'zuletzt aktualisiert vor :timeago',
 
             'download' => [
                 '_' => 'Herunterladen',
···
             ],
 
             'login_required' => [
-                'bottom' => 'für mehr Features',
+                'bottom' => 'für Zugriff auf mehr Features',
                 'top' => 'Einloggen',
             ],
         ],
 
         'details_date' => [
-            'approved' => 'approved :timeago',
-            'loved' => 'loved :timeago',
-            'qualified' => 'qualifiziert :timeago',
-            'ranked' => 'ranked :timeago',
-            'submitted' => 'hochgeladen :timeago',
-            'updated' => 'zuletzt aktualisiert :timeago',
+            'approved' => 'vor :timeago approved',
+            'loved' => 'vor :timeago loved',
+            'qualified' => 'vor :timeago qualifiziert',
+            'ranked' => 'vor :timeago ranked',
+            'submitted' => 'vor :timeago hochgeladen',
+            'updated' => 'vor :timeago zuletzt aktualisiert',
         ],
 
         'favourites' => [
-            'limit_reached' => 'Du hast zu viele favorisierte Beatmaps! Bitte entferne welche, bevor du es nochmal versuchst.',
+            'limit_reached' => 'Du hast zu viele Beatmaps favorisiert! Bitte entferne welche, bevor du es nochmal versuchst.',
         ],
 
         'hype' => [
-            'action' => 'Wenn es dir Spaß gemacht hat, diese Map zu spielen, dann hype sie, um bei ihrem Fortschritt zum <strong>Ranked</strong>-Status zu helfen.',
+            'action' => 'Hat dir die Map Spaß gemacht? Hype sie, um bei ihrem Fortschritt zum <strong>Ranked</strong>-Status zu helfen.',
 
             'current' => [
                 '_' => 'Die Map ist zurzeit :status.',
···
                 'status' => [
                     'pending' => 'ausstehend',
                     'qualified' => 'qualifiziert',
-                    'wip' => 'work-in-progress',
+                    'wip' => 'Work-in-Progress',
                 ],
             ],
 
             'disqualify' => [
-                '_' => 'Wenn du ein Problem mit dieser Beatmap findest, disqualifiziere diese bitte :link.',
+                '_' => 'Bitte disqualifizieren, falls du ein Problem in dieser Beatmap findest :link.',
             ],
 
             'report' => [
-                '_' => 'Wenn du ein Problem mit dieser Beatmap findest, melde es bitte :link, um das Team zu informieren.',
+                '_' => 'Wenn du ein Problem in dieser Beatmap findest, melde es bitte :link, um das Team zu informieren.',
                 'button' => 'Problem melden',
                 'link' => 'hier',
             ],
···
 
         'scoreboard' => [
             'achieved' => 'erreicht :when',
-            'country' => 'Landesrangliste',
+            'country' => 'Länder-Rangliste',
             'error' => 'Die Rangliste konnte nicht geladen werden',
-            'friend' => 'Freundesrangliste',
+            'friend' => 'Freundes-Rangliste',
             'global' => 'Globale Rangliste',
-            'supporter-link' => '<a href=":link">Hier</a> klicken, um alle tollen Features zu entdecken!',
-            'supporter-only' => 'Du musst Supporter sein, um Freundes- und Landesranglisten zu sehen!',
-            'title' => 'Ranglisten',
+            'supporter-link' => '<a href=":link">Hier</a> klicken, um all die tollen Features zu entdecken!',
+            'supporter-only' => 'Du musst osu!supporter sein, um Freundes-, Länder-, oder Mod-Ranglisten zu sehen!',
+            'title' => 'Punkte-Anzeige',
 
             'headers' => [
-                'accuracy' => 'Genauigkeit',
-                'combo' => 'Combo',
+                'accuracy' => 'Präzision',
+                'combo' => 'Maximale Combo',
                 'miss' => 'Miss',
                 'mods' => 'Mods',
                 'pin' => 'Anpinnen',
···
             ],
             'score' => [
                 'first' => 'An der Spitze',
-                'own' => 'Dein bester Rang',
+                'own' => 'Deine Bestleistung',
             ],
             'supporter_link' => [
-                '_' => 'Klicke :here um alle schönen Features zu sehen, die du bekommst!',
+                '_' => 'Klicke :here, um all die tollen Features zu entdecken, die du bekommst!',
                 'here' => 'hier',
             ],
         ],
 
         'stats' => [
-            'cs' => 'Circle Size',
-            'cs-mania' => 'Tastenanzahl',
-            'drain' => 'HP Drain',
-            'accuracy' => 'Genauigkeit',
-            'ar' => 'Approach Rate',
-            'stars' => 'Star Difficulty',
-            'total_length' => 'Länge',
+            'cs' => 'Circle-Size',
+            'cs-mania' => 'Tasten-Anzahl',
+            'drain' => 'HP-Drain',
+            'accuracy' => 'Präzision',
+            'ar' => 'Approach-Rate',
+            'stars' => 'Star-Difficulty',
+            'total_length' => 'Länge (Drain length: :hit_length)',
             'bpm' => 'BPM',
             'count_circles' => 'Circle-Anzahl',
             'count_sliders' => 'Slider-Anzahl',
             'offset' => 'Online-Offset: :offset',
-            'user-rating' => 'Benutzerbewertungen',
-            'rating-spread' => 'Bewertungsverteilung',
+            'user-rating' => 'User-Bewertungen',
+            'rating-spread' => 'Bewertungs-Spread',
             'nominations' => 'Nominierungen',
             'playcount' => 'Playcount',
         ],
···
             'qualified' => 'Qualifiziert',
             'wip' => 'WIP',
             'pending' => 'Ausstehend',
-            'graveyard' => 'Friedhof',
+            'graveyard' => 'Graveyard',
         ],
     ],
 

resources/lang/de/changelog.php

···
 
     'index' => [
         'page_title' => [
-            '_' => 'Changelog Eintrag',
+            '_' => 'Changelog-Auflistung',
             '_from' => 'Änderungen seit :from',
             '_from_to' => 'Änderungen zwischen :from und :to',
             '_stream' => 'Änderungen in :stream',
···
     ],
 
     'support' => [
-        'heading' => 'Dir gefällt, was du siehst?',
+        'heading' => 'Gefällt dir dieses Update?',
         'text_1' => 'Unterstütze die weitere Entwicklung von osu! und :link!',
-        'text_1_link' => 'werde noch heute Supporter',
-        'text_2' => 'Damit treibst du nicht nur die Entwicklung schneller voran, sondern erhältst auch einige coole Features und besondere Anpassungsmöglichkeiten!',
+        'text_1_link' => 'werde noch heute osu!supporter',
+        'text_2' => 'Damit treibst du nicht nur die Entwicklung schneller voran, sondern erhältst auch einige zusätzliche Features und Anpassungsmöglichkeiten!',
     ],
 ];

resources/lang/de/chat.php

···
 // See the LICENCE file in the repository root for full licence text.
 
 return [
-    'loading_users' => 'lade Benutzer...',
-    'talking_in' => 'sprechen in :channel',
-    'talking_with' => 'im gespräch mit :name',
-    'title_compact' => 'chat',
-    'unread_messages' => 'ungelesene nachrichten',
+    'loading_users' => 'lade User...',
+    'talking_in' => 'in :channel reden',
+    'talking_with' => 'im Gespräch mit :name',
+    'title_compact' => 'Chat',
+    'unread_messages' => 'ungelesene Nachrichten',
 
     'cannot_send' => [
-        'channel' => 'Du kannst derzeit keine Nachrichten an diesen Kanal senden. Dies kann folgende Gründe haben:',
+        'channel' => 'Du kannst derzeit keine Nachrichten in diesem Channel senden. Dies kann folgende Gründe haben:',
         'user' => 'Du kannst derzeit keine Nachrichten an diesen User senden. Dies kann folgende Gründe haben:',
     ],
 
     'channels' => [
-        'confirm_part' => 'Möchtest du diesen Kanal ausblenden? Du erhältst weiterhin Nachrichten aus diesem Kanal.',
-        'create' => 'ankündigung erstellen',
+        'confirm_part' => 'Möchtest du diesen Channel ausblenden? Du erhältst weiterhin Nachrichten aus diesem Channel.',
+        'create' => 'Ankündigung erstellen',
 
         'list' => [
             'title' => [
                 'ANNOUNCE' => 'Ankündigungen',
                 'GROUP' => 'Gruppen',
                 'PM' => 'Direktnachrichten',
-                'PUBLIC' => 'Kanäle',
+                'PUBLIC' => 'Channel',
             ],
         ],
     ],
···
         ],
 
         'labels' => [
-            'description' => 'beschreibung',
-            'message' => 'nachricht',
-            'name' => 'raumname',
-            'users' => 'spieler zum hinzufügen',
+            'description' => 'Beschreibung',
+            'message' => 'Nachricht',
+            'name' => 'Raumname',
+            'users' => 'Spieler zum Hinzufügen',
         ],
     ],
 
     'not_found' => [
-        'message' => 'Hier gibt es nichts, vielleicht hast du den Kanal verlassen oder er existiert nicht...',
-        'title' => 'Kanal nicht gefunden',
+        'message' => 'Hier gibt es nichts, vielleicht hast du den Channel verlassen oder er existiert nicht...',
+        'title' => 'Channel nicht gefunden',
     ],
 
     'input' => [
···
     ],
 
     'no-conversations' => [
-        'howto' => "Starte eine Unterhaltung von einem User-Profil oder einem Usercard-Popup.",
-        'lazer' => 'Öffentliche Kanäle, die du mit <a href=":link">osu!lazer</a> beitrittst, werden auch hier angezeigt.',
+        'howto' => "Starte eine Unterhaltung von einem User-Profil oder einem Usercard-Pop-up.",
+        'lazer' => 'Öffentliche Channel, welche du mit <a href=":link">osu!lazer</a> betrittst, werden hier auch sichtbar sein.',
         'title' => 'noch keine Unterhaltungen',
     ],
 ];

resources/lang/de/client_verifications.php

···
     'completed' => [
         'home' => 'Zum Dashboard gehen',
         'logout' => 'Abmelden',
-        'text' => 'Du kannst diesen Tab/dieses Fenster nun schließen',
+        'text' => 'Du kannst dieses Fenster nun schließen',
         'title' => 'osu! Client-Verifizierung wurde abgeschlossen',
     ],
 
     'create' => [
-        'confirm' => 'Klicke unten auf den Autorisierungs-Button, um die Client-Überprüfung abzuschließen.',
+        'confirm' => 'Klicke unten auf den Autorisierungs-Button, um die Client-Verifizierung abzuschließen.',
         'title' => 'osu! Client-Verifizierung',
     ],
 ];

resources/lang/de/comments.php

···
 
 return [
     'deleted' => 'gelöscht',
-    'deleted_by' => 'gelöscht :timeago von :user',
-    'deleted_by_system' => 'system',
+    'deleted_by' => 'vor :timeago von :user entfernt',
+    'deleted_by_system' => 'System',
     'deleted_count' => ':count_delimited gelöschter Kommentar|:count_delimited gelöschte Kommentare',
-    'edited' => 'bearbeitet :timeago von :user',
+    'edited' => 'vor :timeago von :user bearbeitet',
     'pinned' => 'angeheftet',
     'empty' => 'Noch keine Kommentare vorhanden.',
     'load_replies' => 'Antworten laden',
···
     'editor' => [
         'textarea_hint' => [
             '_' => 'Drücke Enter, um zu :action. Benutze Shift+Enter für eine neue Zeile.',
-            'edit' => 'Speichern',
+            'edit' => 'speichern',
             'new' => 'posten',
             'reply' => 'antworten',
         ],
     ],
 
     'guest_button' => [
-        'new' => 'Zum Kommentieren anmelden',
-        'reply' => 'Zum Antworten anmelden',
+        'new' => 'Einloggen, um zu kommentieren',
+        'reply' => 'Einloggen, um zu antworten',
     ],
 
     'index' => [
-        'nav_comments' => 'kommentare',
-        'nav_title' => 'liste',
-        'no_comments' => 'keine kommentare gefunden...',
+        'nav_comments' => 'Kommentare',
+        'nav_title' => 'Auflistung',
+        'no_comments' => 'keine Kommentare gefunden...',
     ],
 
     'placeholder' => [
         'edit' => 'Kommentar hier bearbeiten',
-        'new' => 'Neuen Kommentar hier eingeben',
+        'new' => 'Neuen Kommentar hier schreiben',
         'reply' => 'Antwort hier eingeben',
     ],
 
     'show' => [
-        'nav_title' => 'kommentare',
+        'nav_title' => 'Kommentare',
     ],
 ];

resources/lang/de/common.php

···
 // See the LICENCE file in the repository root for full licence text.
 
 return [
-    'confirmation' => 'Sicher?',
+    'confirmation' => 'Bist du dir sicher?',
     'confirmation_unsaved' => 'Nicht gespeicherte Änderungen gehen verloren. Willst du trotzdem fortfahren?',
     'saved' => 'Gespeichert',
 
···
         'authorise' => 'Autorisieren',
         'authorising' => 'Autorisieren...',
         'back_to_previous' => 'Zur vorherigen Position zurückkehren',
-        'back_to_top' => 'Zum Seitenanfang',
+        'back_to_top' => 'Zurück zum Seitenanfang',
         'cancel' => 'Abbrechen',
         'change' => 'ändern',
         'clear' => 'Löschen',
-        'click_to_copy' => 'Zum Speichern in die Zwischenablage klicken',
-        'click_to_copy_copied' => 'In die Zwischenablage kopiert!',
+        'click_to_copy' => 'klicken, um in Zwischenablage zu speichern',
+        'click_to_copy_copied' => 'in Zwischenablage kopiert!',
         'close' => 'Schließen',
         'collapse' => 'einklappen',
         'delete' => 'Löschen',
···
         'search' => 'Suchen',
         'see_more' => 'mehr anzeigen',
         'show' => 'anzeigen',
-        'show_deleted' => 'Gelöschte anzeigen',
+        'show_deleted' => 'Zeige gelöschtes',
         'show_less' => 'weniger anzeigen',
         'show_more' => 'mehr anzeigen',
-        'show_more_options' => 'mehr optionen anzeigen',
+        'show_more_options' => 'mehr Optionen anzeigen',
         'submit' => 'Speichern',
         'unpin' => 'lösen',
         'update' => 'Aktualisieren',
-        'upload_image' => 'bild hochladen',
+        'upload_image' => 'Bild hochladen',
 
         'watch' => [
-            'to_0' => 'Nicht mehr beobachten',
-            'to_1' => 'Beobachten',
+            'to_0' => 'Nicht mehr merken',
+            'to_1' => 'Merken',
         ],
     ],
 
     'count' => [
         'badges' => ':count abzeichen|:count abzeichen',
-        'days' => ':count tag|:count tage',
+        'days' => ':count Tag|:count Tage',
         'hour_short_unit' => 'std.|std.',
-        'hours' => ':count stunde|:count stunden',
-        'item' => ':count Artikel',
+        'hours' => ':count Stunde|:count Stunden',
+        'item' => ':count_delimited Artikel|:count_delimited Artikel',
         'minute_short_unit' => 'min.|min.',
         'minutes' => ':count Minute|:count Minuten',
-        'months' => ':count monat|:count monate',
-        'notifications' => ':count_delimited Nachricht|:count_delimited Nachrichten',
+        'months' => ':count Monat|:count Monate',
+        'notifications' => ':count_delimited Benachrichtigung|:count_delimited Benachrichtigungen',
         'plus_others' => '+ :count_delimited anderer!|+ :count_delimited andere!',
-        'post' => ':count_delimited Beitrag|:count_delimited Beiträge',
+        'post' => ':count_delimited Post|:count_delimited Posts',
         'second_short_unit' => 'sek.|sek.',
-        'star_priority' => ':count_delimited Sternpriorität|:count_delimited Sternprioritäten',
-        'update' => ':count_delimited Update|:count_delimited Updates',
+        'star_priority' => ':count_delimited Star-Priorität|:count_delimited Star-Prioritäten',
+        'update' => ':count_delimited Aktualisierung|:count_delimited Aktualisierungen',
         'view' => ':count_delimited Aufruf|:count_delimited Aufrufe',
         'years' => ':count_delimited Jahr|:count_delimited Jahre',
     ],
 
     'countdown' => [
-        'days' => 'tage',
-        'hours' => 'stunden',
-        'minutes' => 'minuten',
-        'seconds' => 'sekunden',
+        'days' => 'Tage',
+        'hours' => 'Stunden',
+        'minutes' => 'Minuten',
+        'seconds' => 'Sekunden',
     ],
 
     'datetime' => [
···
     ],
 
     'dropzone' => [
-        'target' => 'zum hochladen hier ablegen',
+        'target' => 'hier fallen lassen, um hochzuladen',
     ],
 
     'input' => [
···
     ],
 
     'pagination' => [
-        'previous' => 'vorh.',
-        'next' => 'näch.',
+        'previous' => 'zurück',
+        'next' => 'weiter',
     ],
 
     'score_count' => [
···
     ],
 
     'title' => [
-        'notice' => 'Anmerkung',
+        'notice' => 'Hinweis',
     ],
 
     'wrong_user' => [

resources/lang/de/community.php

···
         'convinced' => [
             'title' => 'Ich bin überzeugt! :D',
             'support' => 'unterstütze osu!',
-            'gift' => 'oder verschenke \'Supporter\' an andere Spieler',
+            'gift' => 'oder verschenke Supporter an andere Spieler',
             'instructions' => 'klick auf das Herz, um zum osu!store zu gelangen',
         ],
         'why-support' => [
···
                 'description' => 'Ein kleines Team entwickelt und betreibt osu!. Deine Unterstützung hilft ihnen dabei, zu, du weißt schon... leben.',
             ],
             'infra' => [
-                'title' => 'Serverinfrastruktur',
+                'title' => 'Server-Infrastruktur',
                 'description' => 'Die Beiträge gehen an die Server, auf denen die Website, Multiplayer-Dienste, Online-Bestenlisten usw. ausgeführt werden.',
             ],
             'featured-artists' => [
                 'title' => 'Featured Artists',
                 'description' => 'Mit deiner Unterstützung können wir noch mehr großartige Künstler ansprechen und somit mehr gute Musik in osu! lizenzieren!',
-                'link_text' => 'Sieh Dir die aktuelle Liste an »',
+                'link_text' => 'Sieh dir die aktuelle Liste an »',
             ],
             'ads' => [
                 'title' => 'Halte osu! aufrecht',
···
             ],
             'tournaments' => [
                 'title' => 'Offizielle Turniere',
-                'description' => 'Hilf mit, die Durchführung (und die Preise) der offiziellen osu!-Weltcup-Turniere zu finanzieren.',
+                'description' => 'Hilf mit, die Durchführung (und die Preise) der offiziellen osu!-Weltmeisterschaft-Turniere zu finanzieren.',
                 'link_text' => 'Erkunde Turniere »',
             ],
             'bounty-program' => [
-                'title' => 'Open-Source Prämienprogramm',
-                'description' => 'Unterstütze die Community-Mitarbeiter, die ihre Zeit und Mühe investiert haben, um osu! besser zu machen.',
+                'title' => 'Open-Source-Prämien-Programm',
+                'description' => 'Unterstütze Mitwirkende der Community, die ihre Zeit und Mühe investiert haben, um osu! besser zu machen.',
                 'link_text' => 'Finde mehr heraus »',
             ],
         ],
         'perks' => [
-            'title' => 'Oh? Was gibt\'s denn?!',
+            'title' => 'Cool! Was bekommt man denn?',
             'osu_direct' => [
                 'title' => 'osu!direct',
-                'description' => 'Schneller und einfacher Zugriff auf die Beatmapsuche, sogar innerhalb des Spiels.',
+                'description' => 'Schneller und einfacher Zugriff zum Suchen und Downloaden von Beatmaps, ohne das Spiel verlassen zu müssen.',
             ],
 
             'friend_ranking' => [
-                'title' => 'Freundesrangliste',
-                'description' => "Finde heraus, wie Du Dich auf der Bestenliste einer Beatmap gegen Deine Freunde behauptest, sowohl im Spiel als auch auf der Webseite.",
+                'title' => 'Freundes-Rangliste',
+                'description' => "Siehe dir an wie du dich auf der Bestenliste einer Beatmap gegen deine Freunde behauptest, sowohl im Spiel als auch auf der Webseite.",
             ],
 
             'country_ranking' => [
-                'title' => 'Landesrangliste',
+                'title' => 'Länder-Rangliste',
                 'description' => 'Erobere dein Land, bevor du die Welt eroberst.',
             ],
 
···
 
             'auto_downloads' => [
                 'title' => 'Automatische Downloads',
-                'description' => 'Automatische Downloads im Multiplayer, beim Zuschauen, und wenn man Links im Chat anklickt!',
+                'description' => 'Beatmaps werden im Multiplayer, beim Zuschauen oder wenn man Links im Chat anklickt automatisch heruntergeladen!',
             ],
 
             'upload_more' => [
                 'title' => 'Mehr Hochladen',
-                'description' => 'Zusätzliche "ausstehende" Beatmapplätze (pro ranked Beatmap), bis zu einem Maximum von 10.',
+                'description' => 'Zusätzliche ausstehende Beatmap-Slots (pro ranked Beatmap) bis zu einem Maximum von 10.',
             ],
 
             'early_access' => [
                 'title' => 'Früherer Zugang',
-                'description' => 'Zugriff auf frühere Updates, in denen man neue Features ausprobieren kann, bevor sie veröffentlich werden!',
+                'description' => 'Ergattere einen frühzeitigen Zugriff auf neue Releases, in denen man neue Features ausprobieren kann, bevor sie veröffentlicht werden! Dazu gehört auch die Webseite!',
             ],
 
             'customisation' => [
                 'title' => 'Anpassung',
-                'description' => "Füge deinem Profil eine persönliche Note hinzu, indem du eine komplett anpassbare Seite hinzufügst.",
+                'description' => "Füge deinem Profil eine persönliche Note hinzu, indem du ein individuelles Titelbild hochlädst oder einen vollständig anpassbaren \"Ich!\"-Bereich erstellst.",
             ],
 
             'beatmap_filters' => [
-                'title' => 'Beatmapfilter',
-                'description' => 'Filtere Suchanfragen nach gespielten oder ungespielten Beatmaps und nach erreichtem Rang.',
+                'title' => 'Beatmap-Filter',
+                'description' => 'Filtere Beatmap-Suchanfragen nach gespielten und ungespielten Maps oder nach erreichtem Rang.',
             ],
 
             'yellow_fellow' => [
···
 
             'change_username' => [
                 'title' => 'Benutzernamen ändern',
-                'description' => 'Ändere deinen Namen ohne weitere Kosten (einmalig).',
+                'description' => 'Beim ersten Supporter-Kauf ist eine kostenlose Namensänderung enthalten.',
             ],
 
             'skinnables' => [
                 'title' => 'Skinbare Elemente',
-                'description' => 'Mehr skinbare Elemente im Spiel, z. B. der Menühintergrund.',
+                'description' => 'Mehr skinbare Elemente im Spiel, z.B. der Menü-Hintergrund.',
             ],
 
             'feature_votes' => [
···
             ],
 
             'sort_options' => [
-                'title' => 'Sortieroptionen',
+                'title' => 'Sortier-Optionen',
                 'description' => 'Länder-, Freundes- und modspezifische Ranglisten im Spiel einsehen!',
             ],
 
···
             ],
             'more_friends' => [
                 'title' => 'Mehr Freunde',
-                'description' => 'Die maximale Anzahl von Freunden, die Du haben kannst, wurde erhöht von :normally → :supporter',
+                'description' => 'Die maximale Anzahl von Freunden, die du haben kannst, wurde von erhöht :normally → :supporter',
             ],
             'more_beatmaps' => [
-                'title' => 'Weitere Beatmaps hochladen',
-                'description' => 'Die Anzahl der non-ranked Beatmaps, die Du gleichzeitig haben kannst, wird aus einem Basiswert plus einem zusätzlichen Bonus für jede ranked Beatmap berechnet (bis zu einem Limit).<br/><br/>Normalerweise sind dies :base plus :bonus pro ranked Beatmap (bis zu :bonus_max). Mit Supporter erhöht sich dies auf :supporter_base plus :supporter_bonus pro ranked Beatmap (bis zu :supporter_bonus_max).',
+                'title' => 'Mehr Beatmaps hochladen',
+                'description' => 'Die Anzahl der unranked Beatmaps, die du gleichzeitig haben kannst, wird aus einem Basiswert plus einem zusätzlichen Bonus für jede ranked Beatmap berechnet (bis zu einem Limit).<br/><br/>Normalerweise sind dies :base plus :bonus pro ranked Beatmap (bis zu :bonus_max). Mit Supporter erhöht sich dies auf :supporter_base plus :supporter_bonus pro ranked Beatmap (bis zu :supporter_bonus_max).',
             ],
             'friend_filtering' => [
-                'title' => 'Freundesranglisten',
-                'description' => 'Miss Dich mit Deinen Freunden und finde heraus, wie Du Dich gegen sie behauptest!',
+                'title' => 'Freundes-Ranglisten',
+                'description' => 'Kokurriere dich mit deinen Freunden und sieh dir an, wie du dich gegen sie behauptest!',
             ],
 
         ],
         'supporter_status' => [
             'contribution' => 'Danke für deine bisherige Unterstützung! Du hast insgesamt :dollars durch :tags Supporter-Tag(s) beigesteuert!',
-            'gifted' => ":giftedTags deiner Supporter-Einkäufe waren Geschenke (für insgesamt :giftedDollars), wie großzügig von dir!",
+            'gifted' => ":giftedTags deiner Supporter-Einkäufe waren Geschenke (im Wert von :giftedDollars), wie großzügig von dir!",
             'not_yet' => "Du hast noch kein osu!supporter-Tag :(",
             'valid_until' => 'Dein aktuelles osu!supporter-Tag endet am :date!',
             'was_valid_until' => 'Dein osu!supporter-Tag war bis :date gültig.',

resources/lang/de/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Foren',
         'latest_post' => 'Neuester Beitrag',
 
         'index' => [
···
         'confirm_restore' => 'Beitrag wirklich wiederherstellen?',
         'edited' => 'Zuletzt von :user :when bearbeitet, insgesamt :count_delimited Mal bearbeitet.',
         'posted_at' => 'erstellt :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'gepostet von :username in :forum',
 
         'actions' => [
             'destroy' => 'Beitrag löschen',

resources/lang/de/home.php

···
 return [
     'landing' => [
         'download' => 'Jetzt herunterladen',
-        'online' => 'aktuell <strong>:players</strong> online in <strong>:games</strong> Spielen',
+        'online' => 'aktuell sind <strong>:players</strong> in <strong>:games</strong> Spielen online',
         'peak' => 'Maximum, :count Benutzer online',
         'players' => '<strong>:count</strong> registrierte Spieler',
         'title' => 'willkommen',
         'see_more_news' => 'mehr Neuigkeiten anzeigen',
 
         'slogan' => [
-            'main' => 'das besteste free-to-play rhythmusspiel',
-            'sub' => 'der rhythmus ist nur einen klick entfernt',
+            'main' => 'das beste free-to-play Rhythmusspiel',
+            'sub' => 'Rhythmus ist nur ein Klick entfernt',
         ],
     ],
 
     'search' => [
         'advanced_link' => 'Erweiterte Suche',
         'button' => 'Suchen',
-        'empty_result' => 'Nichts gefunden!',
+        'empty_result' => 'Keine Treffer!',
         'keyword_required' => 'Ein Suchbegriff ist erforderlich',
-        'placeholder' => 'Zum Suchen Text eingeben',
-        'title' => 'Suchergebnisse',
+        'placeholder' => 'tippe, um zu suchen',
+        'title' => 'Suche',
 
         'beatmapset' => [
-            'login_required' => 'Melde Dich an, um Beatmaps zu sehen',
+            'login_required' => 'Melde dich an, um Beatmaps zu suchen',
             'more' => ':count weitere gefundene Beatmaps',
-            'more_simple' => 'Mehr gefundene Beatmaps anzeigen',
+            'more_simple' => 'Siehe mehr Beatmap-Ergebnisse',
             'title' => 'Beatmaps',
         ],
 
         'forum_post' => [
             'all' => 'Alle Foren',
-            'link' => 'Das Forum durchsuchen',
-            'login_required' => 'Melde Dich an, um das Forum zu durchsuchen',
-            'more_simple' => 'Mehr gefundene Forenbeiträge anzeigen',
+            'link' => 'Forum durchsuchen',
+            'login_required' => 'Melde dich an, um das Forum zu durchsuchen',
+            'more_simple' => 'Siehe mehr Foren-Ergebnisse',
             'title' => 'Forum',
 
             'label' => [
-                'forum' => 'in foren suchen',
-                'forum_children' => 'subforen einbeziehen',
+                'forum' => 'Foren durchsuchen',
+                'forum_children' => 'Subforen einbeziehen',
                 'include_deleted' => 'Gelöschte Beiträge miteinbeziehen',
                 'topic_id' => 'Thread #',
-                'username' => 'autor',
+                'username' => 'Autor',
             ],
         ],
 
         'mode' => [
             'all' => 'alle',
-            'beatmapset' => 'beatmap',
-            'forum_post' => 'forum',
-            'user' => 'spieler',
-            'wiki_page' => 'wiki',
+            'beatmapset' => 'Beatmap',
+            'forum_post' => 'Forum',
+            'user' => 'Spieler',
+            'wiki_page' => 'Wiki',
         ],
 
         'user' => [
             'login_required' => 'Melde Dich an, um Benutzer zu suchen',
-            'more' => ':count weitere gefundene Spieler',
-            'more_simple' => 'Mehr gefundene Spieler anzeigen',
-            'more_hidden' => 'Die Spielersuche ist auf :max Spieler limitiert. Verfeinere bitte deine Suchanfrage.',
+            'more' => ':count weitere Spieler-Ergebnisse',
+            'more_simple' => 'Siehe mehr Spieler-Ergebnisse',
+            'more_hidden' => 'Die Spielersuche ist auf :max Spieler limitiert. Versuche deine Suchanfrage zu verfeinern.',
             'title' => 'Spieler',
         ],
 
         'wiki_page' => [
-            'link' => 'Das Wiki durchsuchen',
+            'link' => 'wiki durchsuchen',
             'more_simple' => 'Mehr gefundene Wikieinträge anzeigen',
             'title' => 'Wiki',
         ],
···
 
     'download' => [
         'action' => 'osu! herunterladen',
-        'action_lazer' => 'Lade osu!(lazer) herunter',
-        'action_lazer_description' => 'die nächste Hauptversion von osu!',
+        'action_lazer' => 'osu!(lazer) herunterladen',
+        'action_lazer_description' => 'das nächste große Update von osu!',
         'action_lazer_info' => 'siehe hier für weitere Informationen',
         'action_lazer_title' => 'osu!(lazer) ausprobieren',
-        'action_title' => 'Lade osu! herunter',
+        'action_title' => 'osu! herunterladen',
         'for_os' => 'für :os',
         'lazer_note' => 'Anmerkung: Rücksetzungen der Rangliste möglich',
         'macos-fallback' => 'macOS-Benutzer',
···
                 'description' => 'Folge den Anweisungen beim Spielstart, um dich einzuloggen oder einen Account zu erstellen.',
             ],
             'download' => [
-                'title' => 'Lade das Spiel herunter',
+                'title' => 'Spiel herunterladen',
                 'description' => 'Klicke zum Herunterladen oben auf den Button und führe die Installationsdatei aus!',
             ],
             'beatmaps' => [
-                'title' => 'hol\' dir beatmaps',
+                'title' => 'Beatmaps runterladen',
                 'description' => [
-                    '_' => ':browse durch die enorme Bibliothek an von Nutzern erstellten Beatmaps und fang an zu spielen!',
+                    '_' => ':browse durch die riesige Bibliothek von an Nutzern erstellten Beatmaps und fang an zu spielen!',
                     'browse' => 'Stöbere',
                 ],
             ],
···
     ],
 
     'user' => [
-        'title' => 'dashboard',
+        'title' => 'Dashboard',
         'news' => [
             'title' => 'News',
             'error' => 'News konnten nicht geladen werden. Versuche, die Seite neu zu laden?...',

resources/lang/de/news.php

···
         ],
 
         'title' => [
-            '_' => 'Neuigkeiten :info',
+            '_' => 'Neuigkeiten',
             'info' => 'startseite',
         ],
     ],
···
         ],
 
         'title' => [
-            '_' => 'Neuigkeiten :info',
+            '_' => 'Neuigkeiten',
             'info' => 'Beitrag',
         ],
     ],

resources/lang/de/notifications.php

···
 return [
     'all_read' => 'Alle Benachrichtigungen gelesen!',
     'delete' => ':type löschen',
-    'loading' => 'Ungelesene Benachrichtigungen werden geladen...',
+    'loading' => 'Ungelesene Benachrichtigungen werden geladen ...',
     'mark_read' => ':type als gelesen markieren',
     'none' => 'Keine Benachrichtigungen',
     'see_all' => 'alle benachrichtigungen ansehen',
···
     'verifying' => 'Bitte verifiziere deine Sitzung, um Benachrichtigungen anzuzeigen',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => 'Alle',
+        'beatmapset' => 'Beatmaps',
+        'build' => 'Versionen',
+        'channel' => 'Chat',
+        'forum_topic' => 'Forum',
+        'news_post' => 'Neuigkeiten',
+        'user' => 'Profil',
     ],
 
     'filters' => [

resources/lang/de/page_title.php

···
             'show' => 'beatmap-info',
         ],
         'changelog_controller' => [
-            '_' => 'änderungsprotokoll',
+            '_' => 'Änderungsprotokoll',
         ],
         'chat_controller' => [
-            '_' => 'chat',
+            '_' => 'Chat',
         ],
         'comments_controller' => [
             '_' => 'kommentare',
         ],
         'contests_controller' => [
-            '_' => 'wettbewerbe',
+            '_' => 'Wettbewerbe',
         ],
         'groups_controller' => [
             'show' => 'gruppen',
         ],
         'home_controller' => [
-            'get_download' => 'herunterladen',
+            'get_download' => 'Herunterladen',
             'index' => 'dashboard',
-            'search' => 'suchen',
+            'search' => 'Suchen',
             'support_the_game' => 'Das Spiel unterstützen',
             'testflight' => 'testflight',
         ],
···
             '_' => 'spiele',
         ],
         'news_controller' => [
-            '_' => 'neuigkeiten',
+            '_' => 'Neuigkeiten',
         ],
         'notifications_controller' => [
             '_' => 'benachrichtigungsverlauf',
···
             '_' => 'performance',
         ],
         'seasons_controller' => [
-            '_' => '',
+            '_' => 'Ranglisten',
         ],
         'tournaments_controller' => [
             '_' => 'turniere',
···
             'disabled' => 'notiz',
         ],
         'wiki_controller' => [
-            '_' => 'wiki',
+            '_' => 'Wiki',
         ],
     ],
     'passport' => [

resources/lang/de/rankings.php

···
         'multiplayer' => 'mehrspieler',
         'performance' => 'performance',
         'score' => 'punktzahl',
-        'seasons' => '',
+        'seasons' => 'Seasons',
     ],
 
     'seasons' => [
-        'empty' => '',
-        'ongoing' => '',
-        'room_count' => '',
-        'url' => '',
+        'empty' => 'Es existieren noch keine Räume in dieser Season.',
+        'ongoing' => 'Diese Season ist noch im Gange (es werden weitere Playlists hinzugefügt).',
+        'room_count' => 'Anzahl der Playlists',
+        'url' => 'Weitere Informationen zu dieser Season anzeigen.',
     ],
 
     'spotlight' => [

resources/lang/de/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Erstelldatum',
         'feature_votes' => 'Sternpriorität',
         'new' => 'Letzte Antwort',
     ],

resources/lang/de/store.php

···
         'cancel_not_allowed' => 'Diese Bestellung kann zu diesem Zeitpunkt nicht storniert werden.',
         'invoice' => 'Rechnung anzeigen',
         'no_orders' => 'Keine Bestellungen zum anzeigen.',
-        'paid_on' => 'Bestellung aufgegeben am :date',
+        'paid_on' => 'Bestellung aufgegeben :date',
         'resume' => 'Bezahlung fortsetzen',
         'shopify_expired' => 'Der Zahlungslink für diese Bestellung ist abgelaufen.',
 

resources/lang/el/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Προ-πακεταρισμένες συλλογές beatmaps βασισμένες σε ένα κοινό θέμα.',
+        'empty' => '',
         'nav_title' => 'λίστα',
         'title' => 'Πακέτα Beatmaps',
 

resources/lang/el/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => '',
+            'on' => '',
             'queue' => '',
             'soon' => 'σύντομα',
         ],

resources/lang/en/artist.php

···
 
     'beatmaps' => [
         '_' => 'Beatmaps',
-        'download' => 'Download Beatmap Template',
-        'download-na' => 'Beatmap Template not yet available',
+        'download' => 'download beatmap template',
+        'download-na' => 'beatmap template not yet available',
     ],
 
     'index' => [

resources/lang/en/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Pre-packaged collections of beatmaps based around a common theme.',
+        'empty' => 'Coming soon!',
         'nav_title' => 'listing',
         'title' => 'Beatmap Packs',
 

resources/lang/en/beatmaps.php

···
                 'unsaved' => 'Unsaved',
                 'timestamp' => [
                     'all-diff' => 'Posts on "All difficulties" can\'t be timestamped.',
-                    'diff' => 'If this :type starts with a timestamp, it will be shown under Timeline.',
+                    'diff' => 'If this post starts with a timestamp, it will be shown under Timeline.',
                 ],
             ],
             'insert-block' => [
···
 
         'rank_estimate' => [
             '_' => 'This map is estimated to be ranked :date if no issues are found. It is #:position in the :queue.',
+            'on' => 'on :date',
             'queue' => 'ranking queue',
             'soon' => 'soon',
         ],

resources/lang/en/beatmapsets.php

···
 
         'details' => [
             'by_artist' => 'by :artist',
-            'favourite' => 'Favourite this beatmap',
-            'favourite_login' => 'Sign in to favourite this beatmap',
-            'logged-out' => 'You need to sign in before downloading any beatmaps!',
+            'favourite' => 'favourite this beatmap',
+            'favourite_login' => 'sign in to favourite this beatmap',
+            'logged-out' => 'you need to sign in before downloading any beatmaps!',
             'mapped_by' => 'mapped by :mapper',
             'mapped_by_guest' => 'guest difficulty by :mapper',
-            'unfavourite' => 'Unfavourite this beatmap',
+            'unfavourite' => 'unfavourite this beatmap',
             'updated_timeago' => 'last updated :timeago',
 
             'download' => [

resources/lang/en/forum.php

···
             'preview' => 'Preview',
             // TL note: this is used in the topic reply preview, when
             // the user goes back from previewing to editing the reply
-            'preview_hide' => 'Write',
+            'preview_hide' => 'Edit',
             'submit' => 'Post',
 
             'necropost' => [

resources/lang/en/tournament.php

···
         ],
 
         'item' => [
-            'registered' => 'Registered players',
+            'registered' => 'registered players',
         ],
 
         'state' => [

resources/lang/en/users.php

···
         'blocked_count' => 'blocked users (:count)',
         'hide_profile' => 'Hide profile',
         'hide_comment' => 'hide',
+        'forum_post_text' => 'This post is hidden.',
         'not_blocked' => 'That user is not blocked.',
         'show_profile' => 'Show profile',
         'show_comment' => 'show',
···
             'title' => 'User not found! ;_;',
         ],
         'page' => [
-            'button' => 'Edit profile page',
+            'button' => 'edit profile page',
             'description' => '<strong>me!</strong> is a personal customisable area in your profile page.',
             'edit_big' => 'Edit me!',
             'placeholder' => 'Type page content here',
···
         'stats' => [
             'hit_accuracy' => 'Hit Accuracy',
             'level' => 'Level :level',
-            'level_progress' => 'Progress to next level',
+            'level_progress' => 'progress to next level',
             'maximum_combo' => 'Maximum Combo',
             'medals' => 'Medals',
             'play_count' => 'Play Count',

resources/lang/es/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'La discusión de este mapa está bloqueada.',
 
         'metadata' => [
             'nominated' => 'No puedes cambiar los metadatos de un mapa nominado. Contacta con un miembro de los BN o del NAT si crees que están establecidos incorrectamente.',

resources/lang/es/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Colecciones preempaquetadas de mapas basadas en un tema común.',
+        'empty' => '',
         'nav_title' => 'listado',
         'title' => 'Paquetes de Mapas',
 
···
     'mode' => [
         'artist' => 'Artista/Álbum',
         'chart' => 'Destacados',
-        'featured' => '',
+        'featured' => 'Artista destacado',
         'standard' => 'Standard',
         'theme' => 'Tema',
     ],

resources/lang/es/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Se estima que este mapa se clasificará :date si no se encuentran problemas. Es el número :position en la :queue.',
+            'on' => '',
             'queue' => 'cola de clasificación',
             'soon' => 'pronto',
         ],

resources/lang/es/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Foros',
         'latest_post' => 'Último mensaje',
 
         'index' => [
···
         'confirm_restore' => '¿Realmente desea restaurar la publicación?',
         'edited' => 'Última edición por :user :when, editado :count_delimited vez en total.|Última edición por :user :when, editado :count_delimited veces en total.',
         'posted_at' => 'publicado :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'publicado por :username en :forum',
 
         'actions' => [
             'destroy' => 'Eliminar publicación',

resources/lang/es/notifications.php

···
     'verifying' => 'Verifique la sesión para ver las notificaciones',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => 'todas',
+        'beatmapset' => 'mapas',
+        'build' => 'versiones',
+        'channel' => 'chat',
+        'forum_topic' => 'foro',
+        'news_post' => 'noticias',
+        'user' => 'perfil',
     ],
 
     'filters' => [

resources/lang/es/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Creado',
         'feature_votes' => 'Prioridad de estrella',
         'new' => 'Última respuesta',
     ],

resources/lang/fa-IR/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'مجموعه بیتمپ های از پیش بسته بندی شده در مورد یک سبک/ژانر محبوب.',
+        'empty' => '',
         'nav_title' => 'فهرست',
         'title' => 'بسته بیت مپ ها',
 

resources/lang/fa-IR/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => '',
+            'on' => '',
             'queue' => '',
             'soon' => '',
         ],

resources/lang/fi/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Valmiiksi kasattuja beatmap kokoelmia, joissa yhdistyy tietty teema.',
+        'empty' => '',
         'nav_title' => 'listaus',
         'title' => 'Beatmap-Kokoelmat',
 

resources/lang/fi/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Tämän beatmapin arvioidaan tulla hyväksytyksi :date, jos mitään ongelmia ei löydy. Se on #:position :queue.',
+            'on' => '',
             'queue' => 'hyväksytysjonossa',
             'soon' => 'pian',
         ],

resources/lang/fil-PH/authorization.php resources/lang/fil/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'Naka-lock ang beatmap na ito para sa talakayan.',
 
         'metadata' => [
             'nominated' => 'Hindi maaaring baguhin ang metadata ng isang nominadong beatmap. Makipag-ugnayan sa isang miyembro ng BN o NAT kung sa palagay mo ay mali ang pagkakatakda nito.',

resources/lang/fil-PH/beatmappacks.php resources/lang/fil/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Nakaimpakeng koleksyon ng mga beatmaps base sa magkatulad na tema.',
+        'empty' => '',
         'nav_title' => 'listahan',
         'title' => 'Beatmap Packs',
 

resources/lang/fil-PH/beatmaps.php resources/lang/fil/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Ang mapa na ito ay tatantiyahin na maging ranked sa :date kapag walang isyu ang nahanap. Nasa ika-#:position  ng :queue.',
+            'on' => '',
             'queue' => 'pila ng ranking',
             'soon' => 'malapit na',
         ],

resources/lang/fil-PH/forum.php resources/lang/fil/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Forums',
         'latest_post' => 'Pinakabagong Post',
 
         'index' => [
···
         'confirm_restore' => 'Talagang ibalik ang post na ito?',
         'edited' => 'Huling na-edit ni pamamagitan ni :user noong :when, in-edit nang :count_delimited na beses sa kabuuan.|Huling na-edit ni pamamagitan ni :user noong :when, in-edit nang :count_delimited na beses sa kabuuan.',
         'posted_at' => 'nai-post noong :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'ini-ulat ni :username sa :forum',
 
         'actions' => [
             'destroy' => 'Burahin ang post na ito',

resources/lang/fil-PH/notifications.php resources/lang/fil/notifications.php

···
     'verifying' => 'I-verify ang iyong session upang makita ang mga notipikasyon',
 
     'action_type' => [
-        '_' => '',
+        '_' => 'lahat',
         'beatmapset' => '',
         'build' => '',
         'channel' => '',

resources/lang/fil-PH/sort.php resources/lang/fil/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Nilikha',
         'feature_votes' => 'Prayoridad ayon sa bilang ng bituin',
         'new' => 'Huling tugon',
     ],

resources/lang/fr/artist.php

···
                 'artist' => 'Artiste',
                 'bpm_gte' => 'BPM Minimum',
                 'bpm_lte' => 'BPM Maximum',
-                'empty' => 'Aucune musique correspondant aux critères de recherche n\'a été trouvé.',
+                'empty' => 'Aucune musique correspondant aux critères de recherche n\'a été trouvée.',
                 'genre' => 'Genre',
                 'genre_all' => 'Tous',
                 'length_gte' => 'Durée minimale',

resources/lang/fr/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'La discussion de cette beatmap est verrouillée.',
 
         'metadata' => [
             'nominated' => 'Vous ne pouvez pas modifier les métadonnées d\'une beatmap nominée. Contactez un Beatmap Nominator ou un membre de la NAT si vous pensez qu\'elles sont mal définies.',
···
         'annnonce_only' => 'Ce canal est uniquement pour les annonces.',
         'blocked' => 'Vous ne pouvez pas envoyer un message à un utilisateur qui vous a bloqué ou que vous avez bloqué.',
         'friends_only' => 'Cet utilisateur bloque les messages des personnes qui ne sont pas dans sa liste d’amis.',
-        'moderated' => 'Ce salon est actuellement restreint par un modérateur.',
-        'no_access' => 'Vous n’avez pas accès à ce salon.',
+        'moderated' => 'Ce canal est actuellement restreint par un modérateur.',
+        'no_access' => 'Vous n’avez pas accès à ce canal.',
         'receive_friends_only' => 'L\'utilisateur n\'est peut-être pas en mesure de répondre parce que vous n\'acceptez que les messages des personnes de votre liste d\'amis.',
         'restricted' => 'Vous ne pouvez pas envoyer de messages en étant réduit au silence, restreint ou banni.',
         'silenced' => 'Vous ne pouvez pas envoyer de messages en étant réduit au silence, restreint ou banni.',

resources/lang/fr/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Des collections pré-packagées de beatmaps autour d\'un thème commun.',
+        'empty' => '',
         'nav_title' => 'liste',
         'title' => 'Collections de Beatmaps',
 
···
     'mode' => [
         'artist' => 'Artiste/Album',
         'chart' => 'Spotlights',
-        'featured' => '',
+        'featured' => 'Featured Artist',
         'standard' => 'Standard',
         'theme' => 'Thème',
     ],

resources/lang/fr/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Cette beatmap devrait être classée le :date si aucun problème n\'est trouvé. Elle est #:position dans la :queue.',
+            'on' => '',
             'queue' => 'file d\'attente de classement',
             'soon' => 'bientôt',
         ],

resources/lang/fr/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Forums',
         'latest_post' => 'Dernier message',
 
         'index' => [
···
         'confirm_restore' => 'Voulez-vous vraiment restaurer ce post ?',
         'edited' => 'Dernière édition par :user :when, modifié :count_delimited fois au total.|Dernière édition par :user :when, modifié :count_delimited fois au total.',
         'posted_at' => 'posté le :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'posté par :username dans :forum',
 
         'actions' => [
             'destroy' => 'Supprimer le post',

resources/lang/fr/notifications.php

···
     'verifying' => 'Veuillez vérifier votre session pour voir les notifications',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => 'toutes',
+        'beatmapset' => 'beatmaps',
+        'build' => 'versions',
+        'channel' => 'tchat',
+        'forum_topic' => 'forum',
+        'news_post' => 'actualités',
+        'user' => 'profil',
     ],
 
     'filters' => [

resources/lang/fr/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Créé',
         'feature_votes' => 'Star priority',
         'new' => 'Dernière réponse',
     ],

resources/lang/fr/users.php

···
                     'title' => 'Beatmaps loved',
                 ],
                 'nominated' => [
-                    'title' => 'Beatmaps classées nommées',
+                    'title' => 'Beatmaps classées nominées',
                 ],
                 'pending' => [
                     'title' => 'Beatmaps en attente',

resources/lang/he-IL/beatmappacks.php resources/lang/he/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'אוספים ארוזים מראש של beatmaps המבוססים סביב נושא משותף.',
+        'empty' => '',
         'nav_title' => 'רשימה',
         'title' => 'חבילות Beatmap',
 

resources/lang/he-IL/beatmaps.php resources/lang/he/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'מפה זאת תקבל סטטוס Ranked ב:date במידה ולא ימצאו שגיעות. המפה נמצא ב#:position ב:queue.',
+            'on' => '',
             'queue' => 'נבדקת לקבלת Ranking',
             'soon' => 'בקרוב',
         ],

resources/lang/hr-HR/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Unaprijed zapakirane zbirke beatmapa temeljenih na zajedničkoj temi.',
+        'empty' => '',
         'nav_title' => 'popis',
         'title' => 'Paketi beatmapa',
 

resources/lang/hr-HR/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Procjenjuje se da će ova beatmapa biti rangirana :date ako nema problema. To je :position. u :queue.',
+            'on' => '',
             'queue' => 'red čekanja na rangiranje',
             'soon' => 'uskoro',
         ],

resources/lang/hu/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Előre csomagolt, általános témákat körbeölelő beatmap gyűjtemények.',
+        'empty' => '',
         'nav_title' => 'listázás',
         'title' => 'Beatmap Csomagok',
 

resources/lang/hu/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Ez a pálya rangsorolt lesz :date napján, ha további problémák nem merülnek fel. Jelenleg a :position. helyen áll a :queue.',
+            'on' => '',
             'queue' => 'ranglistázási sorban',
             'soon' => 'a közeljövő egy',
         ],

resources/lang/id/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'Diskusi pada beatmap ini telah dikunci.',
 
         'metadata' => [
             'nominated' => 'Kamu tidak dapat mengubah pengaturan metadata pada beatmap yang telah dinominasikan. Harap hubungi BN atau NAT apabila kamu merasa ada suatu hal yang perlu diubah.',

resources/lang/id/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Paket beatmap yang tersusun atas satu tema tertentu.',
+        'empty' => '',
         'nav_title' => 'daftar',
         'title' => 'Paket Beatmap',
 
···
     'mode' => [
         'artist' => 'Artis/Album',
         'chart' => 'Spotlights',
-        'featured' => '',
+        'featured' => 'Featured Artist',
         'standard' => 'Standar',
         'theme' => 'Tematik',
     ],

resources/lang/id/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Map ini akan berstatus Ranked pada :date apabila tidak terdapat masalah baru yang ditemukan. Map ini berada pada urutan ke-:position dalam :queue yang ada.',
+            'on' => '',
             'queue' => 'antrian ranking',
             'soon' => 'segera',
         ],

resources/lang/id/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Forum',
         'latest_post' => 'Kiriman Terbaru',
 
         'index' => [
···
         'confirm_restore' => 'Apakah kamu yakin untuk memulihkan post ini?',
         'edited' => 'Terakhir disunting oleh :user :when, dengan total penyuntingan sebanyak :count_delimited kali.|Terakhir disunting oleh :user :when, dengan total penyuntingan sebanyak :count_delimited kali.',
         'posted_at' => 'diposting :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'diposting oleh :username pada :forum',
 
         'actions' => [
             'destroy' => 'Hapus post',

resources/lang/id/notifications.php

···
     'verifying' => 'Harap verifikasi sesi untuk melihat notifikasi',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => 'semua',
+        'beatmapset' => 'beatmap',
+        'build' => 'versi rilis',
+        'channel' => 'percakapan',
+        'forum_topic' => 'forum',
+        'news_post' => 'berita',
+        'user' => 'profil',
     ],
 
     'filters' => [

resources/lang/id/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Dibuat',
         'feature_votes' => 'Prioritas',
         'new' => 'Balasan Terakhir',
     ],

resources/lang/it/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Collezioni pre-confezionate di beatmap con un tema comune.',
+        'empty' => '',
         'nav_title' => 'lista',
         'title' => 'Pacchetti Beatmap',
 
···
     'mode' => [
         'artist' => 'Artista/Album',
         'chart' => 'Spotlight',
-        'featured' => '',
+        'featured' => 'Artista in primo piano',
         'standard' => 'Standard',
         'theme' => 'Tema',
     ],

resources/lang/it/beatmaps.php

···
             'approved' => 'Questa beatmap è stata approvata il :date!',
             'graveyard' => "Questa beatmap non è stata aggiornata dal :date ed è stata molto probabilmente abbandonata...",
             'loved' => 'Questa beatmap è stata aggiunta a quelle amate il :date!',
-            'ranked' => 'Questa beatmap è stata classificata il :date!',
+            'ranked' => 'Questa beatmap è stata classificata il giorno :date!',
             'wip' => 'Nota: Questa beatmap è contrassegnata come work-in-progress dal creatore.',
         ],
 
···
 
         'rank_estimate' => [
             '_' => 'È stimato che questa mappa verrà classificata in data :date se non vengono trovati problemi. È in posizione #:position nella :queue.',
+            'on' => '',
             'queue' => 'coda per la classifica',
             'soon' => 'molto vicina',
         ],

resources/lang/it/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Forum',
         'latest_post' => 'Post più recente',
 
         'index' => [

resources/lang/it/notifications.php

···
     'verifying' => 'Verifica la sessione per visualizzare le notifiche',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => '"tutto"',
+        'beatmapset' => '"beatmap"',
+        'build' => '"versioni"',
+        'channel' => '"chat"',
+        'forum_topic' => '"forum"',
+        'news_post' => '"notizie"',
+        'user' => '"profilo"',
     ],
 
     'filters' => [

resources/lang/it/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Creazione',
         'feature_votes' => 'Stelle di priorità',
         'new' => 'Ultima risposta',
     ],

resources/lang/it/store.php

···
         'info' => ':count_delimited articolo nel carrello ($:subtotal)|:count_delimited articoli nel carrello ($:subtotal)',
         'more_goodies' => 'Voglio dare un\'occhiata ad altri elementi prima di completare l\'ordine',
         'shipping_fees' => 'costi di spedizione',
-        'title' => 'Carrello della spesa',
+        'title' => 'Carrello',
         'total' => 'totale',
 
         'errors_no_checkout' => [

resources/lang/ja/beatmappacks.php

···
 return [
     'index' => [
         'description' => '共通のテーマを有するビートマップを集めたパックです。',
+        'empty' => '',
         'nav_title' => '一覧',
         'title' => 'ビートマップパック',
 
···
     'mode' => [
         'artist' => 'アーティスト/アルバム',
         'chart' => 'スポットライト',
-        'featured' => '',
+        'featured' => '注目アーティスト',
         'standard' => 'スタンダードパック',
         'theme' => 'テーマ',
     ],

resources/lang/ja/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'このマップは、問題が見つからなければ :date にrankedされると推定されます。:queue 内の #:position ',
+            'on' => '',
             'queue' => 'ランキングキュー',
             'soon' => '間もなく',
         ],

resources/lang/ja/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'フォーラム',
         'latest_post' => '最新の投稿',
 
         'index' => [

resources/lang/ko/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => '이 비트맵은 토론을 할 수 없도록 잠겨 있습니다.',
 
         'metadata' => [
             'nominated' => '추천된 맵의 메타데이터를 변경할 수는 없습니다. 잘못 지정된 것 같으시면 BN이나 NAT 멤버에게 알려주세요.',

resources/lang/ko/beatmappacks.php

···
 return [
     'index' => [
         'description' => '비슷한 테마를 기준으로 모아놓은 비트맵 모음집입니다.',
+        'empty' => '',
         'nav_title' => '목록',
         'title' => '비트맵 팩',
 
···
     'mode' => [
         'artist' => '아티스트/앨범',
         'chart' => '스포트라이트',
-        'featured' => '',
+        'featured' => '공식 아티스트',
         'standard' => '표준',
         'theme' => '테마',
     ],

resources/lang/ko/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => '이 맵에 아무런 문제가 발견되지 않으면 :date 에 랭크될 예정입니다. :queue의 #:position번째 순서입니다.',
+            'on' => '',
             'queue' => '랭킹 대기열',
             'soon' => '곧',
         ],

resources/lang/ko/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => '포럼',
         'latest_post' => '최근 게시글',
 
         'index' => [
···
         'confirm_restore' => '정말 이 글을 복원할까요?',
         'edited' => ':user 님이 마지막으로 :when에 수정하여 총 :count_delimited회 수정되었습니다.',
         'posted_at' => ':when에 게시됨',
-        'posted_by_in' => '',
+        'posted_by_in' => ':username 님이 :forum에 게시함',
 
         'actions' => [
             'destroy' => '삭제',

resources/lang/ko/notifications.php

···
     'verifying' => '알림을 보려면 세션을 검증해주세요.',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => '모두',
+        'beatmapset' => '비트맵',
+        'build' => '빌드',
+        'channel' => '채팅',
+        'forum_topic' => '포럼',
+        'news_post' => '소식',
+        'user' => '프로필',
     ],
 
     'filters' => [

resources/lang/ko/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => '최근 생성',
         'feature_votes' => '별 평점 순위',
         'new' => '최근 응답',
     ],

resources/lang/lt-LT/beatmappacks.php resources/lang/lt/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Surinktos bitmapų kolekcijos pagal temas.',
+        'empty' => '',
         'nav_title' => 'sąrašas',
         'title' => 'Bitmapų Rinkiniai',
 

resources/lang/lt-LT/beatmaps.php resources/lang/lt/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Numatoma, kad šis bitmapas bus reitinguotas :date, jei nebus rasta problemų. Jis yra #:position tarp :queue.',
+            'on' => '',
             'queue' => 'reitingavimo eilės',
             'soon' => 'greitai',
         ],

resources/lang/lv-LV/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Iepriekš sagatavotas bītmapju kolekcijas ar savstarpēji kopīgu tēmu.',
+        'empty' => '',
         'nav_title' => 'saraksts',
         'title' => 'Bītmapju Pakas',
 

resources/lang/lv-LV/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Tiek paredzēts, ka šī mape tiks ierindota :date, ja netiks konstatētas problēmas. Tā ir #:position :queue.',
+            'on' => '',
             'queue' => 'ierindošanas rinda',
             'soon' => 'drīz',
         ],

resources/lang/ms-MY/beatmappacks.php

···
 return [
     'index' => [
         'description' => '',
+        'empty' => '',
         'nav_title' => '',
         'title' => '',
 

resources/lang/ms-MY/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => '',
+            'on' => '',
             'queue' => '',
             'soon' => '',
         ],

resources/lang/nl/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'Deze beatmap is gesloten voor discussie.',
 
         'metadata' => [
             'nominated' => 'U kunt metagegevens van een nominale kaart niet wijzigen. Neem contact op met een BN of NAT lid als u denkt dat deze onjuist is ingesteld.',

resources/lang/nl/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Voorverpakte collecties van beatmaps rond een bepaald thema.',
+        'empty' => '',
         'nav_title' => 'lijst',
         'title' => 'Beatmap Packs',
 
···
     'mode' => [
         'artist' => 'Artiest/Album',
         'chart' => 'In de schijnwerpers',
-        'featured' => '',
+        'featured' => 'Uitgelichte Artiest',
         'standard' => 'Standaard',
         'theme' => 'Thema',
     ],

resources/lang/nl/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Deze map staat gepland om ranked te worden op :date als er geen problemen worden gevonden. Het is #:position in de :queue.',
+            'on' => '',
             'queue' => 'ranking wachtlijst',
             'soon' => 'binnenkort',
         ],

resources/lang/nl/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Forums',
         'latest_post' => 'Laatste bericht',
 
         'index' => [
···
         'confirm_restore' => 'Will je deze post echt terugzetten?',
         'edited' => 'Laatst bewerkt door :user op :when. :count keer bewerkt in totaal.',
         'posted_at' => 'gepost op :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'gepost door :username in :forum',
 
         'actions' => [
             'destroy' => 'Verwijder bericht',

resources/lang/nl/notifications.php

···
     'verifying' => 'Verifieer de sessie om meldingen te bekijken',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => 'alle',
+        'beatmapset' => 'beatmaps',
+        'build' => 'versies',
+        'channel' => 'chat',
+        'forum_topic' => 'forum',
+        'news_post' => 'nieuws',
+        'user' => 'profiel',
     ],
 
     'filters' => [

resources/lang/nl/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Aangemaakt',
         'feature_votes' => 'Ster prioriteit',
         'new' => 'Laatste antwoord',
     ],

resources/lang/no/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Forhåndspakkede samlinger av beatmaps basert rundt et felles tema.',
+        'empty' => '',
         'nav_title' => 'liste',
         'title' => 'Beatmappakker',
 

resources/lang/no/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Dette kartet er estimert til å bli rangert som :date hvis ingen problemer er funnet. Det er #:position i :queue.',
+            'on' => '',
             'queue' => 'rangerings kø ',
             'soon' => 'snart',
         ],

resources/lang/pl/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'Tworzenie dyskusji dla tej beatmapy zostało zablokowane.',
 
         'metadata' => [
             'nominated' => 'Nie możesz zmienić metadanych nominowanej mapy. Skontaktuj się z członkiem BN lub NAT, jeśli uważasz, że są one ustawione nieprawidłowo.',

resources/lang/pl/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Kolekcje beatmap o wspólnej tematyce.',
+        'empty' => '',
         'nav_title' => 'lista',
         'title' => 'Paczki beatmap',
 
···
     'mode' => [
         'artist' => 'Artysta/Album',
         'chart' => 'Wyróżnione',
-        'featured' => '',
+        'featured' => 'Wyróżnieni artyści',
         'standard' => 'Standardowe',
         'theme' => 'Tematyczne',
     ],

resources/lang/pl/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Ta beatmapa uzyska status rankingowy :date, jeżeli nie zostaną zgłoszone żadne problemy. Obecnie jest ona na :position. miejscu w :queue.',
+            'on' => '',
             'queue' => 'kolejce rankingowej',
             'soon' => 'wkrótce',
         ],

resources/lang/pl/beatmapsets.php

···
         'details' => [
             'by_artist' => ':artist',
             'favourite' => 'Dodaj do ulubionych',
-            'favourite_login' => 'Zaloguj się, by dodać tę beatmapę do ulubionych',
+            'favourite_login' => 'Zaloguj się, by dodać tę beatmapę do ulubionych.',
             'logged-out' => 'Zaloguj się, aby zacząć pobierać beatmapy!',
             'mapped_by' => 'autorstwa :mapper',
             'mapped_by_guest' => 'gościnny poziom trudności autorstwa :mapper',

resources/lang/pl/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Forum',
         'latest_post' => 'Ostatni post',
 
         'index' => [
···
         'confirm_restore' => 'Czy na pewno chcesz przywrócić post?',
         'edited' => 'Ostatnio edytowane przez :user :when, łącznie edytowane :count_delimited raz.|Ostatnio edytowane przez :user :when, łącznie edytowane :count_delimited razy.|Ostatnio edytowane przez :user :when, łącznie edytowane :count_delimited razy.',
         'posted_at' => 'opublikowane :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'opublikowane przez :username na :forum',
 
         'actions' => [
             'destroy' => 'Usuń post',

resources/lang/pl/notifications.php

···
     'verifying' => 'Zweryfikuj sesję, by wyświetlić powiadomienia',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => 'wszystkie',
+        'beatmapset' => 'beatmapy',
+        'build' => 'zmiany',
+        'channel' => 'czat',
+        'forum_topic' => 'forum',
+        'news_post' => 'aktualności',
+        'user' => 'profil',
     ],
 
     'filters' => [

resources/lang/pl/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Data utworzenia',
         'feature_votes' => 'Priorytet',
         'new' => 'Ostatnia odpowiedź',
     ],

resources/lang/pt-br/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'Este beatmap está trancado para discussão.',
 
         'metadata' => [
             'nominated' => 'Você não pode alterar os metadados de um mapa nomeado. Entre em contato com um membro do BN ou NAT se você acha que ele está definido incorretamente.',

resources/lang/pt-br/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Coleções temáticas pré-compactadas.',
+        'empty' => '',
         'nav_title' => 'listagem',
         'title' => 'Pacotes de Beatmaps',
 
···
     'mode' => [
         'artist' => 'Artista/Álbum',
         'chart' => 'Destaques',
-        'featured' => '',
+        'featured' => 'Artista em Destaque',
         'standard' => 'Standard',
         'theme' => 'Tema',
     ],

resources/lang/pt-br/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Este mapa é estimado a ser ranqueado em :date se nenhum problema for encontrado. É o #:position na :queue.',
+            'on' => '',
             'queue' => 'fila de ranqueamento',
             'soon' => 'em breve',
         ],

resources/lang/pt-br/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Fóruns',
         'latest_post' => 'Última Publicação',
 
         'index' => [
···
         'confirm_restore' => 'Deseja mesmo restaurar a publicação?',
         'edited' => 'Última edição por :user :when, editado :count vezes no total.',
         'posted_at' => 'publicado :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'postado por :username em :forum',
 
         'actions' => [
             'destroy' => 'Excluir publicação',

resources/lang/pt-br/notifications.php

···
     'verifying' => 'Por favor verifique a sessão para ver as notificações',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => 'todas',
+        'beatmapset' => 'beatmaps',
+        'build' => 'versões',
+        'channel' => 'chat',
+        'forum_topic' => 'fórum',
+        'news_post' => 'notícias',
+        'user' => 'perfil',
     ],
 
     'filters' => [

resources/lang/pt-br/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Criado',
         'feature_votes' => 'Prioridade de estrela',
         'new' => 'Última resposta',
     ],

resources/lang/pt/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Coleções pré-empacotadas de beatmaps baseadas num tema em comum.',
+        'empty' => '',
         'nav_title' => 'listagem',
         'title' => 'Pacotes de beatmap',
 
···
     'mode' => [
         'artist' => 'Artista/Álbum',
         'chart' => 'Em destaque',
-        'featured' => '',
+        'featured' => 'Artista Destacado',
         'standard' => 'Padrão',
         'theme' => 'Tema',
     ],

resources/lang/pt/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Este mapa está estimado a ser classificado em :date se não forem descobertos quaisquer problemas. Está em #:position na :queue.',
+            'on' => '',
             'queue' => 'fila de classificação',
             'soon' => 'em breve',
         ],

resources/lang/pt/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Fóruns',
         'latest_post' => 'Última publicação',
 
         'index' => [
···
         'confirm_restore' => 'Queres mesmo restaurar a publicação?',
         'edited' => 'Editado pela última vez por :user :when, editado :count vezes no total.',
         'posted_at' => 'publicado :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'publicado por :username em :forum',
 
         'actions' => [
             'destroy' => 'Eliminar publicação',

resources/lang/pt/notifications.php

···
 
     'action_type' => [
         '_' => '',
-        'beatmapset' => '',
+        'beatmapset' => 'beatmaps',
         'build' => '',
         'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        'forum_topic' => 'fórum',
+        'news_post' => 'notícias',
+        'user' => 'perfil',
     ],
 
     'filters' => [

resources/lang/ro/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'Discuțiile sunt blocate pe acest beatmap.',
 
         'metadata' => [
             'nominated' => 'Nu poți schimba datele melodiei a unui beatmap nominalizat. Contactează un membru BN sau NAT dacă crezi că e setat greșit.',

resources/lang/ro/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Colecțiile preambalate de beatmap-uri sunt bazate în jurul unei teme comune.',
+        'empty' => '',
         'nav_title' => 'listare',
         'title' => 'Pachete Beatmap',
 
···
     'mode' => [
         'artist' => 'Artist/Album',
         'chart' => 'Promovări',
-        'featured' => '',
+        'featured' => 'Artist Oficial',
         'standard' => 'Standard',
         'theme' => 'Temă',
     ],

resources/lang/ro/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Acest beatmap este estimat a fi clasificat în data de :date dacă nu sunt găsite probleme. Este #:position în :queue.',
+            'on' => '',
             'queue' => 'lista de așteptare pentru clasament',
             'soon' => 'în curând',
         ],

resources/lang/ro/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Forum-uri',
         'latest_post' => 'Ultima Postare',
 
         'index' => [
···
         'confirm_restore' => 'Sigur dorești să restaurezi postarea?',
         'edited' => 'Editat ultima dată de către :user :when, editat o dată în total.|Editat ultima dată de către :user :when, editat de :count_delimited ori în total.',
         'posted_at' => 'postat :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'postat de :username în :forum',
 
         'actions' => [
             'destroy' => 'Șterge postarea',

resources/lang/ro/notifications.php

···
     'verifying' => 'Verificați sesiunea pentru a vizualiza notificările',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => 'tot',
+        'beatmapset' => 'beatmap-uri',
+        'build' => 'versiuni',
+        'channel' => 'chat',
+        'forum_topic' => 'forum',
+        'news_post' => 'știri',
+        'user' => 'profil',
     ],
 
     'filters' => [

resources/lang/ro/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Creat',
         'feature_votes' => 'Prioritatea stelelor',
         'new' => 'Ultimul răspuns',
     ],

resources/lang/ru/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'Обсуждение этой карты закрыто.',
 
         'metadata' => [
             'nominated' => 'Вы не можете изменить метаданные номинируемой карты. В случае ошибок свяжитесь с номнатором или членом NAT.',

resources/lang/ru/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Предварительно упакованные коллекции карт, основанные на общей тематике.',
+        'empty' => '',
         'nav_title' => 'список',
         'title' => 'Сборки карт',
 
···
     'mode' => [
         'artist' => 'Исполнители/Альбомы',
         'chart' => 'Чарты',
-        'featured' => '',
+        'featured' => 'Избранные исполнители',
         'standard' => 'Стандартные',
-        'theme' => 'Темы',
+        'theme' => 'Тематические',
     ],
 
     'require_login' => [

resources/lang/ru/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Эта карта станет рейтинговой :date, если не будет найдено проблем. Она #:position в :queue.',
+            'on' => '',
             'queue' => 'очереди ранка',
             'soon' => 'скоро',
         ],

resources/lang/ru/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Форумы',
         'latest_post' => 'Последний пост',
 
         'index' => [
···
         'confirm_restore' => 'Восстановить ответ?',
         'edited' => 'Последний раз редактировал :user :when, всего правок: :count_delimited.',
         'posted_at' => 'создана :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'опубликовано :username в :forum',
 
         'actions' => [
             'destroy' => 'Удалить ответ',

resources/lang/ru/notifications.php

···
     'verifying' => 'Пожалуйста, проверьте сессию для просмотра уведомлений',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => 'все',
+        'beatmapset' => 'карты',
+        'build' => 'билды',
+        'channel' => 'чат',
+        'forum_topic' => 'форум',
+        'news_post' => 'новости',
+        'user' => 'профиль',
     ],
 
     'filters' => [

resources/lang/ru/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Дате создания',
         'feature_votes' => 'Количество голосов',
         'new' => 'Последнему ответу',
     ],

resources/lang/ru/store.php

···
         'add_to_cart' => 'Добавить в корзину',
         'notify' => 'Сообщить о поступлении!',
 
-        'notification_success' => 'Вы будете оповещены когда товар будет в наличии. Нажмите :link для отмены',
+        'notification_success' => 'Вы будете оповещены, когда товар будет в наличии. Нажмите :link для отмены',
         'notification_remove_text' => 'сюда',
 
         'notification_in_stock' => 'Данный товар уже есть в наличии!',

resources/lang/si-LK/beatmappacks.php

···
 return [
     'index' => [
         'description' => '',
+        'empty' => '',
         'nav_title' => '',
         'title' => '',
 

resources/lang/si-LK/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => '',
+            'on' => '',
             'queue' => '',
             'soon' => '',
         ],

resources/lang/sk/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Kolekcie beatmáp s podobnou tématikou.',
+        'empty' => '',
         'nav_title' => 'výpis',
         'title' => 'Balíky beatmáp',
 

resources/lang/sk/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Táto mapa je predpokladaná k hodnotení :date, pokud sa nenájdu žiadne chyby. Mapa je momentálne v pozícii číslo :position ve fronte :queue.',
+            'on' => '',
             'queue' => 'fronta hodnotení ',
             'soon' => 'neskôr ',
         ],

resources/lang/sl-SI/authorization.php resources/lang/sl/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'Ta beatmapa je zaklenjena za razpravo.',
 
         'metadata' => [
             'nominated' => 'Urejanje metadata nominirane beatmape ni mogoče. Kontaktiraj člana BN ali NAT če misliš, da je ta narobe nastavljen.',

resources/lang/sl-SI/beatmappacks.php resources/lang/sl/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Zapakirane zbirke beatmapov na skupno temo.',
+        'empty' => '',
         'nav_title' => 'seznam',
         'title' => 'Paketi beatmapov',
 

resources/lang/sl-SI/beatmaps.php resources/lang/sl/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Ta beatmapa bo približno rankirana :date če ne bo najdenih težav. Trenutno je #:position v :queue.',
+            'on' => '',
             'queue' => 'čakalna vrsta rankiranja',
             'soon' => 'kmalu',
         ],

resources/lang/sl-SI/beatmapsets.php resources/lang/sl/beatmapsets.php

···
         'discussion' => 'Razprava',
 
         'deleted_banner' => [
-            'title' => '',
-            'message' => '',
+            'title' => 'Ta beatmapa je bila izbrisana.',
+            'message' => '(to lahko vidijo samo moderatorji)',
         ],
 
         'details' => [

resources/lang/sl-SI/forum.php resources/lang/sl/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Forumi',
         'latest_post' => 'Zadnja objava',
 
         'index' => [
···
         'confirm_restore' => 'Res želiš povrniti objavo?',
         'edited' => 'Nazadnje uredil :user :when, uredil skupno :count_delimited-krat.|Nazadnje uredil :user :when, uredil skupno :count_delimited-krat.',
         'posted_at' => 'objavljeno :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'objavil :username v :forum',
 
         'actions' => [
             'destroy' => 'Odstrani objavo',

resources/lang/sl-SI/notifications.php resources/lang/sl/notifications.php

···
     'verifying' => 'Za ogled obvestil te prosimo za verifikacijo seje',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
+        '_' => 'vse',
+        'beatmapset' => 'beatmape',
         'build' => '',
         'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        'forum_topic' => 'forum',
+        'news_post' => 'novice',
+        'user' => 'profil',
     ],
 
     'filters' => [

resources/lang/sl-SI/sort.php resources/lang/sl/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Ustvarjeno',
         'feature_votes' => 'Star prioriteta',
         'new' => 'Zadnji odgovor',
     ],

resources/lang/sr-SP/authorization.php resources/lang/sr/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'Ова мапа је закључана за дискусију.',
 
         'metadata' => [
             'nominated' => 'Не можете да промените метаподатке номиноване мапе. Контактирајте члана БН или НАТ групе ако мислите да су подаци нетачни.',

resources/lang/sr-SP/beatmappacks.php resources/lang/sr/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Већ спремне колекције мапа које су засноване око неке теме.',
+        'empty' => '',
         'nav_title' => 'листинг',
         'title' => 'Колекција мапа',
 
···
     'mode' => [
         'artist' => 'Извођач/Албум',
         'chart' => 'Сезонске колекције',
-        'featured' => '',
+        'featured' => 'Истакнут Уметник',
         'standard' => 'Стандардне колекције',
         'theme' => 'Тематске колекције',
     ],

resources/lang/sr-SP/beatmaps.php resources/lang/sr/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Процењује се да ће мапа бити померена у "ranked" секцију :date ако се не пронађу проблеми. Мапа је тренутно #:position у :queue.',
+            'on' => '',
             'queue' => 'ред за "ranked" секцију',
             'soon' => 'ускоро',
         ],

resources/lang/sr-SP/beatmapsets.php resources/lang/sr/beatmapsets.php

···
         'discussion' => 'Дискусија',
 
         'deleted_banner' => [
-            'title' => '',
-            'message' => '',
+            'title' => 'Ова мапа је избрисана.',
+            'message' => '(ово могу да виде само модератори)',
         ],
 
         'details' => [

resources/lang/sr-SP/forum.php resources/lang/sr/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Форуми',
         'latest_post' => 'Најновији Постови',
 
         'index' => [

resources/lang/sr-SP/home.php resources/lang/sr/home.php

···
             'label' => [
                 'forum' => 'тражите на форуму',
                 'forum_children' => 'укључујући субфоруме',
-                'include_deleted' => '',
+                'include_deleted' => 'укључи избрисане постове',
                 'topic_id' => 'тема #',
                 'username' => 'аутор',
             ],
···
         'macos-fallback' => 'macOS корисници',
         'mirror' => 'алтернативни линк',
         'or' => 'или',
-        'os_version_or_later' => '',
+        'os_version_or_later' => ':os_version или слично',
         'other_os' => 'друге платформе',
         'quick_start_guide' => 'водич за брзи почетак',
         'tagline' => "Почнимо!",

resources/lang/sr-SP/notifications.php resources/lang/sr/notifications.php

···
     'verifying' => 'Молимо Вас да верификујете сесију да би сте видели нотификације',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => 'све',
+        'beatmapset' => 'мапе',
+        'build' => 'верзије',
+        'channel' => 'ћаскање',
+        'forum_topic' => 'форум',
+        'news_post' => 'новости',
+        'user' => 'профил',
     ],
 
     'filters' => [

resources/lang/sr-SP/sort.php resources/lang/sr/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Креирано',
         'feature_votes' => 'Приоритет по звездицама',
         'new' => 'Последњи одговор',
     ],

resources/lang/sv/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Färdigförpackade samlingar med beatmaps som är baserade på ett gemensamt tema.',
+        'empty' => '',
         'nav_title' => 'listning',
         'title' => 'Beatmap-samlingar',
 

resources/lang/sv/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Denna beatmap uppskattas vara rankad :date, så länge inga fel uppstår. Den är #:position i :queue.',
+            'on' => '',
             'queue' => 'rankkö',
             'soon' => 'snart',
         ],

resources/lang/sv/rankings.php

···
         'multiplayer' => 'flerspelarläge',
         'performance' => 'prestation',
         'score' => 'poäng',
-        'seasons' => '',
+        'seasons' => 'säsonger',
     ],
 
     'seasons' => [
-        'empty' => '',
-        'ongoing' => '',
+        'empty' => 'Det finns inga rum i denna säsong ännu.',
+        'ongoing' => 'Denna säsong pågår fortfarande (det kommer läggas till fler spellistor).',
         'room_count' => '',
         'url' => '',
     ],

resources/lang/tg-TJ/beatmappacks.php

···
 return [
     'index' => [
         'description' => '',
+        'empty' => '',
         'nav_title' => '',
         'title' => '',
 

resources/lang/tg-TJ/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => '',
+            'on' => '',
             'queue' => '',
             'soon' => '',
         ],

resources/lang/th/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'แพ็คคอลเล็คชั่นของเพลงที่อยู่ในประเภทเดียวกัน',
+        'empty' => '',
         'nav_title' => 'รายการ',
         'title' => 'แพ็คเกจบีทแมพ',
 

resources/lang/th/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'แมพนี้จะถูก ranked  ใน :date ถ้าไม่พบเจอปัญหาเพิ่มเติม แมพนี้อยู่ที่ #:position ใน :queue',
+            'on' => '',
             'queue' => 'คิวการ rank',
             'soon' => 'เร็ว ๆ นี้',
         ],

resources/lang/tr/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Benzer bir tema etrafında toplanmış, önceden paketlenmiş beatmap paketleri.',
+        'empty' => '',
         'nav_title' => 'katalog',
         'title' => 'Beatmap Paketleri',
 

resources/lang/tr/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Herhangi bir sorun bulunmazsa mapin tahminen dereceli olacağı vakit :date. :queue :position. sırada bulunuyor.',
+            'on' => '',
             'queue' => 'Derecelendirme sırasında',
             'soon' => 'çok yakın',
         ],

resources/lang/uk/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => 'Ця мапа закрита для обговорень.',
 
         'metadata' => [
             'nominated' => 'Ви не можете змінювати метадані номінованій карті. Зв\'яжіться з членом BN або NAT, якщо ви думаєте, що вони вказані невірно.',

resources/lang/uk/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Попередньо впаковані колекції мап, засновані на загальних тематиках.',
+        'empty' => '',
         'nav_title' => 'список',
         'title' => 'Збірки мап',
 
···
     'mode' => [
         'artist' => 'Виконавці/Альбоми',
         'chart' => 'Чарти',
-        'featured' => '',
+        'featured' => 'Обраний виконавець',
         'standard' => 'Стандартні',
         'theme' => 'Тематичні',
     ],

resources/lang/uk/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Ця мапа стане рейтинговою :date, якщо ніяких проблем не буде знайдено. Вона #:position в :queue.',
+            'on' => '',
             'queue' => 'черзі на рейтинг',
             'soon' => 'дуже скоро',
         ],

resources/lang/uk/events.php

···
     'rank' => '<strong><em>:user</em></strong> отримав #:rank місце на мапі <em>:beatmap</em> (:mode)',
     'rank_lost' => '<strong><em>:user</em></strong> втратив лідерство на мапі <em>:beatmap</em> (:mode)',
     'user_support_again' => '<strong>:user</strong> вирішив знову підтримати osu! Дякуємо за вашу підтримку!',
-    'user_support_first' => '<strong>:user</strong> став osu!прихильником! Дякуємо за вашу підтримку!',
+    'user_support_first' => '<strong>:user</strong> підтримав osu! - дякуємо за вашу підтримку!',
     'user_support_gift' => '<strong>:user</strong> отримав тег osu!прихильника в подарунок!',
     'username_change' => '<strong>:previousUsername</strong> змінив своє ім\'я на <strong><em>:user</em></strong>!',
 

resources/lang/uk/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => 'Форуми',
         'latest_post' => 'Останній пост',
 
         'index' => [
···
         'confirm_restore' => 'Відновити відповідь?',
         'edited' => 'Востаннє відредаговано :user :when, загалом відредаговано :count_delimited раз.|Востаннє відредаговано :user :when, загалом відредаговано :count_delimited разів.',
         'posted_at' => 'написано :when',
-        'posted_by_in' => '',
+        'posted_by_in' => 'опубліковано :username у :forum',
 
         'actions' => [
             'destroy' => 'Видалити відповідь',

resources/lang/uk/notifications.php

···
     'verifying' => 'Будь ласка, перевірте сеанс, щоб переглянути сповіщення',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => 'всі',
+        'beatmapset' => 'мапи',
+        'build' => 'збірки',
+        'channel' => 'чат',
+        'forum_topic' => 'форум',
+        'news_post' => 'новини',
+        'user' => 'профіль',
     ],
 
     'filters' => [

resources/lang/uk/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => 'Створено',
         'feature_votes' => 'Кількість голосів',
         'new' => 'Остання відповідь',
     ],

resources/lang/uk/users.php

···
     ],
     'restricted_banner' => [
         'title' => 'Ваш обліковий запис заблоковано!',
-        'message' => 'Під час блокування вашого облікового запису, ви не зможете взаємодіяти з іншими гравцями, і ваші результати будуть показуватись лише для вас. Зазвичай, цей процес відбувається автоматично і як правило, ці обмеження облікового запису знімаються протягом доби. :link',
+        'message' => 'Під час блокування вашого облікового запису, ви не в змозі взаємодіяти з іншими гравцями, й ваші результати будуть показуватися лише вам. Зазвичай, цей автоматизований процес й, як правило, обмеження облікового запису знімаються протягом доби. :link',
         'message_link' => 'Натисніть сюди, щоб дізнатися подробиці.',
     ],
     'show' => [

resources/lang/vi/beatmappacks.php

···
 return [
     'index' => [
         'description' => 'Sưu tầm những map được đóng gói sẵn dựa trên chủ đề chung.',
+        'empty' => '',
         'nav_title' => 'danh sách',
         'title' => 'Gói Beatmap',
 

resources/lang/vi/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => 'Map này ước tính sẽ được Xếp Hạng :date nếu không tìm ra lỗi nào. Nó đang ở #:position trong :queue.',
+            'on' => '',
             'queue' => 'hàng chờ xếp hạng',
             'soon' => 'sớm',
         ],

resources/lang/zh-tw/beatmappacks.php

···
 return [
     'index' => [
         'description' => '相同主題的圖譜合集壓縮檔',
+        'empty' => '',
         'nav_title' => '列表',
         'title' => '曲包',
 

resources/lang/zh-tw/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => '若沒找到問題，該圖譜將於 :date 進榜。位於 :queue 中的 #:position。',
+            'on' => '',
             'queue' => 'ranking 列隊',
             'soon' => '不久後',
         ],

resources/lang/zh-tw/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => '論壇',
         'latest_post' => '最新貼文',
 
         'index' => [

resources/lang/zh-tw/notifications.php

···
 
     'action_type' => [
         '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        'beatmapset' => '圖譜',
+        'build' => '版本',
+        'channel' => '聊天',
+        'forum_topic' => '論壇',
+        'news_post' => '新聞',
+        'user' => '個人資料',
     ],
 
     'filters' => [

resources/lang/zh/authorization.php

···
     ],
 
     'beatmapset' => [
-        'discussion_locked' => '',
+        'discussion_locked' => '谱面已上锁，以供讨论。',
 
         'metadata' => [
             'nominated' => '您不能更改已提名谱面的信息。如果您认为其不正确，请联系谱面审核成员 (BN) 或审核评估团队 (NAT) 更改。',

resources/lang/zh/beatmappacks.php

···
 return [
     'index' => [
         'description' => '围绕某个相同主题打包好的曲包',
+        'empty' => '',
         'nav_title' => '列表',
         'title' => '曲包',
 
···
     'mode' => [
         'artist' => '艺术家/专辑',
         'chart' => '聚光灯',
-        'featured' => '',
+        'featured' => '精选艺术家',
         'standard' => '常规',
         'theme' => '主题',
     ],

resources/lang/zh/beatmaps.php

···
 
         'rank_estimate' => [
             '_' => '谱面正位于 :queue 中第 :position 位。如果没有问题，谱面将在 :date 上架 (Ranked)。',
+            'on' => '',
             'queue' => '谱面上架队列',
             'soon' => '不久后',
         ],

resources/lang/zh/forum.php

···
     ],
 
     'forums' => [
-        'forums' => '',
+        'forums' => '论坛',
         'latest_post' => '最新帖子',
 
         'index' => [
···
         'confirm_restore' => '恢复此回复？',
         'edited' => '最后一次由 :user 在 :when 编辑，总共编辑了 :count_delimited 次。',
         'posted_at' => '发表于 :when',
-        'posted_by_in' => '',
+        'posted_by_in' => ':username 在 “:forum” 下发帖',
 
         'actions' => [
             'destroy' => '删除回复',

resources/lang/zh/notifications.php

···
     'verifying' => '请验证会话以查看通知',
 
     'action_type' => [
-        '_' => '',
-        'beatmapset' => '',
-        'build' => '',
-        'channel' => '',
-        'forum_topic' => '',
-        'news_post' => '',
-        'user' => '',
+        '_' => '全部',
+        'beatmapset' => '谱面',
+        'build' => '版本',
+        'channel' => '聊天',
+        'forum_topic' => '论坛',
+        'news_post' => '新闻',
+        'user' => '个人资料',
     ],
 
     'filters' => [

resources/lang/zh/rankings.php

···
         'multiplayer' => '多人游戏',
         'performance' => '表现',
         'score' => '总分',
-        'seasons' => '季',
+        'seasons' => '季赛',
     ],
 
     'seasons' => [
-        'empty' => '这一季还没有房间。',
-        'ongoing' => '这一季仍在进行中（将加入更多歌单）。',
+        'empty' => '本季赛暂无可用房间。',
+        'ongoing' => '本季赛仍在进行中（将加入更多歌单）。',
         'room_count' => '歌单数量',
-        'url' => '显示该季更多信息。',
+        'url' => '显示该季赛更多信息。',
     ],
 
     'spotlight' => [

resources/lang/zh/sort.php

···
     ],
 
     'forum_topics' => [
-        'created' => '',
+        'created' => '已创建',
         'feature_votes' => '星级优先级',
         'new' => '最后回复',
     ],

resources/lang/zh/users.php

···
         'first_members' => '元老玩家',
         'is_developer' => 'osu! 开发者',
         'is_supporter' => 'osu! 支持者',
-        'joined_at' => '注册时间：:date',
+        'joined_at' => '注册于 :date',
         'lastvisit' => '最后活跃：:date',
         'lastvisit_online' => '当前在线',
         'missingtext' => '你可能打错字了！（或者该用户已经被封禁）',

resources/views/docs/info.md.blade.php

···
 
 Current rate limit is set at an insanely high 1200 requests per minute, with burst capability of up to 200 beyond that. If you require more, you probably fall into the above category of abuse. If you are doing more than 60 requests a minute, you should probably give [peppy](mailto:[e-mail]) a yell.
 
+# Wrappers
+
+Below is a list of some language-specific wrappers maintained by the community. Your mileage may vary when using them – please report any issues to the wrapper first before reporting back to us.
+
+- [ossapi](https://github.com/circleguard/ossapi) (python)
+- [aiosu](https://github.com/NiceAesth/aiosu) (python)
+- [rosu-v2](https://github.com/MaxOhn/rosu-v2) (rust)
+
 # Changelog
 
 For a full list of changes, see the

resources/views/forum/topics/_post.blade.php

···
     See the LICENCE file in the repository root for full licence text.
 --}}
 <?php
-    $options['postPosition'] = $options['postPosition'] ?? 1;
-    $options['signature'] = $options['signature'] ?? true;
-
-    $options['buttons']['delete'] = $options['buttons']['delete'] ?? false;
-    $options['buttons']['edit'] = $options['buttons']['edit'] ?? false;
-    $options['buttons']['quote'] = $options['buttons']['quote'] ?? false;
-    $options['buttons']['report'] = auth()->check() && $post->poster_id !== auth()->user()->getKey();
-
-    $buttons = [];
-
-    foreach (['edit', 'delete', 'quote', 'report'] as $buttonType) {
-        if ($options['buttons'][$buttonType]) {
-            $buttons[] = $buttonType;
-        }
-    }
+    $options['postPosition'] ??= 1;
 
     $user = $post->userNormalized();
-    $hidden = $post->trashed() || ($options['postPosition'] === 1 && $post->topic->trashed());
+    $blocked = $currentUser !== null && $currentUser->hasBlocked($user);
+    $hidden = $blocked || $post->trashed() || ($options['postPosition'] === 1 && $post->topic->trashed());
 ?>
 <div
     {{-- js-forum-post is also used by js-forum-post-report for the postId and postUsername dataset --}}
···
     data-post-username="{{ $user->username }}"
     data-post-position="{{ $options["postPosition"] }}"
 >
-    @include('forum.topics._post_info', compact('user'))
+    @if ($blocked)
+        <div class="forum-post-info">
+            {!! link_to_user($user, null, null, ['forum-post-info__row', 'forum-post-info__row--username']) !!}
+        </div>
+        <div class="forum-post__body">
+            <div class="forum-post__content forum-post__content--blocked">
+                {!! osu_trans('users.blocks.forum_post_text') !!}
+            </div>
+        </div>
+    @else
+        @php
+        $options['signature'] ??= true;
 
-    <div class="forum-post__body js-forum-post-edit--container">
-        <div class="forum-post__content forum-post__content--header">
-            <div class="forum-post__header-content">
-                @if (isset($topic) && $topic->topic_poster === $post->poster_id)
-                    <div class="forum-post__header-content-item">
-                        <span class="forum-user-badge">
-                            {{ osu_trans('forum.post.info.topic_starter') }}
-                        </span>
-                    </div>
-                @endif
+        $options['buttons']['delete'] ??= false;
+        $options['buttons']['edit'] ??= false;
+        $options['buttons']['quote'] ??= false;
+        $options['buttons']['report'] = $currentUserId !== null && $post->poster_id !== $currentUserId;
 
-                <div class="forum-post__header-content-item">
-                    {!! link_to_user($user, null, '', ['forum-post__user']) !!}
+        $buttons = [];
 
-                    <a class="js-post-url" rel="nofollow" href="{{ $post->exists ? route('forum.posts.show', $post->post_id) : '#' }}">
-                        {!! timeago($post->post_time) !!}
-                    </a>
-                </div>
-            </div>
+        foreach (['edit', 'delete', 'quote', 'report'] as $buttonType) {
+            if ($options['buttons'][$buttonType]) {
+                $buttons[] = $buttonType;
+            }
+        }
+        @endphp
+        @include('forum.topics._post_info', compact('user'))
 
-            @if (count($buttons) > 0)
-                <div class="forum-post__menu">
-                    @php
-                        $menuId = implode(':', ['forum-post', $post->getKey(), rand()]);
-                    @endphp
-                    <button class="forum-post__menu-button js-click-menu" data-click-menu-target="{{ $menuId }}">
-                        <span class="fas fa-ellipsis-v"></span>
-                    </button>
+        <div class="forum-post__body js-forum-post-edit--container">
+            <div class="forum-post__content forum-post__content--header">
+                <div class="forum-post__header-content">
+                    @if (isset($topic) && $topic->topic_poster === $post->poster_id)
+                        <div class="forum-post__header-content-item">
+                            <span class="forum-user-badge">
+                                {{ osu_trans('forum.post.info.topic_starter') }}
+                            </span>
+                        </div>
+                    @endif
 
-                    <div
-                        class="simple-menu simple-menu--forum-list js-click-menu"
-                        data-visibility="hidden"
-                        data-click-menu-id="{{ $menuId }}"
-                    >
-                        @foreach ($buttons as $button)
-                            @include("forum.posts._button_{$button}", [
-                                'class' => 'simple-menu__item',
-                                'post' => $post,
-                                'type' => 'menu',
-                            ])
-                        @endforeach
+                    <div class="forum-post__header-content-item">
+                        {!! link_to_user($user, null, '', ['forum-post__user']) !!}
+
+                        <a class="js-post-url" rel="nofollow" href="{{ $post->exists ? route('forum.posts.show', $post->post_id) : '#' }}">
+                            {!! timeago($post->post_time) !!}
+                        </a>
                     </div>
                 </div>
-            @endif
-        </div>
+
+                @if (count($buttons) > 0)
+                    <div class="forum-post__menu">
+                        @php
+                            $menuId = implode(':', ['forum-post', $post->getKey(), rand()]);
+                        @endphp
+                        <button class="forum-post__menu-button js-click-menu" data-click-menu-target="{{ $menuId }}">
+                            <span class="fas fa-ellipsis-v"></span>
+                        </button>
 
-        <div class="forum-post__content forum-post__content--main">
-            <div class="forum-post-content {{ $options['contentExtraClasses'] ?? '' }} js-audio--group">
-                {!! $post->bodyHTML() !!}
+                        <div
+                            class="simple-menu simple-menu--forum-list js-click-menu"
+                            data-visibility="hidden"
+                            data-click-menu-id="{{ $menuId }}"
+                        >
+                            @foreach ($buttons as $button)
+                                @include("forum.posts._button_{$button}", [
+                                    'class' => 'simple-menu__item',
+                                    'post' => $post,
+                                    'type' => 'menu',
+                                ])
+                            @endforeach
+                        </div>
+                    </div>
+                @endif
             </div>
-        </div>
 
-        @if($post->post_edit_count > 0)
-            <div class="forum-post__content forum-post__content--footer">
-                {!!
-                    osu_trans_choice('forum.post.edited', $post->post_edit_count, [
-                        'user' => link_to_user($post->lastEditorNormalized(), null, '', []),
-                        'when' => timeago($post->post_edit_time),
-                    ])
-                !!}
+            <div class="forum-post__content forum-post__content--main">
+                <div class="forum-post-content {{ $options['contentExtraClasses'] ?? '' }} js-audio--group">
+                    {!! $post->bodyHTML() !!}
+                </div>
             </div>
-        @endif
 
-        @if($options["signature"] !== false && present($post->userNormalized()->user_sig))
-            <div class="forum-post__content forum-post__content--signature js-audio--group hidden-xs">
-                {!! bbcode($post->userNormalized()->user_sig, $post->userNormalized()->user_sig_bbcode_uid) !!}
-            </div>
-        @endif
+            @if($post->post_edit_count > 0)
+                <div class="forum-post__content forum-post__content--footer">
+                    {!!
+                        osu_trans_choice('forum.post.edited', $post->post_edit_count, [
+                            'user' => link_to_user($post->lastEditorNormalized(), null, '', []),
+                            'when' => timeago($post->post_edit_time),
+                        ])
+                    !!}
+                </div>
+            @endif
 
-        @if (count($buttons) > 0)
-            <div class="forum-post__actions">
-                @foreach ($buttons as $button)
-                    @include("forum.posts._button_{$button}", ['post' => $post, 'type' => 'circle'])
-                @endforeach
-            </div>
-        @endif
-    </div>
+            @if($options["signature"] !== false && null !== ($signature = $userSignatures->get($user)))
+                <div class="forum-post__content forum-post__content--signature js-audio--group hidden-xs">
+                    {!! $signature !!}
+                </div>
+            @endif
+
+            @if (count($buttons) > 0)
+                <div class="forum-post__actions">
+                    @foreach ($buttons as $button)
+                        @include("forum.posts._button_{$button}", ['post' => $post, 'type' => 'circle'])
+                    @endforeach
+                </div>
+            @endif
+        </div>
+    @endif
 </div>

resources/views/forum/topics/_posts.blade.php

···
     See the LICENCE file in the repository root for full licence text.
 --}}
 @php
+    use App\Libraries\User\UserSignatures;
+
+    $currentUser = Auth::user();
+    $currentUserId = $currentUser?->getKey();
+    $userSignatures = new UserSignatures();
+
     $postPosition = $firstPostPosition;
 @endphp
 
···
         $isBeatmapsetPost = $postPosition === 1 && $post->isBeatmapsetPost();
     @endphp
     @include('forum.topics._post', [
+        'currentUser' => $currentUser,
+        'currentUserId' => $currentUserId,
         'post' => $post,
+        'userSignatures' => $userSignatures,
         'options' => [
             'postPosition' => $postPosition,
             'signature' => $topic->forum->enable_sigs,

resources/views/home/_user_news_post_preview.blade.php

···
     Copyright (c) ppy Pty Ltd <[e-mail]>. Licensed under the GNU Affero General Public License v3.0.
     See the LICENCE file in the repository root for full licence text.
 --}}
-
+@php
+    $publishedAt = $post->published_at;
+@endphp
 <div class="news-post-preview{{$collapsed ? ' news-post-preview--collapsed' : ''}}">
     <a
         class="news-post-preview__image"
···
         {!! background_image($post->firstImage()) !!}
     ></a>
     <div class="news-post-preview__body">
-        <div class="news-post-preview__post-date js-tooltip-time" title="{{ json_time($post->published_at) }}">
+        <div class="news-post-preview__post-date js-tooltip-time" title="{{ json_time($publishedAt) }}">
             <div class="news-post-preview__date">
-                {{$post->published_at->format('d')}}
+                {{ i18n_date_auto($publishedAt, 'd') }}
             </div>
+
             <div class="news-post-preview__month-year">
                 @if ($collapsed)
-                    &nbsp;{{$post->published_at->format('M')}}
+                    &nbsp;{{ i18n_date_auto($publishedAt, 'MMM') }}
                 @else
-                    {{$post->published_at->format('M Y')}}
+                    {{ i18n_date_auto($publishedAt, 'yMMM') }}
                 @endif
             </div>
         </div>

resources/views/objects/search/_forum_options.blade.php

···
                         {{ osu_trans('home.search.forum_post.all') }}
                     </option>
 
-                    @foreach (App\Models\Forum\Forum::displayList()->get() as $forum)
+                    @foreach (App\Models\Forum\Forum::searchable()->displayList()->get() as $forum)
                         @if (priv_check('ForumView', $forum)->can())
                             <option
                                 value="{{ $forum->getKey() }}"

resources/views/packs/index.blade.php

···
         </ul>
 
         <div class="beatmap-packs js-accordion">
+            @if (count($packs) === 0)
+                {{ osu_trans('beatmappacks.index.empty') }}
+            @endif
             @foreach ($packs as $pack)
                 <div class="beatmap-pack js-beatmap-pack js-accordion__item" data-pack-tag="{{ $pack->tag }}">
                     <a href="{{ route('packs.show', $pack) }}" class="beatmap-pack__header js-accordion__item-header">

tests/Browser/SanityTest.php

···
         ]);
 
         // factories for /beatmapsets/*
-        self::$scaffolding['beatmap_mirror'] = factory(BeatmapMirror::class)->create();
+        self::$scaffolding['beatmap_mirror'] = BeatmapMirror::factory()->create();
         self::$scaffolding['genre'] = Genre::factory()->create();
         self::$scaffolding['language'] = Language::factory()->create();
         self::$scaffolding['beatmapset'] = Beatmapset::factory()->create([
···
         self::$scaffolding['pack'] = BeatmapPack::factory()->create();
 
         // factories for /community/contests/*
-        self::$scaffolding['contest'] = factory(Contest::class)->states('entry')->create();
+        self::$scaffolding['contest'] = Contest::factory()->entry()->create();
 
         // factories for /community/tournaments/*
         self::$scaffolding['tournament'] = Tournament::factory()->create();
 
         // factories for /beatmaps/artists/*
-        self::$scaffolding['artist'] = factory(Artist::class)->create();
+        self::$scaffolding['artist'] = Artist::factory()->create();
         self::$scaffolding['track'] = ArtistTrack::factory()->create([
             'artist_id' => self::$scaffolding['artist']->getKey(),
         ]);
···
 
         // factory for /home/changelog/*
         self::$scaffolding['stream'] = factory(UpdateStream::class)->create();
-        self::$scaffolding['changelog'] = factory(Changelog::class)->create([
+        self::$scaffolding['changelog'] = Changelog::factory()->create([
             'stream_id' => self::$scaffolding['stream']->stream_id,
         ]);
         self::$scaffolding['build'] = Build::factory()->create([
···
         ]);
 
         // factory for /g/*
-        self::$scaffolding['group'] = factory(Group::class)->create();
+        self::$scaffolding['group'] = Group::factory()->create();
 
         // factory for comments
         self::$scaffolding['comment'] = Comment::factory()->create([

tests/Controllers/Chat/Channels/MessagesControllerTest.php

···
             'user' => $this->user->getKey(),
         ]));
 
-        $filter = factory(ChatFilter::class)->create();
+        $filter = ChatFilter::factory()->create();
 
         $this->json(
             'POST',

tests/Libraries/bbcode_examples/basic_list.html

···
-<ol class="unordered"><li>Here
-<br /></li><li>be
-<br /></li><li>basic list
-<br /></li></ol><ol><li>Here
-<br /></li><li>be
-<br /></li><li>numbered list
-<br /></li></ol><ol class="unordered"><li>And
-<br /></li><li>here
-<br /><ol class="unordered"><li>is
-<br /></li><li>nested
-<br /></li></ol></li><li>list
-<br /></li><li>and
-<br /><ol><li>with
-<br /></li><li>number
-<br /></li></ol></li></ol>
+<ol class="unordered">
+    <li>Here</li>
+    <li>be</li>
+    <li>basic list</li>
+</ol>
+<ol>
+    <li>Here</li>
+    <li>be</li>
+    <li>numbered list</li>
+</ol>
+<ol class="unordered">
+    <li>And</li>
+    <li>here<br />
+        <ol class="unordered">
+            <li>is</li>
+            <li>nested</li>
+        </ol>
+    </li>
+    <li>list</li>
+    <li>and<br />
+        <ol>
+            <li>with</li>
+            <li>number</li>
+        </ol>
+    </li>
+</ol>

tests/Libraries/bbcode_examples/basic_quote.html

···
-<blockquote>Basic
-<br />quote
-<br />tag</blockquote><blockquote><h4>name wrote:</h4>And with name</blockquote>
+<blockquote>
+Basic<br />
+quote<br />
+tag
+</blockquote>
+<blockquote>
+<h4>name wrote:</h4>
+And with name
+</blockquote>

tests/Libraries/bbcode_examples/box_with_bbcode_title.base.txt

···
+[box=[color=red]colored box title[/color]]box content[/box]
+
+[size=50]other content[/size]
+
+[box=[\[] weird \[ title]box content[/box]
+
+[size=50]other content 2[/size]
+
+[box=[weird title]broken box content[/box]
+
+[size=50]other content 3[/size]

tests/Libraries/bbcode_examples/box_with_bbcode_title.db.txt

···
+[box=[color=red:1]colored box title[/color:1]:1]box content[/box:1]
+
+[size=50:1]other content[/size:1]
+
+[box=[\[] weird \[ title:1]box content[/box:1]
+
+[size=50:1]other content 2[/size:1]
+
+[box=[weird title]broken box content[/box:1]
+
+[size=50:1]other content 3[/size:1]

tests/Libraries/bbcode_examples/box_with_bbcode_title.html

···
+<div class="js-spoilerbox bbcode-spoilerbox">
+    <button class="js-spoilerbox__link bbcode-spoilerbox__link" type="button">
+        <span class="bbcode-spoilerbox__link-icon"></span><span style="color:#FF0000;">colored box title</span>
+    </button>
+    <div class="bbcode-spoilerbox__body">box content</div>
+</div><br />
+<span class="size-50">other content</span><br />
+<br />
+<div class="js-spoilerbox bbcode-spoilerbox">
+    <button class="js-spoilerbox__link bbcode-spoilerbox__link" type="button"><span class="bbcode-spoilerbox__link-icon"></span>[\[] weird \[ title</button>
+    <div class="bbcode-spoilerbox__body">box content</div>
+</div><br />
+<span class="size-50">other content 2</span><br />
+<br />
+[box=[weird title]broken box content<br />
+<span class="size-50">other content 3</span>

tests/Libraries/bbcode_examples/imagemap.base.txt

···
+[imagemap]
+https://assets.ppy.sh/osu-web-test-resources/placeholder-1280x720.jpg
+0 6.9 20 30 https://osu.ppy.sh link 1
[phone] https://osu.ppy.sh/home
+8 8 8 8 #
+9 9 9 9 # some title
+[/imagemap]
+
+[imagemap]
+https://assets.ppy.sh/osu-web-test-resources/placeholder-1280x720.jpg
[phone] https://osu.ppy.sh/users/2
+[/imagemap]
+
+[imagemap]
+https://assets.ppy.sh/osu-web-test-resources/placeholder-1280x720.jpg
+[/imagemap]

tests/Libraries/bbcode_examples/imagemap.db.txt

···
+[imagemap]
https://assets.ppy.sh/osu-web-test-resources/placeholder-1280x720.jpg
0 6.9 20 30 https://osu.ppy.sh link 1
40 50 60 70 https://osu.ppy.sh/home
8 8 8 8 #
9 9 9 9 # some title
[/imagemap]
+
+[imagemap]
https://assets.ppy.sh/osu-web-test-resources/placeholder-1280x720.jpg
40 50 60 70 https://osu.ppy.sh/users/2
[/imagemap]
+
+[imagemap]
https://assets.ppy.sh/osu-web-test-resources/placeholder-1280x720.jpg
[/imagemap]

tests/Libraries/bbcode_examples/imagemap.html

···
+<div class="imagemap">
+    <img class="imagemap__image" loading="lazy" src="https://assets.ppy.sh/osu-web-test-resources/placeholder-1280x720.jpg" width="1280" height="720" alt="placeholder-1280x720.jpg" />
+    <a class="imagemap__link" href="https://osu.ppy.sh" style="left:0%;top:6.9%;width:20%;height:30%;" title="link 1"></a>
+    <a class="imagemap__link" href="https://osu.ppy.sh/home" style="left:40%;top:50%;width:60%;height:70%;" title=""></a>
+    <span class="imagemap__link" style="left:8%;top:8%;width:8%;height:8%;" title=""></span>
+    <span class="imagemap__link" style="left:9%;top:9%;width:9%;height:9%;" title="some title"></span>
+</div>
+<br />
+<div class="imagemap">
+    <img class="imagemap__image" loading="lazy" src="https://assets.ppy.sh/osu-web-test-resources/placeholder-1280x720.jpg" width="1280" height="720" alt="placeholder-1280x720.jpg" />
+    <a class="imagemap__link" href="https://osu.ppy.sh/users/2" style="left:40%;top:50%;width:60%;height:70%;" title=""></a>
+</div>
+<br />
+[imagemap]<br />
+https://assets.ppy.sh/osu-web-test-resources/placeholder-1280x720.jpg<br />
+[/imagemap]

tests/Libraries/bbcode_examples/list_title.html

···
-<ul class="bbcode__list-title"><li>The title<br /></li></ul><ol class="unordered"><li>Here
-<br /></li><li>be
-<br /></li><li>basic list
-<br /></li></ol><ul class="bbcode__list-title"><li>The title<br /></li></ul><ol><li>Here
-<br /></li><li>be
-<br /></li><li>numbered list
-<br /></li></ol>
+<ul class="bbcode__list-title">
+    <li>The title</li>
+</ul>
+<ol class="unordered">
+    <li>Here</li>
+    <li>be</li>
+    <li>basic list</li>
+</ol>
+<ul class="bbcode__list-title">
+    <li>The title</li>
+</ul>
+<ol>
+    <li>Here</li>
+    <li>be</li>
+    <li>numbered list</li>
+</ol>

tests/Libraries/bbcode_examples/multiple_links.base.txt

···
+https://osu.ppy.sh https://osu.ppy.sh
+
+http://localhost/home
+http://localhost/home
+http://localhost/home
+
+www.example.com
+www.example.com
+
[e-mail]
[e-mail]

tests/Libraries/bbcode_examples/multiple_links.db.txt

···
+<!-- m --><a href='https://osu.ppy.sh' rel='nofollow'>https://osu.ppy.sh</a><!-- m --> <!-- m --><a href='https://osu.ppy.sh' rel='nofollow'>https://osu.ppy.sh</a><!-- m -->
+
+<!-- m --><a href='http://localhost/home' rel='nofollow'>home</a><!-- m -->
+<!-- m --><a href='http://localhost/home' rel='nofollow'>home</a><!-- m -->
+<!-- m --><a href='http://localhost/home' rel='nofollow'>home</a><!-- m -->
+
+<!-- w --><a href='http://www.example.com' rel='nofollow'>www.example.com</a><!-- w -->
+<!-- w --><a href='http://www.example.com' rel='nofollow'>www.example.com</a><!-- w -->
+
+<!-- e --><a href='mailto:[e-mail]' rel='nofollow'>[e-mail]</a><!-- e -->
+<!-- e --><a href='mailto:[e-mail]' rel='nofollow'>[e-mail]</a><!-- e -->

tests/Libraries/bbcode_examples/multiple_links.html

···
+<!-- m --><a href="https://osu.ppy.sh" rel="nofollow">https://osu.ppy.sh</a><!-- m --> <!-- m --><a href="https://osu.ppy.sh" rel="nofollow">https://osu.ppy.sh</a><!-- m --><br />
+<br />
+<!-- m --><a href="http://localhost/home" rel="nofollow">home</a><!-- m --><br />
+<!-- m --><a href="http://localhost/home" rel="nofollow">home</a><!-- m --><br />
+<!-- m --><a href="http://localhost/home" rel="nofollow">home</a><!-- m --><br />
+<br />
+<!-- w --><a href="http://www.example.com" rel="nofollow">www.example.com</a><!-- w --><br />
+<!-- w --><a href="http://www.example.com" rel="nofollow">www.example.com</a><!-- w --><br />
+<br />
+<!-- e --><a href="mailto:[e-mail]" rel="nofollow">[e-mail]</a><!-- e --><br />
+<!-- e --><a href="mailto:[e-mail]" rel="nofollow">[e-mail]</a><!-- e -->

tests/Middleware/RouteScopesTest.php

···
             'stream_id' => 1, // Changelog stream_id is tinyint, autoincrement makes test fail too soon.
         ]);
 
-        factory(Changelog::class)->create([
+        Changelog::factory()->create([
             'stream_id' => $stream->getKey(),
             'user_id' => 1, // user doesn't need to exist and not having to create a user makes the test much faster
         ]);

tests/Models/BeatmapsetTest.php

···
 
         $beatmapset = Beatmapset::factory()->create(array_merge($defaultParams, $params));
         $beatmapset->beatmaps()->save(Beatmap::factory()->make());
-        factory(BeatmapMirror::class)->states('default')->create();
+        BeatmapMirror::factory()->default()->create();
 
         return $beatmapset;
     }
···
         foreach ($playmodes as $playmode) {
             $beatmapset->beatmaps()->save(Beatmap::factory()->make(['playmode' => Beatmap::modeInt($playmode)]));
         }
-        factory(BeatmapMirror::class)->states('default')->create();
+        BeatmapMirror::factory()->default()->create();
 
         return $beatmapset;
     }

tests/Models/ContestTest.php

···
                 ]);
             }
         }
-        $contest = factory(Contest::class)->create([
+        $contest = Contest::factory()->create([
             'extra_options' => [
                 'requirement' => [
                     'must_pass' => $mustPass,
···
                 ],
             ],
         ]);
-        $entries = factory(ContestEntry::class, 2)->create(['contest_id' => $contest->getKey()]);
+        $entries = ContestEntry::factory()->count(2)->create(['contest_id' => $contest->getKey()]);
 
         if (!$canVote) {
             $this->expectException(InvariantException::class);
···
 
     public function testAssertVoteRequirementNoRequirement(): void
     {
-        $contest = factory(Contest::class)->create();
-        $entry = factory(ContestEntry::class)->create(['contest_id' => $contest->getKey()]);
+        $contest = Contest::factory()->create();
+        $entry = ContestEntry::factory()->create(['contest_id' => $contest->getKey()]);
         $user = User::factory()->create();
 
         $contest->assertVoteRequirement($user, $entry);
···
         $extraOptions = $showEntryUserOption === null
             ? null
             : ['show_entry_user' => $showEntryUserOption];
-        $contest = factory(Contest::class)->create([
+        $contest = Contest::factory()->create([
             'show_votes' => $showVotes,
             'extra_options' => $extraOptions,
         ]);

tests/Models/GroupTest.php

···
     public function testRename()
     {
         $newName = 'new name';
-        $group = factory(Group::class)->create(['group_name' => 'name']);
+        $group = Group::factory()->create(['group_name' => 'name']);
         $groupRenameEventCount = $this->getGroupRenameEventCount($group);
 
         $group->rename($newName);
···
     public function testRenameUnchanged()
     {
         $name = 'name';
-        $group = factory(Group::class)->create(['group_name' => $name]);
+        $group = Group::factory()->create(['group_name' => $name]);
         $groupRenameEventCount = $this->getGroupRenameEventCount($group);
 
         $group->rename($name);

tests/Models/ModelTest.php

···
 {
     public function testGetWithHasMore()
     {
-        factory(Artist::class, 5)->create();
+        Artist::factory()->count(5)->create();
         $count = Artist::count();
 
         $limit = $count - 1;

tests/Models/UserReportTest.php

···
 use App\Models\BeatmapDiscussion;
 use App\Models\BeatmapDiscussionPost;
 use App\Models\Beatmapset;
+use App\Models\Chat\Message;
 use App\Models\Forum;
 use App\Models\Traits\ReportableInterface;
 use App\Models\User;
 use App\Models\UserReport;
+use Exception;
 use Tests\TestCase;
 
 class UserReportTest extends TestCase
 {
+    private static function getReportableUser(ReportableInterface $reportable)
+    {
+        return match ($reportable::class) {
+            Message::class => $reportable->sender,
+            User::class => $reportable,
+            default => $reportable->user,
+        };
+    }
+
     private static function makeReportable(string $class): ReportableInterface
     {
         $modelFactory = $class::factory();
···
             $userColumn = 'poster_id';
         }
 
-        return $modelFactory->create([$userColumn => User::factory()]);
+        return $class === User::class
+            ? $modelFactory->create()
+            : $modelFactory->create([$userColumn => User::factory()]);
     }
 
     private static function reportParams(array $additionalParams = []): array
···
         $reportable = static::makeReportable($class);
 
         $this->expectException(ValidationException::class);
-        $reportable->reportBy($reportable->user, static::reportParams());
+        $reportable->reportBy(static::getReportableUser($reportable), static::reportParams());
     }
 
     public function testCannotReportScoreableBeatmapset()
···
     /**
      * @dataProvider reportableClasses
      */
-    public function testNoComments(string $class)
+    public function testNoComments(string $class): void
+    {
+        $reportable = static::makeReportable($class);
+        $reporter = User::factory()->create();
+
+        if ($class === Message::class) {
+            $this->expectCountChange(fn () => UserReport::count(), 1);
+        } else {
+            $this->expectException(ValidationException::class);
+        }
+        $reportable->reportBy($reporter, static::reportParams([
+            'comments' => null,
+        ]));
+    }
+
+    /**
+     * @dataProvider reportableClasses
+     */
+    public function testNoCommentsReasonOther(string $class): void
     {
         $reportable = static::makeReportable($class);
         $reporter = User::factory()->create();
···
         $this->expectException(ValidationException::class);
         $reportable->reportBy($reporter, static::reportParams([
             'comments' => null,
+            'reason' => 'Other',
         ]));
     }
 
···
         $this->assertTrue($report->reportable->is($reportable));
     }
 
+    /**
+     * @dataProvider reportableClasses
+     */
+    public function testReportableNotificationEndpoint(string $class): void
+    {
+        $reportable = static::makeReportable($class);
+        $reporter = User::factory()->create();
+        $report = $reportable->reportBy($reporter, static::reportParams());
+
+        $report->routeNotificationForSlack(null);
+
+        $this->assertTrue(true, 'should not fail getting notification routing url');
+    }
+
     public function reportableClasses(): array
     {
-        return array_map(
-            fn (string $morphName): array => [MorphMap::getClass($morphName)],
-            array_keys(UserReport::ALLOWED_REASONS),
-        );
+        $reportables = [];
+
+        foreach (MorphMap::MAP as $class => $_name) {
+            if (isset(class_implements($class)[ReportableInterface::class])) {
+                $reportables[] = [$class];
+            }
+        }
+
+        // Sanity check to make sure there are models to test.
+        if (count($reportables) === 0) {
+            throw new Exception('No reportables found');
+        }
+
+        return $reportables;
     }
 }