22 files changed, 32 insertions, 32 deletions

diff --git a/client/src/app/+signup/+register/register.component.html b/client/src/app/+signup/+register/register.component.html
index 2d0e6e865..5c4fe5f0b 100644
--- a/client/src/app/+signup/+register/register.component.html
+++ b/client/src/app/+signup/+register/register.component.html
@@ -32,7 +32,7 @@
             <button cdkStepperNext [disabled]="!formStepTerms || !formStepTerms.valid">{{ defaultNextStepButtonLabel }}</button>
           </cdk-step>
 
-          <cdk-step [stepControl]="formStepUser" i18n-label="Stepper label for the registration page asking user informations" label="User">
+          <cdk-step [stepControl]="formStepUser" i18n-label="Stepper label for the registration page asking user information" label="User">
             <my-register-step-user (formBuilt)="onUserFormBuilt($event)" [videoUploadDisabled]="videoUploadDisabled"></my-register-step-user>
 
             <button cdkStepperPrevious>{{ defaultPreviousStepButtonLabel }}</button>
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
index 0e4d5fb12..7d3498d4c 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
@@ -7,7 +7,7 @@ import { MiniatureDisplayOptions } from '../../shared-video-miniature'
 import { CustomMarkupComponent } from './shared'
 
 /*
- * Markup component list videos depending on criterias
+ * Markup component list videos depending on criteria
 */
 
 @Component({
diff --git a/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss b/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss
index ef4236ebc..b5a71eddd 100644
--- a/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss
+++ b/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss
@@ -6,7 +6,7 @@ input {
   @include padding-left(15px !important);
   @include padding-right(15px !important);
 
-  // set again properties of peertube-input-text that are overriden by .input-group
+  // set again properties of peertube-input-text that are overridden by .input-group
   font-size: 15px !important;
 }
 
diff --git a/client/src/assets/player/shared/settings/settings-menu-item.ts b/client/src/assets/player/shared/settings/settings-menu-item.ts
index 8d1819a2d..07ff0f2a8 100644
--- a/client/src/assets/player/shared/settings/settings-menu-item.ts
+++ b/client/src/assets/player/shared/settings/settings-menu-item.ts
@@ -301,7 +301,7 @@ class SettingsMenuItem extends MenuItem {
         this.settingsSubMenuValueEl_.innerHTML = html
       }, 250)
     } else {
-      // Loop trough the submenu items to find the selected child
+      // Loop through the submenu items to find the selected child
       for (const subMenuItem of this.subMenu.menu.children_) {
         if (!(subMenuItem instanceof component)) {
           continue
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 84b575eb3..99566acb6 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -342,7 +342,7 @@ table {
     --videosHorizontalMarginContent: #{pvar(--horizontalMarginContent)};
   }
 
-  /* the following applies from 500px to 900px and is partially overriden from 500px to 800px by changes below to $small-view */
+  /* the following applies from 500px to 900px and is partially overridden from 500px to 800px by changes below to $small-view */
   .main-col,
   .main-col.expanded {
     --horizontalMarginContent: #{math.div($expanded-horizontal-margins, 3)};
diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts
index 7d6451db9..ebb102a0d 100644
--- a/server/helpers/image-utils.ts
+++ b/server/helpers/image-utils.ts
@@ -114,7 +114,7 @@ async function autoResize (options: {
 }) {
   const { sourceImage, newSize, destination } = options
 
-  // Portrait mode targetting a landscape, apply some effect on the image
+  // Portrait mode targeting a landscape, apply some effect on the image
   const sourceIsPortrait = sourceImage.getWidth() < sourceImage.getHeight()
   const destIsPortraitOrSquare = newSize.width <= newSize.height
 
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 824a30bd2..2d324d1eb 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -210,7 +210,7 @@ const CRAWL_REQUEST_CONCURRENCY = 1 // How many requests in parallel to fetch re
 
 const AP_CLEANER = {
   CONCURRENCY: 10, // How many requests in parallel we do in activitypub-cleaner job
-  UNAVAILABLE_TRESHOLD: 3, // How many attemps we do before removing an unavailable remote resource
+  UNAVAILABLE_TRESHOLD: 3, // How many attempts we do before removing an unavailable remote resource
   PERIOD: parseDurationToMs('1 week') // /!\ Has to be sync with REPEAT_JOBS
 }
 
diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts
index 3e7931bb2..76ed37aae 100644
--- a/server/lib/activitypub/process/process-create.ts
+++ b/server/lib/activitypub/process/process-create.ts
@@ -124,7 +124,7 @@ async function processCreateVideoComment (activity: ActivityCreate, byActor: MAc
     return
   }
 
-  // Try to not forward unwanted commments on our videos
+  // Try to not forward unwanted comments on our videos
   if (video.isOwned()) {
     if (await isBlockedByServerOrAccount(comment.Account, video.VideoChannel.Account)) {
       logger.info('Skip comment forward from blocked account or server %s.', comment.Account.Actor.url)
diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index aebca04fe..edc99057c 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -179,7 +179,7 @@ class Emailer {
         }
       }
 
-      // overriden/new variables given for a specific template in the payload
+      // overridden/new variables given for a specific template in the payload
       const sendOptions = merge(baseOptions, options)
 
       await email.send(sendOptions)
diff --git a/server/lib/redis.ts b/server/lib/redis.ts
index d052de786..158f3c080 100644
--- a/server/lib/redis.ts
+++ b/server/lib/redis.ts
@@ -308,7 +308,7 @@ class Redis {
     return this.deleteKey('resumable-upload-' + uploadId)
   }
 
-  /* ************ AP ressource unavailability ************ */
+  /* ************ AP resource unavailability ************ */
 
   async addAPUnavailability (url: string) {
     const key = this.generateAPUnavailabilityKey(url)
diff --git a/server/lib/signup.ts b/server/lib/signup.ts
index 3c1397a12..f094531eb 100644
--- a/server/lib/signup.ts
+++ b/server/lib/signup.ts
@@ -26,7 +26,7 @@ function isSignupAllowedForCurrentIP (ip: string) {
   const excludeList = [ 'blacklist' ]
   let matched = ''
 
-  // if there is a valid, non-empty whitelist, we exclude all unknown adresses too
+  // if there is a valid, non-empty whitelist, we exclude all unknown addresses too
   if (CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isCidr(cidr)).length > 0) {
     excludeList.push('unknown')
   }
diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts
index bc6007c6d..6d306121e 100644
--- a/server/middlewares/validators/users.ts
+++ b/server/middlewares/validators/users.ts
@@ -486,7 +486,7 @@ const ensureAuthUserOwnsAccountValidator = [
     if (res.locals.account.id !== user.Account.id) {
       return res.fail({
         status: HttpStatusCode.FORBIDDEN_403,
-        message: 'Only owner of this account can access this ressource.'
+        message: 'Only owner of this account can access this resource.'
       })
     }
 
diff --git a/server/models/abuse/abuse-query-builder.ts b/server/models/abuse/abuse-query-builder.ts
index 025e6ba55..cfc924ba4 100644
--- a/server/models/abuse/abuse-query-builder.ts
+++ b/server/models/abuse/abuse-query-builder.ts
@@ -13,7 +13,7 @@ export type BuildAbusesQueryOptions = {
   searchReporter?: string
   searchReportee?: string
 
-  // video releated
+  // video related
   searchVideo?: string
   searchVideoChannel?: string
   videoIs?: AbuseVideoIs
diff --git a/server/models/shared/abstract-run-query.ts b/server/models/shared/abstract-run-query.ts
index f1182c7be..7f27a0c4b 100644
--- a/server/models/shared/abstract-run-query.ts
+++ b/server/models/shared/abstract-run-query.ts
@@ -2,7 +2,7 @@ import { QueryTypes, Sequelize, Transaction } from 'sequelize'
 
 /**
  *
- * Abstact builder to run video SQL queries
+ * Abstract builder to run video SQL queries
  *
  */
 
diff --git a/server/models/utils.ts b/server/models/utils.ts
index 88e31f22e..c468f748d 100644
--- a/server/models/utils.ts
+++ b/server/models/utils.ts
@@ -119,7 +119,7 @@ function getInstanceFollowsSort (value: string, lastSort: OrderItem = [ 'id', 'A
 
 function isOutdated (model: { createdAt: Date, updatedAt: Date }, refreshInterval: number) {
   if (!model.createdAt || !model.updatedAt) {
-    throw new Error('Miss createdAt & updatedAt attribuets to model')
+    throw new Error('Miss createdAt & updatedAt attributes to model')
   }
 
   const now = Date.now()
diff --git a/server/tests/api/check-params/abuses.ts b/server/tests/api/check-params/abuses.ts
index c4b051723..bc2cc640f 100644
--- a/server/tests/api/check-params/abuses.ts
+++ b/server/tests/api/check-params/abuses.ts
@@ -269,7 +269,7 @@ describe('Test abuses API validators', function () {
       await makePostBodyRequest({ url: server.url, path, token: userToken, fields })
     })
 
-    it('Should succeed with the corret parameters (advanced)', async function () {
+    it('Should succeed with the correct parameters (advanced)', async function () {
       const fields: AbuseCreate = {
         video: {
           id: server.store.videoCreated.id,
@@ -333,7 +333,7 @@ describe('Test abuses API validators', function () {
       await command.addMessage({ token: userToken, abuseId, message: 'a'.repeat(5000), expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
     })
 
-    it('Should suceed with the correct params', async function () {
+    it('Should succeed with the correct params', async function () {
       const res = await command.addMessage({ token: userToken, abuseId, message })
       messageId = res.body.abuseMessage.id
     })
diff --git a/server/tests/api/notifications/user-notifications.ts b/server/tests/api/notifications/user-notifications.ts
index a7cc529f8..a11289236 100644
--- a/server/tests/api/notifications/user-notifications.ts
+++ b/server/tests/api/notifications/user-notifications.ts
@@ -545,7 +545,7 @@ describe('Test user notifications', function () {
       await servers[1].subscriptions.remove({ uri: 'user_1_channel@localhost:' + servers[0].port })
     })
 
-    // PeerTube does not support accout -> account follows
+    // PeerTube does not support account -> account follows
     // it('Should notify when a local account is following one of our channel', async function () {
     //   this.timeout(50000)
     //
diff --git a/server/tests/api/server/contact-form.ts b/server/tests/api/server/contact-form.ts
index 4f01f6fd5..d6165b293 100644
--- a/server/tests/api/server/contact-form.ts
+++ b/server/tests/api/server/contact-form.ts
@@ -61,7 +61,7 @@ describe('Test contact form', function () {
     expect(email['text']).contains('my super message')
   })
 
-  it('Should not have duplicated email adress in text message', async function () {
+  it('Should not have duplicated email address in text message', async function () {
     const text = emails[0]['text'] as string
 
     const matches = text.match(/toto@example.com/g)
diff --git a/shared/models/plugins/client/client-hook.model.ts b/shared/models/plugins/client/client-hook.model.ts
index bb55e92d5..04d42d591 100644
--- a/shared/models/plugins/client/client-hook.model.ts
+++ b/shared/models/plugins/client/client-hook.model.ts
@@ -108,16 +108,16 @@ export const clientActionHookObject = {
   // Fired when the admin plugin settings page is being initialized
   'action:admin-plugin-settings.init': true,
 
-  // Fired when the video upload page is being initalized
+  // Fired when the video upload page is being initialized
   'action:video-upload.init': true,
-  // Fired when the video import by URL page is being initalized
+  // Fired when the video import by URL page is being initialized
   'action:video-url-import.init': true,
-  // Fired when the video import by torrent/magnet URI page is being initalized
+  // Fired when the video import by torrent/magnet URI page is being initialized
   'action:video-torrent-import.init': true,
-  // Fired when the "Go Live" page is being initalized
+  // Fired when the "Go Live" page is being initialized
   'action:go-live.init': true,
 
-  // Fired when the user explicitely logged in/logged out
+  // Fired when the user explicitly logged in/logged out
   'action:auth-user.logged-in': true,
   'action:auth-user.logged-out': true,
   // Fired when the application loaded user information (using tokens from the local storage or after a successful login)
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index 8521f684e..bd36c41cd 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -247,8 +247,8 @@ tags:
       ### Import
 
       - _URL_-based: where the URL points to any service supported by [youtube-dl](https://ytdl-org.github.io/youtube-dl/)
-      - _magnet_-based: where the URI resolves to a BitTorrent ressource containing a single supported video file
-      - _torrent_-based: where the metainfo file resolves to a BitTorrent ressource containing a single supported video file
+      - _magnet_-based: where the URI resolves to a BitTorrent resource containing a single supported video file
+      - _torrent_-based: where the metainfo file resolves to a BitTorrent resource containing a single supported video file
 
       The import function is practical when the desired video/audio is available online. It makes PeerTube
       download it for you, saving you as much bandwidth and avoiding any instability or limitation your network might have.
@@ -2053,7 +2053,7 @@ paths:
           x-summary: video file too large, due to quota or max body size limit set by the reverse-proxy
           description: |
             If the response has no body, it means the reverse-proxy didn't let it through. Otherwise disambiguate via `type`:
-            - `quota_reached` for quota limits wether daily or global
+            - `quota_reached` for quota limits whether daily or global
           headers:
             X-File-Maximum-Size:
               schema:
@@ -5277,7 +5277,7 @@ components:
             moderator: Moderator scope
             user: User scope
   schemas:
-    # Resuable core properties
+    # Reusable core properties
     id:
       type: integer
       minimum: 1
@@ -5443,7 +5443,7 @@ components:
         - 1
         - 2
         - 3
-      description: 'The live latency mode (Default = `1`, HIght latency = `2`, Small Latency = `3`)'
+      description: 'The live latency mode (Default = `1`, High latency = `2`, Small Latency = `3`)'
 
     VideoStateConstant:
       properties:
@@ -7754,7 +7754,7 @@ components:
               - 5
             nullable: true
             description: >
-              Error type if an error occured during the live session:
+              Error type if an error occurred during the live session:
                 - `1`: Bad socket health (transcoding is too slow)
                 - `2`: Max duration exceeded
                 - `3`: Quota exceeded
diff --git a/support/doc/dependencies.md b/support/doc/dependencies.md
index c6cbe83a6..378cb8502 100644
--- a/support/doc/dependencies.md
+++ b/support/doc/dependencies.md
@@ -513,7 +513,7 @@ If `sudo -u postgres createuser -P peertube` gives you an `unknown user: postgre
 ```
 net-libs/nodejs
 sys-apps/yarn
-media-video/ffmpeg[x264] # Optionnally add vorbis,vpx
+media-video/ffmpeg[x264] # Optionally add vorbis,vpx
 dev-db/postgresql
 dev-db/redis
 dev-vcs/git
diff --git a/support/openapi/kotlin/README.mustache b/support/openapi/kotlin/README.mustache
index ac7fbdea9..376314650 100644
--- a/support/openapi/kotlin/README.mustache
+++ b/support/openapi/kotlin/README.mustache
@@ -34,7 +34,7 @@ This runs all tests and packages the library.
 <a name="documentation-for-api-endpoints"></a>
 ## Documentation for API Endpoints
 
-All URIs are relative to *{{{basePath}}}*. Change it when instanciating `ApiClient(basePath)`.
+All URIs are relative to *{{{basePath}}}*. Change it when instantiating `ApiClient(basePath)`.
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------