Merge branch 'main' into actions

docs/releases.md

@@ -24,7 +24,7 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
 **Additional translations:**
 
 * Japanese (thanks to [@shak](https://hosted.weblate.org/user/shak/))
-* Russian (*incomplete*, thanks to [@flamey](https://hosted.weblate.org/user/flamey/))
+* Russian (thanks to [@flamey](https://hosted.weblate.org/user/flamey/) and [@ilya.mikheev.coder](https://hosted.weblate.org/user/ilya.mikheev.coder/))
 
 ## ntfy server v1.21.0 (UNRELEASED)
 
@@ -46,7 +46,7 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
 * Indonesian (thanks to [@linerly](https://hosted.weblate.org/user/linerly/))
 * Japanese (thanks to [@shak](https://hosted.weblate.org/user/shak/))
 * Norwegian Bokmål (thanks to [@comradekingu](https://github.com/comradekingu))
-* Russian (*incomplete*, thanks to [@flamey](https://hosted.weblate.org/user/flamey/))
+* Russian (thanks to [@flamey](https://hosted.weblate.org/user/flamey/) and [@ilya.mikheev.coder](https://hosted.weblate.org/user/ilya.mikheev.coder/))
 * Spanish (thanks to [@rogeliodh](https://github.com/rogeliodh))
 * Turkish (thanks to [@ersen](https://ersen.moe/))
 

web/src/components/Preferences.js

@@ -423,7 +423,7 @@ const Appearance = () => {
 
 const Language = () => {
     const { t, i18n } = useTranslation();
-    const randomFlags = shuffle(["🇬🇧", "🇺🇸", "🇪🇸", "🇧🇬", "🇩🇪", "🇮🇩", "🇯🇵", "🇹🇷"]).slice(0, 3);
+    const randomFlags = shuffle(["🇬🇧", "🇺🇸", "🇪🇸", "🇧🇬", "🇩🇪", "🇮🇩", "🇯🇵", "🇷🇺", "🇹🇷"]).slice(0, 3);
     const title = t("prefs_appearance_language_title") + " " + randomFlags.join(" ");
 
     // Remember: Flags are not languages. Don't put flags next to the language in the list.
@@ -441,6 +441,7 @@ const Language = () => {
                     <MenuItem value="id">Bahasa Indonesia</MenuItem>
                     <MenuItem value="ja">日本語</MenuItem>
                     <MenuItem value="nb_NO">Norsk bokmål</MenuItem>
+                    <MenuItem value="ru">Русский</MenuItem>
                     <MenuItem value="tr">Türkçe</MenuItem>
                 </Select>
             </FormControl>