Merge branch 'fix/reword-edition' into 'develop'

Reword "edition"

See merge request framasoft/peertube/PeerTube!35

client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts

@@ -48,7 +48,7 @@ export class MyAccountNotificationPreferencesComponent implements OnInit {
       abuseStateChange: $localize`One of your abuse reports has been accepted or rejected by moderators`,
       newPeerTubeVersion: $localize`A new PeerTube version is available`,
       newPluginVersion: $localize`One of your plugin/theme has a new available version`,
-      myVideoStudioEditionFinished: $localize`Video studio editing has finished`,
+      myVideoStudioEditionFinished: $localize`Processing of edits has finished`,
       myVideoTranscriptionGenerated: $localize`The transcription of your video has been generated`
     }
     this.notificationSettingGroups = [

client/src/app/+video-studio/edit/video-studio-edit.component.html

@@ -67,19 +67,19 @@
       </div>
 
       <my-button
-        theme="primary" i18n-label label="Run video editing" icon="circle-tick"
-        (click)="runEditing()" (keydown.enter)="runEditing()"
-        [disabled]="!form.valid || isRunningEditing || noEditing()"
+        theme="primary" i18n-label label="Apply edits" icon="circle-tick"
+        (click)="runEdition()" (keydown.enter)="runEdition()"
+        [disabled]="!form.valid || isRunningEdition || noEdition()"
       ></my-button>
     </form>
 
     <div class="embed-container">
-      <div class="mb-1 fw-bold" i18n>Video before editing</div>
+      <div class="mb-1 fw-bold" i18n>Original video</div>
       <my-embed [video]="video"></my-embed>
     </div>
 
-    <div class="tasks-container" *ngIf="!noEditing()">
-      <div class="mb-1 fw-bold" i18n>Editing tasks:</div>
+    <div class="tasks-container" *ngIf="!noEdition()">
+      <div class="mb-1 fw-bold" i18n>Edits to apply:</div>
 
       <ol>
         <li *ngFor="let task of getTasksSummary()">{{ task }}</li>

client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.html

@@ -16,9 +16,9 @@
 
       <div class="d-flex justify-content-between align-items-center mb-3 ms-2">
         <my-peertube-checkbox
-          inputName="raw-edit"
-          [(ngModel)]="rawEdit" (ngModelChange)="onRawEditSwitch()"
-          i18n-labelText labelText="Raw edit"
+          inputName="raw-edition"
+          [(ngModel)]="rawEdition" (ngModelChange)="onRawEditionSwitch()"
+          i18n-labelText labelText="Edit raw"
         ></my-peertube-checkbox>
 
         <my-button *ngIf="!rawEdit && !segmentToUpdate" i18n-label label="Add a new segment" (click)="addSegmentToEdit()">

client/src/app/+videos/+video-edit/shared/caption/video-caption-edit-modal-content.component.ts

@@ -306,7 +306,7 @@ export class VideoCaptionEditModalContentComponent extends FormReactive implemen
 
   updateCaption () {
     if (this.segmentToUpdate) {
-      this.notifier.error($localize`A segment is being edited. Save or cancel the edit first.`)
+      this.notifier.error($localize`A segment is being edited. Save or cancel your edits first.`)
       return
     }
 

client/src/app/+videos/+video-edit/shared/video-edit.component.html

@@ -200,7 +200,7 @@
                     @case ('CREATE') {
                       Cancel creation
                     } @case ('UPDATE') {
-                      Cancel edit
+                      Cancel editing
                     } @case ('REMOVE') {
                       Cancel deletion
                     }

client/src/app/shared/standalone-notifications/user-notifications.component.html

@@ -213,7 +213,7 @@
         <my-global-icon iconName="film" aria-hidden="true"></my-global-icon>
 
         <div class="message" i18n>
-          Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> editing tasks have finished
+          The edits to your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> have been applied
         </div>
       </ng-container>