13 files changed, 24 insertions, 28 deletions

diff --git a/client/src/app/+about/about-follows/about-follows.component.html b/client/src/app/+about/about-follows/about-follows.component.html
index dd50cda74..6d38e2109 100644
--- a/client/src/app/+about/about-follows/about-follows.component.html
+++ b/client/src/app/+about/about-follows/about-follows.component.html
@@ -13,7 +13,7 @@
   <div class="col-xl-6 col-md-12">
     <h2 i18n class="subtitle">Followings instances</h2>
 
-    <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance does not have instances followings.</div>
+    <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance is not following any other.</div>
 
     <a *ngFor="let following of followings" [href]="buildLink(following)" target="_blank" rel="noopener noreferrer">
       {{ following }}
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html
index 93670fe4e..65e06b3a1 100644
--- a/client/src/app/+about/about-peertube/about-peertube.component.html
+++ b/client/src/app/+about/about-peertube/about-peertube.component.html
@@ -11,7 +11,7 @@
     </p>
 
     <p i18n>
-      It is a free and open-source software, under the <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE">AGPLv3
+      It is free and open-source software, under <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE">AGPLv3
       licence</a>.
     </p>
 
@@ -156,7 +156,6 @@
         <li i18n>We set a limit to the number of peers sent by the tracker</li>
         <li i18n>We set a limit on the request frequency received by the tracker</li>
         <li i18n>Allow instance admins to disable P2P from the administration interface</li>
-        <li i18n>Automatic video redundancy from some instances: one doesn't know if the IP downloaded the video on purpose or if it a server</li>
       </ul>
 
       <p i18n>
diff --git a/client/src/app/+about/about-routing.module.ts b/client/src/app/+about/about-routing.module.ts
index 828b2884c..96a737555 100644
--- a/client/src/app/+about/about-routing.module.ts
+++ b/client/src/app/+about/about-routing.module.ts
@@ -44,7 +44,7 @@ const aboutRoutes: Routes = [
         component: AboutFollowsComponent,
         data: {
           meta: {
-            title: $localize`About follows`
+            title: $localize`About this instance's network`
           }
         }
       }
diff --git a/client/src/app/+about/about.component.html b/client/src/app/+about/about.component.html
index b89e6aeeb..1ab00c5df 100644
--- a/client/src/app/+about/about.component.html
+++ b/client/src/app/+about/about.component.html
@@ -6,7 +6,7 @@
 
       <a i18n routerLink="peertube" routerLinkActive="active" class="title-page title-page-about">PeerTube</a>
 
-      <a i18n routerLink="follows" routerLinkActive="active" class="title-page title-page-about">Follows</a>
+      <a i18n routerLink="follows" routerLinkActive="active" class="title-page title-page-about">Network</a>
     </div>
   </div>
 
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index 686f3601b..f8f379d47 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -466,7 +466,7 @@
                     i18n-labelText labelText="Allow users to do remote URI/handle search"
                   >
                     <ng-container ngProjectAs="description">
-                      <span i18n>Allow <strong>your users</strong> to look up remote videos/actors by their URI, that may not be federated with your instance</span>
+                      <span i18n>Allow <strong>your users</strong> to look up remote videos/actors that may not be federated with your instance</span>
                     </ng-container>
                   </my-peertube-checkbox>
                 </div>
@@ -477,7 +477,7 @@
                     i18n-labelText labelText="Allow anonymous to do remote URI/handle search"
                   >
                     <ng-container ngProjectAs="description">
-                      <span i18n>Allow <strong>anonymous users</strong> to look up remote videos/actors by their URI, that may not be federated with your instance</span>
+                      <span i18n>Allow <strong>anonymous users</strong> to look up remote videos/actors that may not be federated with your instance</span>
                     </ng-container>
                   </my-peertube-checkbox>
                 </div>
@@ -682,7 +682,7 @@
                     <ng-template ptTemplate="help">
                       <ng-container i18n>
                         If your instance is explicitly allowed by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br />
-                        If the instance is not, we use an image link card that will redirect on your PeerTube instance.<br /><br />
+                        If the instance is not, we use an image link card that will redirect to your PeerTube instance.<br /><br />
                         Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on
                         <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a>
                         to see if you instance is allowed.
@@ -708,7 +708,7 @@
           <div class="form-group col-12 col-lg-4 col-xl-3">
             <div i18n class="inner-form-title">LIVE</div>
             <div i18n class="inner-form-description">
-              Add ability for your users to do live streaming on your instance.
+              Enable users of your instance to stream live.
             </div>
           </div>
 
diff --git a/client/src/app/+signup/+register/register-step-channel.component.html b/client/src/app/+signup/+register/register-step-channel.component.html
index 170c2964e..67f332409 100644
--- a/client/src/app/+signup/+register/register-step-channel.component.html
+++ b/client/src/app/+signup/+register/register-step-channel.component.html
@@ -48,7 +48,7 @@
     </div>
 
     <div *ngIf="isSameThanUsername()" class="form-error" i18n>
-      Channel name cannot be the same than your account name. You can click on the first step to update your account name.
+      Channel name cannot be the same as your account name. You can click on the first step to update your account name.
     </div>
   </div>
 </form>
diff --git a/client/src/app/+signup/+verify-account/verify-account-routing.module.ts b/client/src/app/+signup/+verify-account/verify-account-routing.module.ts
index c9ac67e4c..67c80ae93 100644
--- a/client/src/app/+signup/+verify-account/verify-account-routing.module.ts
+++ b/client/src/app/+signup/+verify-account/verify-account-routing.module.ts
@@ -14,7 +14,7 @@ const verifyAccountRoutes: Routes = [
         component: VerifyAccountEmailComponent,
         data: {
           meta: {
-            title: $localize`Verify account email`
+            title: $localize`Verify account via email`
           }
         }
       },
@@ -23,7 +23,7 @@ const verifyAccountRoutes: Routes = [
         component: VerifyAccountAskSendEmailComponent,
         data: {
           meta: {
-            title: $localize`Verify account ask send email`
+            title: $localize`Ask to send an email to verify you account`
           }
         }
       }
diff --git a/client/src/app/+videos/video-list/video-most-liked.component.ts b/client/src/app/+videos/video-list/video-most-liked.component.ts
index e5f7bd152..93408d76b 100644
--- a/client/src/app/+videos/video-list/video-most-liked.component.ts
+++ b/client/src/app/+videos/video-list/video-most-liked.component.ts
@@ -39,7 +39,7 @@ export class VideoMostLikedComponent extends AbstractVideoList implements OnInit
     this.generateSyndicationList()
 
     this.titlePage = $localize`Most liked videos`
-    this.titleTooltip = $localize`Videos that have the higher number of likes.`
+    this.titleTooltip = $localize`Videos that have the most likes.`
   }
 
   getVideosObservable (page: number) {
diff --git a/client/src/app/core/rest/rest-extractor.service.ts b/client/src/app/core/rest/rest-extractor.service.ts
index 36702b371..4b8c1e155 100644
--- a/client/src/app/core/rest/rest-extractor.service.ts
+++ b/client/src/app/core/rest/rest-extractor.service.ts
@@ -58,8 +58,7 @@ export class RestExtractor {
       } else if (err.error && err.error.error) {
         errorMessage = err.error.error
       } else if (err.status === 413) {
-        errorMessage = $localize`Request is too large for the server.
- Please contact you administrator if you want to increase the limit size.`
+        errorMessage = $localize`Media is too large for the server. Please contact you administrator if you want to increase the limit size.`
       } else if (err.status === 429) {
         const secondsLeft = err.headers.get('retry-after')
         if (secondsLeft) {
diff --git a/client/src/app/modal/welcome-modal.component.html b/client/src/app/modal/welcome-modal.component.html
index 81c12d4c0..66b144656 100644
--- a/client/src/app/modal/welcome-modal.component.html
+++ b/client/src/app/modal/welcome-modal.component.html
@@ -61,11 +61,9 @@
         </p>
 
         <p i18n>
-          If you want to open registrations, please decide what are <strong>your moderation rules</strong>, fill your <strong>instance
-          terms</strong>
-          and specify the categories and languages you speak. This way, you will help users to register on <strong>the
-          appropriate</strong>
-          PeerTube instance.
+          If you want to open registrations, please decide what <strong>your moderation rules</strong> and <strong>instance
+          terms of service</strong> are, as well as specify the categories and languages and your moderators speak.
+          This way, you will help users to register on <strong>the appropriate</strong> PeerTube instance.
         </p>
       </div>
     </div>
diff --git a/client/src/app/shared/form-validators/user-validators.ts b/client/src/app/shared/form-validators/user-validators.ts
index 18199505c..9efc5180d 100644
--- a/client/src/app/shared/form-validators/user-validators.ts
+++ b/client/src/app/shared/form-validators/user-validators.ts
@@ -27,7 +27,7 @@ export const USER_CHANNEL_NAME_VALIDATOR: BuildFormValidator = {
     'required': $localize`Channel name is required.`,
     'minlength': $localize`Channel name must be at least 1 character long.`,
     'maxlength': $localize`Channel name cannot be more than 50 characters long.`,
-    'pattern': $localize`Channel name should be lowercase alphanumeric; dots and underscores are allowed.`
+    'pattern': $localize`Channel name should be lowercase, and can contain only alphanumeric characters, dots and underscores.`
   }
 }
 
diff --git a/client/src/app/shared/shared-main/users/user-notifications.component.html b/client/src/app/shared/shared-main/users/user-notifications.component.html
index a56a0859b..91a4c8dc3 100644
--- a/client/src/app/shared/shared-main/users/user-notifications.component.html
+++ b/client/src/app/shared/shared-main/users/user-notifications.component.html
@@ -187,7 +187,7 @@
         <my-global-icon iconName="alert" aria-hidden="true"></my-global-icon>
 
         <div class="message" i18n>
-          The notification points to a content now unavailable
+          The notification points to content now unavailable
         </div>
       </ng-container>
     </ng-container>
diff --git a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
index 44aefa853..f59910d1c 100644
--- a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
+++ b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
@@ -295,7 +295,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
         this.userActions.push([
           {
             label: $localize`Mute this account`,
-            description: $localize`Hide any content from that user for you.`,
+            description: $localize`Hide any content from that user from you.`,
             isDisplayed: ({ account }) => account.mutedByUser === false,
             handler: ({ account }) => this.blockAccountByUser(account)
           },
@@ -319,7 +319,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
           },
           {
             label: $localize`Remove comments from your videos`,
-            description: $localize`Remove comments of this account from your videos.`,
+            description: $localize`Remove comments made by this account on your videos.`,
             handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'my-videos' })
           }
         ])
@@ -331,13 +331,13 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
           instanceActions = instanceActions.concat([
             {
               label: $localize`Mute this account by your instance`,
-              description: $localize`Hide any content from that user for you, your instance and its users.`,
+              description: $localize`Hide any content from that user from you, your instance and its users.`,
               isDisplayed: ({ account }) => account.mutedByInstance === false,
               handler: ({ account }) => this.blockAccountByInstance(account)
             },
             {
               label: $localize`Unmute this account by your instance`,
-              description: $localize`Show back content from that user for you, your instance and its users.`,
+              description: $localize`Show this user's content to the users of this instance again.`,
               isDisplayed: ({ account }) => account.mutedByInstance === true,
               handler: ({ account }) => this.unblockAccountByInstance(account)
             }
@@ -349,7 +349,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
           instanceActions = instanceActions.concat([
             {
               label: $localize`Mute the instance by your instance`,
-              description: $localize`Hide any content from that instance for you, your instance and its users.`,
+              description: $localize`Hide any content from that instance from you, your instance and its users.`,
               isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false,
               handler: ({ account }) => this.blockServerByInstance(account.host)
             },
@@ -366,7 +366,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
           instanceActions = instanceActions.concat([
             {
               label: $localize`Remove comments from your instance`,
-              description: $localize`Remove comments of this account from your instance.`,
+              description: $localize`Remove comments made by this account from your instance.`,
               handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'instance' })
             }
           ])