Merge branch 'develop'

.mocharc.json

@@ -2,6 +2,6 @@
 	"extension": ["ts","js","cjs","mjs"],
 	"require": ["ts-node/register", "tsconfig-paths/register"],
 	"slow": 1000,
-	"timeout": 30000,
+	"timeout": 35000,
 	"exit": true
 }

CONTRIBUTING.md

@@ -28,21 +28,16 @@ If your language is not listed in Crowdin, please open an issue.
 
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 
-## Internationalization (i18n)
-Misskey uses the Vue.js plugin [Vue I18n](https://github.com/kazupon/vue-i18n).
-Documentation of Vue I18n is available at http://kazupon.github.io/vue-i18n/introduction.html .
-
 ## Documentation
-* Documents for contributors are located in [`/docs`](/docs).
 * Documents for instance admins are located in [`/docs`](/docs).
 * Documents for end users are located in [`/src/docs`](/src/docs).
 
 ## Test
 * Test codes are located in [`/test`](/test).
 
 ## Continuous integration
-Misskey uses CircleCI for executing automated tests.
-Configuration files are located in [`/.circleci`](/.circleci).
+Misskey uses GitHub Actions for executing automated tests.
+Configuration files are located in [`/.github/workflows`](/.github/workflows).
 
 ## Adding MisskeyRoom items
 * Use English for material, object and texture names.

locales/ar-SA.yml

@@ -385,7 +385,6 @@ updateRemoteUser: "تحديث المعلومات عن المستخدم البع
 deleteAllFiles: "حذف كافة الملفات"
 userSuspended: "تم تعليق هذا المستخدم."
 userSilenced: "تم إسكات هذا المستخدم."
-sidebar: "الشريط الجانبي"
 addItem: "إضافة عنصر"
 rooms: "الغرفة"
 relays: "المُرَحلات"
@@ -430,6 +429,7 @@ user: "المستخدمون"
 administration: "إدارة "
 expiration: "ينتهي استطلاع الرأي في"
 middle: "متوسط"
+global: "الشامل"
 _email:
   _follow:
     title: "يتابعك"
@@ -442,9 +442,7 @@ _reversi:
   total: "المجموع"
 _channel:
   featured: "المتداوَلة"
-_sidebar:
-  full: "كامل"
-  icon: "الصورة الرمزية"
+_menuDisplay:
   hide: "إخفاء"
 _theme:
   explore: "استكشف قوالب المظهر"

locales/cs-CZ.yml

@@ -390,7 +390,6 @@ script: "Skript"
 deleteAllFiles: "Smazat všechny soubory"
 deleteAllFilesConfirm: "Jste si jistí že chcete smazat všechny soubory?"
 userSuspended: "Tomuto uživateli byl pozastaven účet."
-sidebar: "Postranní panel"
 addItem: "Přidat položku"
 rooms: "Místnost"
 inboxUrl: "Inbox URL"
@@ -409,8 +408,6 @@ _mfm:
   search: "Vyhledávání"
 _reversi:
   total: "Celkem"
-_sidebar:
-  icon: "Avatar"
 _theme:
   keys:
     mention: "Zmínění"

locales/de-DE.yml

@@ -528,7 +528,7 @@ removeAllFollowing: "Allen gefolgten Benutzern entfolgen"
 removeAllFollowingDescription: "Allen Benutzerkonten von {host} entfolgen. Bitte führe dies durch, falls diese Instanz nicht mehr existiert."
 userSuspended: "Dieser Benutzer wurde gesperrt."
 userSilenced: "Dieser Benutzer wurde instanzweit stummgeschaltet."
-sidebar: "Seitenleiste"
+menu: "Menü"
 divider: "Trenner"
 addItem: "Element hinzufügen"
 rooms: "Raum"
@@ -761,6 +761,10 @@ middle: "Mittel"
 low: "Niedrig"
 emailNotConfiguredWarning: "Keine Email-Adresse hinterlegt"
 ratio: "Verhältnis"
+customCss: "Benutzerdefiniertes CSS"
+customCssWarn: "Verwende diese Einstellung nur, wenn du weißt, was sie tut. Ungültige Eingaben können dazu führen, dass der Client nicht mehr normal funktioniert."
+global: "Global"
+squareAvatars: "Profilbilder quadratisch anzeigen"
 _ad:
   back: "Zurück"
   reduceFrequencyOfThisAd: "Diese Werbung weniger anzeigen"
@@ -910,9 +914,10 @@ _channel:
   following: "Gefolgt"
   usersCount: "{n} Teilnehmer"
   notesCount: "{n} Notizen"
-_sidebar:
-  full: "Voll"
-  icon: "Symbole"
+_menuDisplay:
+  sideFull: "Horizontal"
+  sideIcon: "Horizontal (Icons)"
+  top: "Oben"
   hide: "Ausblenden"
 _wordMute:
   muteWords: "Wort stummschalten"

locales/en-US.yml

@@ -528,7 +528,7 @@ removeAllFollowing: "Withhold All Followings"
 removeAllFollowingDescription: "Unfollow all accounts from {host}. Please run this if the instance no longer exists."
 userSuspended: "This user has been suspended."
 userSilenced: "This user has been silenced."
-sidebar: "Sidebar"
+menu: "Menu"
 divider: "Divider"
 addItem: "Add Item"
 rooms: "Room"
@@ -761,6 +761,10 @@ middle: "Medium"
 low: "Low"
 emailNotConfiguredWarning: "Email address not set"
 ratio: "Ratio"
+customCss: "Custom CSS"
+customCssWarn: "This setting should only be used if you know what it does. Entering improper values may cause the client to stop functioning normally."
+global: "Global"
+squareAvatars: "Display squared avatars"
 _ad:
   back: "Back"
   reduceFrequencyOfThisAd: "Show this ad less"
@@ -910,9 +914,10 @@ _channel:
   following: "Followed"
   usersCount: "{n} Participants"
   notesCount: "{n} Notes"
-_sidebar:
-  full: "Full"
-  icon: "Icons"
+_menuDisplay:
+  sideFull: "Horizontal"
+  sideIcon: "Horizontal (Icons)"
+  top: "Top"
   hide: "Hide"
 _wordMute:
   muteWords: "Word to mute"