+ Your report will be sent to moderators of {{ currentHost }}. + It will be forwarded to origin instance {{ originHost }} too. +

diff --git a/client/src/app/videos/+video-watch/modal/video-report.component.scss b/client/src/app/videos/+video-watch/modal/video-report.component.scss
index afcdb9a16..4713660a2 100644
--- a/client/src/app/videos/+video-watch/modal/video-report.component.scss
+++ b/client/src/app/videos/+video-watch/modal/video-report.component.scss
@@ -1,6 +1,10 @@
 @import 'variables';
 @import 'mixins';
 
+.information {
+  margin-bottom: 20px;
+}
+
 textarea {
   @include peertube-textarea(100%, 100px);
 }
diff --git a/client/src/app/videos/+video-watch/modal/video-report.component.ts b/client/src/app/videos/+video-watch/modal/video-report.component.ts
index 297afb19f..023387984 100644
--- a/client/src/app/videos/+video-watch/modal/video-report.component.ts
+++ b/client/src/app/videos/+video-watch/modal/video-report.component.ts
@@ -33,6 +33,18 @@ export class VideoReportComponent extends FormReactive implements OnInit {
     super()
   }
 
+  get currentHost () {
+    return window.location.host
+  }
+
+  get originHost () {
+    if (this.isRemoteVideo()) {
+      return this.video.account.host
+    }
+
+    return ''
+  }
+
   ngOnInit () {
     this.buildForm({
       reason: this.videoAbuseValidatorsService.VIDEO_ABUSE_REASON
@@ -61,4 +73,8 @@ export class VideoReportComponent extends FormReactive implements OnInit {
                             err => this.notificationsService.error(this.i18n('Error'), err.message)
                            )
   }
+
+  isRemoteVideo () {
+    return !this.video.isLocal
+  }
 }
-- 
cgit v1.2.3

From ddb83e49ece4e76df1af98aeea30c1d8d133f48c Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 5 Dec 2018 14:21:10 +0100
Subject: My account menu -> open entries on hover

---
 .../src/app/+my-account/my-account.component.html  | 37 +--------
 .../src/app/+my-account/my-account.component.scss  | 15 +---
 client/src/app/+my-account/my-account.component.ts | 97 ++++++++++++----------
 .../shared/menu/top-menu-dropdown.component.html   | 18 ++++
 .../shared/menu/top-menu-dropdown.component.scss   | 14 ++++
 .../app/shared/menu/top-menu-dropdown.component.ts | 75 +++++++++++++++++
 client/src/app/shared/shared.module.ts             |  5 +-
 7 files changed, 168 insertions(+), 93 deletions(-)
 create mode 100644 client/src/app/shared/menu/top-menu-dropdown.component.html
 create mode 100644 client/src/app/shared/menu/top-menu-dropdown.component.scss
 create mode 100644 client/src/app/shared/menu/top-menu-dropdown.component.ts

(limited to 'client')

diff --git a/client/src/app/+my-account/my-account.component.html b/client/src/app/+my-account/my-account.component.html
index 41333c25a..3999252be 100644
--- a/client/src/app/+my-account/my-account.component.html
+++ b/client/src/app/+my-account/my-account.component.html
@@ -1,40 +1,5 @@
 <div class="row">
-  <div class="sub-menu">
-    <a i18n routerLink="/my-account/settings" routerLinkActive="active" class="title-page">My settings</a>
-
-    <div ngbDropdown class="my-library">
-      <span role="button" class="title-page" [ngClass]="{ active: libraryLabel !== '' }" ngbDropdownToggle>
-        <ng-container i18n>My library</ng-container>
-        <ng-container *ngIf="libraryLabel"> - {{ libraryLabel }}</ng-container>
-      </span>
-
-      <div ngbDropdownMenu>
-        <a class="dropdown-item" i18n routerLink="/my-account/video-channels">My channels</a>
-
-        <a class="dropdown-item" i18n routerLink="/my-account/videos">My videos</a>
-
-        <a class="dropdown-item" i18n routerLink="/my-account/subscriptions">My subscriptions</a>
-
-        <a class="dropdown-item" *ngIf="isVideoImportEnabled()" i18n routerLink="/my-account/video-imports">My imports</a>
-      </div>
-    </div>
-
-    <div ngbDropdown class="misc">
-      <span role="button" class="title-page" [ngClass]="{ active: miscLabel !== '' }" ngbDropdownToggle>
-        <ng-container i18n>Misc</ng-container>
-        <ng-container *ngIf="miscLabel"> - {{ miscLabel }}</ng-container>
-      </span>
-
-      <div ngbDropdownMenu>
-        <a class="dropdown-item" i18n routerLink="/my-account/blocklist/accounts">Muted accounts</a>
-
-        <a class="dropdown-item" i18n routerLink="/my-account/blocklist/servers">Muted instances</a>
-
-        <a class="dropdown-item" i18n routerLink="/my-account/ownership">Ownership changes</a>
-      </div>
-    </div>
-
-  </div>
+  <my-top-menu-dropdown [menuEntries]="menuEntries"></my-top-menu-dropdown>
 
   <div class="margin-content">
     <router-outlet></router-outlet>
diff --git a/client/src/app/+my-account/my-account.component.scss b/client/src/app/+my-account/my-account.component.scss
index 6243c6dcf..4f111efdf 100644
--- a/client/src/app/+my-account/my-account.component.scss
+++ b/client/src/app/+my-account/my-account.component.scss
@@ -1,14 +1,3 @@
-.my-library, .misc {
-  span[role=button] {
-    cursor: pointer;
-  }
-
-  a {
-    display: block;
-  }
+.row {
+  flex-direction: column;
 }
-
-/deep/ .dropdown-toggle::after {
-  position: relative;
-  top: 2px;
-}
\ No newline at end of file
diff --git a/client/src/app/+my-account/my-account.component.ts b/client/src/app/+my-account/my-account.component.ts
index d728caf07..d9381ebfa 100644
--- a/client/src/app/+my-account/my-account.component.ts
+++ b/client/src/app/+my-account/my-account.component.ts
@@ -1,38 +1,72 @@
-import { Component, OnDestroy, OnInit } from '@angular/core'
+import { Component } from '@angular/core'
 import { ServerService } from '@app/core'
-import { NavigationStart, Router } from '@angular/router'
-import { filter } from 'rxjs/operators'
 import { I18n } from '@ngx-translate/i18n-polyfill'
-import { Subscription } from 'rxjs'
+import { TopMenuDropdownParam } from '@app/shared/menu/top-menu-dropdown.component'
 
 @Component({
   selector: 'my-my-account',
   templateUrl: './my-account.component.html',
   styleUrls: [ './my-account.component.scss' ]
 })
-export class MyAccountComponent implements OnInit, OnDestroy {
-
-  libraryLabel = ''
-  miscLabel = ''
-
-  private routeSub: Subscription
+export class MyAccountComponent {
+  menuEntries: TopMenuDropdownParam[] = []
 
   constructor (
     private serverService: ServerService,
-    private router: Router,
     private i18n: I18n
-  ) {}
+  ) {
+
+    const libraryEntries: TopMenuDropdownParam = {
+      label: this.i18n('My library'),
+      children: [
+        {
+          label: this.i18n('My channels'),
+          routerLink: '/my-account/videos'
+        },
+        {
+          label: this.i18n('My videos'),
+          routerLink: '/my-account/videos'
+        },
+        {
+          label: this.i18n('My subscriptions'),
+          routerLink: '/my-account/subscriptions'
+        }
+      ]
+    }
 
-  ngOnInit () {
-    this.updateLabels(this.router.url)
+    if (this.isVideoImportEnabled()) {
+      libraryEntries.children.push({
+        label: 'My imports',
+        routerLink: '/my-account/video-imports'
+      })
+    }
 
-    this.routeSub = this.router.events
-        .pipe(filter(event => event instanceof NavigationStart))
-        .subscribe((event: NavigationStart) => this.updateLabels(event.url))
-  }
+    const miscEntries: TopMenuDropdownParam = {
+      label: this.i18n('Misc'),
+      children: [
+        {
+          label: this.i18n('Muted accounts'),
+          routerLink: '/my-account/blocklist/accounts'
+        },
+        {
+          label: this.i18n('Muted instances'),
+          routerLink: '/my-account/blocklist/servers'
+        },
+        {
+          label: this.i18n('Ownership changes'),
+          routerLink: '/my-account/ownership'
+        }
+      ]
+    }
 
-  ngOnDestroy () {
-    if (this.routeSub) this.routeSub.unsubscribe()
+    this.menuEntries = [
+      {
+        label: this.i18n('My settings'),
+        routerLink: '/my-account/settings'
+      },
+      libraryEntries,
+      miscEntries
+    ]
   }
 
   isVideoImportEnabled () {
@@ -41,27 +75,4 @@ export class MyAccountComponent implements OnInit, OnDestroy {
     return importConfig.http.enabled || importConfig.torrent.enabled
   }
 
-  private updateLabels (url: string) {
-    const [ path ] = url.split('?')
-
-    if (path.startsWith('/my-account/video-channels')) {
-      this.libraryLabel = this.i18n('Channels')
-    } else if (path.startsWith('/my-account/videos')) {
-      this.libraryLabel = this.i18n('Videos')
-    } else if (path.startsWith('/my-account/subscriptions')) {
-      this.libraryLabel = this.i18n('Subscriptions')
-    } else if (path.startsWith('/my-account/video-imports')) {
-      this.libraryLabel = this.i18n('Video imports')
-    } else {
-      this.libraryLabel = ''
-    }
-
-    if (path.startsWith('/my-account/blocklist/accounts')) {
-      this.miscLabel = this.i18n('Muted accounts')
-    } else if (path.startsWith('/my-account/blocklist/servers')) {
-      this.miscLabel = this.i18n('Muted instances')
-    } else {
-      this.miscLabel = ''
-    }
-  }
 }
diff --git a/client/src/app/shared/menu/top-menu-dropdown.component.html b/client/src/app/shared/menu/top-menu-dropdown.component.html
new file mode 100644
index 000000000..2d6d1c4bf
--- /dev/null
+++ b/client/src/app/shared/menu/top-menu-dropdown.component.html
@@ -0,0 +1,18 @@
+<div class="sub-menu">
+  <ng-container *ngFor="let menuEntry of menuEntries">
+
+    <a *ngIf="menuEntry.routerLink" [routerLink]="menuEntry.routerLink" routerLinkActive="active" class="title-page">{{ menuEntry.label }}</a>
+
+    <div *ngIf="!menuEntry.routerLink" ngbDropdown class="parent-entry" #dropdown="ngbDropdown" (mouseleave)="closeDropdownIfHovered(dropdown)">
+      <span (mouseenter)="openDropdownOnHover(dropdown)" role="button" class="title-page" [ngClass]="{ active: !!suffixLabels[menuEntry.label] }" ngbDropdownToggle>
+        <ng-container i18n>{{ menuEntry.label }}</ng-container>
+        <ng-container *ngIf="!!suffixLabels[menuEntry.label]"> - {{ suffixLabels[menuEntry.label] }}</ng-container>
+      </span>
+
+      <div ngbDropdownMenu>
+        <a *ngFor="let menuChild of menuEntry.children" class="dropdown-item" [routerLink]="menuChild.routerLink">{{ menuChild.label }}</a>
+      </div>
+    </div>
+
+  </ng-container>
+</div>
diff --git a/client/src/app/shared/menu/top-menu-dropdown.component.scss b/client/src/app/shared/menu/top-menu-dropdown.component.scss
new file mode 100644
index 000000000..f3ef8f814
--- /dev/null
+++ b/client/src/app/shared/menu/top-menu-dropdown.component.scss
@@ -0,0 +1,14 @@
+.parent-entry {
+  span[role=button] {
+    cursor: pointer;
+  }
+
+  a {
+    display: block;
+  }
+}
+
+/deep/ .dropdown-toggle::after {
+  position: relative;
+  top: 2px;
+}
diff --git a/client/src/app/shared/menu/top-menu-dropdown.component.ts b/client/src/app/shared/menu/top-menu-dropdown.component.ts
new file mode 100644
index 000000000..272b721b2
--- /dev/null
+++ b/client/src/app/shared/menu/top-menu-dropdown.component.ts
@@ -0,0 +1,75 @@
+import { Component, Input, OnDestroy, OnInit } from '@angular/core'
+import { filter, take } from 'rxjs/operators'
+import { NavigationStart, Router } from '@angular/router'
+import { Subscription } from 'rxjs'
+import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
+import { drop } from 'lodash-es'
+
+export type TopMenuDropdownParam = {
+  label: string
+  routerLink?: string
+
+  children?: {
+    label: string
+    routerLink: string
+  }[]
+}
+
+@Component({
+  selector: 'my-top-menu-dropdown',
+  templateUrl: './top-menu-dropdown.component.html',
+  styleUrls: [ './top-menu-dropdown.component.scss' ]
+})
+export class TopMenuDropdownComponent implements OnInit, OnDestroy {
+  @Input() menuEntries: TopMenuDropdownParam[] = []
+
+  suffixLabels: { [ parentLabel: string ]: string }
+
+  private openedOnHover = false
+  private routeSub: Subscription
+
+  constructor (private router: Router) {}
+
+  ngOnInit () {
+    this.updateChildLabels(window.location.pathname)
+
+    this.routeSub = this.router.events
+                        .pipe(filter(event => event instanceof NavigationStart))
+                        .subscribe(() => this.updateChildLabels(window.location.pathname))
+  }
+
+  ngOnDestroy () {
+    if (this.routeSub) this.routeSub.unsubscribe()
+  }
+
+  openDropdownOnHover (dropdown: NgbDropdown) {
+    this.openedOnHover = true
+    dropdown.open()
+
+    // Menu was closed
+    dropdown.openChange
+            .pipe(take(1))
+            .subscribe(e => this.openedOnHover = false)
+  }
+
+  closeDropdownIfHovered (dropdown: NgbDropdown) {
+    if (this.openedOnHover === false) return
+
+    dropdown.close()
+    this.openedOnHover = false
+  }
+
+  private updateChildLabels (path: string) {
+    this.suffixLabels = {}
+
+    for (const entry of this.menuEntries) {
+      if (!entry.children) continue
+
+      for (const child of entry.children) {
+        if (path.startsWith(child.routerLink)) {
+          this.suffixLabels[entry.label] = child.label
+        }
+      }
+    }
+  }
+}
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index a2fa27b72..9810e9485 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -61,6 +61,7 @@ import { OverviewService } from '@app/shared/overview'
 import { UserBanModalComponent } from '@app/shared/moderation'
 import { UserModerationDropdownComponent } from '@app/shared/moderation/user-moderation-dropdown.component'
 import { BlocklistService } from '@app/shared/blocklist'
+import { TopMenuDropdownComponent } from '@app/shared/menu/top-menu-dropdown.component'
 
 @NgModule({
   imports: [
@@ -102,7 +103,8 @@ import { BlocklistService } from '@app/shared/blocklist'
     RemoteSubscribeComponent,
     InstanceFeaturesTableComponent,
     UserBanModalComponent,
-    UserModerationDropdownComponent
+    UserModerationDropdownComponent,
+    TopMenuDropdownComponent
   ],
 
   exports: [
@@ -141,6 +143,7 @@ import { BlocklistService } from '@app/shared/blocklist'
     InstanceFeaturesTableComponent,
     UserBanModalComponent,
     UserModerationDropdownComponent,
+    TopMenuDropdownComponent,
 
     NumberFormatterPipe,
     ObjectLengthPipe,
-- 
cgit v1.2.3

From 4e74e8032be8293ffe3cb3c30528d4ef7c11a798 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 5 Dec 2018 14:36:05 +0100
Subject: Remove inferred type

---
 .../user-moderation-dropdown.component.ts          | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'client')

diff --git a/client/src/app/shared/moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/moderation/user-moderation-dropdown.component.ts
index d391246e0..e3c9db923 100644
--- a/client/src/app/shared/moderation/user-moderation-dropdown.component.ts
+++ b/client/src/app/shared/moderation/user-moderation-dropdown.component.ts
@@ -277,18 +277,18 @@ export class UserModerationDropdownComponent implements OnChanges {
           },
           {
             label: this.i18n('Ban'),
-            handler: ({ user }: { user: User }) => this.openBanUserModal(user),
-            isDisplayed: ({ user }: { user: User }) => !user.blocked
+            handler: ({ user }) => this.openBanUserModal(user),
+            isDisplayed: ({ user }) => !user.blocked
           },
           {
             label: this.i18n('Unban'),
-            handler: ({ user }: { user: User }) => this.unbanUser(user),
-            isDisplayed: ({ user }: { user: User }) => user.blocked
+            handler: ({ user }) => this.unbanUser(user),
+            isDisplayed: ({ user }) => user.blocked
           },
           {
             label: this.i18n('Set Email as Verified'),
-            handler: ({ user }: { user: User }) => this.setEmailAsVerified(user),
-            isDisplayed: ({ user }: { user: User }) => this.requiresEmailVerification && !user.blocked && user.emailVerified === false
+            handler: ({ user }) => this.setEmailAsVerified(user),
+            isDisplayed: ({ user }) => this.requiresEmailVerification && !user.blocked && user.emailVerified === false
           }
         ])
       }
@@ -299,23 +299,23 @@ export class UserModerationDropdownComponent implements OnChanges {
         this.userActions.push([
           {
             label: this.i18n('Mute this account'),
-            isDisplayed: ({ account }: { account: Account }) => account.mutedByUser === false,
-            handler: ({ account }: { account: Account }) => this.blockAccountByUser(account)
+            isDisplayed: ({ account }) => account.mutedByUser === false,
+            handler: ({ account }) => this.blockAccountByUser(account)
           },
           {
             label: this.i18n('Unmute this account'),
-            isDisplayed: ({ account }: { account: Account }) => account.mutedByUser === true,
-            handler: ({ account }: { account: Account }) => this.unblockAccountByUser(account)
+            isDisplayed: ({ account }) => account.mutedByUser === true,
+            handler: ({ account }) => this.unblockAccountByUser(account)
           },
           {
             label: this.i18n('Mute the instance'),
-            isDisplayed: ({ account }: { account: Account }) => !account.userId && account.mutedServerByInstance === false,
-            handler: ({ account }: { account: Account }) => this.blockServerByUser(account.host)
+            isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false,
+            handler: ({ account }) => this.blockServerByUser(account.host)
           },
           {
             label: this.i18n('Unmute the instance'),
-            isDisplayed: ({ account }: { account: Account }) => !account.userId && account.mutedServerByInstance === true,
-            handler: ({ account }: { account: Account }) => this.unblockServerByUser(account.host)
+            isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === true,
+            handler: ({ account }) => this.unblockServerByUser(account.host)
           }
         ])
 
@@ -326,13 +326,13 @@ export class UserModerationDropdownComponent implements OnChanges {
           instanceActions = instanceActions.concat([
             {
               label: this.i18n('Mute this account by your instance'),
-              isDisplayed: ({ account }: { account: Account }) => account.mutedByInstance === false,
-              handler: ({ account }: { account: Account }) => this.blockAccountByInstance(account)
+              isDisplayed: ({ account }) => account.mutedByInstance === false,
+              handler: ({ account }) => this.blockAccountByInstance(account)
             },
             {
               label: this.i18n('Unmute this account by your instance'),
-              isDisplayed: ({ account }: { account: Account }) => account.mutedByInstance === true,
-              handler: ({ account }: { account: Account }) => this.unblockAccountByInstance(account)
+              isDisplayed: ({ account }) => account.mutedByInstance === true,
+              handler: ({ account }) => this.unblockAccountByInstance(account)
             }
           ])
         }
@@ -342,13 +342,13 @@ export class UserModerationDropdownComponent implements OnChanges {
           instanceActions = instanceActions.concat([
             {
               label: this.i18n('Mute the instance by your instance'),
-              isDisplayed: ({ account }: { account: Account }) => !account.userId && account.mutedServerByInstance === false,
-              handler: ({ account }: { account: Account }) => this.blockServerByInstance(account.host)
+              isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false,
+              handler: ({ account }) => this.blockServerByInstance(account.host)
             },
             {
               label: this.i18n('Unmute the instance by your instance'),
-              isDisplayed: ({ account }: { account: Account }) => !account.userId && account.mutedServerByInstance === true,
-              handler: ({ account }: { account: Account }) => this.unblockServerByInstance(account.host)
+              isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === true,
+              handler: ({ account }) => this.unblockServerByInstance(account.host)
             }
           ])
         }
-- 
cgit v1.2.3

From 56af5222c1ab3d6aaa76b1237bfa381ecc4878b1 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 5 Dec 2018 14:53:13 +0100
Subject: Put features table in about page

---
 .../about-instance/about-instance.component.html   | 63 ++++++++++++----------
 client/src/app/signup/signup.component.html        |  2 +-
 2 files changed, 37 insertions(+), 28 deletions(-)

(limited to 'client')

diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html
index 5970cac01..37ff795f5 100644
--- a/client/src/app/+about/about-instance/about-instance.component.html
+++ b/client/src/app/+about/about-instance/about-instance.component.html
@@ -1,39 +1,48 @@
-<div i18n class="about-instance-title">
-  About {{ instanceName }} instance
-</div>
+<div class="row">
+  <div class="col-md-12 col-xl-6">
+    <div i18n class="about-instance-title">
+      About {{ instanceName }} instance
+    </div>
 
-<div class="short-description">
-  <div>{{ shortDescription }}</div>
-</div>
+    <div class="short-description">
+      <div>{{ shortDescription }}</div>
+    </div>
 
-<div class="description">
-  <div i18n class="section-title">Description</div>
+    <div class="description">
+      <div i18n class="section-title">Description</div>
 
-  <div [innerHTML]="descriptionHTML"></div>
-</div>
+      <div [innerHTML]="descriptionHTML"></div>
+    </div>
 
-<div class="terms" id="terms-section">
-  <div i18n class="section-title">Terms</div>
+    <div class="terms" id="terms-section">
+      <div i18n class="section-title">Terms</div>
 
-  <div [innerHTML]="termsHTML"></div>
-</div>
+      <div [innerHTML]="termsHTML"></div>
+    </div>
+
+    <div class="signup">
+      <div i18n class="section-title">Signup</div>
 
-<div class="signup">
-  <div i18n class="section-title">Signup</div>
+      <div *ngIf="isSignupAllowed">
+        <ng-container i18n>User registration is allowed and</ng-container>
 
-  <div *ngIf="isSignupAllowed">
-    <ng-container i18n>User registration is allowed and</ng-container>
+        <ng-container i18n *ngIf="userVideoQuota !== -1">
+          this instance provides a baseline quota of {{ userVideoQuota | bytes: 0 }} space for the videos of its users.
+        </ng-container>
 
-    <ng-container i18n *ngIf="userVideoQuota !== -1">
-      this instance provides a baseline quota of {{ userVideoQuota | bytes: 0 }} space for the videos of its users.
-    </ng-container>
+        <ng-container i18n *ngIf="userVideoQuota === -1">
+          this instance provides unlimited space for the videos of its users.
+        </ng-container>
+      </div>
 
-    <ng-container i18n *ngIf="userVideoQuota === -1">
-      this instance provides unlimited space for the videos of its users.
-    </ng-container>
+      <div i18n *ngIf="isSignupAllowed === false">
+        User registration is currently not allowed.
+      </div>
+    </div>
   </div>
 
-  <div i18n *ngIf="isSignupAllowed === false">
-    User registration is currently not allowed.
+  <div class="col-md-12 col-xl-6">
+    <label>Features found on this instance</label>
+    <my-instance-features-table></my-instance-features-table>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/client/src/app/signup/signup.component.html b/client/src/app/signup/signup.component.html
index 0207a166e..07d24b381 100644
--- a/client/src/app/signup/signup.component.html
+++ b/client/src/app/signup/signup.component.html
@@ -64,7 +64,7 @@
     </form>
 
     <div>
-      <label for="email" i18n>Features found on this instance</label>
+      <label i18n>Features found on this instance</label>
       <my-instance-features-table></my-instance-features-table>
     </div>
   </div>
-- 
cgit v1.2.3

From 3b3b18203fe73e499bf8b49b15369710df95993e Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 5 Dec 2018 15:10:45 +0100
Subject: Add error when email system is not configured and using the forgot
 password system

---
 client/src/app/core/server/server.service.ts | 3 +++
 client/src/app/login/login.component.html    | 7 ++++++-
 client/src/app/login/login.component.ts      | 9 ++++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'client')

diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index da8bd26db..6eccb8336 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -37,6 +37,9 @@ export class ServerService {
         css: ''
       }
     },
+    email: {
+      enabled: false
+    },
     serverVersion: 'Unknown',
     signup: {
       allowed: false,
diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html
index 93dbed525..9b8146624 100644
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/login/login.component.html
@@ -59,7 +59,12 @@
   </div>
 
   <div class="modal-body">
-    <div class="form-group">
+
+    <div *ngIf="isEmailDisabled()" class="alert alert-danger" i18n>
+      We are sorry, you cannot recover you password because your instance administrator did not configure the PeerTube email system.
+    </div>
+
+    <div class="form-group" [hidden]="isEmailDisabled()">
       <label i18n for="forgot-password-email">Email</label>
       <input
         type="email" id="forgot-password-email" i18n-placeholder placeholder="Email address" required
diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts
index 7553e6456..212a8ff1f 100644
--- a/client/src/app/login/login.component.ts
+++ b/client/src/app/login/login.component.ts
@@ -19,7 +19,6 @@ import { Router } from '@angular/router'
 export class LoginComponent extends FormReactive implements OnInit {
   @ViewChild('emailInput') input: ElementRef
   @ViewChild('forgotPasswordModal') forgotPasswordModal: ElementRef
-  @ViewChild('forgotPasswordEmailInput') forgotPasswordEmailInput: ElementRef
 
   error: string = null
   forgotPasswordEmail = ''
@@ -45,6 +44,10 @@ export class LoginComponent extends FormReactive implements OnInit {
     return this.serverService.getConfig().signup.allowed === true
   }
 
+  isEmailDisabled () {
+    return this.serverService.getConfig().email.enabled === false
+  }
+
   ngOnInit () {
     this.buildForm({
       username: this.loginValidatorsService.LOGIN_USERNAME,
@@ -96,10 +99,6 @@ export class LoginComponent extends FormReactive implements OnInit {
       )
   }
 
-  onForgotPasswordModalShown () {
-    this.forgotPasswordEmailInput.nativeElement.focus()
-  }
-
   openForgotPasswordModal () {
     this.openedForgotPasswordModal = this.modalService.open(this.forgotPasswordModal)
   }
-- 
cgit v1.2.3

From d0ce42c1c17054b7e0c5081243152c32ecb1c193 Mon Sep 17 00:00:00 2001
From: BRAINS YUM <43896676+McFlat@users.noreply.github.com>
Date: Fri, 7 Dec 2018 07:54:33 -0600
Subject: username/display_name/video_channel_name min length 1 and max length
 50 (#1265)

* make username, display_name and video_channel_name min length 1 and max length 50; (fixes #1263);
    ! still some bug on the frontend complains but if you remove the disabled property it creates the account just fine;
allow for usernames to start with a number;
fix test, since username can be 1 char now make test check empty;
fix test, Should fail with a too long username;
fix test, Should fail with a too small username;
fix regular expression for username and videoChannel;
change username, videoChannel to be lowercase and fix message;

* change 1 characters to 1 character
---
 .../forms/form-validators/user-validators.service.ts | 20 ++++++++++----------
 .../video-channel-validators.service.ts              | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'client')

diff --git a/client/src/app/shared/forms/form-validators/user-validators.service.ts b/client/src/app/shared/forms/form-validators/user-validators.service.ts
index d14fa4777..66543657a 100644
--- a/client/src/app/shared/forms/form-validators/user-validators.service.ts
+++ b/client/src/app/shared/forms/form-validators/user-validators.service.ts
@@ -23,15 +23,15 @@ export class UserValidatorsService {
     this.USER_USERNAME = {
       VALIDATORS: [
         Validators.required,
-        Validators.minLength(3),
-        Validators.maxLength(20),
-        Validators.pattern(/^[a-z0-9._]+$/)
+        Validators.minLength(1),
+        Validators.maxLength(50),
+        Validators.pattern(/^[a-z0-9][a-z0-9-._]*$/)
       ],
       MESSAGES: {
         'required': this.i18n('Username is required.'),
-        'minlength': this.i18n('Username must be at least 3 characters long.'),
-        'maxlength': this.i18n('Username cannot be more than 20 characters long.'),
-        'pattern': this.i18n('Username should be only lowercase alphanumeric characters.')
+        'minlength': this.i18n('Username must be at least 1 character long.'),
+        'maxlength': this.i18n('Username cannot be more than 50 characters long.'),
+        'pattern': this.i18n('Username should be lowercase alphanumeric; dots, dashes and underscores are allowed.')
       }
     }
 
@@ -88,13 +88,13 @@ export class UserValidatorsService {
     this.USER_DISPLAY_NAME = {
       VALIDATORS: [
         Validators.required,
-        Validators.minLength(3),
-        Validators.maxLength(120)
+        Validators.minLength(1),
+        Validators.maxLength(50)
       ],
       MESSAGES: {
         'required': this.i18n('Display name is required.'),
-        'minlength': this.i18n('Display name must be at least 3 characters long.'),
-        'maxlength': this.i18n('Display name cannot be more than 120 characters long.')
+        'minlength': this.i18n('Display name must be at least 1 character long.'),
+        'maxlength': this.i18n('Display name cannot be more than 50 characters long.')
       }
     }
 
diff --git a/client/src/app/shared/forms/form-validators/video-channel-validators.service.ts b/client/src/app/shared/forms/form-validators/video-channel-validators.service.ts
index f62ff65f7..7df4f6adf 100644
--- a/client/src/app/shared/forms/form-validators/video-channel-validators.service.ts
+++ b/client/src/app/shared/forms/form-validators/video-channel-validators.service.ts
@@ -14,28 +14,28 @@ export class VideoChannelValidatorsService {
     this.VIDEO_CHANNEL_NAME = {
       VALIDATORS: [
         Validators.required,
-        Validators.minLength(3),
-        Validators.maxLength(20),
-        Validators.pattern(/^[a-z0-9._]+$/)
+        Validators.minLength(1),
+        Validators.maxLength(50),
+        Validators.pattern(/^[a-z0-9][a-z0-9-._]*$/)
       ],
       MESSAGES: {
         'required': this.i18n('Name is required.'),
-        'minlength': this.i18n('Name must be at least 3 characters long.'),
-        'maxlength': this.i18n('Name cannot be more than 20 characters long.'),
-        'pattern': this.i18n('Name should be only lowercase alphanumeric characters.')
+        'minlength': this.i18n('Name must be at least 1 character long.'),
+        'maxlength': this.i18n('Name cannot be more than 50 characters long.'),
+        'pattern': this.i18n('Name should be lowercase alphanumeric; dots, dashes and underscores are allowed.')
       }
     }
 
     this.VIDEO_CHANNEL_DISPLAY_NAME = {
       VALIDATORS: [
         Validators.required,
-        Validators.minLength(3),
-        Validators.maxLength(120)
+        Validators.minLength(1),
+        Validators.maxLength(50)
       ],
       MESSAGES: {
         'required': i18n('Display name is required.'),
-        'minlength': i18n('Display name must be at least 3 characters long.'),
-        'maxlength': i18n('Display name cannot be more than 120 characters long.')
+        'minlength': i18n('Display name must be at least 1 character long.'),
+        'maxlength': i18n('Display name cannot be more than 50 characters long.')
       }
     }
 
-- 
cgit v1.2.3

From 6ebfaf67641d466bbd29db8acbd6608ed13bcd6d Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 7 Dec 2018 14:56:56 +0100
Subject: Remove dashes from actor names

---
 .../src/app/shared/forms/form-validators/user-validators.service.ts   | 4 ++--
 .../shared/forms/form-validators/video-channel-validators.service.ts  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'client')

From 4b49385892b25aea5aa9e605fbcb66074bcb49b0 Mon Sep 17 00:00:00 2001
From: Micah Elizabeth Scott <beth@scanlime.org>
Date: Fri, 7 Dec 2018 05:58:17 -0800
Subject: Remove hard-coded 8GB upload limit in client (#1293)

* Remove hard-coded 8GB upload limit in client

Ideally we'd know what the specific server's configured upload limit
is before starting, but this 8GB limit is not useful if an administrator
has changed the nginx post limit on the server.

* Better docs for admins about client_max_body_size

Seems like some admins already tweak this value up or down to allow
for different maximum video upload sizes. The current codebase has no
other server-side limits that I'm aware of, and I've been routinely
uploading quite large videos to my instance.

This patch replaces the somewhat incorrect (or outdated?) 'hard limit'
comment with some advice about allocating enough space for nginx and
communicating the limit with your users.

Of course it would be better if this configuration could be unified with
PeerTube's config somehow. I'm not sure whether the best option there is
to turn off nginx's buffering here and let PeerTube handle the entire upload
(can we do this only for the video upload API endpoint?) or whether we want
PeerTube to generate nginx configs in a more automated way layer. In any case,
this patch is intended as an incremental improvement.
---
 .../+video-edit/video-add-components/video-upload.component.ts      | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'client')

diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
index 3fcb71ac3..7ea3691fa 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
@@ -117,12 +117,6 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
     const videofile = this.videofileInput.nativeElement.files[0]
     if (!videofile) return
 
-    // Cannot upload videos > 8GB for now
-    if (videofile.size > 8 * 1024 * 1024 * 1024) {
-      this.notificationsService.error(this.i18n('Error'), this.i18n('We are sorry but PeerTube cannot handle videos > 8GB'))
-      return
-    }
-
     const bytePipes = new BytesPipe()
     const videoQuota = this.authService.getUser().videoQuota
     if (videoQuota !== -1 && (this.userVideoQuotaUsed + videofile.size) > videoQuota) {
-- 
cgit v1.2.3

From 851c5cddc12f905d49eb38da1b4180a5b383c53b Mon Sep 17 00:00:00 2001
From: Josh Morel <morel.josh@hotmail.com>
Date: Sat, 8 Dec 2018 07:58:38 -0500
Subject: rename ask-email link to ask-send-email

---
 .../verify-account-email/verify-account-email.component.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'client')

diff --git a/client/src/app/+verify-account/verify-account-email/verify-account-email.component.html b/client/src/app/+verify-account/verify-account-email/verify-account-email.component.html
index 30ace5e10..a83d4a3c2 100644
--- a/client/src/app/+verify-account/verify-account-email/verify-account-email.component.html
+++ b/client/src/app/+verify-account/verify-account-email/verify-account-email.component.html
@@ -9,7 +9,7 @@
   <ng-template #verificationError>
     <div>
       <span i18n>An error occurred. </span>
-      <a i18n routerLink="/verify-account/ask-email">Request new verification email.</a>
+      <a i18n routerLink="/verify-account/ask-send-email">Request new verification email.</a>
     </div>
   </ng-template>
 </div>
-- 
cgit v1.2.3

From 4523bf113287b33212844b56dccc75e82e24772e Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 10 Dec 2018 10:25:35 +0100
Subject: dots are allowed in actor names

---
 client/src/app/shared/forms/form-validators/user-validators.service.ts  | 2 +-
 .../shared/forms/form-validators/video-channel-validators.service.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'client')

From e2a095bc96dc3dfadba8c3d8487f3a18bc2b7a03 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 10 Dec 2018 10:47:29 +0100
Subject: Fix default homepage in web application

---
 client/src/manifest.webmanifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'client')

diff --git a/client/src/manifest.webmanifest b/client/src/manifest.webmanifest
index 3d3c7d6d5..851e098a8 100644
--- a/client/src/manifest.webmanifest
+++ b/client/src/manifest.webmanifest
@@ -43,5 +43,5 @@
   ],
   "name": "PeerTube",
   "short_name": "PeerTube",
-  "start_url": "/videos/trending"
+  "start_url": "/"
 }
-- 
cgit v1.2.3

From 14e2014acc1362cfbb770c051a7254b156cd8efb Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 11 Dec 2018 14:52:50 +0100
Subject: Support additional video extensions

---
 .../config/edit-custom-config/edit-custom-config.component.html  | 8 ++++++++
 .../config/edit-custom-config/edit-custom-config.component.ts    | 3 +++
 client/src/app/shared/forms/peertube-checkbox.component.html     | 4 ++--
 client/src/app/shared/forms/peertube-checkbox.component.ts       | 5 ++---
 .../src/app/videos/+video-edit/shared/video-edit.component.html  | 1 +
 client/src/app/videos/+video-edit/shared/video-edit.component.ts | 1 +
 .../+video-edit/video-add-components/video-upload.component.html | 3 ++-
 .../+video-edit/video-add-components/video-upload.component.ts   | 9 +++++++++
 client/src/app/videos/+video-edit/video-update.component.html    | 2 +-
 client/src/app/videos/+video-edit/video-update.component.ts      | 7 +++++++
 10 files changed, 36 insertions(+), 7 deletions(-)

(limited to 'client')

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 fd4d3d9c9..6ece7e8bc 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
@@ -219,6 +219,14 @@
 
         <ng-template [ngIf]="isTranscodingEnabled()">
 
+          <div class="form-group">
+            <my-peertube-checkbox
+              inputName="transcodingAllowAdditionalExtensions" formControlName="transcodingAllowAdditionalExtensions"
+              i18n-labelText labelText="Allow additional extensions"
+              i18n-helpHtml helpHtml="Allow your users to upload .mkv, .mov, .avi, .flv videos"
+            ></my-peertube-checkbox>
+          </div>
+
           <div class="form-group">
             <label i18n for="transcodingThreads">Transcoding threads</label>
             <div class="peertube-select-container">
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index f48b6fc1a..6eea1cd76 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -82,6 +82,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
       userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA,
       userVideoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY,
       transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS,
+      transcodingAllowAdditionalExtensions: null,
       transcodingEnabled: null,
       customizationJavascript: null,
       customizationCSS: null
@@ -163,6 +164,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
       },
       transcoding: {
         enabled: this.form.value['transcodingEnabled'],
+        allowAdditionalExtensions: this.form.value['transcodingAllowAdditionalExtensions'],
         threads: this.form.value['transcodingThreads'],
         resolutions: {
           '240p': this.form.value[this.getResolutionKey('240p')],
@@ -221,6 +223,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
       userVideoQuotaDaily: this.customConfig.user.videoQuotaDaily,
       transcodingThreads: this.customConfig.transcoding.threads,
       transcodingEnabled: this.customConfig.transcoding.enabled,
+      transcodingAllowAdditionalExtensions: this.customConfig.transcoding.allowAdditionalExtensions,
       customizationJavascript: this.customConfig.instance.customizations.javascript,
       customizationCSS: this.customConfig.instance.customizations.css,
       importVideosHttpEnabled: this.customConfig.import.videos.http.enabled,
diff --git a/client/src/app/shared/forms/peertube-checkbox.component.html b/client/src/app/shared/forms/peertube-checkbox.component.html
index fb3006b53..7b8bcf601 100644
--- a/client/src/app/shared/forms/peertube-checkbox.component.html
+++ b/client/src/app/shared/forms/peertube-checkbox.component.html
@@ -1,10 +1,10 @@
 <div class="root">
   <label class="form-group-checkbox">
-    <input type="checkbox" [(ngModel)]="checked" (ngModelChange)="onModelChange()" [id]="inputName" [disabled]="isDisabled" />
+    <input type="checkbox" [(ngModel)]="checked" (ngModelChange)="onModelChange()" [id]="inputName" [disabled]="disabled" />
     <span role="checkbox" [attr.aria-checked]="checked"></span>
     <span *ngIf="labelText">{{ labelText }}</span>
     <span *ngIf="labelHtml" [innerHTML]="labelHtml"></span>
   </label>
 
   <my-help *ngIf="helpHtml" tooltipPlacement="top" helpType="custom" i18n-customHtml [customHtml]="helpHtml"></my-help>
-</div>
\ No newline at end of file
+</div>
diff --git a/client/src/app/shared/forms/peertube-checkbox.component.ts b/client/src/app/shared/forms/peertube-checkbox.component.ts
index bbc9904df..c1a6915e8 100644
--- a/client/src/app/shared/forms/peertube-checkbox.component.ts
+++ b/client/src/app/shared/forms/peertube-checkbox.component.ts
@@ -19,8 +19,7 @@ export class PeertubeCheckboxComponent implements ControlValueAccessor {
   @Input() labelText: string
   @Input() labelHtml: string
   @Input() helpHtml: string
-
-  isDisabled = false
+  @Input() disabled = false
 
   propagateChange = (_: any) => { /* empty */ }
 
@@ -41,6 +40,6 @@ export class PeertubeCheckboxComponent implements ControlValueAccessor {
   }
 
   setDisabledState (isDisabled: boolean) {
-    this.isDisabled = isDisabled
+    this.disabled = isDisabled
   }
 }
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/videos/+video-edit/shared/video-edit.component.html
index 33c766d87..bd52d686a 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html
@@ -126,6 +126,7 @@
             ></my-peertube-checkbox>
 
             <my-peertube-checkbox
+              *ngIf="waitTranscodingEnabled"
               inputName="waitTranscoding" formControlName="waitTranscoding"
               i18n-labelText labelText="Wait transcoding before publishing the video"
               i18n-helpHtml helpHtml="If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends."
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
index a56733e57..1d35b4ba8 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
@@ -27,6 +27,7 @@ export class VideoEditComponent implements OnInit, OnDestroy {
   @Input() userVideoChannels: { id: number, label: string, support: string }[] = []
   @Input() schedulePublicationPossible = true
   @Input() videoCaptions: VideoCaptionEdit[] = []
+  @Input() waitTranscodingEnabled = true
 
   @ViewChild('videoCaptionAddModal') videoCaptionAddModal: VideoCaptionAddModalComponent
 
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html
index a09f54dfc..289a28c66 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html
+++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html
@@ -6,7 +6,7 @@
       <span i18n>Select the file to upload</span>
       <input #videofileInput type="file" name="videofile" id="videofile" [accept]="videoExtensions" (change)="fileChange()" />
     </div>
-    <span class="button-file-extension">(.mp4, .webm, .ogv)</span>
+    <span class="button-file-extension">({{ videoExtensions }})</span>
 
     <div class="form-group form-group-channel">
       <label i18n for="first-step-channel">Channel</label>
@@ -47,6 +47,7 @@
   <my-video-edit
     [form]="form" [formErrors]="formErrors" [videoCaptions]="videoCaptions"
     [validationMessages]="validationMessages" [videoPrivacies]="videoPrivacies" [userVideoChannels]="userVideoChannels"
+    [waitTranscodingEnabled]="waitTranscodingEnabled"
   ></my-video-edit>
 
   <div class="submit-container">
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
index 7ea3691fa..2180e22ab 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
@@ -44,6 +44,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
     id: 0,
     uuid: ''
   }
+  waitTranscodingEnabled = true
 
   error: string
 
@@ -117,6 +118,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
     const videofile = this.videofileInput.nativeElement.files[0]
     if (!videofile) return
 
+    // Check global user quota
     const bytePipes = new BytesPipe()
     const videoQuota = this.authService.getUser().videoQuota
     if (videoQuota !== -1 && (this.userVideoQuotaUsed + videofile.size) > videoQuota) {
@@ -132,6 +134,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
       return
     }
 
+    // Check daily user quota
     const videoQuotaDaily = this.authService.getUser().videoQuotaDaily
     if (videoQuotaDaily !== -1 && (this.userVideoQuotaUsedDaily + videofile.size) > videoQuotaDaily) {
       const msg = this.i18n(
@@ -146,6 +149,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
       return
     }
 
+    // Build name field
     const nameWithoutExtension = videofile.name.replace(/\.[^/.]+$/, '')
     let name: string
 
@@ -153,6 +157,11 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
     if (nameWithoutExtension.length < 3) name = videofile.name
     else name = nameWithoutExtension
 
+    // Force user to wait transcoding for unsupported video types in web browsers
+    if (!videofile.name.endsWith('.mp4') && !videofile.name.endsWith('.webm') && !videofile.name.endsWith('.ogv')) {
+      this.waitTranscodingEnabled = false
+    }
+
     const privacy = this.firstStepPrivacyId.toString()
     const nsfw = false
     const waitTranscoding = true
diff --git a/client/src/app/videos/+video-edit/video-update.component.html b/client/src/app/videos/+video-edit/video-update.component.html
index 9242c30a0..0457778c0 100644
--- a/client/src/app/videos/+video-edit/video-update.component.html
+++ b/client/src/app/videos/+video-edit/video-update.component.html
@@ -8,7 +8,7 @@
     <my-video-edit
       [form]="form" [formErrors]="formErrors" [schedulePublicationPossible]="schedulePublicationPossible"
       [validationMessages]="validationMessages" [videoPrivacies]="videoPrivacies" [userVideoChannels]="userVideoChannels"
-      [videoCaptions]="videoCaptions"
+      [videoCaptions]="videoCaptions" [waitTranscodingEnabled]="waitTranscodingEnabled"
     ></my-video-edit>
 
     <div class="submit-container">
diff --git a/client/src/app/videos/+video-edit/video-update.component.ts b/client/src/app/videos/+video-edit/video-update.component.ts
index 3a0f3a39a..d99a02b18 100644
--- a/client/src/app/videos/+video-edit/video-update.component.ts
+++ b/client/src/app/videos/+video-edit/video-update.component.ts
@@ -12,6 +12,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 import { VideoCaptionService } from '@app/shared/video-caption'
 import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model'
+import { VideoDetails } from '@app/shared/video/video-details.model'
 
 @Component({
   selector: 'my-videos-update',
@@ -26,6 +27,7 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
   userVideoChannels: { id: number, label: string, support: string }[] = []
   schedulePublicationPossible = false
   videoCaptions: VideoCaptionEdit[] = []
+  waitTranscodingEnabled = true
 
   private updateDone = false
 
@@ -65,6 +67,11 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
 
           this.videoPrivacies = this.videoService.explainedPrivacyLabels(this.videoPrivacies)
 
+          const videoFiles = (video as VideoDetails).files
+          if (videoFiles.length > 1) { // Already transcoded
+            this.waitTranscodingEnabled = false
+          }
+
           // FIXME: Angular does not detect the change inside this subscription, so use the patched setTimeout
           setTimeout(() => this.hydrateFormFromVideo())
         },
-- 
cgit v1.2.3

From dae5ca24b173aebd16de2a202ccd4088568b8dfb Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 11 Dec 2018 15:27:46 +0100
Subject: Redirect to the last url on login

---
 client/src/app/core/auth/auth.service.ts            |  5 +----
 client/src/app/core/routing/login-guard.service.ts  |  2 --
 client/src/app/core/routing/redirect.service.ts     | 21 ++++++++++++++++++++-
 client/src/app/login/login.component.ts             | 11 +----------
 .../user-subscription/subscribe-button.component.ts |  7 +++----
 .../comment/video-comment-add.component.ts          |  1 -
 6 files changed, 25 insertions(+), 22 deletions(-)

(limited to 'client')

diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index 443772c9e..5f5730e02 100644
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -14,7 +14,7 @@ import { AuthUser } from './auth-user.model'
 import { objectToUrlEncoded } from '@app/shared/misc/utils'
 import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage'
 import { I18n } from '@ngx-translate/i18n-polyfill'
-import { HotkeysService, Hotkey } from 'angular2-hotkeys'
+import { Hotkey, HotkeysService } from 'angular2-hotkeys'
 
 interface UserLoginWithUsername extends UserLogin {
   access_token: string
@@ -38,7 +38,6 @@ export class AuthService {
   loginChangedSource: Observable<AuthStatus>
   userInformationLoaded = new ReplaySubject<boolean>(1)
   hotkeys: Hotkey[]
-  redirectUrl: string
 
   private clientId: string = peertubeLocalStorage.getItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_ID)
   private clientSecret: string = peertubeLocalStorage.getItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_SECRET)
@@ -178,8 +177,6 @@ export class AuthService {
     this.setStatus(AuthStatus.LoggedOut)
 
     this.hotkeysService.remove(this.hotkeys)
-
-    this.redirectUrl = null
   }
 
   refreshAccessToken () {
diff --git a/client/src/app/core/routing/login-guard.service.ts b/client/src/app/core/routing/login-guard.service.ts
index 40ff8f505..18bc41ca6 100644
--- a/client/src/app/core/routing/login-guard.service.ts
+++ b/client/src/app/core/routing/login-guard.service.ts
@@ -20,8 +20,6 @@ export class LoginGuard implements CanActivate, CanActivateChild {
   canActivate (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
     if (this.auth.isLoggedIn() === true) return true
 
-    this.auth.redirectUrl = state.url
-
     this.router.navigate([ '/login' ])
     return false
   }
diff --git a/client/src/app/core/routing/redirect.service.ts b/client/src/app/core/routing/redirect.service.ts
index 1881be117..e1db4097b 100644
--- a/client/src/app/core/routing/redirect.service.ts
+++ b/client/src/app/core/routing/redirect.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { Router } from '@angular/router'
+import { NavigationEnd, Router } from '@angular/router'
 import { ServerService } from '../server'
 
 @Injectable()
@@ -8,6 +8,9 @@ export class RedirectService {
   static INIT_DEFAULT_ROUTE = '/videos/trending'
   static DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
 
+  private previousUrl: string
+  private currentUrl: string
+
   constructor (
     private router: Router,
     private serverService: ServerService
@@ -18,6 +21,7 @@ export class RedirectService {
       RedirectService.DEFAULT_ROUTE = config.instance.defaultClientRoute
     }
 
+    // Load default route
     this.serverService.configLoaded
         .subscribe(() => {
           const defaultRouteConfig = this.serverService.getConfig().instance.defaultClientRoute
@@ -26,6 +30,21 @@ export class RedirectService {
             RedirectService.DEFAULT_ROUTE = defaultRouteConfig
           }
         })
+
+    // Track previous url
+    this.currentUrl = this.router.url
+    router.events.subscribe(event => {
+      if (event instanceof NavigationEnd) {
+        this.previousUrl = this.currentUrl
+        this.currentUrl = event.url
+      }
+    })
+  }
+
+  redirectToPreviousRoute () {
+    if (this.previousUrl) return this.router.navigateByUrl(this.previousUrl)
+
+    return this.redirectToHomepage()
   }
 
   redirectToHomepage (skipLocationChange = false) {
diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts
index 212a8ff1f..18f8f69e5 100644
--- a/client/src/app/login/login.component.ts
+++ b/client/src/app/login/login.component.ts
@@ -64,7 +64,7 @@ export class LoginComponent extends FormReactive implements OnInit {
 
     this.authService.login(username, password)
       .subscribe(
-        () => this.redirect(),
+        () => this.redirectService.redirectToPreviousRoute(),
 
         err => {
           if (err.message.indexOf('credentials are invalid') !== -1) this.error = this.i18n('Incorrect username or password.')
@@ -74,15 +74,6 @@ export class LoginComponent extends FormReactive implements OnInit {
       )
   }
 
-  redirect () {
-    const redirect = this.authService.redirectUrl
-    if (redirect) {
-      this.router.navigate([ redirect ])
-    } else {
-      this.redirectService.redirectToHomepage()
-    }
-  }
-
   askResetPassword () {
     this.userService.askResetPassword(this.forgotPasswordEmail)
       .subscribe(
diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.ts b/client/src/app/shared/user-subscription/subscribe-button.component.ts
index 315ea5037..9c8a15023 100644
--- a/client/src/app/shared/user-subscription/subscribe-button.component.ts
+++ b/client/src/app/shared/user-subscription/subscribe-button.component.ts
@@ -50,11 +50,10 @@ export class SubscribeButtonComponent implements OnInit {
 
   subscribe () {
     if (this.isUserLoggedIn()) {
-      this.localSubscribe()
-    } else {
-      this.authService.redirectUrl = this.router.url
-      this.gotoLogin()
+      return this.localSubscribe()
     }
+
+    return this.gotoLogin()
   }
 
   localSubscribe () {
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
index 6db0eb55d..7f582c950 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
@@ -135,7 +135,6 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit {
 
   gotoLogin () {
     this.hideVisitorModal()
-    this.authService.redirectUrl = this.router.url
     this.router.navigate([ '/login' ])
   }
 
-- 
cgit v1.2.3

From 5e755fff9d70a7fd3c4f85bb524f1b774dd85b25 Mon Sep 17 00:00:00 2001
From: Rigel Kent <par@rigelk.eu>
Date: Thu, 13 Dec 2018 09:49:45 +0100
Subject: add Content Security Policy (#1252)

* add Content Security Policy

* remove reflect-metadata on production builds to get rid of unsafe-eval

* fix baseCSP usage

* add SRI to CSP

* add blob: to media-src

* remove SRI

* CSP set to reportOnly

* adding data: to connect-src CSP

* remove block-all-mixed-content

* add report-uri support
---
 client/src/environments/environment.ts | 7 +++++++
 client/src/polyfills.ts                | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'client')

diff --git a/client/src/environments/environment.ts b/client/src/environments/environment.ts
index 5bb6f4b34..1ea483554 100644
--- a/client/src/environments/environment.ts
+++ b/client/src/environments/environment.ts
@@ -2,6 +2,13 @@
 // `ng build --env=prod` then `environment.prod.ts` will be used instead.
 // The list of which env maps to which file can be found in `.angular-cli.json`.
 
+// Reflect.metadata polyfill is only needed in the JIT/dev mode.
+//
+// In order to load these polyfills early enough (before app code), polyfill.ts imports this file to
+// to change the order in the final bundle.
+import 'core-js/es6/reflect'
+import 'core-js/es7/reflect'
+
 export const environment = {
   production: false,
   hmr: false,
diff --git a/client/src/polyfills.ts b/client/src/polyfills.ts
index 5dff18632..368908432 100644
--- a/client/src/polyfills.ts
+++ b/client/src/polyfills.ts
@@ -45,7 +45,13 @@ import 'core-js/es7/object'
 /** IE10 and IE11 requires the following for the Reflect API. */
 
 // For Google Bot
-import 'core-js/es6/reflect'
+// import 'core-js/es6/reflect'; // --> dealt with in src/environment.ts
+
+/**
+ * Evergreen browsers require these.
+ */
+// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
+// import 'core-js/es7/reflect' // --> dealt with in src/environment.ts
 
 /**
  * Required to support Web Animations `@angular/platform-browser/animations`.
-- 
cgit v1.2.3

From 16c07398f2ed884b9223b3e18c5e541cf9ab8469 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 13 Dec 2018 15:00:10 +0100
Subject: Fix followers search

---
 .../src/app/+admin/follows/followers-list/followers-list.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'client')

diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.ts b/client/src/app/+admin/follows/followers-list/followers-list.component.ts
index 4a25b7ff3..43ce5d4af 100644
--- a/client/src/app/+admin/follows/followers-list/followers-list.component.ts
+++ b/client/src/app/+admin/follows/followers-list/followers-list.component.ts
@@ -32,7 +32,7 @@ export class FollowersListComponent extends RestTable implements OnInit {
   }
 
   protected loadData () {
-    this.followService.getFollowers(this.pagination, this.sort)
+    this.followService.getFollowers(this.pagination, this.sort, this.search)
                       .subscribe(
                         resultList => {
                           this.followers = resultList.data
-- 
cgit v1.2.3

From 259dd796e6d93db8068ec47aac99a560f2818673 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 17 Dec 2018 13:38:01 +0100
Subject: Fix adding captions to a video

---
 .../videos/+video-edit/shared/video-caption-add-modal.component.ts    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'client')

diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts
index eaf819726..1413e7262 100644
--- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts
+++ b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts
@@ -72,8 +72,6 @@ export class VideoCaptionAddModalComponent extends FormReactive implements OnIni
   }
 
   async addCaption () {
-    this.hide()
-
     const languageId = this.form.value[ 'language' ]
     const languageObject = this.videoCaptionLanguages.find(l => l.id === languageId)
 
@@ -82,6 +80,6 @@ export class VideoCaptionAddModalComponent extends FormReactive implements OnIni
       captionfile: this.form.value[ 'captionfile' ]
     })
 
-    this.form.reset()
+    this.hide()
   }
 }
-- 
cgit v1.2.3

From 3b019808ef529cacce7f40706441670309e231d1 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 17 Dec 2018 14:14:54 +0100
Subject: Set last subtitle or subtitle in URL

---
 .../assets/player/peertube-player-local-storage.ts | 12 +++++-
 client/src/assets/player/peertube-player.ts        | 36 ++++++++++--------
 .../src/assets/player/peertube-videojs-plugin.ts   | 44 ++++++++++++++++------
 .../src/assets/player/peertube-videojs-typings.ts  |  1 +
 client/src/assets/player/utils.ts                  |  1 +
 client/src/standalone/videos/embed.ts              | 28 +++++++-------
 6 files changed, 81 insertions(+), 41 deletions(-)

(limited to 'client')

diff --git a/client/src/assets/player/peertube-player-local-storage.ts b/client/src/assets/player/peertube-player-local-storage.ts
index 7e3813570..059fca308 100644
--- a/client/src/assets/player/peertube-player-local-storage.ts
+++ b/client/src/assets/player/peertube-player-local-storage.ts
@@ -60,6 +60,14 @@ function getAverageBandwidthInStore () {
   return undefined
 }
 
+function saveLastSubtitle (language: string) {
+  return setLocalStorage('last-subtitle', language)
+}
+
+function getStoredLastSubtitle () {
+  return getLocalStorage('last-subtitle')
+}
+
 // ---------------------------------------------------------------------------
 
 export {
@@ -71,7 +79,9 @@ export {
   saveMuteInStore,
   saveTheaterInStore,
   saveAverageBandwidth,
-  getAverageBandwidthInStore
+  getAverageBandwidthInStore,
+  saveLastSubtitle,
+  getStoredLastSubtitle
 }
 
 // ---------------------------------------------------------------------------
diff --git a/client/src/assets/player/peertube-player.ts b/client/src/assets/player/peertube-player.ts
index aaa1170b6..e0e063838 100644
--- a/client/src/assets/player/peertube-player.ts
+++ b/client/src/assets/player/peertube-player.ts
@@ -26,23 +26,24 @@ videojsUntyped.getComponent('CaptionsButton').prototype.controlText_ = 'Subtitle
 videojsUntyped.getComponent('CaptionsButton').prototype.label_ = ' '
 
 function getVideojsOptions (options: {
-  autoplay: boolean,
-  playerElement: HTMLVideoElement,
-  videoViewUrl: string,
-  videoDuration: number,
-  videoFiles: VideoFile[],
-  enableHotkeys: boolean,
-  inactivityTimeout: number,
-  peertubeLink: boolean,
-  poster: string,
+  autoplay: boolean
+  playerElement: HTMLVideoElement
+  videoViewUrl: string
+  videoDuration: number
+  videoFiles: VideoFile[]
+  enableHotkeys: boolean
+  inactivityTimeout: number
+  peertubeLink: boolean
+  poster: string
   startTime: number | string
-  theaterMode: boolean,
-  videoCaptions: VideoJSCaption[],
+  theaterMode: boolean
+  videoCaptions: VideoJSCaption[]
 
-  language?: string,
-  controls?: boolean,
-  muted?: boolean,
+  language?: string
+  controls?: boolean
+  muted?: boolean
   loop?: boolean
+  subtitle?: string
 
   userWatching?: UserWatching
 }) {
@@ -50,8 +51,10 @@ function getVideojsOptions (options: {
     // We don't use text track settings for now
     textTrackSettings: false,
     controls: options.controls !== undefined ? options.controls : true,
-    muted: options.controls !== undefined ? options.muted : false,
     loop: options.loop !== undefined ? options.loop : false,
+
+    muted: options.muted !== undefined ? options.muted : undefined, // Undefined so the player knows it has to check the local storage
+
     poster: options.poster,
     autoplay: false,
     inactivityTimeout: options.inactivityTimeout,
@@ -65,7 +68,8 @@ function getVideojsOptions (options: {
         videoViewUrl: options.videoViewUrl,
         videoDuration: options.videoDuration,
         startTime: options.startTime,
-        userWatching: options.userWatching
+        userWatching: options.userWatching,
+        subtitle: options.subtitle
       }
     },
     controlBar: {
diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/peertube-videojs-plugin.ts
index 4fd5a9be2..4a280b7ef 100644
--- a/client/src/assets/player/peertube-videojs-plugin.ts
+++ b/client/src/assets/player/peertube-videojs-plugin.ts
@@ -11,10 +11,12 @@ import { isMobile, timeToInt, videoFileMaxByResolution, videoFileMinByResolution
 import { PeertubeChunkStore } from './peertube-chunk-store'
 import {
   getAverageBandwidthInStore,
+  getStoredLastSubtitle,
   getStoredMute,
   getStoredVolume,
   getStoredWebTorrentEnabled,
   saveAverageBandwidth,
+  saveLastSubtitle,
   saveMuteInStore,
   saveVolumeInStore
 } from './peertube-player-local-storage'
@@ -67,10 +69,11 @@ class PeerTubePlugin extends Plugin {
   private currentVideoFile: VideoFile
   private torrent: WebTorrent.Torrent
   private videoCaptions: VideoJSCaption[]
+  private defaultSubtitle: string
 
   private renderer: any
   private fakeRenderer: any
-  private destoyingFakeRenderer = false
+  private destroyingFakeRenderer = false
 
   private autoResolution = true
   private forbidAutoResolution = false
@@ -106,11 +109,34 @@ class PeerTubePlugin extends Plugin {
     if (this.autoplay === true) this.player.addClass('vjs-has-autoplay')
 
     this.player.ready(() => {
+      const playerOptions = this.player.options_
+
       const volume = getStoredVolume()
       if (volume !== undefined) this.player.volume(volume)
-      const muted = getStoredMute()
+
+      const muted = playerOptions.muted !== undefined ? playerOptions.muted : getStoredMute()
       if (muted !== undefined) this.player.muted(muted)
 
+      this.defaultSubtitle = options.subtitle || getStoredLastSubtitle()
+
+      this.player.on('volumechange', () => {
+        saveVolumeInStore(this.player.volume())
+        saveMuteInStore(this.player.muted())
+      })
+
+      this.player.textTracks().on('change', () => {
+        const showing = this.player.textTracks().tracks_.find((t: { kind: string, mode: string }) => {
+          return t.kind === 'captions' && t.mode === 'showing'
+        })
+
+        if (!showing) {
+          saveLastSubtitle('off')
+          return
+        }
+
+        saveLastSubtitle(showing.language)
+      })
+
       this.player.duration(options.videoDuration)
 
       this.initializePlayer()
@@ -124,11 +150,6 @@ class PeerTubePlugin extends Plugin {
         this.runAutoQualitySchedulerTimer = setTimeout(() => this.runAutoQualityScheduler(), this.CONSTANTS.AUTO_QUALITY_SCHEDULER)
       })
     })
-
-    this.player.on('volumechange', () => {
-      saveVolumeInStore(this.player.volume())
-      saveMuteInStore(this.player.muted())
-    })
   }
 
   dispose () {
@@ -657,14 +678,14 @@ class PeerTubePlugin extends Plugin {
   }
 
   private renderFileInFakeElement (file: WebTorrent.TorrentFile, delay: number) {
-    this.destoyingFakeRenderer = false
+    this.destroyingFakeRenderer = false
 
     const fakeVideoElem = document.createElement('video')
     renderVideo(file, fakeVideoElem, { autoplay: false, controls: false }, (err, renderer) => {
       this.fakeRenderer = renderer
 
       // The renderer returns an error when we destroy it, so skip them
-      if (this.destoyingFakeRenderer === false && err) {
+      if (this.destroyingFakeRenderer === false && err) {
         console.error('Cannot render new torrent in fake video element.', err)
       }
 
@@ -675,7 +696,7 @@ class PeerTubePlugin extends Plugin {
 
   private destroyFakeRenderer () {
     if (this.fakeRenderer) {
-      this.destoyingFakeRenderer = true
+      this.destroyingFakeRenderer = true
 
       if (this.fakeRenderer.destroy) {
         try {
@@ -695,7 +716,8 @@ class PeerTubePlugin extends Plugin {
         label: caption.label,
         language: caption.language,
         id: caption.language,
-        src: caption.src
+        src: caption.src,
+        default: this.defaultSubtitle === caption.language
       }, false)
     }
   }
diff --git a/client/src/assets/player/peertube-videojs-typings.ts b/client/src/assets/player/peertube-videojs-typings.ts
index d127230fa..634c7fdc9 100644
--- a/client/src/assets/player/peertube-videojs-typings.ts
+++ b/client/src/assets/player/peertube-videojs-typings.ts
@@ -39,6 +39,7 @@ type PeertubePluginOptions = {
   autoplay: boolean,
   videoCaptions: VideoJSCaption[]
 
+  subtitle?: string
   userWatching?: UserWatching
 }
 
diff --git a/client/src/assets/player/utils.ts b/client/src/assets/player/utils.ts
index c87287482..8b9f34b99 100644
--- a/client/src/assets/player/utils.ts
+++ b/client/src/assets/player/utils.ts
@@ -39,6 +39,7 @@ function buildVideoLink (time?: number, url?: string) {
 }
 
 function timeToInt (time: number | string) {
+  if (!time) return 0
   if (typeof time === 'number') return time
 
   const reg = /^((\d+)h)?((\d+)m)?((\d+)s?)?$/
diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts
index 7daa03f23..3a09f285e 100644
--- a/client/src/standalone/videos/embed.ts
+++ b/client/src/standalone/videos/embed.ts
@@ -157,10 +157,11 @@ class PeerTubeEmbed {
   player: any
   playerOptions: any
   api: PeerTubeEmbedApi = null
-  autoplay = false
-  controls = true
-  muted = false
-  loop = false
+  autoplay: boolean
+  controls: boolean
+  muted: boolean
+  loop: boolean
+  subtitle: string
   enableApi = false
   startTime: number | string = 0
   scope = 'peertube'
@@ -214,11 +215,11 @@ class PeerTubeEmbed {
     this.displayError(text)
   }
 
-  getParamToggle (params: URLSearchParams, name: string, defaultValue: boolean) {
+  getParamToggle (params: URLSearchParams, name: string, defaultValue?: boolean) {
     return params.has(name) ? (params.get(name) === '1' || params.get(name) === 'true') : defaultValue
   }
 
-  getParamString (params: URLSearchParams, name: string, defaultValue: string) {
+  getParamString (params: URLSearchParams, name: string, defaultValue?: string) {
     return params.has(name) ? params.get(name) : defaultValue
   }
 
@@ -241,15 +242,15 @@ class PeerTubeEmbed {
     try {
       let params = new URL(window.location.toString()).searchParams
 
-      this.autoplay = this.getParamToggle(params, 'autoplay', this.autoplay)
-      this.controls = this.getParamToggle(params, 'controls', this.controls)
-      this.muted = this.getParamToggle(params, 'muted', this.muted)
-      this.loop = this.getParamToggle(params, 'loop', this.loop)
+      this.autoplay = this.getParamToggle(params, 'autoplay')
+      this.controls = this.getParamToggle(params, 'controls')
+      this.muted = this.getParamToggle(params, 'muted')
+      this.loop = this.getParamToggle(params, 'loop')
       this.enableApi = this.getParamToggle(params, 'api', this.enableApi)
-      this.scope = this.getParamString(params, 'scope', this.scope)
 
-      const startTimeParamString = params.get('start')
-      if (startTimeParamString) this.startTime = startTimeParamString
+      this.scope = this.getParamString(params, 'scope', this.scope)
+      this.subtitle = this.getParamString(params, 'subtitle')
+      this.startTime = this.getParamString(params, 'start')
     } catch (err) {
       console.error('Cannot get params from URL.', err)
     }
@@ -291,6 +292,7 @@ class PeerTubeEmbed {
       muted: this.muted,
       loop: this.loop,
       startTime: this.startTime,
+      subtitle: this.subtitle,
 
       videoCaptions,
       inactivityTimeout: 1500,
-- 
cgit v1.2.3

From 1b04f19c48616f8f93e45451bb992711627bbdfc Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 17 Dec 2018 14:22:36 +0100
Subject: Add ability to set subtitle in URL in watch page

---
 client/src/app/videos/+video-watch/video-watch.component.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'client')

diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index 09ee96bdc..afbe1fe78 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -118,7 +118,9 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
         )
         .subscribe(([ video, captionsResult ]) => {
           const startTime = this.route.snapshot.queryParams.start
-          this.onVideoFetched(video, captionsResult.data, startTime)
+          const subtitle = this.route.snapshot.queryParams.subtitle
+
+          this.onVideoFetched(video, captionsResult.data, { startTime, subtitle })
               .catch(err => this.handleError(err))
         })
     })
@@ -371,7 +373,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
         )
   }
 
-  private async onVideoFetched (video: VideoDetails, videoCaptions: VideoCaption[], startTimeFromUrl: number) {
+  private async onVideoFetched (video: VideoDetails, videoCaptions: VideoCaption[], urlOptions: { startTime: number, subtitle: string }) {
     this.video = video
 
     // Re init attributes
@@ -379,7 +381,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     this.completeDescriptionShown = false
     this.remoteServerDown = false
 
-    let startTime = startTimeFromUrl || (this.video.userHistory ? this.video.userHistory.currentTime : 0)
+    let startTime = urlOptions.startTime || (this.video.userHistory ? this.video.userHistory.currentTime : 0)
     // Don't start the video if we are at the end
     if (this.video.duration - startTime <= 1) startTime = 0
 
@@ -419,6 +421,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
       peertubeLink: false,
       poster: this.video.previewUrl,
       startTime,
+      subtitle: urlOptions.subtitle,
       theaterMode: true,
       language: this.localeId,
 
-- 
cgit v1.2.3

From 583cd0d2129dc855e599f981d70e537feade1632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Tue, 18 Dec 2018 18:42:39 +0900
Subject: Add WebFinger support (#1498)

* Add WebFinger support

* Fix TS7006

* Follow lint

* Fix TS7006
---
 .../user-subscription/remote-subscribe.component.ts | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'client')

diff --git a/client/src/app/shared/user-subscription/remote-subscribe.component.ts b/client/src/app/shared/user-subscription/remote-subscribe.component.ts
index 7a81108cd..49722ce40 100644
--- a/client/src/app/shared/user-subscription/remote-subscribe.component.ts
+++ b/client/src/app/shared/user-subscription/remote-subscribe.component.ts
@@ -37,7 +37,24 @@ export class RemoteSubscribeComponent extends FormReactive implements OnInit {
 
   formValidated () {
     const address = this.form.value['text']
-    const [ , hostname ] = address.split('@')
-    window.open(`https://${hostname}/authorize_interaction?acct=${this.account}`)
+    const [ username, hostname ] = address.split('@')
+
+    fetch(`https://${hostname}/.well-known/webfinger?resource=acct:${username}@${hostname}`)
+      .then(response => response.json())
+      .then(data => new Promise((resolve, reject) => {
+        if (data && Array.isArray(data.links)) {
+          const link: {
+            template: string
+          } = data.links.find((link: any) =>
+            link && typeof link.template === 'string' && link.rel === 'http://ostatus.org/schema/1.0/subscribe')
+
+          if (link && link.template.includes('{uri}')) {
+            resolve(link.template.replace('{uri}', `acct:${this.account}`))
+          }
+        }
+        reject()
+      }))
+      .then(window.open)
+      .catch(() => window.open(`https://${hostname}/authorize_interaction?acct=${this.account}`))
   }
 }
-- 
cgit v1.2.3

From 80bfd33c0bf910e2cfdd3270b14ba9eddd90e2e8 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 18 Dec 2018 09:31:09 +0100
Subject: Add history page on client

---
 .../my-account-history.component.html              | 15 +++++
 .../my-account-history.component.scss              | 68 ++++++++++++++++++++++
 .../my-account-history.component.ts                | 66 +++++++++++++++++++++
 .../app/+my-account/my-account-routing.module.ts   | 10 ++++
 .../my-account-videos.component.scss               |  2 +-
 client/src/app/+my-account/my-account.component.ts |  6 +-
 client/src/app/+my-account/my-account.module.ts    |  4 +-
 .../shared/menu/top-menu-dropdown.component.html   |  5 +-
 .../shared/menu/top-menu-dropdown.component.scss   |  4 ++
 .../app/shared/menu/top-menu-dropdown.component.ts | 14 ++++-
 client/src/app/shared/shared.module.ts             |  2 +
 .../src/app/shared/users/user-history.service.ts   | 45 ++++++++++++++
 12 files changed, 234 insertions(+), 7 deletions(-)
 create mode 100644 client/src/app/+my-account/my-account-history/my-account-history.component.html
 create mode 100644 client/src/app/+my-account/my-account-history/my-account-history.component.scss
 create mode 100644 client/src/app/+my-account/my-account-history/my-account-history.component.ts
 create mode 100644 client/src/app/shared/users/user-history.service.ts

(limited to 'client')

diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.html b/client/src/app/+my-account/my-account-history/my-account-history.component.html
new file mode 100644
index 000000000..653b33f89
--- /dev/null
+++ b/client/src/app/+my-account/my-account-history/my-account-history.component.html
@@ -0,0 +1,15 @@
+<div i18n *ngIf="pagination.totalItems === 0">You don't have history yet.</div>
+
+<div myInfiniteScroller (nearOfBottom)="onNearOfBottom()" class="videos" #videosElement>
+  <div *ngFor="let videos of videoPages;" class="videos-page">
+    <div class="video" *ngFor="let video of videos">
+      <my-video-thumbnail [video]="video"></my-video-thumbnail>
+
+      <div class="video-info">
+        <a tabindex="-1" class="video-info-name" [routerLink]="['/videos/watch', video.uuid]" [attr.title]="video.name">{{ video.name }}</a>
+        <span i18n class="video-info-date-views">{{ video.views | myNumberFormatter }} views</span>
+        <a tabindex="-1" class="video-info-account" [routerLink]="[ '/accounts', video.byAccount ]">{{ video.byAccount }}</a>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.scss b/client/src/app/+my-account/my-account-history/my-account-history.component.scss
new file mode 100644
index 000000000..115bb0e5c
--- /dev/null
+++ b/client/src/app/+my-account/my-account-history/my-account-history.component.scss
@@ -0,0 +1,68 @@
+@import '_variables';
+@import '_mixins';
+
+.video {
+  @include row-blocks;
+
+  my-video-thumbnail {
+    margin-right: 10px;
+  }
+
+  .video-info {
+    flex-grow: 1;
+
+    .video-info-name {
+      @include disable-default-a-behaviour;
+
+      color: var(--mainForegroundColor);
+      display: block;
+      width: fit-content;
+      font-size: 18px;
+      font-weight: $font-semibold;
+    }
+
+    .video-info-date-views {
+      font-size: 14px;
+    }
+
+    .video-info-account {
+      @include disable-default-a-behaviour;
+
+      display: block;
+      width: fit-content;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      font-size: 14px;
+      color: #585858;
+
+      &:hover {
+        color: #303030;
+      }
+    }
+  }
+}
+
+@media screen and (max-width: $small-view) {
+  .video {
+    flex-direction: column;
+    height: auto;
+    text-align: center;
+
+    .video-info-name {
+      margin: auto;
+    }
+
+    input[type=checkbox] {
+      display: none;
+    }
+
+    my-video-thumbnail {
+      margin-right: 0;
+    }
+
+    .video-buttons {
+      margin-top: 10px;
+    }
+  }
+}
diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.ts b/client/src/app/+my-account/my-account-history/my-account-history.component.ts
new file mode 100644
index 000000000..508552167
--- /dev/null
+++ b/client/src/app/+my-account/my-account-history/my-account-history.component.ts
@@ -0,0 +1,66 @@
+import { Component, OnDestroy, OnInit } from '@angular/core'
+import { ActivatedRoute, Router } from '@angular/router'
+import { Location } from '@angular/common'
+import { immutableAssign } from '@app/shared/misc/utils'
+import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
+import { NotificationsService } from 'angular2-notifications'
+import { AuthService } from '../../core/auth'
+import { ConfirmService } from '../../core/confirm'
+import { AbstractVideoList } from '../../shared/video/abstract-video-list'
+import { VideoService } from '../../shared/video/video.service'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { ScreenService } from '@app/shared/misc/screen.service'
+import { UserHistoryService } from '@app/shared/users/user-history.service'
+
+@Component({
+  selector: 'my-account-history',
+  templateUrl: './my-account-history.component.html',
+  styleUrls: [ './my-account-history.component.scss' ]
+})
+export class MyAccountHistoryComponent extends AbstractVideoList implements OnInit, OnDestroy {
+  titlePage: string
+  currentRoute = '/my-account/history/videos'
+  pagination: ComponentPagination = {
+    currentPage: 1,
+    itemsPerPage: 5,
+    totalItems: null
+  }
+
+  protected baseVideoWidth = -1
+  protected baseVideoHeight = 155
+
+  constructor (
+    protected router: Router,
+    protected route: ActivatedRoute,
+    protected authService: AuthService,
+    protected notificationsService: NotificationsService,
+    protected location: Location,
+    protected screenService: ScreenService,
+    protected i18n: I18n,
+    private confirmService: ConfirmService,
+    private videoService: VideoService,
+    private userHistoryService: UserHistoryService
+  ) {
+    super()
+
+    this.titlePage = this.i18n('My videos history')
+  }
+
+  ngOnInit () {
+    super.ngOnInit()
+  }
+
+  ngOnDestroy () {
+    super.ngOnDestroy()
+  }
+
+  getVideosObservable (page: number) {
+    const newPagination = immutableAssign(this.pagination, { currentPage: page })
+
+    return this.userHistoryService.getUserVideosHistory(newPagination)
+  }
+
+  generateSyndicationList () {
+    throw new Error('Method not implemented.')
+  }
+}
diff --git a/client/src/app/+my-account/my-account-routing.module.ts b/client/src/app/+my-account/my-account-routing.module.ts
index 601e517b4..a2cbeaffc 100644
--- a/client/src/app/+my-account/my-account-routing.module.ts
+++ b/client/src/app/+my-account/my-account-routing.module.ts
@@ -13,6 +13,7 @@ import { MyAccountSubscriptionsComponent } from '@app/+my-account/my-account-sub
 import { MyAccountOwnershipComponent } from '@app/+my-account/my-account-ownership/my-account-ownership.component'
 import { MyAccountBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-blocklist.component'
 import { MyAccountServerBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-server-blocklist.component'
+import { MyAccountHistoryComponent } from '@app/+my-account/my-account-history/my-account-history.component'
 
 const myAccountRoutes: Routes = [
   {
@@ -114,6 +115,15 @@ const myAccountRoutes: Routes = [
             title: 'Muted instances'
           }
         }
+      },
+      {
+        path: 'history/videos',
+        component: MyAccountHistoryComponent,
+        data: {
+          meta: {
+            title: 'Videos history'
+          }
+        }
       }
     ]
   }
diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss b/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss
index 2db81a3fe..a735562f8 100644
--- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss
+++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss
@@ -97,7 +97,7 @@
   }
 }
 
-@media screen and (max-width: 800px) {
+@media screen and (max-width: $small-view) {
   .video {
     flex-direction: column;
     height: auto;
diff --git a/client/src/app/+my-account/my-account.component.ts b/client/src/app/+my-account/my-account.component.ts
index d9381ebfa..1bac9547d 100644
--- a/client/src/app/+my-account/my-account.component.ts
+++ b/client/src/app/+my-account/my-account.component.ts
@@ -21,7 +21,7 @@ export class MyAccountComponent {
       children: [
         {
           label: this.i18n('My channels'),
-          routerLink: '/my-account/videos'
+          routerLink: '/my-account/video-channels'
         },
         {
           label: this.i18n('My videos'),
@@ -30,6 +30,10 @@ export class MyAccountComponent {
         {
           label: this.i18n('My subscriptions'),
           routerLink: '/my-account/subscriptions'
+        },
+        {
+          label: this.i18n('My history'),
+          routerLink: '/my-account/history/videos'
         }
       ]
     }
diff --git a/client/src/app/+my-account/my-account.module.ts b/client/src/app/+my-account/my-account.module.ts
index 017ebd57d..c05406438 100644
--- a/client/src/app/+my-account/my-account.module.ts
+++ b/client/src/app/+my-account/my-account.module.ts
@@ -21,6 +21,7 @@ import { MyAccountDangerZoneComponent } from '@app/+my-account/my-account-settin
 import { MyAccountSubscriptionsComponent } from '@app/+my-account/my-account-subscriptions/my-account-subscriptions.component'
 import { MyAccountBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-blocklist.component'
 import { MyAccountServerBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-server-blocklist.component'
+import { MyAccountHistoryComponent } from '@app/+my-account/my-account-history/my-account-history.component'
 
 @NgModule({
   imports: [
@@ -49,7 +50,8 @@ import { MyAccountServerBlocklistComponent } from '@app/+my-account/my-account-b
     MyAccountDangerZoneComponent,
     MyAccountSubscriptionsComponent,
     MyAccountBlocklistComponent,
-    MyAccountServerBlocklistComponent
+    MyAccountServerBlocklistComponent,
+    MyAccountHistoryComponent
   ],
 
   exports: [
diff --git a/client/src/app/shared/menu/top-menu-dropdown.component.html b/client/src/app/shared/menu/top-menu-dropdown.component.html
index 2d6d1c4bf..d3c896019 100644
--- a/client/src/app/shared/menu/top-menu-dropdown.component.html
+++ b/client/src/app/shared/menu/top-menu-dropdown.component.html
@@ -4,7 +4,10 @@
     <a *ngIf="menuEntry.routerLink" [routerLink]="menuEntry.routerLink" routerLinkActive="active" class="title-page">{{ menuEntry.label }}</a>
 
     <div *ngIf="!menuEntry.routerLink" ngbDropdown class="parent-entry" #dropdown="ngbDropdown" (mouseleave)="closeDropdownIfHovered(dropdown)">
-      <span (mouseenter)="openDropdownOnHover(dropdown)" role="button" class="title-page" [ngClass]="{ active: !!suffixLabels[menuEntry.label] }" ngbDropdownToggle>
+      <span
+        (mouseenter)="openDropdownOnHover(dropdown)" [ngClass]="{ active: !!suffixLabels[menuEntry.label] }" ngbDropdownAnchor
+        (click)="dropdownAnchorClicked(dropdown)" role="button" class="title-page"
+      >
         <ng-container i18n>{{ menuEntry.label }}</ng-container>
         <ng-container *ngIf="!!suffixLabels[menuEntry.label]"> - {{ suffixLabels[menuEntry.label] }}</ng-container>
       </span>
diff --git a/client/src/app/shared/menu/top-menu-dropdown.component.scss b/client/src/app/shared/menu/top-menu-dropdown.component.scss
index f3ef8f814..77159532f 100644
--- a/client/src/app/shared/menu/top-menu-dropdown.component.scss
+++ b/client/src/app/shared/menu/top-menu-dropdown.component.scss
@@ -12,3 +12,7 @@
   position: relative;
   top: 2px;
 }
+
+/deep/ .dropdown-menu {
+  margin-top: 0 !important;
+}
diff --git a/client/src/app/shared/menu/top-menu-dropdown.component.ts b/client/src/app/shared/menu/top-menu-dropdown.component.ts
index 272b721b2..e859c30dd 100644
--- a/client/src/app/shared/menu/top-menu-dropdown.component.ts
+++ b/client/src/app/shared/menu/top-menu-dropdown.component.ts
@@ -1,9 +1,8 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core'
 import { filter, take } from 'rxjs/operators'
-import { NavigationStart, Router } from '@angular/router'
+import { NavigationEnd, Router } from '@angular/router'
 import { Subscription } from 'rxjs'
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
-import { drop } from 'lodash-es'
 
 export type TopMenuDropdownParam = {
   label: string
@@ -34,7 +33,7 @@ export class TopMenuDropdownComponent implements OnInit, OnDestroy {
     this.updateChildLabels(window.location.pathname)
 
     this.routeSub = this.router.events
-                        .pipe(filter(event => event instanceof NavigationStart))
+                        .pipe(filter(event => event instanceof NavigationEnd))
                         .subscribe(() => this.updateChildLabels(window.location.pathname))
   }
 
@@ -52,6 +51,15 @@ export class TopMenuDropdownComponent implements OnInit, OnDestroy {
             .subscribe(e => this.openedOnHover = false)
   }
 
+  dropdownAnchorClicked (dropdown: NgbDropdown) {
+    if (this.openedOnHover) {
+      this.openedOnHover = false
+      return
+    }
+
+    return dropdown.toggle()
+  }
+
   closeDropdownIfHovered (dropdown: NgbDropdown) {
     if (this.openedOnHover === false) return
 
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index 9810e9485..4a5d664db 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -62,6 +62,7 @@ import { UserBanModalComponent } from '@app/shared/moderation'
 import { UserModerationDropdownComponent } from '@app/shared/moderation/user-moderation-dropdown.component'
 import { BlocklistService } from '@app/shared/blocklist'
 import { TopMenuDropdownComponent } from '@app/shared/menu/top-menu-dropdown.component'
+import { UserHistoryService } from '@app/shared/users/user-history.service'
 
 @NgModule({
   imports: [
@@ -181,6 +182,7 @@ import { TopMenuDropdownComponent } from '@app/shared/menu/top-menu-dropdown.com
     VideoChangeOwnershipValidatorsService,
     VideoAcceptOwnershipValidatorsService,
     BlocklistService,
+    UserHistoryService,
 
     I18nPrimengCalendarService,
     ScreenService,
diff --git a/client/src/app/shared/users/user-history.service.ts b/client/src/app/shared/users/user-history.service.ts
new file mode 100644
index 000000000..9ed25bfc7
--- /dev/null
+++ b/client/src/app/shared/users/user-history.service.ts
@@ -0,0 +1,45 @@
+import { HttpClient, HttpParams } from '@angular/common/http'
+import { Injectable } from '@angular/core'
+import { environment } from '../../../environments/environment'
+import { RestExtractor } from '../rest/rest-extractor.service'
+import { RestService } from '../rest/rest.service'
+import { Video } from '../video/video.model'
+import { catchError, map, switchMap } from 'rxjs/operators'
+import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
+import { VideoService } from '@app/shared/video/video.service'
+import { ResultList } from '../../../../../shared'
+
+@Injectable()
+export class UserHistoryService {
+  static BASE_USER_VIDEOS_HISTORY_URL = environment.apiUrl + '/api/v1/users/me/history/videos'
+
+  constructor (
+    private authHttp: HttpClient,
+    private restExtractor: RestExtractor,
+    private restService: RestService,
+    private videoService: VideoService
+  ) {}
+
+  getUserVideosHistory (historyPagination: ComponentPagination) {
+    const pagination = this.restService.componentPaginationToRestPagination(historyPagination)
+
+    let params = new HttpParams()
+    params = this.restService.addRestGetParams(params, pagination)
+
+    return this.authHttp
+               .get<ResultList<Video>>(UserHistoryService.BASE_USER_VIDEOS_HISTORY_URL, { params })
+               .pipe(
+                 switchMap(res => this.videoService.extractVideos(res)),
+                 catchError(err => this.restExtractor.handleError(err))
+               )
+  }
+
+  deleteUserVideosHistory () {
+    return this.authHttp
+               .post(UserHistoryService.BASE_USER_VIDEOS_HISTORY_URL + '/remove', {})
+               .pipe(
+                 map(() => this.restExtractor.extractDataBool()),
+                 catchError(err => this.restExtractor.handleError(err))
+               )
+  }
+}
-- 
cgit v1.2.3

From 276d96529529621d5f70473990095495f2743c29 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 18 Dec 2018 11:32:37 +0100
Subject: Add ability to disable and clear history

---
 .../my-account-history.component.html              | 14 ++++-
 .../my-account-history.component.scss              | 31 ++++++++++
 .../my-account-history.component.ts                | 41 +++++++++++++
 client/src/app/+my-account/my-account.module.ts    |  4 +-
 client/src/app/core/auth/auth-user.model.ts        | 10 +++-
 client/src/app/core/routing/login-guard.service.ts |  8 +--
 client/src/app/shared/users/user.model.ts          | 33 ++---------
 .../video-upload.component.scss                    |  4 +-
 client/src/sass/primeng-custom.scss                | 68 +++++++++++++++++-----
 9 files changed, 158 insertions(+), 55 deletions(-)

(limited to 'client')

diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.html b/client/src/app/+my-account/my-account-history/my-account-history.component.html
index 653b33f89..d42af37d4 100644
--- a/client/src/app/+my-account/my-account-history/my-account-history.component.html
+++ b/client/src/app/+my-account/my-account-history/my-account-history.component.html
@@ -1,4 +1,16 @@
-<div i18n *ngIf="pagination.totalItems === 0">You don't have history yet.</div>
+<div class="top-buttons">
+  <div class="history-switch">
+    <p-inputSwitch [(ngModel)]="videosHistoryEnabled" (ngModelChange)="onVideosHistoryChange()"></p-inputSwitch>
+    <label i18n>History enabled</label>
+  </div>
+
+  <div class="delete-history">
+    <button (click)="deleteHistory()" i18n>Delete history</button>
+  </div>
+</div>
+
+
+<div class="no-history" i18n *ngIf="pagination.totalItems === 0">You don't have videos history yet.</div>
 
 <div myInfiniteScroller (nearOfBottom)="onNearOfBottom()" class="videos" #videosElement>
   <div *ngFor="let videos of videoPages;" class="videos-page">
diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.scss b/client/src/app/+my-account/my-account-history/my-account-history.component.scss
index 115bb0e5c..82150cbe3 100644
--- a/client/src/app/+my-account/my-account-history/my-account-history.component.scss
+++ b/client/src/app/+my-account/my-account-history/my-account-history.component.scss
@@ -1,6 +1,37 @@
 @import '_variables';
 @import '_mixins';
 
+.no-history {
+  display: flex;
+  justify-content: center;
+  margin-top: 50px;
+  font-weight: $font-semibold;
+  font-size: 16px;
+}
+
+.top-buttons {
+  margin-bottom: 20px;
+  display: flex;
+
+  .history-switch {
+    display: flex;
+    flex-grow: 1;
+
+    label {
+      margin: 0 0 0 5px;
+    }
+  }
+
+  .delete-history {
+    font-size: 15px;
+
+    button {
+      @include peertube-button;
+      @include grey-button;
+    }
+  }
+}
+
 .video {
   @include row-blocks;
 
diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.ts b/client/src/app/+my-account/my-account-history/my-account-history.component.ts
index 508552167..6ec4fefe8 100644
--- a/client/src/app/+my-account/my-account-history/my-account-history.component.ts
+++ b/client/src/app/+my-account/my-account-history/my-account-history.component.ts
@@ -11,6 +11,7 @@ import { VideoService } from '../../shared/video/video.service'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { ScreenService } from '@app/shared/misc/screen.service'
 import { UserHistoryService } from '@app/shared/users/user-history.service'
+import { UserService } from '@app/shared'
 
 @Component({
   selector: 'my-account-history',
@@ -25,6 +26,7 @@ export class MyAccountHistoryComponent extends AbstractVideoList implements OnIn
     itemsPerPage: 5,
     totalItems: null
   }
+  videosHistoryEnabled: boolean
 
   protected baseVideoWidth = -1
   protected baseVideoHeight = 155
@@ -33,6 +35,7 @@ export class MyAccountHistoryComponent extends AbstractVideoList implements OnIn
     protected router: Router,
     protected route: ActivatedRoute,
     protected authService: AuthService,
+    protected userService: UserService,
     protected notificationsService: NotificationsService,
     protected location: Location,
     protected screenService: ScreenService,
@@ -48,6 +51,8 @@ export class MyAccountHistoryComponent extends AbstractVideoList implements OnIn
 
   ngOnInit () {
     super.ngOnInit()
+
+    this.videosHistoryEnabled = this.authService.getUser().videosHistoryEnabled
   }
 
   ngOnDestroy () {
@@ -63,4 +68,40 @@ export class MyAccountHistoryComponent extends AbstractVideoList implements OnIn
   generateSyndicationList () {
     throw new Error('Method not implemented.')
   }
+
+  onVideosHistoryChange () {
+    this.userService.updateMyProfile({ videosHistoryEnabled: this.videosHistoryEnabled })
+      .subscribe(
+        () => {
+          const message = this.videosHistoryEnabled === true ?
+            this.i18n('Videos history is enabled') :
+            this.i18n('Videos history is disabled')
+
+          this.notificationsService.success(this.i18n('Success'), message)
+
+          this.authService.refreshUserInformation()
+        },
+
+        err => this.notificationsService.error(this.i18n('Error'), err.message)
+      )
+  }
+
+  async deleteHistory () {
+    const title = this.i18n('Delete videos history')
+    const message = this.i18n('Are you sure you want to delete all your videos history?')
+
+    const res = await this.confirmService.confirm(message, title)
+    if (res !== true) return
+
+    this.userHistoryService.deleteUserVideosHistory()
+        .subscribe(
+          () => {
+            this.notificationsService.success(this.i18n('Success'), this.i18n('Videos history deleted'))
+
+            this.reloadVideos()
+          },
+
+          err => this.notificationsService.error(this.i18n('Error'), err.message)
+        )
+  }
 }
diff --git a/client/src/app/+my-account/my-account.module.ts b/client/src/app/+my-account/my-account.module.ts
index c05406438..80d9f0cf7 100644
--- a/client/src/app/+my-account/my-account.module.ts
+++ b/client/src/app/+my-account/my-account.module.ts
@@ -1,6 +1,7 @@
 import { TableModule } from 'primeng/table'
 import { NgModule } from '@angular/core'
 import { AutoCompleteModule } from 'primeng/autocomplete'
+import { InputSwitchModule } from 'primeng/inputswitch'
 import { SharedModule } from '../shared'
 import { MyAccountRoutingModule } from './my-account-routing.module'
 import { MyAccountChangePasswordComponent } from './my-account-settings/my-account-change-password/my-account-change-password.component'
@@ -29,7 +30,8 @@ import { MyAccountHistoryComponent } from '@app/+my-account/my-account-history/m
     MyAccountRoutingModule,
     AutoCompleteModule,
     SharedModule,
-    TableModule
+    TableModule,
+    InputSwitchModule
   ],
 
   declarations: [
diff --git a/client/src/app/core/auth/auth-user.model.ts b/client/src/app/core/auth/auth-user.model.ts
index acd13d9c5..abb11fdc2 100644
--- a/client/src/app/core/auth/auth-user.model.ts
+++ b/client/src/app/core/auth/auth-user.model.ts
@@ -1,8 +1,9 @@
 import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage'
 import { UserRight } from '../../../../../shared/models/users/user-right.enum'
+import { User as ServerUserModel } from '../../../../../shared/models/users/user.model'
 // Do not use the barrel (dependency loop)
 import { hasUserRight, UserRole } from '../../../../../shared/models/users/user-role'
-import { User, UserConstructorHash } from '../../shared/users/user.model'
+import { User } from '../../shared/users/user.model'
 import { NSFWPolicyType } from '../../../../../shared/models/videos/nsfw-policy.type'
 
 export type TokenOptions = {
@@ -70,6 +71,7 @@ export class AuthUser extends User {
     ID: 'id',
     ROLE: 'role',
     EMAIL: 'email',
+    VIDEOS_HISTORY_ENABLED: 'videos-history-enabled',
     USERNAME: 'username',
     NSFW_POLICY: 'nsfw_policy',
     WEBTORRENT_ENABLED: 'peertube-videojs-' + 'webtorrent_enabled',
@@ -89,7 +91,8 @@ export class AuthUser extends User {
           role: parseInt(peertubeLocalStorage.getItem(this.KEYS.ROLE), 10) as UserRole,
           nsfwPolicy: peertubeLocalStorage.getItem(this.KEYS.NSFW_POLICY) as NSFWPolicyType,
           webTorrentEnabled: peertubeLocalStorage.getItem(this.KEYS.WEBTORRENT_ENABLED) === 'true',
-          autoPlayVideo: peertubeLocalStorage.getItem(this.KEYS.AUTO_PLAY_VIDEO) === 'true'
+          autoPlayVideo: peertubeLocalStorage.getItem(this.KEYS.AUTO_PLAY_VIDEO) === 'true',
+          videosHistoryEnabled: peertubeLocalStorage.getItem(this.KEYS.VIDEOS_HISTORY_ENABLED) === 'true'
         },
         Tokens.load()
       )
@@ -104,12 +107,13 @@ export class AuthUser extends User {
     peertubeLocalStorage.removeItem(this.KEYS.ROLE)
     peertubeLocalStorage.removeItem(this.KEYS.NSFW_POLICY)
     peertubeLocalStorage.removeItem(this.KEYS.WEBTORRENT_ENABLED)
+    peertubeLocalStorage.removeItem(this.KEYS.VIDEOS_HISTORY_ENABLED)
     peertubeLocalStorage.removeItem(this.KEYS.AUTO_PLAY_VIDEO)
     peertubeLocalStorage.removeItem(this.KEYS.EMAIL)
     Tokens.flush()
   }
 
-  constructor (userHash: UserConstructorHash, hashTokens: TokenOptions) {
+  constructor (userHash: Partial<ServerUserModel>, hashTokens: TokenOptions) {
     super(userHash)
     this.tokens = new Tokens(hashTokens)
   }
diff --git a/client/src/app/core/routing/login-guard.service.ts b/client/src/app/core/routing/login-guard.service.ts
index 18bc41ca6..7b1c37ee8 100644
--- a/client/src/app/core/routing/login-guard.service.ts
+++ b/client/src/app/core/routing/login-guard.service.ts
@@ -1,11 +1,5 @@
 import { Injectable } from '@angular/core'
-import {
-  ActivatedRouteSnapshot,
-  CanActivateChild,
-  RouterStateSnapshot,
-  CanActivate,
-  Router
-} from '@angular/router'
+import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, Router, RouterStateSnapshot } from '@angular/router'
 
 import { AuthService } from '../auth/auth.service'
 
diff --git a/client/src/app/shared/users/user.model.ts b/client/src/app/shared/users/user.model.ts
index 9819829fd..3663a7b61 100644
--- a/client/src/app/shared/users/user.model.ts
+++ b/client/src/app/shared/users/user.model.ts
@@ -1,33 +1,8 @@
-import {
-  Account as AccountServerModel,
-  hasUserRight,
-  User as UserServerModel,
-  UserRight,
-  UserRole,
-  VideoChannel
-} from '../../../../../shared'
+import { hasUserRight, User as UserServerModel, UserRight, UserRole, VideoChannel } from '../../../../../shared'
 import { NSFWPolicyType } from '../../../../../shared/models/videos/nsfw-policy.type'
 import { Account } from '@app/shared/account/account.model'
 import { Avatar } from '../../../../../shared/models/avatars/avatar.model'
 
-export type UserConstructorHash = {
-  id: number,
-  username: string,
-  email: string,
-  role: UserRole,
-  emailVerified?: boolean,
-  videoQuota?: number,
-  videoQuotaDaily?: number,
-  nsfwPolicy?: NSFWPolicyType,
-  webTorrentEnabled?: boolean,
-  autoPlayVideo?: boolean,
-  createdAt?: Date,
-  account?: AccountServerModel,
-  videoChannels?: VideoChannel[]
-
-  blocked?: boolean
-  blockedReason?: string
-}
 export class User implements UserServerModel {
   id: number
   username: string
@@ -35,8 +10,11 @@ export class User implements UserServerModel {
   emailVerified: boolean
   role: UserRole
   nsfwPolicy: NSFWPolicyType
+
   webTorrentEnabled: boolean
   autoPlayVideo: boolean
+  videosHistoryEnabled: boolean
+
   videoQuota: number
   videoQuotaDaily: number
   account: Account
@@ -46,7 +24,7 @@ export class User implements UserServerModel {
   blocked: boolean
   blockedReason?: string
 
-  constructor (hash: UserConstructorHash) {
+  constructor (hash: Partial<UserServerModel>) {
     this.id = hash.id
     this.username = hash.username
     this.email = hash.email
@@ -57,6 +35,7 @@ export class User implements UserServerModel {
     this.videoQuotaDaily = hash.videoQuotaDaily
     this.nsfwPolicy = hash.nsfwPolicy
     this.webTorrentEnabled = hash.webTorrentEnabled
+    this.videosHistoryEnabled = hash.videosHistoryEnabled
     this.autoPlayVideo = hash.autoPlayVideo
     this.createdAt = hash.createdAt
     this.blocked = hash.blocked
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss
index cf1725ef9..4b2c86ae9 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss
+++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss
@@ -54,9 +54,7 @@
 
     /deep/ .ui-progressbar {
       font-size: 15px !important;
-      color: #fff !important;
       height: 30px !important;
-      line-height: 30px !important;
       border-radius: 3px !important;
       background-color: rgba(11, 204, 41, 0.16) !important;
 
@@ -68,6 +66,8 @@
         text-align: left;
         padding-left: 18px;
         margin-top: 0 !important;
+        color: #fff !important;
+        line-height: 30px !important;
       }
     }
 
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 0568de4e2..1d6eebcfa 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -2,7 +2,7 @@
 @import '_mixins';
 
 @import '~primeng/resources/primeng.css';
-@import '~primeng/resources/themes/bootstrap/theme.css';
+@import '~primeng/resources/themes/nova-light/theme.css';
 
 @mixin glyphicon-light {
   font-family: 'Glyphicons Halflings';
@@ -12,10 +12,9 @@
 
 // data table customizations
 p-table {
-  font-size: 15px !important;
-
   .ui-table-caption {
-    border: none;
+    border: none !important;
+    background-color: #fff !important;
 
     .caption {
       height: 40px;
@@ -24,6 +23,17 @@ p-table {
     }
   }
 
+  th {
+    background-color: #fff !important;
+    outline: 0;
+  }
+
+  td, th {
+    font-family: $main-fonts;
+    font-size: 15px !important;
+    color: var(--mainForegroundColor) !important;
+  }
+
   td {
     padding-left: 15px !important;
 
@@ -35,12 +45,16 @@ p-table {
   }
 
   tr {
+    outline: 0;
     background-color: var(--mainBackgroundColor) !important;
     height: 46px;
 
     &.ui-state-highlight {
-      background-color:var(--submenuColor) !important;
-      color:var(--mainForegroundColor) !important;
+      background-color: var(--submenuColor) !important;
+
+      td, td > a {
+        color: var(--mainForegroundColor) !important;
+      }
     }
   }
 
@@ -56,6 +70,10 @@ p-table {
         }
       }
 
+      td {
+        border: none !important;
+      }
+
       &:first-child td {
         border-top: none !important;
       }
@@ -93,14 +111,14 @@ p-table {
     }
 
     &.ui-state-highlight {
-      background-color:var(--submenuColor) !important;
+      background-color: var(--submenuColor) !important;
 
       .pi {
         @extend .glyphicon;
 
-        color: #000;
-        font-size: 11px;
-        top: 0;
+        color: #000 !important;
+        font-size: 11px !important;
+        top: 0 !important;
 
         &.pi-sort-up {
           @extend .glyphicon-triangle-top;
@@ -177,11 +195,12 @@ p-table {
         a {
           color: #000 !important;
           font-weight: $font-semibold !important;
-          margin: 0 10px !important;
+          margin: 0 5px !important;
           outline: 0 !important;
           border-radius: 3px !important;
           padding: 5px 2px !important;
           height: auto !important;
+          line-height: initial !important;
 
           &.ui-state-active {
             &, &:hover, &:active, &:focus {
@@ -210,11 +229,23 @@ p-calendar .ui-datepicker {
     .ui-datepicker-next {
       @extend .glyphicon-chevron-right;
       @include glyphicon-light;
+
+      text-align: right;
+
+      .pi.pi-chevron-right {
+        display: none !important;
+      }
     }
 
     .ui-datepicker-prev {
       @extend .glyphicon-chevron-left;
       @include glyphicon-light;
+
+      text-align: left;
+
+      .pi.pi-chevron-left {
+        display: none !important;
+      }
     }
   }
 
@@ -232,6 +263,7 @@ p-calendar .ui-datepicker {
   }
 }
 
+
 .ui-chkbox-box {
   &.ui-state-active {
     border-color: var(--mainColor) !important;
@@ -240,13 +272,15 @@ p-calendar .ui-datepicker {
 
   .ui-chkbox-icon {
     position: relative;
+    overflow: visible !important;
 
     &:after {
       content: '';
       position: absolute;
-      left: 5px;
+      top: 1px;
+      left: 7px;
       width: 5px;
-      height: 12px;
+      height: 13px;
       opacity: 0;
       transform: rotate(45deg) scale(0);
       border-right: 2px solid var(--mainBackgroundColor);
@@ -258,4 +292,10 @@ p-calendar .ui-datepicker {
       transform: rotate(45deg) scale(1);
     }
   }
-}
\ No newline at end of file
+}
+
+p-inputswitch {
+  .ui-inputswitch-checked .ui-inputswitch-slider {
+    background-color: var(--mainColor) !important;
+  }
+}
-- 
cgit v1.2.3

From e0e665f0efa98f2701dd9f5529e99989680481ae Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 19 Dec 2018 13:45:43 +0100
Subject: Don't call watching endpoint if history is disabled

---
 client/src/app/videos/+video-watch/video-watch.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'client')

diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index afbe1fe78..ef0f685c6 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -425,7 +425,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
       theaterMode: true,
       language: this.localeId,
 
-      userWatching: this.user ? {
+      userWatching: this.user && this.user.videosHistoryEnabled === true ? {
         url: this.videoService.getUserWatchingVideoUrl(this.video.uuid),
         authorizationHeader: this.authService.getRequestHeaderValue()
       } : undefined
-- 
cgit v1.2.3

From f8b2c1b4f509c037b9650cca2c5befd21f056df3 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 19 Dec 2018 16:04:34 +0100
Subject: Refractor notification service

Shorter name and use primeng component
---
 client/package.json                                |  1 -
 .../about-instance/about-instance.component.ts     |  8 +-
 .../account-videos/account-videos.component.ts     |  4 +-
 client/src/app/+accounts/accounts.component.ts     |  9 +--
 .../edit-custom-config.component.ts                | 10 +--
 .../followers-list/followers-list.component.ts     |  6 +-
 .../following-add/following-add.component.ts       |  8 +-
 .../following-list/following-list.component.ts     | 13 ++--
 .../shared/redundancy-checkbox.component.ts        | 21 +++---
 .../+admin/jobs/jobs-list/jobs-list.component.ts   |  6 +-
 .../instance-account-blocklist.component.ts        | 11 ++-
 .../instance-server-blocklist.component.ts         | 11 +--
 .../moderation-comment-modal.component.ts          | 25 +++----
 .../video-abuse-list/video-abuse-list.component.ts | 15 ++--
 .../video-blacklist-list.component.ts              | 13 ++--
 .../users/user-edit/user-create.component.ts       | 10 +--
 .../users/user-edit/user-update.component.ts       |  9 +--
 .../+admin/users/user-list/user-list.component.ts  | 42 +++++------
 .../my-account-blocklist.component.ts              | 13 ++--
 .../my-account-server-blocklist.component.ts       | 11 +--
 .../my-account-history.component.ts                | 12 +--
 .../my-account-accept-ownership.component.ts       |  9 +--
 .../my-account-ownership.component.ts              | 15 ++--
 .../my-account-change-password.component.ts        |  7 +-
 .../my-account-danger-zone.component.ts            |  8 +-
 .../my-account-profile.component.ts                |  6 +-
 .../my-account-settings.component.ts               |  8 +-
 .../my-account-video-settings.component.ts         |  8 +-
 .../my-account-subscriptions.component.ts          |  6 +-
 .../my-account-video-channel-create.component.ts   |  9 +--
 .../my-account-video-channel-update.component.ts   | 14 ++--
 .../my-account-video-channels.component.ts         | 11 ++-
 .../my-account-video-imports.component.ts          |  6 +-
 .../my-account-videos.component.ts                 | 20 ++---
 .../video-change-ownership.component.ts            | 14 ++--
 .../shared/actor-avatar-info.component.ts          |  6 +-
 .../verify-account-ask-send-email.component.ts     | 11 ++-
 .../verify-account-email.component.ts              |  8 +-
 .../video-channel-videos.component.ts              |  4 +-
 client/src/app/app.component.html                  | 13 +++-
 client/src/app/app.component.ts                    | 13 ----
 client/src/app/core/auth/auth.service.ts           |  9 +--
 client/src/app/core/auth/index.ts                  |  1 -
 client/src/app/core/core.module.ts                 | 17 +++--
 client/src/app/core/index.ts                       |  1 +
 client/src/app/core/notification/index.ts          |  1 +
 .../src/app/core/notification/notifier.service.ts  | 41 +++++++++++
 .../app/core/routing/user-right-guard.service.ts   |  2 +-
 client/src/app/login/login.component.ts            |  9 +--
 .../app/reset-password/reset-password.component.ts | 13 ++--
 client/src/app/search/search-filters.component.ts  |  6 +-
 client/src/app/search/search.component.ts          | 11 +--
 .../app/shared/forms/reactive-file.component.ts    |  6 +-
 .../shared/moderation/user-ban-modal.component.ts  |  8 +-
 .../user-moderation-dropdown.component.ts          | 86 +++++++---------------
 .../subscribe-button.component.ts                  | 23 +++---
 client/src/app/shared/video/abstract-video-list.ts |  6 +-
 client/src/app/signup/signup.component.ts          | 10 +--
 .../+video-edit/shared/video-edit.component.ts     |  4 +-
 .../video-import-torrent.component.ts              |  9 +--
 .../video-import-url.component.ts                  |  9 +--
 .../+video-edit/video-add-components/video-send.ts |  5 +-
 .../video-add-components/video-upload.component.ts | 15 ++--
 .../videos/+video-edit/video-update.component.ts   | 10 +--
 .../comment/video-comment-add.component.ts         |  6 +-
 .../comment/video-comments.component.ts            | 13 ++--
 .../modal/video-blacklist.component.ts             |  9 +--
 .../+video-watch/modal/video-download.component.ts |  6 +-
 .../+video-watch/modal/video-report.component.ts   |  8 +-
 .../+video-watch/modal/video-share.component.ts    |  6 +-
 .../videos/+video-watch/video-watch.component.ts   | 31 +++-----
 .../app/videos/video-list/video-local.component.ts |  4 +-
 .../videos/video-list/video-overview.component.ts  | 10 +--
 .../video-list/video-recently-added.component.ts   |  4 +-
 .../videos/video-list/video-trending.component.ts  |  4 +-
 .../video-user-subscriptions.component.ts          |  4 +-
 client/src/sass/primeng-custom.scss                | 45 +++++++++++
 client/yarn.lock                                   |  5 --
 78 files changed, 435 insertions(+), 476 deletions(-)
 create mode 100644 client/src/app/core/notification/index.ts
 create mode 100644 client/src/app/core/notification/notifier.service.ts

(limited to 'client')

diff --git a/client/package.json b/client/package.json
index 62ae47184..81422f05f 100644
--- a/client/package.json
+++ b/client/package.json
@@ -97,7 +97,6 @@
     "@types/video.js": "^7.2.5",
     "@types/webtorrent": "^0.98.4",
     "angular2-hotkeys": "^2.1.2",
-    "angular2-notifications": "^1.0.2",
     "awesome-typescript-loader": "5.2.1",
     "bootstrap": "^4.1.3",
     "buffer": "^5.1.0",
diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts
index 354f52ce7..36e7a8e5b 100644
--- a/client/src/app/+about/about-instance/about-instance.component.ts
+++ b/client/src/app/+about/about-instance/about-instance.component.ts
@@ -1,7 +1,6 @@
 import { Component, OnInit } from '@angular/core'
-import { ServerService } from '@app/core'
+import { Notifier, ServerService } from '@app/core'
 import { MarkdownService } from '@app/videos/shared'
-import { NotificationsService } from 'angular2-notifications'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
@@ -9,14 +8,13 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
   templateUrl: './about-instance.component.html',
   styleUrls: [ './about-instance.component.scss' ]
 })
-
 export class AboutInstanceComponent implements OnInit {
   shortDescription = ''
   descriptionHTML = ''
   termsHTML = ''
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private serverService: ServerService,
     private markdownService: MarkdownService,
     private i18n: I18n
@@ -43,7 +41,7 @@ export class AboutInstanceComponent implements OnInit {
           this.termsHTML = this.markdownService.textMarkdownToHTML(res.instance.terms)
         },
 
-        err => this.notificationsService.error(this.i18n('Error getting about from server'), err)
+        () => this.notifier.error(this.i18n('Cannot get about information from server'))
       )
   }
 
diff --git a/client/src/app/+accounts/account-videos/account-videos.component.ts b/client/src/app/+accounts/account-videos/account-videos.component.ts
index e5c1f58b0..13b634a01 100644
--- a/client/src/app/+accounts/account-videos/account-videos.component.ts
+++ b/client/src/app/+accounts/account-videos/account-videos.component.ts
@@ -2,7 +2,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { Location } from '@angular/common'
 import { immutableAssign } from '@app/shared/misc/utils'
-import { NotificationsService } from 'angular2-notifications'
 import { AuthService } from '../../core/auth'
 import { ConfirmService } from '../../core/confirm'
 import { AbstractVideoList } from '../../shared/video/abstract-video-list'
@@ -13,6 +12,7 @@ import { tap } from 'rxjs/operators'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { Subscription } from 'rxjs'
 import { ScreenService } from '@app/shared/misc/screen.service'
+import { Notifier } from '@app/core'
 
 @Component({
   selector: 'my-account-videos',
@@ -35,7 +35,7 @@ export class AccountVideosComponent extends AbstractVideoList implements OnInit,
     protected router: Router,
     protected route: ActivatedRoute,
     protected authService: AuthService,
-    protected notificationsService: NotificationsService,
+    protected notifier: Notifier,
     protected confirmService: ConfirmService,
     protected location: Location,
     protected screenService: ScreenService,
diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts
index e19927d6b..036264602 100644
--- a/client/src/app/+accounts/accounts.component.ts
+++ b/client/src/app/+accounts/accounts.component.ts
@@ -5,10 +5,9 @@ import { Account } from '@app/shared/account/account.model'
 import { RestExtractor, UserService } from '@app/shared'
 import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'
 import { Subscription } from 'rxjs'
-import { NotificationsService } from 'angular2-notifications'
+import { AuthService, Notifier, RedirectService } from '@app/core'
 import { User, UserRight } from '../../../../shared'
 import { I18n } from '@ngx-translate/i18n-polyfill'
-import { AuthService, RedirectService } from '@app/core'
 
 @Component({
   templateUrl: './accounts.component.html',
@@ -24,7 +23,7 @@ export class AccountsComponent implements OnInit, OnDestroy {
     private route: ActivatedRoute,
     private userService: UserService,
     private accountService: AccountService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private restExtractor: RestExtractor,
     private redirectService: RedirectService,
     private authService: AuthService,
@@ -43,7 +42,7 @@ export class AccountsComponent implements OnInit, OnDestroy {
       .subscribe(
         account => this.account = account,
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
@@ -69,7 +68,7 @@ export class AccountsComponent implements OnInit, OnDestroy {
           .subscribe(
             user => this.user = user,
 
-            err => this.notificationsService.error(this.i18n('Error'), err.message)
+            err => this.notifier.error(err.message)
           )
     }
   }
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index 6eea1cd76..ee877ee31 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'
 import { ConfigService } from '@app/+admin/config/shared/config.service'
 import { ServerService } from '@app/core/server/server.service'
 import { CustomConfigValidatorsService, FormReactive, UserValidatorsService } from '@app/shared'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { BuildFormDefaultValues, FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
@@ -25,7 +25,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
     protected formValidatorService: FormValidatorService,
     private customConfigValidatorsService: CustomConfigValidatorsService,
     private userValidatorsService: UserValidatorsService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private configService: ConfigService,
     private serverService: ServerService,
     private i18n: I18n
@@ -110,7 +110,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
           this.forceCheck()
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
@@ -196,10 +196,10 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
 
           this.updateForm()
 
-          this.notificationsService.success(this.i18n('Success'), this.i18n('Configuration updated.'))
+          this.notifier.success(this.i18n('Configuration updated.'))
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.ts b/client/src/app/+admin/follows/followers-list/followers-list.component.ts
index 43ce5d4af..9a8848bfb 100644
--- a/client/src/app/+admin/follows/followers-list/followers-list.component.ts
+++ b/client/src/app/+admin/follows/followers-list/followers-list.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core'
 
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { SortMeta } from 'primeng/primeng'
 import { ActorFollow } from '../../../../../../shared/models/actors/follow.model'
 import { RestPagination, RestTable } from '../../../shared'
@@ -20,7 +20,7 @@ export class FollowersListComponent extends RestTable implements OnInit {
   pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private followService: FollowService,
     private i18n: I18n
   ) {
@@ -39,7 +39,7 @@ export class FollowersListComponent extends RestTable implements OnInit {
                           this.totalRecords = resultList.total
                         },
 
-                        err => this.notificationsService.error(this.i18n('Error'), err.message)
+                        err => this.notifier.error(err.message)
                       )
   }
 }
diff --git a/client/src/app/+admin/follows/following-add/following-add.component.ts b/client/src/app/+admin/follows/following-add/following-add.component.ts
index bd9cc022b..2bb249746 100644
--- a/client/src/app/+admin/follows/following-add/following-add.component.ts
+++ b/client/src/app/+admin/follows/following-add/following-add.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core'
 import { Router } from '@angular/router'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { ConfirmService } from '../../../core'
 import { validateHost } from '../../../shared'
 import { FollowService } from '../shared'
@@ -18,7 +18,7 @@ export class FollowingAddComponent {
 
   constructor (
     private router: Router,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private confirmService: ConfirmService,
     private followService: FollowService,
     private i18n: I18n
@@ -64,12 +64,12 @@ export class FollowingAddComponent {
 
     this.followService.follow(hosts).subscribe(
       () => {
-        this.notificationsService.success(this.i18n('Success'), this.i18n('Follow request(s) sent!'))
+        this.notifier.success(this.i18n('Follow request(s) sent!'))
 
         setTimeout(() => this.router.navigate([ '/admin/follows/following-list' ]), 500)
       },
 
-      err => this.notificationsService.error(this.i18n('Error'), err.message)
+      err => this.notifier.error(err.message)
     )
   }
 
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.ts b/client/src/app/+admin/follows/following-list/following-list.component.ts
index 9b7029f75..4517a721e 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.ts
+++ b/client/src/app/+admin/follows/following-list/following-list.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { SortMeta } from 'primeng/primeng'
 import { ActorFollow } from '../../../../../../shared/models/actors/follow.model'
 import { ConfirmService } from '../../../core/confirm/confirm.service'
@@ -20,7 +20,7 @@ export class FollowingListComponent extends RestTable implements OnInit {
   pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private confirmService: ConfirmService,
     private followService: FollowService,
     private i18n: I18n
@@ -41,14 +41,11 @@ export class FollowingListComponent extends RestTable implements OnInit {
 
     this.followService.unfollow(follow).subscribe(
       () => {
-        this.notificationsService.success(
-          this.i18n('Success'),
-          this.i18n('You are not following {{host}} anymore.', { host: follow.following.host })
-        )
+        this.notifier.success(this.i18n('You are not following {{host}} anymore.', { host: follow.following.host }))
         this.loadData()
       },
 
-      err => this.notificationsService.error(this.i18n('Error'), err.message)
+      err => this.notifier.error(err.message)
     )
   }
 
@@ -60,7 +57,7 @@ export class FollowingListComponent extends RestTable implements OnInit {
                           this.totalRecords = resultList.total
                         },
 
-                        err => this.notificationsService.error(this.i18n('Error'), err.message)
+                        err => this.notifier.error(err.message)
                       )
   }
 }
diff --git a/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts b/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts
index 6d77a0eb4..fa1da26bf 100644
--- a/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts
+++ b/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { RedundancyService } from '@app/+admin/follows/shared/redundancy.service'
 
@@ -13,24 +13,21 @@ export class RedundancyCheckboxComponent {
   @Input() host: string
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private redundancyService: RedundancyService,
     private i18n: I18n
   ) { }
 
   updateRedundancyState () {
     this.redundancyService.updateRedundancy(this.host, this.redundancyAllowed)
-      .subscribe(
-        () => {
-          const stateLabel = this.redundancyAllowed ? this.i18n('enabled') : this.i18n('disabled')
+        .subscribe(
+          () => {
+            const stateLabel = this.redundancyAllowed ? this.i18n('enabled') : this.i18n('disabled')
 
-          this.notificationsService.success(
-            this.i18n('Success'),
-            this.i18n('Redundancy for {{host}} is {{stateLabel}}', { host: this.host, stateLabel })
-          )
-        },
+            this.notifier.success(this.i18n('Redundancy for {{host}} is {{stateLabel}}', { host: this.host, stateLabel }))
+          },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
-      )
+          err => this.notifier.error(err.message)
+        )
   }
 }
diff --git a/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts b/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts
index 44778ab56..b265e1dd6 100644
--- a/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts
+++ b/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core'
 import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { SortMeta } from 'primeng/primeng'
 import { Job } from '../../../../../../shared/index'
 import { JobState } from '../../../../../../shared/models'
@@ -25,7 +25,7 @@ export class JobsListComponent extends RestTable implements OnInit {
   pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private jobsService: JobService,
     private i18n: I18n
   ) {
@@ -53,7 +53,7 @@ export class JobsListComponent extends RestTable implements OnInit {
           this.totalRecords = resultList.total
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts
index 3f243aee4..032bf745a 100644
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts
+++ b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { RestPagination, RestTable } from '@app/shared'
 import { SortMeta } from 'primeng/components/common/sortmeta'
-import { BlocklistService, AccountBlock } from '@app/shared/blocklist'
+import { AccountBlock, BlocklistService } from '@app/shared/blocklist'
 
 @Component({
   selector: 'my-instance-account-blocklist',
@@ -18,7 +18,7 @@ export class InstanceAccountBlocklistComponent extends RestTable implements OnIn
   pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private blocklistService: BlocklistService,
     private i18n: I18n
   ) {
@@ -35,8 +35,7 @@ export class InstanceAccountBlocklistComponent extends RestTable implements OnIn
     this.blocklistService.unblockAccountByInstance(blockedAccount)
         .subscribe(
           () => {
-            this.notificationsService.success(
-              this.i18n('Success'),
+            this.notifier.success(
               this.i18n('Account {{nameWithHost}} unmuted by your instance.', { nameWithHost: blockedAccount.nameWithHost })
             )
 
@@ -53,7 +52,7 @@ export class InstanceAccountBlocklistComponent extends RestTable implements OnIn
           this.totalRecords = resultList.total
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 }
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
index 130009dc7..db3dfcd1c 100644
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
+++ b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { RestPagination, RestTable } from '@app/shared'
 import { SortMeta } from 'primeng/components/common/sortmeta'
@@ -19,7 +19,7 @@ export class InstanceServerBlocklistComponent extends RestTable implements OnIni
   pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private blocklistService: BlocklistService,
     private i18n: I18n
   ) {
@@ -36,10 +36,7 @@ export class InstanceServerBlocklistComponent extends RestTable implements OnIni
     this.blocklistService.unblockServerByInstance(host)
       .subscribe(
         () => {
-          this.notificationsService.success(
-            this.i18n('Success'),
-            this.i18n('Instance {{host}} unmuted by your instance.', { host })
-          )
+          this.notifier.success(this.i18n('Instance {{host}} unmuted by your instance.', { host }))
 
           this.loadData()
         }
@@ -54,7 +51,7 @@ export class InstanceServerBlocklistComponent extends RestTable implements OnIni
           this.totalRecords = resultList.total
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 }
diff --git a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts
index 34ab384d1..bebcb4207 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts
+++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { FormReactive, VideoAbuseService, VideoAbuseValidatorsService } from '../../../shared'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
@@ -22,7 +22,7 @@ export class ModerationCommentModalComponent extends FormReactive implements OnI
   constructor (
     protected formValidatorService: FormValidatorService,
     private modalService: NgbModal,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private videoAbuseService: VideoAbuseService,
     private videoAbuseValidatorsService: VideoAbuseValidatorsService,
     private i18n: I18n
@@ -52,22 +52,19 @@ export class ModerationCommentModalComponent extends FormReactive implements OnI
   }
 
   async banUser () {
-    const moderationComment: string = this.form.value['moderationComment']
+    const moderationComment: string = this.form.value[ 'moderationComment' ]
 
     this.videoAbuseService.updateVideoAbuse(this.abuseToComment, { moderationComment })
-      .subscribe(
-        () => {
-          this.notificationsService.success(
-            this.i18n('Success'),
-            this.i18n('Comment updated.')
-          )
+        .subscribe(
+          () => {
+            this.notifier.success(this.i18n('Comment updated.'))
 
-          this.commentUpdated.emit(moderationComment)
-          this.hideModerationCommentModal()
-        },
+            this.commentUpdated.emit(moderationComment)
+            this.hideModerationCommentModal()
+          },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
-      )
+          err => this.notifier.error(err.message)
+        )
   }
 
 }
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts
index 7a219c846..f64234b74 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts
+++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { Account } from '../../../shared/account/account.model'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { SortMeta } from 'primeng/components/common/sortmeta'
 import { VideoAbuse, VideoAbuseState } from '../../../../../../shared'
 import { RestPagination, RestTable, VideoAbuseService } from '../../../shared'
@@ -27,7 +27,7 @@ export class VideoAbuseListComponent extends RestTable implements OnInit {
   videoAbuseActions: DropdownAction<VideoAbuse>[] = []
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private videoAbuseService: VideoAbuseService,
     private confirmService: ConfirmService,
     private i18n: I18n
@@ -90,14 +90,11 @@ export class VideoAbuseListComponent extends RestTable implements OnInit {
 
     this.videoAbuseService.removeVideoAbuse(videoAbuse).subscribe(
       () => {
-        this.notificationsService.success(
-          this.i18n('Success'),
-          this.i18n('Abuse deleted.')
-        )
+        this.notifier.success(this.i18n('Abuse deleted.'))
         this.loadData()
       },
 
-      err => this.notificationsService.error(this.i18n('Error'), err.message)
+      err => this.notifier.error(err.message)
     )
   }
 
@@ -106,7 +103,7 @@ export class VideoAbuseListComponent extends RestTable implements OnInit {
       .subscribe(
         () => this.loadData(),
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
 
   }
@@ -119,7 +116,7 @@ export class VideoAbuseListComponent extends RestTable implements OnInit {
                    this.totalRecords = resultList.total
                  },
 
-                 err => this.notificationsService.error(this.i18n('Error'), err.message)
+                 err => this.notifier.error(err.message)
                )
   }
 }
diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts
index e491edaca..a02e84f67 100644
--- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts
+++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core'
 import { SortMeta } from 'primeng/components/common/sortmeta'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { ConfirmService } from '../../../core'
 import { RestPagination, RestTable, VideoBlacklistService } from '../../../shared'
 import { VideoBlacklist } from '../../../../../../shared'
@@ -23,7 +23,7 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit {
   videoBlacklistActions: DropdownAction<VideoBlacklist>[] = []
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private confirmService: ConfirmService,
     private videoBlacklistService: VideoBlacklistService,
     private i18n: I18n
@@ -56,14 +56,11 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit {
 
     this.videoBlacklistService.removeVideoFromBlacklist(entry.video.id).subscribe(
       () => {
-        this.notificationsService.success(
-          this.i18n('Success'),
-          this.i18n('Video {{name}} removed from the blacklist.', { name: entry.video.name })
-        )
+        this.notifier.success(this.i18n('Video {{name}} removed from the blacklist.', { name: entry.video.name }))
         this.loadData()
       },
 
-      err => this.notificationsService.error(this.i18n('Error'), err.message)
+      err => this.notifier.error(err.message)
     )
   }
 
@@ -75,7 +72,7 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit {
           this.totalRecords = resultList.total
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 }
diff --git a/client/src/app/+admin/users/user-edit/user-create.component.ts b/client/src/app/+admin/users/user-edit/user-create.component.ts
index dd8e4efd5..137ecfcbd 100644
--- a/client/src/app/+admin/users/user-edit/user-create.component.ts
+++ b/client/src/app/+admin/users/user-edit/user-create.component.ts
@@ -1,7 +1,6 @@
 import { Component, OnInit } from '@angular/core'
 import { Router } from '@angular/router'
-import { NotificationsService } from 'angular2-notifications'
-import { ServerService } from '../../../core'
+import { Notifier, ServerService } from '@app/core'
 import { UserCreate, UserRole } from '../../../../../../shared'
 import { UserEdit } from './user-edit'
 import { I18n } from '@ngx-translate/i18n-polyfill'
@@ -24,7 +23,7 @@ export class UserCreateComponent extends UserEdit implements OnInit {
     protected configService: ConfigService,
     private userValidatorsService: UserValidatorsService,
     private router: Router,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private userService: UserService,
     private i18n: I18n
   ) {
@@ -60,10 +59,7 @@ export class UserCreateComponent extends UserEdit implements OnInit {
 
     this.userService.addUser(userCreate).subscribe(
       () => {
-        this.notificationsService.success(
-          this.i18n('Success'),
-          this.i18n('User {{username}} created.', { username: userCreate.username })
-        )
+        this.notifier.success(this.i18n('User {{username}} created.', { username: userCreate.username }))
         this.router.navigate([ '/admin/users/list' ])
       },
 
diff --git a/client/src/app/+admin/users/user-edit/user-update.component.ts b/client/src/app/+admin/users/user-edit/user-update.component.ts
index cd3885a99..61e641823 100644
--- a/client/src/app/+admin/users/user-edit/user-update.component.ts
+++ b/client/src/app/+admin/users/user-edit/user-update.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { Subscription } from 'rxjs'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { ServerService } from '../../../core'
 import { UserEdit } from './user-edit'
 import { User, UserUpdate } from '../../../../../../shared'
@@ -30,7 +30,7 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy {
     private userValidatorsService: UserValidatorsService,
     private route: ActivatedRoute,
     private router: Router,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private userService: UserService,
     private i18n: I18n
   ) {
@@ -73,10 +73,7 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy {
 
     this.userService.updateUser(this.userId, userUpdate).subscribe(
       () => {
-        this.notificationsService.success(
-          this.i18n('Success'),
-          this.i18n('User {{username}} updated.', { username: this.username })
-        )
+        this.notifier.success(this.i18n('User {{username}} updated.', { username: this.username }))
         this.router.navigate([ '/admin/users/list' ])
       },
 
diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts
index fb085c133..66ab796f9 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.ts
+++ b/client/src/app/+admin/users/user-list/user-list.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { SortMeta } from 'primeng/components/common/sortmeta'
 import { ConfirmService, ServerService } from '../../../core'
 import { RestPagination, RestTable, UserService } from '../../../shared'
@@ -26,7 +26,7 @@ export class UserListComponent extends RestTable implements OnInit {
   bulkUserActions: DropdownAction<User[]>[] = []
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private confirmService: ConfirmService,
     private serverService: ServerService,
     private userService: UserService,
@@ -68,7 +68,7 @@ export class UserListComponent extends RestTable implements OnInit {
   openBanUserModal (users: User[]) {
     for (const user of users) {
       if (user.username === 'root') {
-        this.notificationsService.error(this.i18n('Error'), this.i18n('You cannot ban root.'))
+        this.notifier.error(this.i18n('You cannot ban root.'))
         return
       }
     }
@@ -91,18 +91,18 @@ export class UserListComponent extends RestTable implements OnInit {
           () => {
             const message = this.i18n('{{num}} users unbanned.', { num: users.length })
 
-            this.notificationsService.success(this.i18n('Success'), message)
+            this.notifier.success(message)
             this.loadData()
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 
   async removeUsers (users: User[]) {
     for (const user of users) {
       if (user.username === 'root') {
-        this.notificationsService.error(this.i18n('Error'), this.i18n('You cannot delete root.'))
+        this.notifier.error(this.i18n('You cannot delete root.'))
         return
       }
     }
@@ -113,28 +113,22 @@ export class UserListComponent extends RestTable implements OnInit {
 
     this.userService.removeUser(users).subscribe(
       () => {
-        this.notificationsService.success(
-          this.i18n('Success'),
-          this.i18n('{{num}} users deleted.', { num: users.length })
-        )
+        this.notifier.success(this.i18n('{{num}} users deleted.', { num: users.length }))
         this.loadData()
       },
 
-      err => this.notificationsService.error(this.i18n('Error'), err.message)
+      err => this.notifier.error(err.message)
     )
   }
 
   async setEmailsAsVerified (users: User[]) {
     this.userService.updateUsers(users, { emailVerified: true }).subscribe(
       () => {
-        this.notificationsService.success(
-          this.i18n('Success'),
-          this.i18n('{{num}} users email set as verified.', { num: users.length })
-        )
+        this.notifier.success(this.i18n('{{num}} users email set as verified.', { num: users.length }))
         this.loadData()
       },
 
-      err => this.notificationsService.error(this.i18n('Error'), err.message)
+      err => this.notifier.error(err.message)
     )
   }
 
@@ -146,13 +140,13 @@ export class UserListComponent extends RestTable implements OnInit {
     this.selectedUsers = []
 
     this.userService.getUsers(this.pagination, this.sort, this.search)
-                    .subscribe(
-                      resultList => {
-                        this.users = resultList.data
-                        this.totalRecords = resultList.total
-                      },
-
-                      err => this.notificationsService.error(this.i18n('Error'), err.message)
-                    )
+        .subscribe(
+          resultList => {
+            this.users = resultList.data
+            this.totalRecords = resultList.total
+          },
+
+          err => this.notifier.error(err.message)
+        )
   }
 }
diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts b/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts
index fbad28410..e3025dec4 100644
--- a/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts
+++ b/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { RestPagination, RestTable } from '@app/shared'
 import { SortMeta } from 'primeng/components/common/sortmeta'
-import { BlocklistService, AccountBlock } from '@app/shared/blocklist'
+import { AccountBlock, BlocklistService } from '@app/shared/blocklist'
 
 @Component({
   selector: 'my-account-blocklist',
@@ -18,7 +18,7 @@ export class MyAccountBlocklistComponent extends RestTable implements OnInit {
   pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private blocklistService: BlocklistService,
     private i18n: I18n
   ) {
@@ -35,10 +35,7 @@ export class MyAccountBlocklistComponent extends RestTable implements OnInit {
     this.blocklistService.unblockAccountByUser(blockedAccount)
         .subscribe(
           () => {
-            this.notificationsService.success(
-              this.i18n('Success'),
-              this.i18n('Account {{nameWithHost}} unmuted.', { nameWithHost: blockedAccount.nameWithHost })
-            )
+            this.notifier.success(this.i18n('Account {{nameWithHost}} unmuted.', { nameWithHost: blockedAccount.nameWithHost }))
 
             this.loadData()
           }
@@ -53,7 +50,7 @@ export class MyAccountBlocklistComponent extends RestTable implements OnInit {
           this.totalRecords = resultList.total
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 }
diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts
index b411d6926..4c5cc28b8 100644
--- a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts
+++ b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { RestPagination, RestTable } from '@app/shared'
 import { SortMeta } from 'primeng/components/common/sortmeta'
@@ -19,7 +19,7 @@ export class MyAccountServerBlocklistComponent extends RestTable implements OnIn
   pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private blocklistService: BlocklistService,
     private i18n: I18n
   ) {
@@ -36,10 +36,7 @@ export class MyAccountServerBlocklistComponent extends RestTable implements OnIn
     this.blocklistService.unblockServerByUser(host)
       .subscribe(
         () => {
-          this.notificationsService.success(
-            this.i18n('Success'),
-            this.i18n('Instance {{host}} unmuted.', { host })
-          )
+          this.notifier.success(this.i18n('Instance {{host}} unmuted.', { host }))
 
           this.loadData()
         }
@@ -54,7 +51,7 @@ export class MyAccountServerBlocklistComponent extends RestTable implements OnIn
           this.totalRecords = resultList.total
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 }
diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.ts b/client/src/app/+my-account/my-account-history/my-account-history.component.ts
index 6ec4fefe8..394091bad 100644
--- a/client/src/app/+my-account/my-account-history/my-account-history.component.ts
+++ b/client/src/app/+my-account/my-account-history/my-account-history.component.ts
@@ -3,7 +3,6 @@ import { ActivatedRoute, Router } from '@angular/router'
 import { Location } from '@angular/common'
 import { immutableAssign } from '@app/shared/misc/utils'
 import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
-import { NotificationsService } from 'angular2-notifications'
 import { AuthService } from '../../core/auth'
 import { ConfirmService } from '../../core/confirm'
 import { AbstractVideoList } from '../../shared/video/abstract-video-list'
@@ -12,6 +11,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
 import { ScreenService } from '@app/shared/misc/screen.service'
 import { UserHistoryService } from '@app/shared/users/user-history.service'
 import { UserService } from '@app/shared'
+import { Notifier } from '@app/core'
 
 @Component({
   selector: 'my-account-history',
@@ -36,7 +36,7 @@ export class MyAccountHistoryComponent extends AbstractVideoList implements OnIn
     protected route: ActivatedRoute,
     protected authService: AuthService,
     protected userService: UserService,
-    protected notificationsService: NotificationsService,
+    protected notifier: Notifier,
     protected location: Location,
     protected screenService: ScreenService,
     protected i18n: I18n,
@@ -77,12 +77,12 @@ export class MyAccountHistoryComponent extends AbstractVideoList implements OnIn
             this.i18n('Videos history is enabled') :
             this.i18n('Videos history is disabled')
 
-          this.notificationsService.success(this.i18n('Success'), message)
+          this.notifier.success(message)
 
           this.authService.refreshUserInformation()
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
@@ -96,12 +96,12 @@ export class MyAccountHistoryComponent extends AbstractVideoList implements OnIn
     this.userHistoryService.deleteUserVideosHistory()
         .subscribe(
           () => {
-            this.notificationsService.success(this.i18n('Success'), this.i18n('Videos history deleted'))
+            this.notifier.success(this.i18n('Videos history deleted'))
 
             this.reloadVideos()
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 }
diff --git a/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.ts b/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.ts
index a68b452ec..79d29b139 100644
--- a/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.ts
+++ b/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.ts
@@ -1,5 +1,5 @@
 import { Component, ElementRef, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { AuthService, Notifier } from '@app/core'
 import { FormReactive } from '@app/shared'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 import { VideoOwnershipService } from '@app/shared/video-ownership'
@@ -8,7 +8,6 @@ import { VideoAcceptOwnershipValidatorsService } from '@app/shared/forms/form-va
 import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
 import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
 import { I18n } from '@ngx-translate/i18n-polyfill'
-import { AuthService } from '@app/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
@@ -31,7 +30,7 @@ export class MyAccountAcceptOwnershipComponent extends FormReactive implements O
     protected formValidatorService: FormValidatorService,
     private videoChangeOwnershipValidatorsService: VideoAcceptOwnershipValidatorsService,
     private videoOwnershipService: VideoOwnershipService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private authService: AuthService,
     private videoChannelService: VideoChannelService,
     private modalService: NgbModal,
@@ -68,12 +67,12 @@ export class MyAccountAcceptOwnershipComponent extends FormReactive implements O
       .acceptOwnership(videoChangeOwnership.id, { channelId: channel })
       .subscribe(
         () => {
-          this.notificationsService.success(this.i18n('Success'), this.i18n('Ownership accepted'))
+          this.notifier.success(this.i18n('Ownership accepted'))
           if (this.accepted) this.accepted.emit()
           this.videoChangeOwnership = undefined
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 }
diff --git a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.ts b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.ts
index 0b51ac13c..77857c4fd 100644
--- a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.ts
+++ b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.ts
@@ -1,13 +1,11 @@
 import { Component, OnInit, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
-import { I18n } from '@ngx-translate/i18n-polyfill'
+import { Notifier } from '@app/core'
 import { RestPagination, RestTable } from '@app/shared'
 import { SortMeta } from 'primeng/components/common/sortmeta'
 import { VideoChangeOwnership } from '../../../../../shared'
 import { VideoOwnershipService } from '@app/shared/video-ownership'
 import { Account } from '@app/shared/account/account.model'
-import { MyAccountAcceptOwnershipComponent }
-from '@app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component'
+import { MyAccountAcceptOwnershipComponent } from './my-account-accept-ownership/my-account-accept-ownership.component'
 
 @Component({
   selector: 'my-account-ownership',
@@ -23,9 +21,8 @@ export class MyAccountOwnershipComponent extends RestTable implements OnInit {
   @ViewChild('myAccountAcceptOwnershipComponent') myAccountAcceptOwnershipComponent: MyAccountAcceptOwnershipComponent
 
   constructor (
-    private notificationsService: NotificationsService,
-    private videoOwnershipService: VideoOwnershipService,
-    private i18n: I18n
+    private notifier: Notifier,
+    private videoOwnershipService: VideoOwnershipService
   ) {
     super()
   }
@@ -50,7 +47,7 @@ export class MyAccountOwnershipComponent extends RestTable implements OnInit {
     this.videoOwnershipService.refuseOwnership(videoChangeOwnership.id)
       .subscribe(
         () => this.loadData(),
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
@@ -62,7 +59,7 @@ export class MyAccountOwnershipComponent extends RestTable implements OnInit {
           this.totalRecords = resultList.total
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 }
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
index e5343b33d..cbb068c7c 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
@@ -1,11 +1,10 @@
 import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { AuthService, Notifier } from '@app/core'
 import { FormReactive, UserService } from '../../../shared'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service'
 import { filter } from 'rxjs/operators'
-import { AuthService } from '@app/core'
 import { User } from '../../../../../../shared'
 
 @Component({
@@ -20,7 +19,7 @@ export class MyAccountChangePasswordComponent extends FormReactive implements On
   constructor (
     protected formValidatorService: FormValidatorService,
     private userValidatorsService: UserValidatorsService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private authService: AuthService,
     private userService: UserService,
     private i18n: I18n
@@ -50,7 +49,7 @@ export class MyAccountChangePasswordComponent extends FormReactive implements On
 
     this.userService.changePassword(currentPassword, newPassword).subscribe(
       () => {
-        this.notificationsService.success(this.i18n('Success'), this.i18n('Password updated.'))
+        this.notifier.success(this.i18n('Password updated.'))
 
         this.form.reset()
         this.error = null
diff --git a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
index 63a121f64..3f79efe20 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { AuthService, ConfirmService, RedirectService } from '../../../core'
 import { UserService } from '../../../shared'
 import { I18n } from '@ngx-translate/i18n-polyfill'
@@ -15,7 +15,7 @@ export class MyAccountDangerZoneComponent {
 
   constructor (
     private authService: AuthService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private userService: UserService,
     private confirmService: ConfirmService,
     private redirectService: RedirectService,
@@ -34,13 +34,13 @@ export class MyAccountDangerZoneComponent {
 
     this.userService.deleteMe().subscribe(
       () => {
-        this.notificationsService.success(this.i18n('Success'), this.i18n('Your account is deleted.'))
+        this.notifier.success(this.i18n('Your account is deleted.'))
 
         this.authService.logout()
         this.redirectService.redirectToHomepage()
       },
 
-      err => this.notificationsService.error(this.i18n('Error'), err.message)
+      err => this.notifier.error(err.message)
     )
   }
 }
diff --git a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts
index 967e21f0b..a9503ed1b 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { FormReactive, UserService } from '../../../shared'
 import { User } from '@app/shared'
 import { I18n } from '@ngx-translate/i18n-polyfill'
@@ -21,7 +21,7 @@ export class MyAccountProfileComponent extends FormReactive implements OnInit {
   constructor (
     protected formValidatorService: FormValidatorService,
     private userValidatorsService: UserValidatorsService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private userService: UserService,
     private i18n: I18n
   ) {
@@ -53,7 +53,7 @@ export class MyAccountProfileComponent extends FormReactive implements OnInit {
         this.user.account.displayName = displayName
         this.user.account.description = description
 
-        this.notificationsService.success(this.i18n('Success'), this.i18n('Profile updated.'))
+        this.notifier.success(this.i18n('Profile updated.'))
       },
 
       err => this.error = err.message
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts b/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
index 62053d97b..f4b954e54 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { BytesPipe } from 'ngx-pipes'
 import { AuthService } from '../../core'
 import { User } from '../../shared'
@@ -19,7 +19,7 @@ export class MyAccountSettingsComponent implements OnInit {
   constructor (
     private userService: UserService,
     private authService: AuthService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private i18n: I18n
   ) {}
 
@@ -48,12 +48,12 @@ export class MyAccountSettingsComponent implements OnInit {
     this.userService.changeAvatar(formData)
       .subscribe(
         data => {
-          this.notificationsService.success(this.i18n('Success'), this.i18n('Avatar changed.'))
+          this.notifier.success(this.i18n('Avatar changed.'))
 
           this.user.updateAccountAvatar(data.avatar)
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 }
diff --git a/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts b/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts
index 6c9a7ce75..b8f80bc1a 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { UserUpdateMe } from '../../../../../../shared'
 import { AuthService } from '../../../core'
 import { FormReactive, User, UserService } from '../../../shared'
@@ -19,7 +19,7 @@ export class MyAccountVideoSettingsComponent extends FormReactive implements OnI
   constructor (
     protected formValidatorService: FormValidatorService,
     private authService: AuthService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private userService: UserService,
     private i18n: I18n
   ) {
@@ -54,12 +54,12 @@ export class MyAccountVideoSettingsComponent extends FormReactive implements OnI
 
     this.userService.updateMyProfile(details).subscribe(
       () => {
-        this.notificationsService.success(this.i18n('Success'), this.i18n('Information updated.'))
+        this.notifier.success(this.i18n('Information updated.'))
 
         this.authService.refreshUserInformation()
       },
 
-      err => this.notificationsService.error(this.i18n('Error'), err.message)
+      err => this.notifier.error(err.message)
     )
   }
 }
diff --git a/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.ts b/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.ts
index 9517a3705..9d2dccdf0 100644
--- a/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.ts
+++ b/client/src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { UserSubscriptionService } from '@app/shared/user-subscription'
@@ -21,7 +21,7 @@ export class MyAccountSubscriptionsComponent implements OnInit {
 
   constructor (
     private userSubscriptionService: UserSubscriptionService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private i18n: I18n
   ) {}
 
@@ -37,7 +37,7 @@ export class MyAccountSubscriptionsComponent implements OnInit {
             this.pagination.totalItems = res.total
           },
 
-          error => this.notificationsService.error(this.i18n('Error'), error.message)
+          error => this.notifier.error(error.message)
         )
   }
 
diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts
index 81608d837..a68f79b47 100644
--- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts
+++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts
@@ -1,10 +1,9 @@
 import { Component, OnInit } from '@angular/core'
 import { Router } from '@angular/router'
-import { NotificationsService } from 'angular2-notifications'
+import { AuthService, Notifier } from '@app/core'
 import { MyAccountVideoChannelEdit } from './my-account-video-channel-edit'
 import { VideoChannelCreate } from '../../../../../shared/models/videos'
 import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
-import { AuthService } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 import { VideoChannelValidatorsService } from '@app/shared/forms/form-validators/video-channel-validators.service'
@@ -21,7 +20,7 @@ export class MyAccountVideoChannelCreateComponent extends MyAccountVideoChannelE
     protected formValidatorService: FormValidatorService,
     private authService: AuthService,
     private videoChannelValidatorsService: VideoChannelValidatorsService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private router: Router,
     private videoChannelService: VideoChannelService,
     private i18n: I18n
@@ -56,8 +55,8 @@ export class MyAccountVideoChannelCreateComponent extends MyAccountVideoChannelE
     this.videoChannelService.createVideoChannel(videoChannelCreate).subscribe(
       () => {
         this.authService.refreshUserInformation()
-        this.notificationsService.success(
-          this.i18n('Success'),
+
+        this.notifier.success(
           this.i18n('Video channel {{videoChannelName}} created.', { videoChannelName: videoChannelCreate.displayName })
         )
         this.router.navigate([ '/my-account', 'video-channels' ])
diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts
index 5d43956f2..da4fb645a 100644
--- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts
+++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts
@@ -1,12 +1,11 @@
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
-import { NotificationsService } from 'angular2-notifications'
+import { AuthService, Notifier, ServerService } from '@app/core'
 import { MyAccountVideoChannelEdit } from './my-account-video-channel-edit'
 import { VideoChannelUpdate } from '../../../../../shared/models/videos'
 import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
 import { Subscription } from 'rxjs'
 import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
-import { AuthService, ServerService } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 import { VideoChannelValidatorsService } from '@app/shared/forms/form-validators/video-channel-validators.service'
@@ -26,7 +25,7 @@ export class MyAccountVideoChannelUpdateComponent extends MyAccountVideoChannelE
     protected formValidatorService: FormValidatorService,
     private authService: AuthService,
     private videoChannelValidatorsService: VideoChannelValidatorsService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private router: Router,
     private route: ActivatedRoute,
     private videoChannelService: VideoChannelService,
@@ -79,10 +78,11 @@ export class MyAccountVideoChannelUpdateComponent extends MyAccountVideoChannelE
     this.videoChannelService.updateVideoChannel(this.videoChannelToUpdate.name, videoChannelUpdate).subscribe(
       () => {
         this.authService.refreshUserInformation()
-        this.notificationsService.success(
-          this.i18n('Success'),
+
+        this.notifier.success(
           this.i18n('Video channel {{videoChannelName}} updated.', { videoChannelName: videoChannelUpdate.displayName })
         )
+
         this.router.navigate([ '/my-account', 'video-channels' ])
       },
 
@@ -94,12 +94,12 @@ export class MyAccountVideoChannelUpdateComponent extends MyAccountVideoChannelE
     this.videoChannelService.changeVideoChannelAvatar(this.videoChannelToUpdate.name, formData)
         .subscribe(
           data => {
-            this.notificationsService.success(this.i18n('Success'), this.i18n('Avatar changed.'))
+            this.notifier.success(this.i18n('Avatar changed.'))
 
             this.videoChannelToUpdate.updateAvatar(data.avatar)
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 
diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts
index 6d1098865..0ab3e2067 100644
--- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts
+++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { AuthService } from '../../core/auth'
 import { ConfirmService } from '../../core/confirm'
 import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
@@ -20,7 +20,7 @@ export class MyAccountVideoChannelsComponent implements OnInit {
 
   constructor (
     private authService: AuthService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private confirmService: ConfirmService,
     private videoChannelService: VideoChannelService,
     private i18n: I18n
@@ -46,15 +46,14 @@ export class MyAccountVideoChannelsComponent implements OnInit {
 
     this.videoChannelService.removeVideoChannel(videoChannel)
       .subscribe(
-        status => {
+        () => {
           this.loadVideoChannels()
-          this.notificationsService.success(
-            this.i18n('Success'),
+          this.notifier.success(
             this.i18n('Video channel {{videoChannelName}} deleted.', { videoChannelName: videoChannel.displayName })
           )
         },
 
-        error => this.notificationsService.error(this.i18n('Error'), error.message)
+        error => this.notifier.error(error.message)
       )
   }
 
diff --git a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts
index 5b920c98d..21a10c8ff 100644
--- a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts
+++ b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core'
 import { RestPagination, RestTable } from '@app/shared'
 import { SortMeta } from 'primeng/components/common/sortmeta'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { VideoImport, VideoImportState } from '../../../../../shared/models/videos'
 import { VideoImportService } from '@app/shared/video-import'
@@ -19,7 +19,7 @@ export class MyAccountVideoImportsComponent extends RestTable implements OnInit
   pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private videoImportService: VideoImportService,
     private i18n: I18n
   ) {
@@ -58,7 +58,7 @@ export class MyAccountVideoImportsComponent extends RestTable implements OnInit
             this.totalRecords = resultList.total
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 }
diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.ts b/client/src/app/+my-account/my-account-videos/my-account-videos.component.ts
index 2d88ac760..41608f796 100644
--- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.ts
+++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.ts
@@ -5,7 +5,7 @@ import { ActivatedRoute, Router } from '@angular/router'
 import { Location } from '@angular/common'
 import { immutableAssign } from '@app/shared/misc/utils'
 import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { AuthService } from '../../core/auth'
 import { ConfirmService } from '../../core/confirm'
 import { AbstractVideoList } from '../../shared/video/abstract-video-list'
@@ -40,7 +40,7 @@ export class MyAccountVideosComponent extends AbstractVideoList implements OnIni
     protected router: Router,
     protected route: ActivatedRoute,
     protected authService: AuthService,
-    protected notificationsService: NotificationsService,
+    protected notifier: Notifier,
     protected location: Location,
     protected screenService: ScreenService,
     protected i18n: I18n,
@@ -102,16 +102,13 @@ export class MyAccountVideosComponent extends AbstractVideoList implements OnIni
       .pipe(concatAll())
       .subscribe(
         res => {
-          this.notificationsService.success(
-            this.i18n('Success'),
-            this.i18n('{{deleteLength}} videos deleted.', { deleteLength: toDeleteVideosIds.length })
-          )
+          this.notifier.success(this.i18n('{{deleteLength}} videos deleted.', { deleteLength: toDeleteVideosIds.length }))
 
           this.abortSelectionMode()
           this.reloadVideos()
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
@@ -124,15 +121,12 @@ export class MyAccountVideosComponent extends AbstractVideoList implements OnIni
 
     this.videoService.removeVideo(video.id)
         .subscribe(
-          status => {
-            this.notificationsService.success(
-              this.i18n('Success'),
-              this.i18n('Video {{videoName}} deleted.', { videoName: video.name })
-            )
+          () => {
+            this.notifier.success(this.i18n('Video {{videoName}} deleted.', { videoName: video.name }))
             this.reloadVideos()
           },
 
-          error => this.notificationsService.error(this.i18n('Error'), error.message)
+          error => this.notifier.error(error.message)
         )
   }
 
diff --git a/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.ts b/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.ts
index 9f94f3c13..37d7cf2a4 100644
--- a/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.ts
+++ b/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.ts
@@ -1,5 +1,5 @@
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { FormReactive, UserService } from '../../../shared/index'
 import { Video } from '@app/shared/video/video.model'
@@ -25,7 +25,7 @@ export class VideoChangeOwnershipComponent extends FormReactive implements OnIni
     protected formValidatorService: FormValidatorService,
     private videoChangeOwnershipValidatorsService: VideoChangeOwnershipValidatorsService,
     private videoOwnershipService: VideoOwnershipService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private userService: UserService,
     private modalService: NgbModal,
     private i18n: I18n
@@ -53,11 +53,9 @@ export class VideoChangeOwnershipComponent extends FormReactive implements OnIni
     const query = event.query
     this.userService.autocomplete(query)
       .subscribe(
-        usernames => {
-          this.usernamePropositions = usernames
-        },
+        usernames => this.usernamePropositions = usernames,
 
-        err => this.notificationsService.error('Error', err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
@@ -67,9 +65,9 @@ export class VideoChangeOwnershipComponent extends FormReactive implements OnIni
     this.videoOwnershipService
       .changeOwnership(this.video.id, username)
       .subscribe(
-        () => this.notificationsService.success(this.i18n('Success'), this.i18n('Ownership change request sent.')),
+        () => this.notifier.success(this.i18n('Ownership change request sent.')),
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 }
diff --git a/client/src/app/+my-account/shared/actor-avatar-info.component.ts b/client/src/app/+my-account/shared/actor-avatar-info.component.ts
index 54bacc212..72c815a0c 100644
--- a/client/src/app/+my-account/shared/actor-avatar-info.component.ts
+++ b/client/src/app/+my-account/shared/actor-avatar-info.component.ts
@@ -1,8 +1,8 @@
 import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'
 import { ServerService } from '../../core/server'
-import { NotificationsService } from 'angular2-notifications'
 import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
 import { Account } from '@app/shared/account/account.model'
+import { Notifier } from '@app/core'
 
 @Component({
   selector: 'my-actor-avatar-info',
@@ -18,13 +18,13 @@ export class ActorAvatarInfoComponent {
 
   constructor (
     private serverService: ServerService,
-    private notificationsService: NotificationsService
+    private notifier: Notifier
   ) {}
 
   onAvatarChange () {
     const avatarfile = this.avatarfileInput.nativeElement.files[ 0 ]
     if (avatarfile.size > this.maxAvatarSize) {
-      this.notificationsService.error('Error', 'This image is too large.')
+      this.notifier.error('Error', 'This image is too large.')
       return
     }
 
diff --git a/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts b/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts
index 995f42ffc..cfd471fa4 100644
--- a/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts
+++ b/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts
@@ -1,9 +1,8 @@
 import { Component, OnInit } from '@angular/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier, RedirectService } from '@app/core'
 import { ServerService } from '@app/core/server'
-import { RedirectService } from '@app/core'
-import { UserService, FormReactive } from '@app/shared'
+import { FormReactive, UserService } from '@app/shared'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service'
 
@@ -20,7 +19,7 @@ export class VerifyAccountAskSendEmailComponent extends FormReactive implements
     private userValidatorsService: UserValidatorsService,
     private userService: UserService,
     private serverService: ServerService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private redirectService: RedirectService,
     private i18n: I18n
   ) {
@@ -46,12 +45,12 @@ export class VerifyAccountAskSendEmailComponent extends FormReactive implements
             'An email with verification link will be sent to {{email}}.',
             { email }
           )
-          this.notificationsService.success(this.i18n('Success'), message)
+          this.notifier.success(message)
           this.redirectService.redirectToHomepage()
         },
 
         err => {
-          this.notificationsService.error(this.i18n('Error'), err.message)
+          this.notifier.error(err.message)
         }
       )
   }
diff --git a/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts b/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts
index e4a5522c8..f9ecf664b 100644
--- a/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts
+++ b/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { I18n } from '@ngx-translate/i18n-polyfill'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { UserService } from '@app/shared'
 
 @Component({
@@ -17,7 +17,7 @@ export class VerifyAccountEmailComponent implements OnInit {
 
   constructor (
     private userService: UserService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private router: Router,
     private route: ActivatedRoute,
     private i18n: I18n
@@ -29,7 +29,7 @@ export class VerifyAccountEmailComponent implements OnInit {
     this.verificationString = this.route.snapshot.queryParams['verificationString']
 
     if (!this.userId || !this.verificationString) {
-      this.notificationsService.error(this.i18n('Error'), this.i18n('Unable to find user id or verification string.'))
+      this.notifier.error(this.i18n('Unable to find user id or verification string.'))
     } else {
       this.verifyEmail()
     }
@@ -46,7 +46,7 @@ export class VerifyAccountEmailComponent implements OnInit {
         },
 
         err => {
-          this.notificationsService.error(this.i18n('Error'), err.message)
+          this.notifier.error(err.message)
         }
       )
   }
diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
index 1f0744fb1..70c4374e0 100644
--- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
+++ b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
@@ -2,7 +2,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { Location } from '@angular/common'
 import { immutableAssign } from '@app/shared/misc/utils'
-import { NotificationsService } from 'angular2-notifications'
 import { AuthService } from '../../core/auth'
 import { ConfirmService } from '../../core/confirm'
 import { AbstractVideoList } from '../../shared/video/abstract-video-list'
@@ -13,6 +12,7 @@ import { tap } from 'rxjs/operators'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { Subscription } from 'rxjs'
 import { ScreenService } from '@app/shared/misc/screen.service'
+import { Notifier } from '@app/core'
 
 @Component({
   selector: 'my-video-channel-videos',
@@ -35,7 +35,7 @@ export class VideoChannelVideosComponent extends AbstractVideoList implements On
     protected router: Router,
     protected route: ActivatedRoute,
     protected authService: AuthService,
-    protected notificationsService: NotificationsService,
+    protected notifier: Notifier,
     protected confirmService: ConfirmService,
     protected location: Location,
     protected screenService: ScreenService,
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 03f7e88ed..0489c9558 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -38,4 +38,15 @@
 
 <ngx-loading-bar [includeSpinner]="false"></ngx-loading-bar>
 <my-confirm></my-confirm>
-<simple-notifications [options]="notificationOptions"></simple-notifications>
+<p-toast position="bottom-right">
+  <ng-template let-message pTemplate="message">
+    <div class="message">
+      <h3>{{ message.summary }}</h3>
+      <p>{{ message.detail }}</p>
+    </div>
+
+    <span *ngIf="message.severity === 'success'" class="glyphicon glyphicon-ok"></span>
+    <span *ngIf="message.severity === 'info'" class="glyphicon glyphicon-info-sign"></span>
+    <span *ngIf="message.severity === 'error'" class="glyphicon glyphicon-remove"></span>
+  </ng-template>
+</p-toast>
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index dc4d0bf6a..7583fdee8 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -15,19 +15,6 @@ import { fromEvent } from 'rxjs'
   styleUrls: [ './app.component.scss' ]
 })
 export class AppComponent implements OnInit {
-  notificationOptions = {
-    timeOut: 5000,
-    lastOnBottom: true,
-    clickToClose: true,
-    maxLength: 0,
-    maxStack: 7,
-    showProgressBar: false,
-    pauseOnHover: false,
-    preventDuplicates: false,
-    preventLastDuplicates: 'visible',
-    rtl: false
-  }
-
   isMenuDisplayed = true
   isMenuChangedByUser = false
 
diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index 5f5730e02..79ea32ced 100644
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -3,7 +3,7 @@ import { catchError, map, mergeMap, share, tap } from 'rxjs/operators'
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { Router } from '@angular/router'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core/notification'
 import { OAuthClientLocal, User as UserServerModel, UserRefreshToken } from '../../../../../shared'
 import { User } from '../../../../../shared/models/users'
 import { UserLogin } from '../../../../../shared/models/users/user-login.model'
@@ -47,7 +47,7 @@ export class AuthService {
 
   constructor (
     private http: HttpClient,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private hotkeysService: HotkeysService,
     private restExtractor: RestExtractor,
     private router: Router,
@@ -105,9 +105,8 @@ export class AuthService {
               )
             }
 
-            // We put a bigger timeout
-            // This is an important message
-            this.notificationsService.error(this.i18n('Error'), errorMessage, { timeOut: 7000 })
+            // We put a bigger timeout: this is an important message
+            this.notifier.error(errorMessage, this.i18n('Error'), 7000)
           }
         )
   }
diff --git a/client/src/app/core/auth/index.ts b/client/src/app/core/auth/index.ts
index bc7bfec0e..8e5caa7ed 100644
--- a/client/src/app/core/auth/index.ts
+++ b/client/src/app/core/auth/index.ts
@@ -1,4 +1,3 @@
 export * from './auth-status.model'
 export * from './auth-user.model'
 export * from './auth.service'
-export * from '../routing/login-guard.service'
diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index 8a6654aa1..7c0d4ac8f 100644
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -7,8 +7,6 @@ import { LoadingBarModule } from '@ngx-loading-bar/core'
 import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client'
 import { LoadingBarRouterModule } from '@ngx-loading-bar/router'
 
-import { SimpleNotificationsModule } from 'angular2-notifications'
-
 import { AuthService } from './auth'
 import { ConfirmComponent, ConfirmService } from './confirm'
 import { throwIfAlreadyLoaded } from './module-import-guard'
@@ -16,7 +14,10 @@ import { LoginGuard, RedirectService, UserRightGuard } from './routing'
 import { ServerService } from './server'
 import { ThemeService } from './theme'
 import { HotkeyModule } from 'angular2-hotkeys'
-import { CheatSheetComponent } from '@app/core/hotkeys'
+import { CheatSheetComponent } from './hotkeys'
+import { ToastModule } from 'primeng/toast'
+import { Notifier } from './notification'
+import { MessageService } from 'primeng/api'
 
 @NgModule({
   imports: [
@@ -25,11 +26,10 @@ import { CheatSheetComponent } from '@app/core/hotkeys'
     FormsModule,
     BrowserAnimationsModule,
 
-    SimpleNotificationsModule.forRoot(),
-
     LoadingBarHttpClientModule,
     LoadingBarRouterModule,
     LoadingBarModule,
+    ToastModule,
 
     HotkeyModule.forRoot({
       cheatSheetCloseEsc: true
@@ -42,10 +42,11 @@ import { CheatSheetComponent } from '@app/core/hotkeys'
   ],
 
   exports: [
-    SimpleNotificationsModule,
     LoadingBarHttpClientModule,
     LoadingBarModule,
 
+    ToastModule,
+
     ConfirmComponent,
     CheatSheetComponent
   ],
@@ -57,7 +58,9 @@ import { CheatSheetComponent } from '@app/core/hotkeys'
     ThemeService,
     LoginGuard,
     UserRightGuard,
-    RedirectService
+    RedirectService,
+    Notifier,
+    MessageService
   ]
 })
 export class CoreModule {
diff --git a/client/src/app/core/index.ts b/client/src/app/core/index.ts
index 524589d74..f664aff41 100644
--- a/client/src/app/core/index.ts
+++ b/client/src/app/core/index.ts
@@ -2,6 +2,7 @@ export * from './auth'
 export * from './confirm'
 export * from './routing'
 export * from './server'
+export * from './notification'
 export * from './theme'
 
 export * from './core.module'
diff --git a/client/src/app/core/notification/index.ts b/client/src/app/core/notification/index.ts
new file mode 100644
index 000000000..8b0cfde5f
--- /dev/null
+++ b/client/src/app/core/notification/index.ts
@@ -0,0 +1 @@
+export * from './notifier.service'
diff --git a/client/src/app/core/notification/notifier.service.ts b/client/src/app/core/notification/notifier.service.ts
new file mode 100644
index 000000000..9833c65a0
--- /dev/null
+++ b/client/src/app/core/notification/notifier.service.ts
@@ -0,0 +1,41 @@
+import { Injectable } from '@angular/core'
+import { MessageService } from 'primeng/api'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+
+@Injectable()
+export class Notifier {
+  readonly TIMEOUT = 5000
+
+  constructor (
+    private i18n: I18n,
+    private messageService: MessageService) {
+  }
+
+  info (text: string, title?: string, timeout?: number) {
+    if (!title) title = this.i18n('Info')
+
+    return this.notify('info', text, title, timeout)
+  }
+
+  error (text: string, title?: string, timeout?: number) {
+    if (!title) title = this.i18n('Error')
+
+    return this.notify('error', text, title, timeout)
+  }
+
+  success (text: string, title?: string, timeout?: number) {
+    if (!title) title = this.i18n('Success')
+
+    return this.notify('success', text, title, timeout)
+  }
+
+  private notify (severity: 'success' | 'info' | 'warn' | 'error', text: string, title: string, timeout?: number) {
+    this.messageService.add({
+      severity,
+      summary: title,
+      detail: text,
+      closable: true,
+      life: timeout || this.TIMEOUT
+    })
+  }
+}
diff --git a/client/src/app/core/routing/user-right-guard.service.ts b/client/src/app/core/routing/user-right-guard.service.ts
index 65d029977..50c3d8c19 100644
--- a/client/src/app/core/routing/user-right-guard.service.ts
+++ b/client/src/app/core/routing/user-right-guard.service.ts
@@ -7,7 +7,7 @@ import {
   Router
 } from '@angular/router'
 
-import { AuthService } from '../auth'
+import { AuthService } from '../auth/auth.service'
 
 @Injectable()
 export class UserRightGuard implements CanActivate, CanActivateChild {
diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts
index 18f8f69e5..fc2442c0e 100644
--- a/client/src/app/login/login.component.ts
+++ b/client/src/app/login/login.component.ts
@@ -1,7 +1,6 @@
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'
-import { RedirectService, ServerService } from '@app/core'
+import { Notifier, RedirectService, ServerService } from '@app/core'
 import { UserService } from '@app/shared'
-import { NotificationsService } from 'angular2-notifications'
 import { AuthService } from '../core'
 import { FormReactive } from '../shared'
 import { I18n } from '@ngx-translate/i18n-polyfill'
@@ -34,7 +33,7 @@ export class LoginComponent extends FormReactive implements OnInit {
     private userService: UserService,
     private serverService: ServerService,
     private redirectService: RedirectService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private i18n: I18n
   ) {
     super()
@@ -82,11 +81,11 @@ export class LoginComponent extends FormReactive implements OnInit {
             'An email with the reset password instructions will be sent to {{email}}.',
             { email: this.forgotPasswordEmail }
           )
-          this.notificationsService.success(this.i18n('Success'), message)
+          this.notifier.success(message)
           this.hideForgotPasswordModal()
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
diff --git a/client/src/app/reset-password/reset-password.component.ts b/client/src/app/reset-password/reset-password.component.ts
index af1298de6..07b93ee73 100644
--- a/client/src/app/reset-password/reset-password.component.ts
+++ b/client/src/app/reset-password/reset-password.component.ts
@@ -1,8 +1,7 @@
 import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
-import { UserService, UserValidatorsService } from '@app/shared'
-import { NotificationsService } from 'angular2-notifications'
-import { FormReactive } from '../shared'
+import { UserService, UserValidatorsService, FormReactive } from '@app/shared'
+import { Notifier } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 import { ResetPasswordValidatorsService } from '@app/shared/forms/form-validators/reset-password-validators.service'
@@ -22,7 +21,7 @@ export class ResetPasswordComponent extends FormReactive implements OnInit {
     private resetPasswordValidatorsService: ResetPasswordValidatorsService,
     private userValidatorsService: UserValidatorsService,
     private userService: UserService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private router: Router,
     private route: ActivatedRoute,
     private i18n: I18n
@@ -40,7 +39,7 @@ export class ResetPasswordComponent extends FormReactive implements OnInit {
     this.verificationString = this.route.snapshot.queryParams['verificationString']
 
     if (!this.userId || !this.verificationString) {
-      this.notificationsService.error(this.i18n('Error'), this.i18n('Unable to find user id or verification string.'))
+      this.notifier.error(this.i18n('Unable to find user id or verification string.'))
       this.router.navigate([ '/' ])
     }
   }
@@ -49,11 +48,11 @@ export class ResetPasswordComponent extends FormReactive implements OnInit {
     this.userService.resetPassword(this.userId, this.verificationString, this.form.value.password)
       .subscribe(
         () => {
-          this.notificationsService.success(this.i18n('Success'), this.i18n('Your password has been successfully reset!'))
+          this.notifier.success(this.i18n('Your password has been successfully reset!'))
           this.router.navigate([ '/login' ])
         },
 
-        err => this.notificationsService.error('Error', err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
diff --git a/client/src/app/search/search-filters.component.ts b/client/src/app/search/search-filters.component.ts
index 8d7f84ac1..3fdc6df35 100644
--- a/client/src/app/search/search-filters.component.ts
+++ b/client/src/app/search/search-filters.component.ts
@@ -1,10 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import { RedirectService, ServerService } from '@app/core'
-import { NotificationsService } from 'angular2-notifications'
-import { SearchService } from '@app/search/search.service'
+import { ServerService } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
-import { MetaService } from '@ngx-meta/core'
 import { AdvancedSearch } from '@app/search/advanced-search.model'
 import { VideoConstant } from '../../../../shared'
 
diff --git a/client/src/app/search/search.component.ts b/client/src/app/search/search.component.ts
index 3d17e6d96..474b72824 100644
--- a/client/src/app/search/search.component.ts
+++ b/client/src/app/search/search.component.ts
@@ -1,7 +1,6 @@
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
-import { AuthService } from '@app/core'
-import { NotificationsService } from 'angular2-notifications'
+import { AuthService, Notifier } from '@app/core'
 import { forkJoin, Subscription } from 'rxjs'
 import { SearchService } from '@app/search/search.service'
 import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
@@ -40,7 +39,7 @@ export class SearchComponent implements OnInit, OnDestroy {
     private route: ActivatedRoute,
     private router: Router,
     private metaService: MetaService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private searchService: SearchService,
     private authService: AuthService
   ) { }
@@ -68,7 +67,7 @@ export class SearchComponent implements OnInit, OnDestroy {
         this.search()
       },
 
-      err => this.notificationsService.error('Error', err.text)
+      err => this.notifier.error(err.text)
     )
   }
 
@@ -112,9 +111,7 @@ export class SearchComponent implements OnInit, OnDestroy {
           this.firstSearch = false
         },
 
-        error => {
-          this.notificationsService.error(this.i18n('Error'), error.message)
-        }
+        err => this.notifier.error(err.message)
       )
 
   }
diff --git a/client/src/app/shared/forms/reactive-file.component.ts b/client/src/app/shared/forms/reactive-file.component.ts
index 8d22aa56c..c3986838f 100644
--- a/client/src/app/shared/forms/reactive-file.component.ts
+++ b/client/src/app/shared/forms/reactive-file.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, forwardRef, Input, OnInit, Output } from '@angular/core'
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
@@ -30,7 +30,7 @@ export class ReactiveFileComponent implements OnInit, ControlValueAccessor {
   private file: File
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private i18n: I18n
   ) {}
 
@@ -49,7 +49,7 @@ export class ReactiveFileComponent implements OnInit, ControlValueAccessor {
       const [ file ] = event.target.files
 
       if (file.size > this.maxFileSize) {
-        this.notificationsService.error(this.i18n('Error'), this.i18n('This file is too large.'))
+        this.notifier.error(this.i18n('This file is too large.'))
         return
       }
 
diff --git a/client/src/app/shared/moderation/user-ban-modal.component.ts b/client/src/app/shared/moderation/user-ban-modal.component.ts
index 60bd442dd..f755ba0e8 100644
--- a/client/src/app/shared/moderation/user-ban-modal.component.ts
+++ b/client/src/app/shared/moderation/user-ban-modal.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
@@ -23,7 +23,7 @@ export class UserBanModalComponent extends FormReactive implements OnInit {
   constructor (
     protected formValidatorService: FormValidatorService,
     private modalService: NgbModal,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private userService: UserService,
     private userValidatorsService: UserValidatorsService,
     private i18n: I18n
@@ -57,13 +57,13 @@ export class UserBanModalComponent extends FormReactive implements OnInit {
             ? this.i18n('{{num}} users banned.', { num: this.usersToBan.length })
             : this.i18n('User {{username}} banned.', { username: this.usersToBan.username })
 
-          this.notificationsService.success(this.i18n('Success'), message)
+          this.notifier.success(message)
 
           this.userBanned.emit(this.usersToBan)
           this.hideBanUserModal()
         },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
       )
   }
 
diff --git a/client/src/app/shared/moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/moderation/user-moderation-dropdown.component.ts
index e3c9db923..9a2461ebf 100644
--- a/client/src/app/shared/moderation/user-moderation-dropdown.component.ts
+++ b/client/src/app/shared/moderation/user-moderation-dropdown.component.ts
@@ -1,10 +1,9 @@
 import { Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { DropdownAction } from '@app/shared/buttons/action-dropdown.component'
 import { UserBanModalComponent } from '@app/shared/moderation/user-ban-modal.component'
 import { UserService } from '@app/shared/users'
-import { AuthService, ConfirmService, ServerService } from '@app/core'
+import { AuthService, ConfirmService, Notifier, ServerService } from '@app/core'
 import { User, UserRight } from '../../../../../shared/models/users'
 import { Account } from '@app/shared/account/account.model'
 import { BlocklistService } from '@app/shared/blocklist'
@@ -30,7 +29,7 @@ export class UserModerationDropdownComponent implements OnChanges {
 
   constructor (
     private authService: AuthService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private confirmService: ConfirmService,
     private serverService: ServerService,
     private userService: UserService,
@@ -48,7 +47,7 @@ export class UserModerationDropdownComponent implements OnChanges {
 
   openBanUserModal (user: User) {
     if (user.username === 'root') {
-      this.notificationsService.error(this.i18n('Error'), this.i18n('You cannot ban root.'))
+      this.notifier.error(this.i18n('You cannot ban root.'))
       return
     }
 
@@ -67,21 +66,18 @@ export class UserModerationDropdownComponent implements OnChanges {
     this.userService.unbanUsers(user)
         .subscribe(
           () => {
-            this.notificationsService.success(
-              this.i18n('Success'),
-              this.i18n('User {{username}} unbanned.', { username: user.username })
-            )
+            this.notifier.success(this.i18n('User {{username}} unbanned.', { username: user.username }))
 
             this.userChanged.emit()
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 
   async removeUser (user: User) {
     if (user.username === 'root') {
-      this.notificationsService.error(this.i18n('Error'), this.i18n('You cannot delete root.'))
+      this.notifier.error(this.i18n('You cannot delete root.'))
       return
     }
 
@@ -91,29 +87,23 @@ export class UserModerationDropdownComponent implements OnChanges {
 
     this.userService.removeUser(user).subscribe(
       () => {
-        this.notificationsService.success(
-          this.i18n('Success'),
-          this.i18n('User {{username}} deleted.', { username: user.username })
-        )
+        this.notifier.success(this.i18n('User {{username}} deleted.', { username: user.username }))
         this.userDeleted.emit()
       },
 
-      err => this.notificationsService.error(this.i18n('Error'), err.message)
+      err => this.notifier.error(err.message)
     )
   }
 
   setEmailAsVerified (user: User) {
     this.userService.updateUser(user.id, { emailVerified: true }).subscribe(
       () => {
-        this.notificationsService.success(
-          this.i18n('Success'),
-          this.i18n('User {{username}} email set as verified', { username: user.username })
-        )
+        this.notifier.success(this.i18n('User {{username}} email set as verified', { username: user.username }))
 
         this.userChanged.emit()
       },
 
-      err => this.notificationsService.error(this.i18n('Error'), err.message)
+      err => this.notifier.error(err.message)
     )
   }
 
@@ -121,16 +111,13 @@ export class UserModerationDropdownComponent implements OnChanges {
     this.blocklistService.blockAccountByUser(account)
         .subscribe(
           () => {
-            this.notificationsService.success(
-              this.i18n('Success'),
-              this.i18n('Account {{nameWithHost}} muted.', { nameWithHost: account.nameWithHost })
-            )
+            this.notifier.success(this.i18n('Account {{nameWithHost}} muted.', { nameWithHost: account.nameWithHost }))
 
             this.account.mutedByUser = true
             this.userChanged.emit()
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 
@@ -138,16 +125,13 @@ export class UserModerationDropdownComponent implements OnChanges {
     this.blocklistService.unblockAccountByUser(account)
         .subscribe(
           () => {
-            this.notificationsService.success(
-              this.i18n('Success'),
-              this.i18n('Account {{nameWithHost}} unmuted.', { nameWithHost: account.nameWithHost })
-            )
+            this.notifier.success(this.i18n('Account {{nameWithHost}} unmuted.', { nameWithHost: account.nameWithHost }))
 
             this.account.mutedByUser = false
             this.userChanged.emit()
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 
@@ -155,16 +139,13 @@ export class UserModerationDropdownComponent implements OnChanges {
     this.blocklistService.blockServerByUser(host)
         .subscribe(
           () => {
-            this.notificationsService.success(
-              this.i18n('Success'),
-              this.i18n('Instance {{host}} muted.', { host })
-            )
+            this.notifier.success(this.i18n('Instance {{host}} muted.', { host }))
 
             this.account.mutedServerByUser = true
             this.userChanged.emit()
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 
@@ -172,16 +153,13 @@ export class UserModerationDropdownComponent implements OnChanges {
     this.blocklistService.unblockServerByUser(host)
         .subscribe(
           () => {
-            this.notificationsService.success(
-              this.i18n('Success'),
-              this.i18n('Instance {{host}} unmuted.', { host })
-            )
+            this.notifier.success(this.i18n('Instance {{host}} unmuted.', { host }))
 
             this.account.mutedServerByUser = false
             this.userChanged.emit()
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 
@@ -189,16 +167,13 @@ export class UserModerationDropdownComponent implements OnChanges {
     this.blocklistService.blockAccountByInstance(account)
         .subscribe(
           () => {
-            this.notificationsService.success(
-              this.i18n('Success'),
-              this.i18n('Account {{nameWithHost}} muted by the instance.', { nameWithHost: account.nameWithHost })
-            )
+            this.notifier.success(this.i18n('Account {{nameWithHost}} muted by the instance.', { nameWithHost: account.nameWithHost }))
 
             this.account.mutedByInstance = true
             this.userChanged.emit()
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 
@@ -206,16 +181,13 @@ export class UserModerationDropdownComponent implements OnChanges {
     this.blocklistService.unblockAccountByInstance(account)
         .subscribe(
           () => {
-            this.notificationsService.success(
-              this.i18n('Success'),
-              this.i18n('Account {{nameWithHost}} unmuted by the instance.', { nameWithHost: account.nameWithHost })
-            )
+            this.notifier.success(this.i18n('Account {{nameWithHost}} unmuted by the instance.', { nameWithHost: account.nameWithHost }))
 
             this.account.mutedByInstance = false
             this.userChanged.emit()
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 
@@ -223,16 +195,13 @@ export class UserModerationDropdownComponent implements OnChanges {
     this.blocklistService.blockServerByInstance(host)
         .subscribe(
           () => {
-            this.notificationsService.success(
-              this.i18n('Success'),
-              this.i18n('Instance {{host}} muted by the instance.', { host })
-            )
+            this.notifier.success(this.i18n('Instance {{host}} muted by the instance.', { host }))
 
             this.account.mutedServerByInstance = true
             this.userChanged.emit()
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 
@@ -240,16 +209,13 @@ export class UserModerationDropdownComponent implements OnChanges {
     this.blocklistService.unblockServerByInstance(host)
         .subscribe(
           () => {
-            this.notificationsService.success(
-              this.i18n('Success'),
-              this.i18n('Instance {{host}} unmuted by the instance.', { host })
-            )
+            this.notifier.success(this.i18n('Instance {{host}} unmuted by the instance.', { host }))
 
             this.account.mutedServerByInstance = false
             this.userChanged.emit()
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 
diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.ts b/client/src/app/shared/user-subscription/subscribe-button.component.ts
index 9c8a15023..8f1754c7f 100644
--- a/client/src/app/shared/user-subscription/subscribe-button.component.ts
+++ b/client/src/app/shared/user-subscription/subscribe-button.component.ts
@@ -1,9 +1,8 @@
 import { Component, Input, OnInit } from '@angular/core'
 import { Router } from '@angular/router'
-import { AuthService } from '@app/core'
+import { AuthService, Notifier } from '@app/core'
 import { UserSubscriptionService } from '@app/shared/user-subscription/user-subscription.service'
 import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
-import { NotificationsService } from 'angular2-notifications'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { VideoService } from '@app/shared/video/video.service'
 import { FeedFormat } from '../../../../../shared/models/feeds'
@@ -23,7 +22,7 @@ export class SubscribeButtonComponent implements OnInit {
   constructor (
     private authService: AuthService,
     private router: Router,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private userSubscriptionService: UserSubscriptionService,
     private i18n: I18n,
     private videoService: VideoService
@@ -43,7 +42,7 @@ export class SubscribeButtonComponent implements OnInit {
         .subscribe(
           res => this.subscribed = res[this.uri],
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
     }
   }
@@ -62,13 +61,13 @@ export class SubscribeButtonComponent implements OnInit {
         () => {
           this.subscribed = true
 
-          this.notificationsService.success(
-            this.i18n('Subscribed'),
-            this.i18n('Subscribed to {{nameWithHost}}', { nameWithHost: this.videoChannel.displayName })
+          this.notifier.success(
+            this.i18n('Subscribed to {{nameWithHost}}', { nameWithHost: this.videoChannel.displayName }),
+            this.i18n('Subscribed')
           )
         },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
       )
   }
 
@@ -84,13 +83,13 @@ export class SubscribeButtonComponent implements OnInit {
           () => {
             this.subscribed = false
 
-            this.notificationsService.success(
-              this.i18n('Unsubscribed'),
-              this.i18n('Unsubscribed from {{nameWithHost}}', { nameWithHost: this.videoChannel.displayName })
+            this.notifier.success(
+              this.i18n('Unsubscribed from {{nameWithHost}}', { nameWithHost: this.videoChannel.displayName }),
+              this.i18n('Unsubscribed')
             )
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 
diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts
index 2d32dd6ad..d234c8bfa 100644
--- a/client/src/app/shared/video/abstract-video-list.ts
+++ b/client/src/app/shared/video/abstract-video-list.ts
@@ -3,7 +3,6 @@ import { ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { Location } from '@angular/common'
 import { InfiniteScrollerDirective } from '@app/shared/video/infinite-scroller.directive'
-import { NotificationsService } from 'angular2-notifications'
 import { fromEvent, Observable, Subscription } from 'rxjs'
 import { AuthService } from '../../core/auth'
 import { ComponentPagination } from '../rest/component-pagination.model'
@@ -13,6 +12,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
 import { ScreenService } from '@app/shared/misc/screen.service'
 import { OwnerDisplayType } from '@app/shared/video/video-miniature.component'
 import { Syndication } from '@app/shared/video/syndication.model'
+import { Notifier } from '@app/core'
 
 export abstract class AbstractVideoList implements OnInit, OnDestroy {
   private static LINES_PER_PAGE = 4
@@ -43,7 +43,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy {
   protected baseVideoWidth = 215
   protected baseVideoHeight = 205
 
-  protected abstract notificationsService: NotificationsService
+  protected abstract notifier: Notifier
   protected abstract authService: AuthService
   protected abstract router: Router
   protected abstract route: ActivatedRoute
@@ -157,7 +157,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy {
       },
       error => {
         this.loadingPage[page] = false
-        this.notificationsService.error(this.i18n('Error'), error.message)
+        this.notifier.error(error.message)
       }
     )
   }
diff --git a/client/src/app/signup/signup.component.ts b/client/src/app/signup/signup.component.ts
index 3341d4e09..13941ec79 100644
--- a/client/src/app/signup/signup.component.ts
+++ b/client/src/app/signup/signup.component.ts
@@ -1,8 +1,7 @@
 import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { AuthService, Notifier, RedirectService, ServerService } from '@app/core'
 import { UserCreate } from '../../../../shared'
 import { FormReactive, UserService, UserValidatorsService } from '../shared'
-import { AuthService, RedirectService, ServerService } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 
@@ -20,7 +19,7 @@ export class SignupComponent extends FormReactive implements OnInit {
     protected formValidatorService: FormValidatorService,
     private authService: AuthService,
     private userValidatorsService: UserValidatorsService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private userService: UserService,
     private serverService: ServerService,
     private redirectService: RedirectService,
@@ -64,10 +63,7 @@ export class SignupComponent extends FormReactive implements OnInit {
         this.authService.login(userCreate.username, userCreate.password)
             .subscribe(
               () => {
-                this.notificationsService.success(
-                  this.i18n('Success'),
-                  this.i18n('You are now logged in as {{username}}!', { username: userCreate.username })
-                )
+                this.notifier.success(this.i18n('You are now logged in as {{username}}!', { username: userCreate.username }))
 
                 this.redirectService.redirectToHomepage()
               },
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
index 1d35b4ba8..85e015901 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'
 import { FormArray, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms'
 import { ActivatedRoute, Router } from '@angular/router'
 import { FormReactiveValidationMessages, VideoValidatorsService } from '@app/shared'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { ServerService } from '../../../core/server'
 import { VideoEdit } from '../../../shared/video/video-edit.model'
 import { map } from 'rxjs/operators'
@@ -59,7 +59,7 @@ export class VideoEditComponent implements OnInit, OnDestroy {
     private videoCaptionService: VideoCaptionService,
     private route: ActivatedRoute,
     private router: Router,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private serverService: ServerService,
     private i18nPrimengCalendarService: I18nPrimengCalendarService
   ) {
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts
index 13776ae36..63db06919 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts
@@ -1,8 +1,7 @@
 import { Component, ElementRef, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'
 import { Router } from '@angular/router'
-import { NotificationsService } from 'angular2-notifications'
 import { VideoPrivacy, VideoUpdate } from '../../../../../../shared/models/videos'
-import { AuthService, ServerService } from '../../../core'
+import { AuthService, Notifier, ServerService } from '../../../core'
 import { VideoService } from '../../../shared/video/video.service'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { LoadingBarService } from '@ngx-loading-bar/core'
@@ -41,7 +40,7 @@ export class VideoImportTorrentComponent extends VideoSend implements OnInit, Ca
   constructor (
     protected formValidatorService: FormValidatorService,
     protected loadingBar: LoadingBarService,
-    protected notificationsService: NotificationsService,
+    protected notifier: Notifier,
     protected authService: AuthService,
     protected serverService: ServerService,
     protected videoService: VideoService,
@@ -107,7 +106,7 @@ export class VideoImportTorrentComponent extends VideoSend implements OnInit, Ca
         this.loadingBar.complete()
         this.isImportingVideo = false
         this.firstStepError.emit()
-        this.notificationsService.error(this.i18n('Error'), err.message)
+        this.notifier.error(err.message)
       }
     )
   }
@@ -126,7 +125,7 @@ export class VideoImportTorrentComponent extends VideoSend implements OnInit, Ca
         .subscribe(
           () => {
             this.isUpdatingVideo = false
-            this.notificationsService.success(this.i18n('Success'), this.i18n('Video to import updated.'))
+            this.notifier.success(this.i18n('Video to import updated.'))
 
             this.router.navigate([ '/my-account', 'video-imports' ])
           },
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts
index 9cdface75..a1810b7a0 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts
@@ -1,8 +1,7 @@
 import { Component, EventEmitter, OnInit, Output } from '@angular/core'
 import { Router } from '@angular/router'
-import { NotificationsService } from 'angular2-notifications'
 import { VideoPrivacy, VideoUpdate } from '../../../../../../shared/models/videos'
-import { AuthService, ServerService } from '../../../core'
+import { AuthService, Notifier, ServerService } from '../../../core'
 import { VideoService } from '../../../shared/video/video.service'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { LoadingBarService } from '@ngx-loading-bar/core'
@@ -40,7 +39,7 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, CanCom
   constructor (
     protected formValidatorService: FormValidatorService,
     protected loadingBar: LoadingBarService,
-    protected notificationsService: NotificationsService,
+    protected notifier: Notifier,
     protected authService: AuthService,
     protected serverService: ServerService,
     protected videoService: VideoService,
@@ -99,7 +98,7 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, CanCom
         this.loadingBar.complete()
         this.isImportingVideo = false
         this.firstStepError.emit()
-        this.notificationsService.error(this.i18n('Error'), err.message)
+        this.notifier.error(err.message)
       }
     )
   }
@@ -118,7 +117,7 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, CanCom
         .subscribe(
           () => {
             this.isUpdatingVideo = false
-            this.notificationsService.success(this.i18n('Success'), this.i18n('Video to import updated.'))
+            this.notifier.success(this.i18n('Video to import updated.'))
 
             this.router.navigate([ '/my-account', 'video-imports' ])
           },
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-send.ts b/client/src/app/videos/+video-edit/video-add-components/video-send.ts
index 71d2544d8..580c123a0 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-send.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-send.ts
@@ -1,10 +1,9 @@
 import { EventEmitter, OnInit } from '@angular/core'
 import { LoadingBarService } from '@ngx-loading-bar/core'
-import { NotificationsService } from 'angular2-notifications'
+import { AuthService, Notifier, ServerService } from '@app/core'
 import { catchError, switchMap, tap } from 'rxjs/operators'
 import { FormReactive } from '@app/shared'
 import { VideoConstant, VideoPrivacy } from '../../../../../../shared'
-import { AuthService, ServerService } from '@app/core'
 import { VideoService } from '@app/shared/video/video.service'
 import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model'
 import { VideoCaptionService } from '@app/shared/video-caption'
@@ -25,7 +24,7 @@ export abstract class VideoSend extends FormReactive implements OnInit {
   protected abstract readonly DEFAULT_VIDEO_PRIVACY: VideoPrivacy
 
   protected loadingBar: LoadingBarService
-  protected notificationsService: NotificationsService
+  protected notifier: Notifier
   protected authService: AuthService
   protected serverService: ServerService
   protected videoService: VideoService
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
index 2180e22ab..aa40f8781 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
@@ -2,11 +2,10 @@ import { HttpEventType, HttpResponse } from '@angular/common/http'
 import { Component, ElementRef, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core'
 import { Router } from '@angular/router'
 import { LoadingBarService } from '@ngx-loading-bar/core'
-import { NotificationsService } from 'angular2-notifications'
 import { BytesPipe } from 'ngx-pipes'
 import { Subscription } from 'rxjs'
 import { VideoPrivacy } from '../../../../../../shared/models/videos'
-import { AuthService, ServerService } from '../../../core'
+import { AuthService, Notifier, ServerService } from '../../../core'
 import { VideoEdit } from '../../../shared/video/video-edit.model'
 import { VideoService } from '../../../shared/video/video.service'
 import { I18n } from '@ngx-translate/i18n-polyfill'
@@ -53,7 +52,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
   constructor (
     protected formValidatorService: FormValidatorService,
     protected loadingBar: LoadingBarService,
-    protected notificationsService: NotificationsService,
+    protected notifier: Notifier,
     protected authService: AuthService,
     protected serverService: ServerService,
     protected videoService: VideoService,
@@ -110,7 +109,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
       this.isUploadingVideo = false
       this.videoUploadPercents = 0
       this.videoUploadObservable = null
-      this.notificationsService.info(this.i18n('Info'), this.i18n('Upload cancelled'))
+      this.notifier.info(this.i18n('Upload cancelled'))
     }
   }
 
@@ -130,7 +129,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
           videoQuota: bytePipes.transform(videoQuota, 0)
         }
       )
-      this.notificationsService.error(this.i18n('Error'), msg)
+      this.notifier.error(msg)
       return
     }
 
@@ -145,7 +144,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
           quotaDaily: bytePipes.transform(videoQuotaDaily, 0)
         }
       )
-      this.notificationsService.error(this.i18n('Error'), msg)
+      this.notifier.error(msg)
       return
     }
 
@@ -209,7 +208,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
         this.videoUploadPercents = 0
         this.videoUploadObservable = null
         this.firstStepError.emit()
-        this.notificationsService.error(this.i18n('Error'), err.message)
+        this.notifier.error(err.message)
       }
     )
   }
@@ -238,7 +237,7 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
             this.isUpdatingVideo = false
             this.isUploadingVideo = false
 
-            this.notificationsService.success(this.i18n('Success'), this.i18n('Video published.'))
+            this.notifier.success(this.i18n('Video published.'))
             this.router.navigate([ '/videos/watch', video.uuid ])
           },
 
diff --git a/client/src/app/videos/+video-edit/video-update.component.ts b/client/src/app/videos/+video-edit/video-update.component.ts
index d99a02b18..d22ee540a 100644
--- a/client/src/app/videos/+video-edit/video-update.component.ts
+++ b/client/src/app/videos/+video-edit/video-update.component.ts
@@ -2,7 +2,7 @@ import { map, switchMap } from 'rxjs/operators'
 import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { LoadingBarService } from '@ngx-loading-bar/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { VideoConstant, VideoPrivacy } from '../../../../../shared/models/videos'
 import { ServerService } from '../../core'
 import { FormReactive } from '../../shared'
@@ -35,7 +35,7 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
     protected formValidatorService: FormValidatorService,
     private route: ActivatedRoute,
     private router: Router,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private serverService: ServerService,
     private videoService: VideoService,
     private loadingBar: LoadingBarService,
@@ -78,7 +78,7 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
 
         err => {
           console.error(err)
-          this.notificationsService.error(this.i18n('Error'), err.message)
+          this.notifier.error(err.message)
         }
       )
   }
@@ -121,14 +121,14 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
             this.updateDone = true
             this.isUpdatingVideo = false
             this.loadingBar.complete()
-            this.notificationsService.success(this.i18n('Success'), this.i18n('Video updated.'))
+            this.notifier.success(this.i18n('Video updated.'))
             this.router.navigate([ '/videos/watch', this.video.uuid ])
           },
 
           err => {
             this.loadingBar.complete()
             this.isUpdatingVideo = false
-            this.notificationsService.error(this.i18n('Error'), err.message)
+            this.notifier.error(err.message)
             console.error(err)
           }
         )
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
index 7f582c950..6b7e62042 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
@@ -1,6 +1,6 @@
 import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
 import { Router } from '@angular/router'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { Observable } from 'rxjs'
 import { VideoCommentCreate } from '../../../../../../shared/models/videos/video-comment.model'
 import { FormReactive } from '../../../shared'
@@ -36,7 +36,7 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit {
   constructor (
     protected formValidatorService: FormValidatorService,
     private videoCommentValidatorsService: VideoCommentValidatorsService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private videoCommentService: VideoCommentService,
     private authService: AuthService,
     private modalService: NgbModal,
@@ -115,7 +115,7 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit {
       err => {
         this.addingComment = false
 
-        this.notificationsService.error(this.i18n('Error'), err.text)
+        this.notifier.error(err.text)
       }
     )
   }
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.ts b/client/src/app/videos/+video-watch/comment/video-comments.component.ts
index 8850eccd8..957c17bbf 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.ts
@@ -1,7 +1,6 @@
-import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild, ElementRef } from '@angular/core'
+import { Component, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { ConfirmService } from '@app/core'
-import { NotificationsService } from 'angular2-notifications'
+import { ConfirmService, Notifier } from '@app/core'
 import { Subscription } from 'rxjs'
 import { VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model'
 import { AuthService } from '../../../core/auth'
@@ -42,7 +41,7 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
 
   constructor (
     private authService: AuthService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private confirmService: ConfirmService,
     private videoCommentService: VideoCommentService,
     private activatedRoute: ActivatedRoute,
@@ -92,7 +91,7 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
           }
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
@@ -104,7 +103,7 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
           this.componentPagination.totalItems = res.totalComments
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
@@ -155,7 +154,7 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
           if (this.highlightedThread.id === commentToDelete.id) this.highlightedThread = undefined
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
diff --git a/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts b/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts
index 2c123ebed..357ce39ce 100644
--- a/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts
+++ b/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts
@@ -1,12 +1,11 @@
 import { Component, Input, OnInit, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier, RedirectService } from '@app/core'
 import { FormReactive, VideoBlacklistService, VideoBlacklistValidatorsService } from '../../../shared/index'
 import { VideoDetails } from '../../../shared/video/video-details.model'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
-import { RedirectService } from '@app/core'
 
 @Component({
   selector: 'my-video-blacklist',
@@ -27,7 +26,7 @@ export class VideoBlacklistComponent extends FormReactive implements OnInit {
     private modalService: NgbModal,
     private videoBlacklistValidatorsService: VideoBlacklistValidatorsService,
     private videoBlacklistService: VideoBlacklistService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private redirectService: RedirectService,
     private i18n: I18n
   ) {
@@ -55,12 +54,12 @@ export class VideoBlacklistComponent extends FormReactive implements OnInit {
     this.videoBlacklistService.blacklistVideo(this.video.id, reason)
         .subscribe(
           () => {
-            this.notificationsService.success(this.i18n('Success'), this.i18n('Video blacklisted.'))
+            this.notifier.success(this.i18n('Video blacklisted.'))
             this.hide()
             this.redirectService.redirectToHomepage()
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 }
diff --git a/client/src/app/videos/+video-watch/modal/video-download.component.ts b/client/src/app/videos/+video-watch/modal/video-download.component.ts
index b1b2c0623..834385771 100644
--- a/client/src/app/videos/+video-watch/modal/video-download.component.ts
+++ b/client/src/app/videos/+video-watch/modal/video-download.component.ts
@@ -2,7 +2,7 @@ import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'
 import { VideoDetails } from '../../../shared/video/video-details.model'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { I18n } from '@ngx-translate/i18n-polyfill'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 
 @Component({
   selector: 'my-video-download',
@@ -18,7 +18,7 @@ export class VideoDownloadComponent implements OnInit {
   resolutionId: number | string = -1
 
   constructor (
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private modalService: NgbModal,
     private i18n: I18n
   ) { }
@@ -63,6 +63,6 @@ export class VideoDownloadComponent implements OnInit {
   }
 
   activateCopiedMessage () {
-    this.notificationsService.success(this.i18n('Success'), this.i18n('Copied'))
+    this.notifier.success(this.i18n('Copied'))
   }
 }
diff --git a/client/src/app/videos/+video-watch/modal/video-report.component.ts b/client/src/app/videos/+video-watch/modal/video-report.component.ts
index 023387984..911f3b447 100644
--- a/client/src/app/videos/+video-watch/modal/video-report.component.ts
+++ b/client/src/app/videos/+video-watch/modal/video-report.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnInit, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { FormReactive, VideoAbuseService } from '../../../shared/index'
 import { VideoDetails } from '../../../shared/video/video-details.model'
 import { I18n } from '@ngx-translate/i18n-polyfill'
@@ -27,7 +27,7 @@ export class VideoReportComponent extends FormReactive implements OnInit {
     private modalService: NgbModal,
     private videoAbuseValidatorsService: VideoAbuseValidatorsService,
     private videoAbuseService: VideoAbuseService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private i18n: I18n
   ) {
     super()
@@ -66,11 +66,11 @@ export class VideoReportComponent extends FormReactive implements OnInit {
     this.videoAbuseService.reportVideo(this.video.id, reason)
                           .subscribe(
                             () => {
-                              this.notificationsService.success(this.i18n('Success'), this.i18n('Video reported.'))
+                              this.notifier.success(this.i18n('Video reported.'))
                               this.hide()
                             },
 
-                            err => this.notificationsService.error(this.i18n('Error'), err.message)
+                            err => this.notifier.error(err.message)
                            )
   }
 
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.ts b/client/src/app/videos/+video-watch/modal/video-share.component.ts
index 17e2b31e1..c6205e355 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.ts
+++ b/client/src/app/videos/+video-watch/modal/video-share.component.ts
@@ -1,5 +1,5 @@
 import { Component, ElementRef, Input, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { VideoDetails } from '../../../shared/video/video-details.model'
 import { buildVideoEmbed, buildVideoLink } from '../../../../assets/player/utils'
 import { I18n } from '@ngx-translate/i18n-polyfill'
@@ -23,7 +23,7 @@ export class VideoShareComponent {
 
   constructor (
     private modalService: NgbModal,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private i18n: I18n
   ) { }
 
@@ -49,7 +49,7 @@ export class VideoShareComponent {
   }
 
   activateCopiedMessage () {
-    this.notificationsService.success(this.i18n('Success'), this.i18n('Copied'))
+    this.notifier.success(this.i18n('Copied'))
   }
 
   getStartCheckboxLabel () {
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index ef0f685c6..7765c4660 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -5,7 +5,7 @@ import { RedirectService } from '@app/core/routing/redirect.service'
 import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage'
 import { VideoSupportComponent } from '@app/videos/+video-watch/modal/video-support.component'
 import { MetaService } from '@ngx-meta/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier, ServerService } from '@app/core'
 import { forkJoin, Subscription } from 'rxjs'
 // FIXME: something weird with our path definition in tsconfig and typings
 // @ts-ignore
@@ -13,7 +13,7 @@ import videojs from 'video.js'
 import 'videojs-hotkeys'
 import { Hotkey, HotkeysService } from 'angular2-hotkeys'
 import * as WebTorrent from 'webtorrent'
-import { UserVideoRateType, VideoCaption, VideoPrivacy, VideoRateType, VideoState } from '../../../../../shared'
+import { UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '../../../../../shared'
 import '../../../assets/player/peertube-videojs-plugin'
 import { AuthService, ConfirmService } from '../../core'
 import { RestExtractor, VideoBlacklistService } from '../../shared'
@@ -26,7 +26,6 @@ import { VideoShareComponent } from './modal/video-share.component'
 import { VideoBlacklistComponent } from './modal/video-blacklist.component'
 import { SubscribeButtonComponent } from '@app/shared/user-subscription/subscribe-button.component'
 import { addContextMenu, getVideojsOptions, loadLocaleInVideoJS } from '../../../assets/player/peertube-player'
-import { ServerService } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { environment } from '../../../environments/environment'
 import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils'
@@ -77,7 +76,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     private authService: AuthService,
     private serverService: ServerService,
     private restExtractor: RestExtractor,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private markdownService: MarkdownService,
     private zone: NgZone,
     private redirectService: RedirectService,
@@ -205,7 +204,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
 
           error => {
             this.descriptionLoading = false
-            this.notificationsService.error(this.i18n('Error'), error.message)
+            this.notifier.error(error.message)
           }
         )
   }
@@ -247,16 +246,13 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
 
     this.videoBlacklistService.removeVideoFromBlacklist(this.video.id).subscribe(
       () => {
-        this.notificationsService.success(
-          this.i18n('Success'),
-          this.i18n('Video {{name}} removed from the blacklist.', { name: this.video.name })
-        )
+        this.notifier.success(this.i18n('Video {{name}} removed from the blacklist.', { name: this.video.name }))
 
         this.video.blacklisted = false
         this.video.blacklistedReason = null
       },
 
-      err => this.notificationsService.error(this.i18n('Error'), err.message)
+      err => this.notifier.error(err.message)
     )
   }
 
@@ -294,17 +290,14 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
 
     this.videoService.removeVideo(this.video.id)
         .subscribe(
-          status => {
-            this.notificationsService.success(
-              this.i18n('Success'),
-              this.i18n('Video {{videoName}} deleted.', { videoName: this.video.name })
-            )
+          () => {
+            this.notifier.success(this.i18n('Video {{videoName}} deleted.', { videoName: this.video.name }))
 
             // Go back to the video-list.
             this.redirectService.redirectToHomepage()
           },
 
-          error => this.notificationsService.error(this.i18n('Error'), error.message)
+          error => this.notifier.error(error.message)
         )
   }
 
@@ -354,7 +347,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
       return
     }
 
-    this.notificationsService.error(this.i18n('Error'), errorMessage)
+    this.notifier.error(errorMessage)
   }
 
   private checkUserRating () {
@@ -369,7 +362,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
             }
           },
 
-          err => this.notificationsService.error(this.i18n('Error'), err.message)
+          err => this.notifier.error(err.message)
         )
   }
 
@@ -475,7 +468,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
               this.userRating = nextRating
             },
 
-            (err: { message: string }) => this.notificationsService.error(this.i18n('Error'), err.message)
+            (err: { message: string }) => this.notifier.error(err.message)
           )
   }
 
diff --git a/client/src/app/videos/video-list/video-local.component.ts b/client/src/app/videos/video-list/video-local.component.ts
index 9d000cf2e..c0be4b885 100644
--- a/client/src/app/videos/video-list/video-local.component.ts
+++ b/client/src/app/videos/video-list/video-local.component.ts
@@ -2,7 +2,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { immutableAssign } from '@app/shared/misc/utils'
 import { Location } from '@angular/common'
-import { NotificationsService } from 'angular2-notifications'
 import { AuthService } from '../../core/auth'
 import { AbstractVideoList } from '../../shared/video/abstract-video-list'
 import { VideoSortField } from '../../shared/video/sort-field.type'
@@ -11,6 +10,7 @@ import { VideoFilter } from '../../../../../shared/models/videos/video-query.typ
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { ScreenService } from '@app/shared/misc/screen.service'
 import { UserRight } from '../../../../../shared/models/users'
+import { Notifier } from '@app/core'
 
 @Component({
   selector: 'my-videos-local',
@@ -26,7 +26,7 @@ export class VideoLocalComponent extends AbstractVideoList implements OnInit, On
   constructor (
     protected router: Router,
     protected route: ActivatedRoute,
-    protected notificationsService: NotificationsService,
+    protected notifier: Notifier,
     protected authService: AuthService,
     protected location: Location,
     protected i18n: I18n,
diff --git a/client/src/app/videos/video-list/video-overview.component.ts b/client/src/app/videos/video-list/video-overview.component.ts
index 2c6054721..7ff52b259 100644
--- a/client/src/app/videos/video-list/video-overview.component.ts
+++ b/client/src/app/videos/video-list/video-overview.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit } from '@angular/core'
-import { AuthService } from '@app/core'
-import { NotificationsService } from 'angular2-notifications'
+import { AuthService, Notifier } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { VideosOverview } from '@app/shared/overview/videos-overview.model'
 import { OverviewService } from '@app/shared/overview'
@@ -21,7 +20,7 @@ export class VideoOverviewComponent implements OnInit {
 
   constructor (
     private i18n: I18n,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private authService: AuthService,
     private overviewService: OverviewService
   ) { }
@@ -43,10 +42,7 @@ export class VideoOverviewComponent implements OnInit {
             ) this.notResults = true
           },
 
-          err => {
-            console.log(err)
-            this.notificationsService.error('Error', err.text)
-          }
+          err => this.notifier.error(err.message)
         )
   }
 
diff --git a/client/src/app/videos/video-list/video-recently-added.component.ts b/client/src/app/videos/video-list/video-recently-added.component.ts
index ac1fcfff3..f99c8abb6 100644
--- a/client/src/app/videos/video-list/video-recently-added.component.ts
+++ b/client/src/app/videos/video-list/video-recently-added.component.ts
@@ -2,13 +2,13 @@ import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { Location } from '@angular/common'
 import { immutableAssign } from '@app/shared/misc/utils'
-import { NotificationsService } from 'angular2-notifications'
 import { AuthService } from '../../core/auth'
 import { AbstractVideoList } from '../../shared/video/abstract-video-list'
 import { VideoSortField } from '../../shared/video/sort-field.type'
 import { VideoService } from '../../shared/video/video.service'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { ScreenService } from '@app/shared/misc/screen.service'
+import { Notifier } from '@app/core'
 
 @Component({
   selector: 'my-videos-recently-added',
@@ -24,7 +24,7 @@ export class VideoRecentlyAddedComponent extends AbstractVideoList implements On
     protected router: Router,
     protected route: ActivatedRoute,
     protected location: Location,
-    protected notificationsService: NotificationsService,
+    protected notifier: Notifier,
     protected authService: AuthService,
     protected i18n: I18n,
     protected screenService: ScreenService,
diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/videos/video-list/video-trending.component.ts
index 8f3d3842b..accc5bfe5 100644
--- a/client/src/app/videos/video-list/video-trending.component.ts
+++ b/client/src/app/videos/video-list/video-trending.component.ts
@@ -2,13 +2,13 @@ import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { Location } from '@angular/common'
 import { immutableAssign } from '@app/shared/misc/utils'
-import { NotificationsService } from 'angular2-notifications'
 import { AuthService } from '../../core/auth'
 import { AbstractVideoList } from '../../shared/video/abstract-video-list'
 import { VideoSortField } from '../../shared/video/sort-field.type'
 import { VideoService } from '../../shared/video/video.service'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { ScreenService } from '@app/shared/misc/screen.service'
+import { Notifier } from '@app/core'
 
 @Component({
   selector: 'my-videos-trending',
@@ -23,7 +23,7 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit,
   constructor (
     protected router: Router,
     protected route: ActivatedRoute,
-    protected notificationsService: NotificationsService,
+    protected notifier: Notifier,
     protected authService: AuthService,
     protected location: Location,
     protected screenService: ScreenService,
diff --git a/client/src/app/videos/video-list/video-user-subscriptions.component.ts b/client/src/app/videos/video-list/video-user-subscriptions.component.ts
index 6e8959c54..bee828e12 100644
--- a/client/src/app/videos/video-list/video-user-subscriptions.component.ts
+++ b/client/src/app/videos/video-list/video-user-subscriptions.component.ts
@@ -2,7 +2,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { immutableAssign } from '@app/shared/misc/utils'
 import { Location } from '@angular/common'
-import { NotificationsService } from 'angular2-notifications'
 import { AuthService } from '../../core/auth'
 import { AbstractVideoList } from '../../shared/video/abstract-video-list'
 import { VideoSortField } from '../../shared/video/sort-field.type'
@@ -10,6 +9,7 @@ import { VideoService } from '../../shared/video/video.service'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { ScreenService } from '@app/shared/misc/screen.service'
 import { OwnerDisplayType } from '@app/shared/video/video-miniature.component'
+import { Notifier } from '@app/core'
 
 @Component({
   selector: 'my-videos-user-subscriptions',
@@ -25,7 +25,7 @@ export class VideoUserSubscriptionsComponent extends AbstractVideoList implement
   constructor (
     protected router: Router,
     protected route: ActivatedRoute,
-    protected notificationsService: NotificationsService,
+    protected notifier: Notifier,
     protected authService: AuthService,
     protected location: Location,
     protected i18n: I18n,
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 1d6eebcfa..21452fa16 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -299,3 +299,48 @@ p-inputswitch {
     background-color: var(--mainColor) !important;
   }
 }
+
+p-toast {
+  .ui-toast-message {
+    font-family: $main-fonts;
+
+    &.ui-toast-message-success {
+      color: #fff !important;
+      background-color: #8BC34A !important;
+    }
+
+    &.ui-toast-message-error {
+      color: #fff !important;
+      background-color: #F44336 !important;
+    }
+
+    &.ui-toast-message-info {
+      color: #fff !important;
+      background-color: #03A9F4 !important;
+    }
+
+    &.ui-toast-message-info {
+      color: #fff !important;
+      background-color: #03A9F4 !important;
+    }
+
+    .message {
+      float: left;
+
+      h3 {
+        font-size: 21px;
+      }
+
+      p {
+        font-size: 15px;
+      }
+    }
+
+    .glyphicon {
+      float: right;
+      font-size: 32px;
+      margin-top: 15px;
+      margin-right: 5px;
+    }
+  }
+}
diff --git a/client/yarn.lock b/client/yarn.lock
index 98a30941e..3c7ba2d25 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -999,11 +999,6 @@ angular2-hotkeys@^2.1.2:
     "@types/mousetrap" "^1.6.0"
     mousetrap "^1.6.0"
 
-angular2-notifications@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/angular2-notifications/-/angular2-notifications-1.0.4.tgz#7b3c449dbad45503965f8cd8ac00e998a4463544"
-  integrity sha512-DjazfwXtLY8BNXKIEw1oEEMy7G6fmldpzP1FYwyVGUwEtZPLQyYGu9MQYCjtVlZMljxpa3qvnv8l9ZUfXAarNA==
-
 ansi-colors@^3.0.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.2.tgz#e49349137dbeb6d381b91e607c189915e53265ba"
-- 
cgit v1.2.3

From 4707f410ae44b55e17e1758693dd21cff03b7ef1 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 20 Dec 2018 11:18:29 +0100
Subject: Fix notification with large message

---
 .../video-abuse-list.component.html                |  4 ++--
 .../video-blacklist-list.component.html            |  2 +-
 client/src/app/app.component.html                  | 16 +++++++------
 client/src/sass/primeng-custom.scss                | 27 +++++++++++-----------
 4 files changed, 26 insertions(+), 23 deletions(-)

(limited to 'client')

diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
index 0374b70ef..e862d5162 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
+++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
@@ -41,7 +41,7 @@
       </td>
 
       <td class="action-cell">
-        <my-action-dropdown i18n-label label="Actions" [actions]="videoAbuseActions" [entry]="videoAbuse"></my-action-dropdown>
+        <my-action-dropdown placement="bottom-right" i18n-label label="Actions" [actions]="videoAbuseActions" [entry]="videoAbuse"></my-action-dropdown>
       </td>
     </tr>
   </ng-template>
@@ -62,4 +62,4 @@
   </ng-template>
 </p-table>
 
-<my-moderation-comment-modal #moderationCommentModal (commentUpdated)="onModerationCommentUpdated()"></my-moderation-comment-modal>
\ No newline at end of file
+<my-moderation-comment-modal #moderationCommentModal (commentUpdated)="onModerationCommentUpdated()"></my-moderation-comment-modal>
diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html
index ff4543b97..7cef787d2 100644
--- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html
+++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html
@@ -30,7 +30,7 @@
       <td>{{ videoBlacklist.createdAt }}</td>
 
       <td class="action-cell">
-        <my-action-dropdown i18n-label label="Actions" [actions]="videoBlacklistActions" [entry]="videoBlacklist"></my-action-dropdown>
+        <my-action-dropdown i18n-label  placement="bottom-right" label="Actions" [actions]="videoBlacklistActions" [entry]="videoBlacklist"></my-action-dropdown>
       </td>
     </tr>
   </ng-template>
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 0489c9558..3a60139e1 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -40,13 +40,15 @@
 <my-confirm></my-confirm>
 <p-toast position="bottom-right">
   <ng-template let-message pTemplate="message">
-    <div class="message">
-      <h3>{{ message.summary }}</h3>
-      <p>{{ message.detail }}</p>
-    </div>
+    <div class="notification-block">
+      <div class="message">
+        <h3>{{ message.summary }}</h3>
+        <p>{{ message.detail }}</p>
+      </div>
 
-    <span *ngIf="message.severity === 'success'" class="glyphicon glyphicon-ok"></span>
-    <span *ngIf="message.severity === 'info'" class="glyphicon glyphicon-info-sign"></span>
-    <span *ngIf="message.severity === 'error'" class="glyphicon glyphicon-remove"></span>
+      <span *ngIf="message.severity === 'success'" class="glyphicon glyphicon-ok"></span>
+      <span *ngIf="message.severity === 'info'" class="glyphicon glyphicon-info-sign"></span>
+      <span *ngIf="message.severity === 'error'" class="glyphicon glyphicon-remove"></span>
+    </div>
   </ng-template>
 </p-toast>
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 21452fa16..8b3e0b813 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -324,23 +324,24 @@ p-toast {
       background-color: #03A9F4 !important;
     }
 
-    .message {
-      float: left;
+    .notification-block {
+      display: flex;
 
-      h3 {
-        font-size: 21px;
-      }
+      .message {
+        h3 {
+          font-size: 21px;
+        }
 
-      p {
-        font-size: 15px;
+        p {
+          font-size: 15px;
+        }
       }
-    }
 
-    .glyphicon {
-      float: right;
-      font-size: 32px;
-      margin-top: 15px;
-      margin-right: 5px;
+      .glyphicon {
+        font-size: 32px;
+        margin-top: 15px;
+        margin-right: 5px;
+      }
     }
   }
 }
-- 
cgit v1.2.3

From 6e7e63b83f08ba68edc2bb9f72ff03d1802e45df Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 31 Dec 2018 13:06:11 +0100
Subject: Fix notification icon position

---
 client/src/app/app.component.scss   | 5 -----
 client/src/sass/primeng-custom.scss | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'client')

diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index b51a81eb1..881f3ff31 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -91,8 +91,3 @@ footer {
   height: $footer-height;
   justify-content: center;
 }
-
-simple-notifications {
-  position: relative;
-  z-index: 1500;
-}
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 8b3e0b813..05db2a2cb 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -328,6 +328,8 @@ p-toast {
       display: flex;
 
       .message {
+        flex-grow: 1;
+
         h3 {
           font-size: 21px;
         }
-- 
cgit v1.2.3

From 2f1548fda32c3ba9e53913270394eedfacd55986 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 8 Jan 2019 11:26:41 +0100
Subject: Add notifications in the client

---
 client/package.json                                |   2 +
 .../my-account-notifications.component.html        |   7 +
 .../my-account-notifications.component.scss        |  23 ++++
 .../my-account-notifications.component.ts          |  14 ++
 .../app/+my-account/my-account-routing.module.ts   |  10 ++
 .../my-account-notification-preferences/index.ts   |   1 +
 ...account-notification-preferences.component.html |  19 +++
 ...account-notification-preferences.component.scss |  25 ++++
 ...y-account-notification-preferences.component.ts |  99 +++++++++++++
 .../my-account-settings.component.html             |   5 +-
 client/src/app/+my-account/my-account.component.ts |   4 +
 client/src/app/+my-account/my-account.module.ts    |   6 +-
 .../video-channel-videos.component.ts              |   2 +-
 .../video-channels-routing.module.ts               |   2 +-
 .../+video-channels/video-channels.component.ts    |   4 +-
 client/src/app/app.module.ts                       |   4 +-
 .../app/menu/avatar-notification.component.html    |  23 ++++
 .../app/menu/avatar-notification.component.scss    |  82 +++++++++++
 .../src/app/menu/avatar-notification.component.ts  |  64 +++++++++
 client/src/app/menu/index.ts                       |   2 +
 client/src/app/menu/menu.component.html            |   6 +-
 client/src/app/menu/menu.component.scss            |   7 -
 client/src/app/shared/misc/help.component.html     |   1 +
 client/src/app/shared/misc/help.component.scss     |  22 +--
 .../app/shared/rest/component-pagination.model.ts  |  11 ++
 .../src/app/shared/rest/rest-extractor.service.ts  |   1 +
 client/src/app/shared/shared.module.ts             |   8 +-
 client/src/app/shared/users/index.ts               |   1 +
 .../app/shared/users/user-notification.model.ts    | 153 +++++++++++++++++++++
 .../app/shared/users/user-notification.service.ts  | 110 +++++++++++++++
 .../shared/users/user-notifications.component.html |  61 ++++++++
 .../shared/users/user-notifications.component.scss |  30 ++++
 .../shared/users/user-notifications.component.ts   |  82 +++++++++++
 client/src/app/shared/users/user.model.ts          |   6 +-
 .../comment/video-comments.component.ts            |  15 +-
 client/src/sass/include/_bootstrap-variables.scss  |   3 +-
 client/src/sass/primeng-custom.scss                |   4 +-
 client/yarn.lock                                   |  53 ++++++-
 38 files changed, 925 insertions(+), 47 deletions(-)
 create mode 100644 client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
 create mode 100644 client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss
 create mode 100644 client/src/app/+my-account/my-account-notifications/my-account-notifications.component.ts
 create mode 100644 client/src/app/+my-account/my-account-settings/my-account-notification-preferences/index.ts
 create mode 100644 client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html
 create mode 100644 client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss
 create mode 100644 client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
 create mode 100644 client/src/app/menu/avatar-notification.component.html
 create mode 100644 client/src/app/menu/avatar-notification.component.scss
 create mode 100644 client/src/app/menu/avatar-notification.component.ts
 create mode 100644 client/src/app/shared/users/user-notification.model.ts
 create mode 100644 client/src/app/shared/users/user-notification.service.ts
 create mode 100644 client/src/app/shared/users/user-notifications.component.html
 create mode 100644 client/src/app/shared/users/user-notifications.component.scss
 create mode 100644 client/src/app/shared/users/user-notifications.component.ts

(limited to 'client')

diff --git a/client/package.json b/client/package.json
index 81422f05f..5fe1f3d5f 100644
--- a/client/package.json
+++ b/client/package.json
@@ -94,6 +94,7 @@
     "@types/markdown-it": "^0.0.5",
     "@types/node": "^10.9.2",
     "@types/sanitize-html": "1.18.0",
+    "@types/socket.io-client": "^1.4.32",
     "@types/video.js": "^7.2.5",
     "@types/webtorrent": "^0.98.4",
     "angular2-hotkeys": "^2.1.2",
@@ -141,6 +142,7 @@
     "sanitize-html": "^1.18.4",
     "sass-loader": "^7.1.0",
     "sass-resources-loader": "^2.0.0",
+    "socket.io-client": "^2.2.0",
     "stream-browserify": "^2.0.1",
     "stream-http": "^3.0.0",
     "terser-webpack-plugin": "^1.1.0",
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
new file mode 100644
index 000000000..d2810c343
--- /dev/null
+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
@@ -0,0 +1,7 @@
+<div class="header">
+  <a routerLink="/my-account/settings" i18n>Notification preferences</a>
+
+  <button (click)="markAllAsRead()" i18n>Mark all as read</button>
+</div>
+
+<my-user-notifications #userNotification></my-user-notifications>
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss
new file mode 100644
index 000000000..86ac094c5
--- /dev/null
+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss
@@ -0,0 +1,23 @@
+@import '_variables';
+@import '_mixins';
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  font-size: 15px;
+  margin-bottom: 10px;
+
+  a {
+    @include peertube-button-link;
+    @include grey-button;
+  }
+
+  button {
+    @include peertube-button;
+    @include grey-button;
+  }
+}
+
+my-user-notifications {
+  font-size: 15px;
+}
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.ts b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.ts
new file mode 100644
index 000000000..3e197088d
--- /dev/null
+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.ts
@@ -0,0 +1,14 @@
+import { Component, ViewChild } from '@angular/core'
+import { UserNotificationsComponent } from '@app/shared'
+
+@Component({
+  templateUrl: './my-account-notifications.component.html',
+  styleUrls: [ './my-account-notifications.component.scss' ]
+})
+export class MyAccountNotificationsComponent {
+  @ViewChild('userNotification') userNotification: UserNotificationsComponent
+
+  markAllAsRead () {
+    this.userNotification.markAllAsRead()
+  }
+}
diff --git a/client/src/app/+my-account/my-account-routing.module.ts b/client/src/app/+my-account/my-account-routing.module.ts
index a2cbeaffc..9996218ca 100644
--- a/client/src/app/+my-account/my-account-routing.module.ts
+++ b/client/src/app/+my-account/my-account-routing.module.ts
@@ -14,6 +14,7 @@ import { MyAccountOwnershipComponent } from '@app/+my-account/my-account-ownersh
 import { MyAccountBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-blocklist.component'
 import { MyAccountServerBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-server-blocklist.component'
 import { MyAccountHistoryComponent } from '@app/+my-account/my-account-history/my-account-history.component'
+import { MyAccountNotificationsComponent } from '@app/+my-account/my-account-notifications/my-account-notifications.component'
 
 const myAccountRoutes: Routes = [
   {
@@ -124,6 +125,15 @@ const myAccountRoutes: Routes = [
             title: 'Videos history'
           }
         }
+      },
+      {
+        path: 'notifications',
+        component: MyAccountNotificationsComponent,
+        data: {
+          meta: {
+            title: 'Notifications'
+          }
+        }
       }
     ]
   }
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/index.ts b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/index.ts
new file mode 100644
index 000000000..5e1d51339
--- /dev/null
+++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/index.ts
@@ -0,0 +1 @@
+export * from './my-account-notification-preferences.component'
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html
new file mode 100644
index 000000000..59422d682
--- /dev/null
+++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html
@@ -0,0 +1,19 @@
+<div class="custom-row">
+  <div i18n>Activities</div>
+  <div i18n>Web</div>
+  <div i18n *ngIf="emailEnabled">Email</div>
+</div>
+
+<div class="custom-row" *ngFor="let notificationType of notificationSettingKeys">
+  <ng-container *ngIf="hasUserRight(notificationType)">
+    <div>{{ labelNotifications[notificationType] }}</div>
+
+    <div>
+      <p-inputSwitch [(ngModel)]="webNotifications[notificationType]" (onChange)="updateWebSetting(notificationType, $event.checked)"></p-inputSwitch>
+    </div>
+
+    <div *ngIf="emailEnabled">
+      <p-inputSwitch [(ngModel)]="emailNotifications[notificationType]" (onChange)="updateEmailSetting(notificationType, $event.checked)"></p-inputSwitch>
+    </div>
+  </ng-container>
+</div>
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss
new file mode 100644
index 000000000..6feb16ab1
--- /dev/null
+++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss
@@ -0,0 +1,25 @@
+@import '_variables';
+@import '_mixins';
+
+.custom-row {
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.10);
+
+  &:first-child {
+    font-size: 16px;
+
+    & > div {
+      font-weight: $font-semibold;
+    }
+  }
+
+  & > div {
+    width: 350px;
+  }
+
+  & > div {
+    padding: 10px
+  }
+}
+
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
new file mode 100644
index 000000000..519bdfab4
--- /dev/null
+++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
@@ -0,0 +1,99 @@
+import { Component, Input, OnInit } from '@angular/core'
+import { User } from '@app/shared'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { Subject } from 'rxjs'
+import { UserNotificationSetting, UserNotificationSettingValue, UserRight } from '../../../../../../shared'
+import { Notifier, ServerService } from '@app/core'
+import { debounce } from 'lodash-es'
+import { UserNotificationService } from '@app/shared/users/user-notification.service'
+
+@Component({
+  selector: 'my-account-notification-preferences',
+  templateUrl: './my-account-notification-preferences.component.html',
+  styleUrls: [ './my-account-notification-preferences.component.scss' ]
+})
+export class MyAccountNotificationPreferencesComponent implements OnInit {
+  @Input() user: User = null
+  @Input() userInformationLoaded: Subject<any>
+
+  notificationSettingKeys: (keyof UserNotificationSetting)[] = []
+  emailNotifications: { [ id in keyof UserNotificationSetting ]: boolean } = {} as any
+  webNotifications: { [ id in keyof UserNotificationSetting ]: boolean } = {} as any
+  labelNotifications: { [ id in keyof UserNotificationSetting ]: string } = {} as any
+  rightNotifications: { [ id in keyof Partial<UserNotificationSetting> ]: UserRight } = {} as any
+  emailEnabled: boolean
+
+  private savePreferences = debounce(this.savePreferencesImpl.bind(this), 500)
+
+  constructor (
+    private i18n: I18n,
+    private userNotificationService: UserNotificationService,
+    private serverService: ServerService,
+    private notifier: Notifier
+  ) {
+    this.labelNotifications = {
+      newVideoFromSubscription: this.i18n('New video from your subscriptions'),
+      newCommentOnMyVideo: this.i18n('New comment on your video'),
+      videoAbuseAsModerator: this.i18n('New video abuse on local video'),
+      blacklistOnMyVideo: this.i18n('One of your video is blacklisted/unblacklisted'),
+      myVideoPublished: this.i18n('Video published (after transcoding/scheduled update)'),
+      myVideoImportFinished: this.i18n('Video import finished'),
+      newUserRegistration: this.i18n('A new user registered on your instance'),
+      newFollow: this.i18n('You or your channel(s) has a new follower'),
+      commentMention: this.i18n('Someone mentioned you in video comments')
+    }
+    this.notificationSettingKeys = Object.keys(this.labelNotifications) as (keyof UserNotificationSetting)[]
+
+    this.rightNotifications = {
+      videoAbuseAsModerator: UserRight.MANAGE_VIDEO_ABUSES,
+      newUserRegistration: UserRight.MANAGE_USERS
+    }
+
+    this.emailEnabled = this.serverService.getConfig().email.enabled
+  }
+
+  ngOnInit () {
+    this.userInformationLoaded.subscribe(() => this.loadNotificationSettings())
+  }
+
+  hasUserRight (field: keyof UserNotificationSetting) {
+    const rightToHave = this.rightNotifications[field]
+    if (!rightToHave) return true // No rights needed
+
+    return this.user.hasRight(rightToHave)
+  }
+
+  updateEmailSetting (field: keyof UserNotificationSetting, value: boolean) {
+    if (value === true) this.user.notificationSettings[field] |= UserNotificationSettingValue.EMAIL
+    else this.user.notificationSettings[field] &= ~UserNotificationSettingValue.EMAIL
+
+    this.savePreferences()
+  }
+
+  updateWebSetting (field: keyof UserNotificationSetting, value: boolean) {
+    if (value === true) this.user.notificationSettings[field] |= UserNotificationSettingValue.WEB
+    else this.user.notificationSettings[field] &= ~UserNotificationSettingValue.WEB
+
+    this.savePreferences()
+  }
+
+  private savePreferencesImpl () {
+    this.userNotificationService.updateNotificationSettings(this.user, this.user.notificationSettings)
+      .subscribe(
+        () => {
+          this.notifier.success(this.i18n('Preferences saved'), undefined, 2000)
+        },
+
+        err => this.notifier.error(err.message)
+      )
+  }
+
+  private loadNotificationSettings () {
+    for (const key of Object.keys(this.user.notificationSettings)) {
+      const value = this.user.notificationSettings[key]
+      this.emailNotifications[key] = value & UserNotificationSettingValue.EMAIL
+
+      this.webNotifications[key] = value & UserNotificationSettingValue.WEB
+    }
+  }
+}
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
index c7e23cd1f..2eb7dd56e 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
@@ -9,6 +9,9 @@
   <my-account-profile [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-profile>
 </ng-template>
 
+<div i18n class="account-title" id="notifications">Notifications</div>
+<my-account-notification-preferences [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-notification-preferences>
+
 <div i18n class="account-title">Password</div>
 <my-account-change-password></my-account-change-password>
 
@@ -16,4 +19,4 @@
 <my-account-video-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-video-settings>
 
 <div i18n class="account-title">Danger zone</div>
-<my-account-danger-zone [user]="user"></my-account-danger-zone>
\ No newline at end of file
+<my-account-danger-zone [user]="user"></my-account-danger-zone>
diff --git a/client/src/app/+my-account/my-account.component.ts b/client/src/app/+my-account/my-account.component.ts
index 1bac9547d..8a4102d80 100644
--- a/client/src/app/+my-account/my-account.component.ts
+++ b/client/src/app/+my-account/my-account.component.ts
@@ -68,6 +68,10 @@ export class MyAccountComponent {
         label: this.i18n('My settings'),
         routerLink: '/my-account/settings'
       },
+      {
+        label: this.i18n('My notifications'),
+        routerLink: '/my-account/notifications'
+      },
       libraryEntries,
       miscEntries
     ]
diff --git a/client/src/app/+my-account/my-account.module.ts b/client/src/app/+my-account/my-account.module.ts
index 80d9f0cf7..18f51f171 100644
--- a/client/src/app/+my-account/my-account.module.ts
+++ b/client/src/app/+my-account/my-account.module.ts
@@ -23,6 +23,8 @@ import { MyAccountSubscriptionsComponent } from '@app/+my-account/my-account-sub
 import { MyAccountBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-blocklist.component'
 import { MyAccountServerBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-server-blocklist.component'
 import { MyAccountHistoryComponent } from '@app/+my-account/my-account-history/my-account-history.component'
+import { MyAccountNotificationsComponent } from '@app/+my-account/my-account-notifications/my-account-notifications.component'
+import { MyAccountNotificationPreferencesComponent } from '@app/+my-account/my-account-settings/my-account-notification-preferences'
 
 @NgModule({
   imports: [
@@ -53,7 +55,9 @@ import { MyAccountHistoryComponent } from '@app/+my-account/my-account-history/m
     MyAccountSubscriptionsComponent,
     MyAccountBlocklistComponent,
     MyAccountServerBlocklistComponent,
-    MyAccountHistoryComponent
+    MyAccountHistoryComponent,
+    MyAccountNotificationsComponent,
+    MyAccountNotificationPreferencesComponent
   ],
 
   exports: [
diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
index 70c4374e0..dea378a6e 100644
--- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
+++ b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
@@ -55,7 +55,7 @@ export class VideoChannelVideosComponent extends AbstractVideoList implements On
     this.videoChannelSub = this.videoChannelService.videoChannelLoaded
       .subscribe(videoChannel => {
         this.videoChannel = videoChannel
-        this.currentRoute = '/video-channels/' + this.videoChannel.uuid + '/videos'
+        this.currentRoute = '/video-channels/' + this.videoChannel.nameWithHost + '/videos'
 
         this.reloadVideos()
         this.generateSyndicationList()
diff --git a/client/src/app/+video-channels/video-channels-routing.module.ts b/client/src/app/+video-channels/video-channels-routing.module.ts
index 935578d2a..3ac3533d9 100644
--- a/client/src/app/+video-channels/video-channels-routing.module.ts
+++ b/client/src/app/+video-channels/video-channels-routing.module.ts
@@ -7,7 +7,7 @@ import { VideoChannelAboutComponent } from './video-channel-about/video-channel-
 
 const videoChannelsRoutes: Routes = [
   {
-    path: ':videoChannelId',
+    path: ':videoChannelName',
     component: VideoChannelsComponent,
     canActivateChild: [ MetaGuard ],
     children: [
diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts
index 0c5c814c7..41ff82e98 100644
--- a/client/src/app/+video-channels/video-channels.component.ts
+++ b/client/src/app/+video-channels/video-channels.component.ts
@@ -34,9 +34,9 @@ export class VideoChannelsComponent implements OnInit, OnDestroy {
   ngOnInit () {
     this.routeSub = this.route.params
                         .pipe(
-                          map(params => params[ 'videoChannelId' ]),
+                          map(params => params[ 'videoChannelName' ]),
                           distinctUntilChanged(),
-                          switchMap(videoChannelId => this.videoChannelService.getVideoChannel(videoChannelId)),
+                          switchMap(videoChannelName => this.videoChannelService.getVideoChannel(videoChannelName)),
                           catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ]))
                         )
                         .subscribe(videoChannel => this.videoChannel = videoChannel)
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 371199442..0bbc2e08b 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -12,13 +12,12 @@ import { AppComponent } from './app.component'
 import { CoreModule } from './core'
 import { HeaderComponent } from './header'
 import { LoginModule } from './login'
-import { MenuComponent } from './menu'
+import { AvatarNotificationComponent, LanguageChooserComponent, MenuComponent } from './menu'
 import { SharedModule } from './shared'
 import { SignupModule } from './signup'
 import { VideosModule } from './videos'
 import { buildFileLocale, getCompleteLocale, isDefaultLocale } from '../../../shared/models/i18n'
 import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils'
-import { LanguageChooserComponent } from '@app/menu/language-chooser.component'
 import { SearchModule } from '@app/search'
 
 export function metaFactory (serverService: ServerService): MetaLoader {
@@ -40,6 +39,7 @@ export function metaFactory (serverService: ServerService): MetaLoader {
 
     MenuComponent,
     LanguageChooserComponent,
+    AvatarNotificationComponent,
     HeaderComponent
   ],
   imports: [
diff --git a/client/src/app/menu/avatar-notification.component.html b/client/src/app/menu/avatar-notification.component.html
new file mode 100644
index 000000000..2f0b7c669
--- /dev/null
+++ b/client/src/app/menu/avatar-notification.component.html
@@ -0,0 +1,23 @@
+<div
+  [ngbPopover]="popContent" autoClose="outside" placement="bottom-left" container="body" popoverClass="popover-notifications"
+  i18n-title title="View your notifications" class="notification-avatar" #popover="ngbPopover"
+>
+  <div *ngIf="unreadNotifications > 0" class="unread-notifications">{{ unreadNotifications }}</div>
+
+  <img [src]="user.accountAvatarUrl" alt="Avatar" />
+</div>
+
+<ng-template #popContent>
+  <div class="notifications-header">
+    <div i18n>Notifications</div>
+
+    <a
+      i18n-title title="Update your notification preferences" class="glyphicon glyphicon-cog"
+      routerLink="/my-account/settings" fragment="notifications"
+    ></a>
+  </div>
+
+  <my-user-notifications [ignoreLoadingBar]="true" [infiniteScroll]="false"></my-user-notifications>
+
+  <a class="all-notifications" routerLink="/my-account/notifications" i18n>See all your notifications</a>
+</ng-template>
diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss
new file mode 100644
index 000000000..c86667469
--- /dev/null
+++ b/client/src/app/menu/avatar-notification.component.scss
@@ -0,0 +1,82 @@
+@import '_variables';
+@import '_mixins';
+
+/deep/ {
+  .popover-notifications.popover {
+    max-width: 400px;
+
+    .popover-body {
+      padding: 0;
+      font-size: 14px;
+      font-family: $main-fonts;
+      overflow-y: auto;
+      max-height: 500px;
+      box-shadow: 0 6px 14px rgba(0, 0, 0, 0.30);
+
+      .notifications-header {
+        display: flex;
+        justify-content: space-between;
+
+        background-color: rgba(0, 0, 0, 0.10);
+        align-items: center;
+        padding: 0 10px;
+        font-size: 16px;
+        height: 50px;
+
+        a {
+          @include disable-default-a-behaviour;
+
+          color: rgba(20, 20, 20, 0.5);
+
+          &:hover {
+            color: rgba(20, 20, 20, 0.8);
+          }
+        }
+      }
+
+      .all-notifications {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-weight: $font-semibold;
+        color: var(--mainForegroundColor);
+        height: 30px;
+      }
+    }
+  }
+}
+
+.notification-avatar {
+  cursor: pointer;
+  position: relative;
+
+  img,
+  .unread-notifications {
+    margin-left: 20px;
+  }
+
+  img {
+    @include avatar(34px);
+
+    margin-right: 10px;
+  }
+
+  .unread-notifications {
+    position: absolute;
+    top: -5px;
+    left: -5px;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    background-color: var(--mainColor);
+    color: var(--mainBackgroundColor);
+    font-size: 10px;
+    font-weight: $font-semibold;
+
+    border-radius: 15px;
+    width: 15px;
+    height: 15px;
+  }
+}
diff --git a/client/src/app/menu/avatar-notification.component.ts b/client/src/app/menu/avatar-notification.component.ts
new file mode 100644
index 000000000..60e090726
--- /dev/null
+++ b/client/src/app/menu/avatar-notification.component.ts
@@ -0,0 +1,64 @@
+import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'
+import { User } from '../shared/users/user.model'
+import { UserNotificationService } from '@app/shared/users/user-notification.service'
+import { Subscription } from 'rxjs'
+import { Notifier } from '@app/core'
+import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
+import { NavigationEnd, Router } from '@angular/router'
+import { filter } from 'rxjs/operators'
+
+@Component({
+  selector: 'my-avatar-notification',
+  templateUrl: './avatar-notification.component.html',
+  styleUrls: [ './avatar-notification.component.scss' ]
+})
+export class AvatarNotificationComponent implements OnInit, OnDestroy {
+  @ViewChild('popover') popover: NgbPopover
+  @Input() user: User
+
+  unreadNotifications = 0
+
+  private notificationSub: Subscription
+  private routeSub: Subscription
+
+  constructor (
+    private userNotificationService: UserNotificationService,
+    private notifier: Notifier,
+    private router: Router
+  ) {}
+
+  ngOnInit () {
+    this.userNotificationService.countUnreadNotifications()
+      .subscribe(
+        result => {
+          this.unreadNotifications = Math.min(result, 99) // Limit number to 99
+          this.subscribeToNotifications()
+        },
+
+        err => this.notifier.error(err.message)
+      )
+
+    this.routeSub = this.router.events
+                        .pipe(filter(event => event instanceof NavigationEnd))
+                        .subscribe(() => this.closePopover())
+  }
+
+  ngOnDestroy () {
+    if (this.notificationSub) this.notificationSub.unsubscribe()
+    if (this.routeSub) this.routeSub.unsubscribe()
+  }
+
+  closePopover () {
+    this.popover.close()
+  }
+
+  private subscribeToNotifications () {
+    this.notificationSub = this.userNotificationService.getMyNotificationsSocket()
+                               .subscribe(data => {
+                                 if (data.type === 'new') return this.unreadNotifications++
+                                 if (data.type === 'read') return this.unreadNotifications--
+                                 if (data.type === 'read-all') return this.unreadNotifications = 0
+                               })
+  }
+
+}
diff --git a/client/src/app/menu/index.ts b/client/src/app/menu/index.ts
index 421271c12..39dbde750 100644
--- a/client/src/app/menu/index.ts
+++ b/client/src/app/menu/index.ts
@@ -1 +1,3 @@
+export * from './language-chooser.component'
+export * from './avatar-notification.component'
 export * from './menu.component'
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index e04bdf3d6..aa5bfa9c9 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -2,9 +2,7 @@
   <menu>
     <div class="top-menu">
       <div *ngIf="isLoggedIn" class="logged-in-block">
-        <a routerLink="/my-account/settings">
-          <img [src]="user.accountAvatarUrl" alt="Avatar" />
-        </a>
+        <my-avatar-notification [user]="user"></my-avatar-notification>
 
         <div class="logged-in-info">
           <a routerLink="/my-account/settings" class="logged-in-username">{{ user.account?.displayName }}</a>
@@ -97,4 +95,4 @@
   </menu>
 </div>
 
-<my-language-chooser #languageChooserModal></my-language-chooser>
\ No newline at end of file
+<my-language-chooser #languageChooserModal></my-language-chooser>
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index b271ebfd2..a4aaadc7f 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -39,13 +39,6 @@ menu {
     justify-content: center;
     margin-bottom: 35px;
 
-    img {
-      @include avatar(34px);
-
-      margin-left: 20px;
-      margin-right: 10px;
-    }
-
     .logged-in-info {
       flex-grow: 1;
 
diff --git a/client/src/app/shared/misc/help.component.html b/client/src/app/shared/misc/help.component.html
index 28ccb1e26..08a2fc367 100644
--- a/client/src/app/shared/misc/help.component.html
+++ b/client/src/app/shared/misc/help.component.html
@@ -18,6 +18,7 @@
   container="body"
   title="Get help"
   i18n-title
+  popoverClass="help-popover"
   [attr.aria-pressed]="isPopoverOpened"
   [ngbPopover]="tooltipTemplate"
   [placement]="tooltipPlacement"
diff --git a/client/src/app/shared/misc/help.component.scss b/client/src/app/shared/misc/help.component.scss
index 5c73a8031..6a5c3b1fa 100644
--- a/client/src/app/shared/misc/help.component.scss
+++ b/client/src/app/shared/misc/help.component.scss
@@ -12,19 +12,21 @@
 }
 
 /deep/ {
-  .popover-body {
-    text-align: left;
-    padding: 10px;
+  .popover-help.popover {
     max-width: 300px;
 
-    font-size: 13px;
-    font-family: $main-fonts;
-    background-color: #fff;
-    color: #000;
-    box-shadow: 0 0 6px rgba(0, 0, 0, 0.5);
+    .popover-body {
+      text-align: left;
+      padding: 10px;
+      font-size: 13px;
+      font-family: $main-fonts;
+      background-color: #fff;
+      color: #000;
+      box-shadow: 0 0 6px rgba(0, 0, 0, 0.5);
 
-    ul {
-      padding-left: 20px;
+      ul {
+        padding-left: 20px;
+      }
     }
   }
 }
diff --git a/client/src/app/shared/rest/component-pagination.model.ts b/client/src/app/shared/rest/component-pagination.model.ts
index 0b8ecc318..85160d445 100644
--- a/client/src/app/shared/rest/component-pagination.model.ts
+++ b/client/src/app/shared/rest/component-pagination.model.ts
@@ -3,3 +3,14 @@ export interface ComponentPagination {
   itemsPerPage: number
   totalItems?: number
 }
+
+export function hasMoreItems (componentPagination: ComponentPagination) {
+  // No results
+  if (componentPagination.totalItems === 0) return false
+
+  // Not loaded yet
+  if (!componentPagination.totalItems) return true
+
+  const maxPage = componentPagination.totalItems / componentPagination.itemsPerPage
+  return maxPage > componentPagination.currentPage
+}
diff --git a/client/src/app/shared/rest/rest-extractor.service.ts b/client/src/app/shared/rest/rest-extractor.service.ts
index f149569ef..e6518dd1d 100644
--- a/client/src/app/shared/rest/rest-extractor.service.ts
+++ b/client/src/app/shared/rest/rest-extractor.service.ts
@@ -80,6 +80,7 @@ export class RestExtractor {
       errorMessage = errorMessage ? errorMessage : 'Unknown error.'
       console.error(`Backend returned code ${err.status}, errorMessage is: ${errorMessage}`)
     } else {
+      console.error(err)
       errorMessage = err
     }
 
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index 4a5d664db..c99c87c00 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -63,6 +63,8 @@ import { UserModerationDropdownComponent } from '@app/shared/moderation/user-mod
 import { BlocklistService } from '@app/shared/blocklist'
 import { TopMenuDropdownComponent } from '@app/shared/menu/top-menu-dropdown.component'
 import { UserHistoryService } from '@app/shared/users/user-history.service'
+import { UserNotificationService } from '@app/shared/users/user-notification.service'
+import { UserNotificationsComponent } from '@app/shared/users/user-notifications.component'
 
 @NgModule({
   imports: [
@@ -105,7 +107,8 @@ import { UserHistoryService } from '@app/shared/users/user-history.service'
     InstanceFeaturesTableComponent,
     UserBanModalComponent,
     UserModerationDropdownComponent,
-    TopMenuDropdownComponent
+    TopMenuDropdownComponent,
+    UserNotificationsComponent
   ],
 
   exports: [
@@ -145,6 +148,7 @@ import { UserHistoryService } from '@app/shared/users/user-history.service'
     UserBanModalComponent,
     UserModerationDropdownComponent,
     TopMenuDropdownComponent,
+    UserNotificationsComponent,
 
     NumberFormatterPipe,
     ObjectLengthPipe,
@@ -187,6 +191,8 @@ import { UserHistoryService } from '@app/shared/users/user-history.service'
     I18nPrimengCalendarService,
     ScreenService,
 
+    UserNotificationService,
+
     I18n
   ]
 })
diff --git a/client/src/app/shared/users/index.ts b/client/src/app/shared/users/index.ts
index 7b5a67bc7..ebd715fb1 100644
--- a/client/src/app/shared/users/index.ts
+++ b/client/src/app/shared/users/index.ts
@@ -1,2 +1,3 @@
 export * from './user.model'
 export * from './user.service'
+export * from './user-notifications.component'
diff --git a/client/src/app/shared/users/user-notification.model.ts b/client/src/app/shared/users/user-notification.model.ts
new file mode 100644
index 000000000..5ff816fb8
--- /dev/null
+++ b/client/src/app/shared/users/user-notification.model.ts
@@ -0,0 +1,153 @@
+import { UserNotification as UserNotificationServer, UserNotificationType, VideoInfo } from '../../../../../shared'
+
+export class UserNotification implements UserNotificationServer {
+  id: number
+  type: UserNotificationType
+  read: boolean
+
+  video?: VideoInfo & {
+    channel: {
+      id: number
+      displayName: string
+    }
+  }
+
+  videoImport?: {
+    id: number
+    video?: VideoInfo
+    torrentName?: string
+    magnetUri?: string
+    targetUrl?: string
+  }
+
+  comment?: {
+    id: number
+    threadId: number
+    account: {
+      id: number
+      displayName: string
+    }
+    video: VideoInfo
+  }
+
+  videoAbuse?: {
+    id: number
+    video: VideoInfo
+  }
+
+  videoBlacklist?: {
+    id: number
+    video: VideoInfo
+  }
+
+  account?: {
+    id: number
+    displayName: string
+    name: string
+  }
+
+  actorFollow?: {
+    id: number
+    follower: {
+      name: string
+      displayName: string
+    }
+    following: {
+      type: 'account' | 'channel'
+      name: string
+      displayName: string
+    }
+  }
+
+  createdAt: string
+  updatedAt: string
+
+  // Additional fields
+  videoUrl?: string
+  commentUrl?: any[]
+  videoAbuseUrl?: string
+  accountUrl?: string
+  videoImportIdentifier?: string
+  videoImportUrl?: string
+
+  constructor (hash: UserNotificationServer) {
+    this.id = hash.id
+    this.type = hash.type
+    this.read = hash.read
+
+    this.video = hash.video
+    this.videoImport = hash.videoImport
+    this.comment = hash.comment
+    this.videoAbuse = hash.videoAbuse
+    this.videoBlacklist = hash.videoBlacklist
+    this.account = hash.account
+    this.actorFollow = hash.actorFollow
+
+    this.createdAt = hash.createdAt
+    this.updatedAt = hash.updatedAt
+
+    switch (this.type) {
+      case UserNotificationType.NEW_VIDEO_FROM_SUBSCRIPTION:
+        this.videoUrl = this.buildVideoUrl(this.video)
+        break
+
+      case UserNotificationType.UNBLACKLIST_ON_MY_VIDEO:
+        this.videoUrl = this.buildVideoUrl(this.video)
+        break
+
+      case UserNotificationType.NEW_COMMENT_ON_MY_VIDEO:
+      case UserNotificationType.COMMENT_MENTION:
+        this.commentUrl = [ this.buildVideoUrl(this.comment.video), { threadId: this.comment.threadId } ]
+        break
+
+      case UserNotificationType.NEW_VIDEO_ABUSE_FOR_MODERATORS:
+        this.videoAbuseUrl = '/admin/moderation/video-abuses/list'
+        this.videoUrl = this.buildVideoUrl(this.videoAbuse.video)
+        break
+
+      case UserNotificationType.BLACKLIST_ON_MY_VIDEO:
+        this.videoUrl = this.buildVideoUrl(this.videoBlacklist.video)
+        break
+
+      case UserNotificationType.MY_VIDEO_PUBLISHED:
+        this.videoUrl = this.buildVideoUrl(this.video)
+        break
+
+      case UserNotificationType.MY_VIDEO_IMPORT_SUCCESS:
+        this.videoImportUrl = this.buildVideoImportUrl()
+        this.videoImportIdentifier = this.buildVideoImportIdentifier(this.videoImport)
+        this.videoUrl = this.buildVideoUrl(this.videoImport.video)
+        break
+
+      case UserNotificationType.MY_VIDEO_IMPORT_ERROR:
+        this.videoImportUrl = this.buildVideoImportUrl()
+        this.videoImportIdentifier = this.buildVideoImportIdentifier(this.videoImport)
+        break
+
+      case UserNotificationType.NEW_USER_REGISTRATION:
+        this.accountUrl = this.buildAccountUrl(this.account)
+        break
+
+      case UserNotificationType.NEW_FOLLOW:
+        this.accountUrl = this.buildAccountUrl(this.actorFollow.follower)
+        break
+    }
+  }
+
+  private buildVideoUrl (video: { uuid: string }) {
+    return '/videos/watch/' + video.uuid
+  }
+
+  private buildAccountUrl (account: { name: string }) {
+    return '/accounts/' + account.name
+  }
+
+  private buildVideoImportUrl () {
+    return '/my-account/video-imports'
+  }
+
+  private buildVideoImportIdentifier (videoImport: { targetUrl?: string, magnetUri?: string, torrentName?: string }) {
+    return videoImport.targetUrl || videoImport.magnetUri || videoImport.torrentName
+  }
+
+}
diff --git a/client/src/app/shared/users/user-notification.service.ts b/client/src/app/shared/users/user-notification.service.ts
new file mode 100644
index 000000000..2dfee8060
--- /dev/null
+++ b/client/src/app/shared/users/user-notification.service.ts
@@ -0,0 +1,110 @@
+import { Injectable } from '@angular/core'
+import { HttpClient, HttpParams } from '@angular/common/http'
+import { RestExtractor, RestService } from '@app/shared/rest'
+import { catchError, map, tap } from 'rxjs/operators'
+import { environment } from '../../../environments/environment'
+import { ResultList, UserNotification as UserNotificationServer, UserNotificationSetting } from '../../../../../shared'
+import { UserNotification } from '@app/shared/users/user-notification.model'
+import { Subject } from 'rxjs'
+import * as io from 'socket.io-client'
+import { AuthService } from '@app/core'
+import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
+import { User } from '@app/shared'
+
+@Injectable()
+export class UserNotificationService {
+  static BASE_NOTIFICATIONS_URL = environment.apiUrl + '/api/v1/users/me/notifications'
+  static BASE_NOTIFICATION_SETTINGS = environment.apiUrl + '/api/v1/users/me/notification-settings'
+
+  private notificationSubject = new Subject<{ type: 'new' | 'read' | 'read-all', notification?: UserNotification }>()
+
+  private socket: SocketIOClient.Socket
+
+  constructor (
+    private auth: AuthService,
+    private authHttp: HttpClient,
+    private restExtractor: RestExtractor,
+    private restService: RestService
+  ) {}
+
+  listMyNotifications (pagination: ComponentPagination, unread?: boolean, ignoreLoadingBar = false) {
+    let params = new HttpParams()
+    params = this.restService.addRestGetParams(params, this.restService.componentPaginationToRestPagination(pagination))
+
+    if (unread) params = params.append('unread', `${unread}`)
+
+    const headers = ignoreLoadingBar ? { ignoreLoadingBar: '' } : undefined
+
+    return this.authHttp.get<ResultList<UserNotification>>(UserNotificationService.BASE_NOTIFICATIONS_URL, { params, headers })
+               .pipe(
+                 map(res => this.restExtractor.convertResultListDateToHuman(res)),
+                 map(res => this.restExtractor.applyToResultListData(res, this.formatNotification.bind(this))),
+                 catchError(err => this.restExtractor.handleError(err))
+               )
+  }
+
+  countUnreadNotifications () {
+    return this.listMyNotifications({ currentPage: 1, itemsPerPage: 0 }, true)
+      .pipe(map(n => n.total))
+  }
+
+  getMyNotificationsSocket () {
+    const socket = this.getSocket()
+
+    socket.on('new-notification', (n: UserNotificationServer) => {
+      this.notificationSubject.next({ type: 'new', notification: new UserNotification(n) })
+    })
+
+    return this.notificationSubject.asObservable()
+  }
+
+  markAsRead (notification: UserNotification) {
+    const url = UserNotificationService.BASE_NOTIFICATIONS_URL + '/read'
+
+    const body = { ids: [ notification.id ] }
+    const headers = { ignoreLoadingBar: '' }
+
+    return this.authHttp.post(url, body, { headers })
+               .pipe(
+                 map(this.restExtractor.extractDataBool),
+                 tap(() => this.notificationSubject.next({ type: 'read' })),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
+  }
+
+  markAllAsRead () {
+    const url = UserNotificationService.BASE_NOTIFICATIONS_URL + '/read-all'
+    const headers = { ignoreLoadingBar: '' }
+
+    return this.authHttp.post(url, {}, { headers })
+               .pipe(
+                 map(this.restExtractor.extractDataBool),
+                 tap(() => this.notificationSubject.next({ type: 'read-all' })),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
+  }
+
+  updateNotificationSettings (user: User, settings: UserNotificationSetting) {
+    const url = UserNotificationService.BASE_NOTIFICATION_SETTINGS
+
+    return this.authHttp.put(url, settings)
+               .pipe(
+                 map(this.restExtractor.extractDataBool),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
+  }
+
+  private getSocket () {
+    if (this.socket) return this.socket
+
+    this.socket = io(environment.apiUrl + '/user-notifications', {
+      query: { accessToken: this.auth.getAccessToken() }
+    })
+
+    return this.socket
+  }
+
+  private formatNotification (notification: UserNotificationServer) {
+    return new UserNotification(notification)
+  }
+}
diff --git a/client/src/app/shared/users/user-notifications.component.html b/client/src/app/shared/users/user-notifications.component.html
new file mode 100644
index 000000000..86379d941
--- /dev/null
+++ b/client/src/app/shared/users/user-notifications.component.html
@@ -0,0 +1,61 @@
+<div *ngIf="componentPagination.totalItems === 0" class="no-notification" i18n>You don't have notifications.</div>
+
+<div class="notifications" myInfiniteScroller [autoInit]="true" (nearOfBottom)="onNearOfBottom()">
+  <div *ngFor="let notification of notifications" class="notification" [ngClass]="{ unread: !notification.read }">
+
+    <div [ngSwitch]="notification.type">
+      <ng-container i18n *ngSwitchCase="UserNotificationType.NEW_VIDEO_FROM_SUBSCRIPTION">
+        {{ notification.video.channel.displayName }} published a <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">new video</a>
+      </ng-container>
+
+      <ng-container i18n *ngSwitchCase="UserNotificationType.UNBLACKLIST_ON_MY_VIDEO">
+        Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> has been unblacklisted
+      </ng-container>
+
+      <ng-container i18n *ngSwitchCase="UserNotificationType.BLACKLIST_ON_MY_VIDEO">
+        Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoBlacklist.video.name }}</a> has been blacklisted
+      </ng-container>
+
+      <ng-container i18n *ngSwitchCase="UserNotificationType.NEW_VIDEO_ABUSE_FOR_MODERATORS">
+        <a (click)="markAsRead(notification)" [routerLink]="notification.videoAbuseUrl">A new video abuse</a> has been created on video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoAbuse.video.name }}</a>
+      </ng-container>
+
+      <ng-container i18n *ngSwitchCase="UserNotificationType.NEW_COMMENT_ON_MY_VIDEO">
+        {{ notification.comment.account.displayName }} commented your video <a (click)="markAsRead(notification)" [routerLink]="notification.commentUrl">{{ notification.comment.video.name }}</a>
+      </ng-container>
+
+      <ng-container i18n *ngSwitchCase="UserNotificationType.MY_VIDEO_PUBLISHED">
+        Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> has been published
+      </ng-container>
+
+      <ng-container i18n *ngSwitchCase="UserNotificationType.MY_VIDEO_IMPORT_SUCCESS">
+        <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">Your video import</a> {{ notification.videoImportIdentifier }} succeeded
+      </ng-container>
+
+      <ng-container i18n *ngSwitchCase="UserNotificationType.MY_VIDEO_IMPORT_ERROR">
+        <a (click)="markAsRead(notification)" [routerLink]="notification.videoImportUrl">Your video import</a> {{ notification.videoImportIdentifier }} failed
+      </ng-container>
+
+      <ng-container i18n *ngSwitchCase="UserNotificationType.NEW_USER_REGISTRATION">
+        User <a (click)="markAsRead(notification)" [routerLink]="notification.accountUrl">{{ notification.account.name }} registered</a> on your instance
+      </ng-container>
+
+      <ng-container i18n *ngSwitchCase="UserNotificationType.NEW_FOLLOW">
+        <a (click)="markAsRead(notification)" [routerLink]="notification.accountUrl">{{ notification.actorFollow.follower.displayName }}</a> is following
+
+        <ng-container *ngIf="notification.actorFollow.following.type === 'channel'">
+          your channel {{ notification.actorFollow.following.displayName }}
+        </ng-container>
+        <ng-container *ngIf="notification.actorFollow.following.type === 'account'">your account</ng-container>
+      </ng-container>
+
+      <ng-container i18n *ngSwitchCase="UserNotificationType.COMMENT_MENTION">
+        {{ notification.comment.account.displayName }} mentioned you on <a (click)="markAsRead(notification)" [routerLink]="notification.commentUrl">video {{ notification.comment.video.name }}</a>
+      </ng-container>
+    </div>
+
+    <div i18n title="Mark as read" class="mark-as-read">
+      <div class="glyphicon glyphicon-ok" (click)="markAsRead(notification)"></div>
+    </div>
+  </div>
+</div>
diff --git a/client/src/app/shared/users/user-notifications.component.scss b/client/src/app/shared/users/user-notifications.component.scss
new file mode 100644
index 000000000..0493b10d9
--- /dev/null
+++ b/client/src/app/shared/users/user-notifications.component.scss
@@ -0,0 +1,30 @@
+.notification {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: inherit;
+  padding: 15px 10px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.10);
+
+  .mark-as-read {
+    min-width: 35px;
+
+    .glyphicon {
+      display: none;
+      cursor: pointer;
+      color: rgba(20, 20, 20, 0.5)
+    }
+  }
+
+  &.unread {
+    background-color: rgba(0, 0, 0, 0.05);
+
+    &:hover .mark-as-read .glyphicon {
+      display: block;
+
+      &:hover {
+        color: rgba(20, 20, 20, 0.8);
+      }
+    }
+  }
+}
diff --git a/client/src/app/shared/users/user-notifications.component.ts b/client/src/app/shared/users/user-notifications.component.ts
new file mode 100644
index 000000000..682116226
--- /dev/null
+++ b/client/src/app/shared/users/user-notifications.component.ts
@@ -0,0 +1,82 @@
+import { Component, Input, OnInit } from '@angular/core'
+import { UserNotificationService } from '@app/shared/users/user-notification.service'
+import { UserNotificationType } from '../../../../../shared'
+import { ComponentPagination, hasMoreItems } from '@app/shared/rest/component-pagination.model'
+import { Notifier } from '@app/core'
+import { UserNotification } from '@app/shared/users/user-notification.model'
+
+@Component({
+  selector: 'my-user-notifications',
+  templateUrl: 'user-notifications.component.html',
+  styleUrls: [ 'user-notifications.component.scss' ]
+})
+export class UserNotificationsComponent implements OnInit {
+  @Input() ignoreLoadingBar = false
+  @Input() infiniteScroll = true
+
+  notifications: UserNotification[] = []
+
+  // So we can access it in the template
+  UserNotificationType = UserNotificationType
+
+  componentPagination: ComponentPagination = {
+    currentPage: 1,
+    itemsPerPage: 10,
+    totalItems: null
+  }
+
+  constructor (
+    private userNotificationService: UserNotificationService,
+    private notifier: Notifier
+  ) { }
+
+  ngOnInit () {
+    this.loadMoreNotifications()
+  }
+
+  loadMoreNotifications () {
+    this.userNotificationService.listMyNotifications(this.componentPagination, undefined, this.ignoreLoadingBar)
+        .subscribe(
+          result => {
+            this.notifications = this.notifications.concat(result.data)
+            this.componentPagination.totalItems = result.total
+          },
+
+          err => this.notifier.error(err.message)
+        )
+  }
+
+  onNearOfBottom () {
+    if (this.infiniteScroll === false) return
+
+    this.componentPagination.currentPage++
+
+    if (hasMoreItems(this.componentPagination)) {
+      this.loadMoreNotifications()
+    }
+  }
+
+  markAsRead (notification: UserNotification) {
+    this.userNotificationService.markAsRead(notification)
+        .subscribe(
+          () => {
+            notification.read = true
+          },
+
+          err => this.notifier.error(err.message)
+        )
+  }
+
+  markAllAsRead () {
+    this.userNotificationService.markAllAsRead()
+        .subscribe(
+          () => {
+            for (const notification of this.notifications) {
+              notification.read = true
+            }
+          },
+
+          err => this.notifier.error(err.message)
+        )
+  }
+}
diff --git a/client/src/app/shared/users/user.model.ts b/client/src/app/shared/users/user.model.ts
index 3663a7b61..c15f1de8c 100644
--- a/client/src/app/shared/users/user.model.ts
+++ b/client/src/app/shared/users/user.model.ts
@@ -1,4 +1,4 @@
-import { hasUserRight, User as UserServerModel, UserRight, UserRole, VideoChannel } from '../../../../../shared'
+import { hasUserRight, User as UserServerModel, UserNotificationSetting, UserRight, UserRole, VideoChannel } from '../../../../../shared'
 import { NSFWPolicyType } from '../../../../../shared/models/videos/nsfw-policy.type'
 import { Account } from '@app/shared/account/account.model'
 import { Avatar } from '../../../../../shared/models/avatars/avatar.model'
@@ -24,6 +24,8 @@ export class User implements UserServerModel {
   blocked: boolean
   blockedReason?: string
 
+  notificationSettings?: UserNotificationSetting
+
   constructor (hash: Partial<UserServerModel>) {
     this.id = hash.id
     this.username = hash.username
@@ -41,6 +43,8 @@ export class User implements UserServerModel {
     this.blocked = hash.blocked
     this.blockedReason = hash.blockedReason
 
+    this.notificationSettings = hash.notificationSettings
+
     if (hash.account !== undefined) {
       this.account = new Account(hash.account)
     }
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.ts b/client/src/app/videos/+video-watch/comment/video-comments.component.ts
index 957c17bbf..dc62fe5ae 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.ts
@@ -4,7 +4,7 @@ import { ConfirmService, Notifier } from '@app/core'
 import { Subscription } from 'rxjs'
 import { VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model'
 import { AuthService } from '../../../core/auth'
-import { ComponentPagination } from '../../../shared/rest/component-pagination.model'
+import { ComponentPagination, hasMoreItems } from '../../../shared/rest/component-pagination.model'
 import { User } from '../../../shared/users'
 import { VideoSortField } from '../../../shared/video/sort-field.type'
 import { VideoDetails } from '../../../shared/video/video-details.model'
@@ -165,22 +165,11 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
   onNearOfBottom () {
     this.componentPagination.currentPage++
 
-    if (this.hasMoreComments()) {
+    if (hasMoreItems(this.componentPagination)) {
       this.loadMoreComments()
     }
   }
 
-  private hasMoreComments () {
-    // No results
-    if (this.componentPagination.totalItems === 0) return false
-
-    // Not loaded yet
-    if (!this.componentPagination.totalItems) return true
-
-    const maxPage = this.componentPagination.totalItems / this.componentPagination.itemsPerPage
-    return maxPage > this.componentPagination.currentPage
-  }
-
   private deleteLocalCommentThread (parentComment: VideoCommentThreadTree, commentToDelete: VideoComment) {
     for (const commentChild of parentComment.children) {
       if (commentChild.comment.id === commentToDelete.id) {
diff --git a/client/src/sass/include/_bootstrap-variables.scss b/client/src/sass/include/_bootstrap-variables.scss
index 77a20cfe1..7f413836b 100644
--- a/client/src/sass/include/_bootstrap-variables.scss
+++ b/client/src/sass/include/_bootstrap-variables.scss
@@ -31,4 +31,5 @@ $input-focus-border-color: #ced4da;
 $nav-pills-link-active-bg: #F0F0F0;
 $nav-pills-link-active-color: #000;
 
-$zindex-dropdown: 10000;
\ No newline at end of file
+$zindex-dropdown: 10000;
+$zindex-popover: 10000;
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 05db2a2cb..58a6a0004 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -326,6 +326,8 @@ p-toast {
 
     .notification-block {
       display: flex;
+      align-items: center;
+      padding: 5px;
 
       .message {
         flex-grow: 1;
@@ -336,12 +338,12 @@ p-toast {
 
         p {
           font-size: 15px;
+          margin-bottom: 0;
         }
       }
 
       .glyphicon {
         font-size: 32px;
-        margin-top: 15px;
         margin-right: 5px;
       }
     }
diff --git a/client/yarn.lock b/client/yarn.lock
index 3c7ba2d25..5ed43117a 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -510,6 +510,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/socket.io-client@^1.4.32":
+  version "1.4.32"
+  resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.32.tgz#988a65a0386c274b1c22a55377fab6a30789ac14"
+  integrity sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==
+
 "@types/video.js@^7.2.5":
   version "7.2.5"
   resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-7.2.5.tgz#20896c81141d3517c3a89bb6eb97c6a191aa5d4c"
@@ -3195,6 +3200,23 @@ engine.io-client@~3.2.0:
     xmlhttprequest-ssl "~1.5.4"
     yeast "0.1.2"
 
+engine.io-client@~3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.3.1.tgz#afedb4a07b2ea48b7190c3136bfea98fdd4f0f03"
+  integrity sha512-q66JBFuQcy7CSlfAz9L3jH+v7DTT3i6ZEadYcVj2pOs8/0uJHLxKX3WBkGTvULJMdz0tUCyJag0aKT/dpXL9BQ==
+  dependencies:
+    component-emitter "1.2.1"
+    component-inherit "0.0.3"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.1"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    ws "~6.1.0"
+    xmlhttprequest-ssl "~1.5.4"
+    yeast "0.1.2"
+
 engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
@@ -8981,6 +9003,26 @@ socket.io-client@2.1.1:
     socket.io-parser "~3.2.0"
     to-array "0.1.4"
 
+socket.io-client@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.2.0.tgz#84e73ee3c43d5020ccc1a258faeeb9aec2723af7"
+  integrity sha512-56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==
+  dependencies:
+    backo2 "1.0.2"
+    base64-arraybuffer "0.1.5"
+    component-bind "1.0.0"
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    engine.io-client "~3.3.1"
+    has-binary2 "~1.0.2"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    object-component "0.0.3"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    socket.io-parser "~3.3.0"
+    to-array "0.1.4"
+
 socket.io-parser@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
@@ -8990,6 +9032,15 @@ socket.io-parser@~3.2.0:
     debug "~3.1.0"
     isarray "2.0.1"
 
+socket.io-parser@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.0.tgz#2b52a96a509fdf31440ba40fed6094c7d4f1262f"
+  integrity sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    isarray "2.0.1"
+
 socket.io@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
@@ -10671,7 +10722,7 @@ ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^6.0.0:
+ws@^6.0.0, ws@~6.1.0:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
   integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==
-- 
cgit v1.2.3

From 07a982363fcc6f838dd3f5c2039a2affaea3b0b2 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 8 Jan 2019 15:06:58 +0100
Subject: Correctly scroll in notification preferences

---
 .../my-account-notifications.component.html                         | 2 +-
 .../my-account-settings/my-account-settings.component.html          | 6 ++----
 client/src/app/app-routing.module.ts                                | 3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'client')

diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
index d2810c343..b98a1087e 100644
--- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
@@ -1,5 +1,5 @@
 <div class="header">
-  <a routerLink="/my-account/settings" i18n>Notification preferences</a>
+  <a routerLink="/my-account/settings" fragment="notifications" i18n>Notification preferences</a>
 
   <button (click)="markAllAsRead()" i18n>Mark all as read</button>
 </div>
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
index 2eb7dd56e..ad64f28fe 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
@@ -4,10 +4,8 @@
   <span i18n class="user-quota-label">Video quota:</span> {{ userVideoQuotaUsed | bytes: 0 }} / {{ userVideoQuota }}
 </div>
 
-<ng-template [ngIf]="user && user.account">
-  <div i18n class="account-title">Profile</div>
-  <my-account-profile [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-profile>
-</ng-template>
+<div i18n class="account-title">Profile</div>
+<my-account-profile [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-profile>
 
 <div i18n class="account-title" id="notifications">Notifications</div>
 <my-account-notification-preferences [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-notification-preferences>
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 545d6aeda..cff37a7d6 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -43,7 +43,8 @@ const routes: Routes = [
   imports: [
     RouterModule.forRoot(routes, {
       useHash: Boolean(history.pushState) === false,
-      preloadingStrategy: PreloadSelectedModulesList
+      preloadingStrategy: PreloadSelectedModulesList,
+      anchorScrolling: 'enabled'
     })
   ],
   providers: [
-- 
cgit v1.2.3

From 43483d12963ed7a82adee2e35a7bcb7e55e54b3e Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 8 Jan 2019 15:16:54 +0100
Subject: Correctly scroll to video comment

---
 .../src/app/videos/+video-watch/comment/video-comments.component.ts | 6 +-----
 client/src/app/videos/+video-watch/video-watch.component.ts         | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'client')

diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.ts b/client/src/app/videos/+video-watch/comment/video-comments.component.ts
index dc62fe5ae..2616820d2 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.ts
@@ -83,11 +83,7 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
             this.highlightedThread = new VideoComment(res.comment)
 
             // Scroll to the highlighted thread
-            setTimeout(() => {
-              // -60 because of the fixed header
-              const scrollY = this.commentHighlightBlock.nativeElement.offsetTop - 60
-              window.scroll(0, scrollY)
-            }, 500)
+            setTimeout(() => this.commentHighlightBlock.nativeElement.scrollIntoView(), 0)
           }
         },
 
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index 7765c4660..67c5254b3 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -375,7 +375,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     this.remoteServerDown = false
 
     let startTime = urlOptions.startTime || (this.video.userHistory ? this.video.userHistory.currentTime : 0)
-    // Don't start the video if we are at the end
+    // If we are at the end of the video, reset the timer
     if (this.video.duration - startTime <= 1) startTime = 0
 
     if (this.video.isVideoNSFWForUser(this.user, this.serverService.getConfig())) {
-- 
cgit v1.2.3

From 3866f1a02f73665541468fbadcc3cd2cc459aef2 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 10 Jan 2019 09:58:08 +0100
Subject: Add contact form checkbox in admin form

---
 .../edit-custom-config.component.html              | 495 +++++++++++----------
 .../edit-custom-config.component.ts                | 203 +++------
 client/src/app/core/server/server.service.ts       |   3 +
 client/src/app/shared/forms/form-reactive.ts       |  46 +-
 .../form-validators/form-validator.service.ts      |  33 +-
 client/src/app/shared/misc/help.component.scss     |   2 +-
 .../remote-subscribe.component.ts                  |   2 +-
 .../comment/video-comment-add.component.ts         |   2 +-
 8 files changed, 387 insertions(+), 399 deletions(-)

(limited to 'client')

- {{ formErrors.instanceShortDescription }} +

+ Short description + +

- Description - -

- {{ formErrors.instanceDescription }} +

+ Description + +

- Terms - -

- {{ formErrors.instanceTerms }} +

+ Terms + +

- Default client route -

- +

+ Default client route +

+ +

- {{ formErrors.instanceDefaultClientRoute }} + +

+ Policy on videos containing sensitive content + + +

+ +

+ -

- Policy on videos containing sensitive content - +

Signup

- + +

- {{ formErrors.instanceDefaultNSFWPolicy }} + +

Signup

+ Signup limit + +

+ -

- -

Users

- -

+ +

+ User default video quota +

+ +

- Signup limit - -

- {{ formErrors.signupLimit }} +

+ User default daily upload limit +

+ +

Import

- -

+ + -

- -

+ +

+ + +

Administrator

Admin email -

- {{ formErrors.adminEmail }} -

Users

- -

- User default video quota -

- -

- {{ formErrors.userVideoQuota }} -

- User default daily upload limit -

- -

- {{ formErrors.userVideoQuotaDaily }} -

@@ -177,30 +177,35 @@

Twitter

- Your Twitter username - - -

- {{ formErrors.servicesTwitterUsername }} -

+ + + +

+ Your Twitter username + + +

+ +

+ + + -

- -

@@ -209,45 +214,48 @@

Transcoding

- -

- - - +

- Transcoding threads -

- + + +

- {{ formErrors.transcodingThreads }} + +

+ Transcoding threads +

+ +

- -

- + +

+ +

+ + + +

Cache @@ -258,74 +266,73 @@ >

- Previews cache size - -

- {{ formErrors.cachePreviewsSize }} + +

+ Previews cache size + +

- Video captions cache size - -

- {{ formErrors.cacheCaptionsSize }} +

+ Video captions cache size + +

Customizations

- JavaScript - - -

- {{ formErrors.customizationJavascript }} -

+ + +

+ JavaScript + + +

+ +

+ CSS + + +

+ + -

- CSS - - -

- {{ formErrors.customizationCSS }} -

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts index ee877ee31..654a076b0 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts @@ -18,9 +18,6 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { resolutions: string[] = [] transcodingThreadOptions: { label: string, value: number }[] = [] - private oldCustomJavascript: string - private oldCustomCSS: string - constructor ( protected formValidatorService: FormValidatorService, private customConfigValidatorsService: CustomConfigValidatorsService, @@ -58,41 +55,78 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { } getResolutionKey (resolution: string) { - return 'transcodingResolution' + resolution + return 'transcoding.resolutions.' + resolution } ngOnInit () { - const formGroupData: { [key: string]: any } = { - instanceName: this.customConfigValidatorsService.INSTANCE_NAME, - instanceShortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION, - instanceDescription: null, - instanceTerms: null, - instanceDefaultClientRoute: null, - instanceDefaultNSFWPolicy: null, - servicesTwitterUsername: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME, - servicesTwitterWhitelisted: null, - cachePreviewsSize: this.customConfigValidatorsService.CACHE_PREVIEWS_SIZE, - cacheCaptionsSize: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE, - signupEnabled: null, - signupLimit: this.customConfigValidatorsService.SIGNUP_LIMIT, - signupRequiresEmailVerification: null, - importVideosHttpEnabled: null, - importVideosTorrentEnabled: null, - adminEmail: this.customConfigValidatorsService.ADMIN_EMAIL, - userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA, - userVideoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY, - transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS, - transcodingAllowAdditionalExtensions: null, - transcodingEnabled: null, - customizationJavascript: null, - customizationCSS: null + const formGroupData: { [key in keyof CustomConfig ]: any } = { + instance: { + name: this.customConfigValidatorsService.INSTANCE_NAME, + shortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION, + description: null, + terms: null, + defaultClientRoute: null, + defaultNSFWPolicy: null, + customizations: { + javascript: null, + css: null + } + }, + services: { + twitter: { + username: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME, + whitelisted: null + } + }, + cache: { + previews: { + size: this.customConfigValidatorsService.CACHE_PREVIEWS_SIZE + }, + captions: { + size: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE + } + }, + signup: { + enabled: null, + limit: this.customConfigValidatorsService.SIGNUP_LIMIT, + requiresEmailVerification: null + }, + import: { + videos: { + http: { + enabled: null + }, + torrent: { + enabled: null + } + } + }, + admin: { + email: this.customConfigValidatorsService.ADMIN_EMAIL + }, + contactForm: { + enabled: null + }, + user: { + videoQuota: this.userValidatorsService.USER_VIDEO_QUOTA, + videoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY + }, + transcoding: { + enabled: null, + threads: this.customConfigValidatorsService.TRANSCODING_THREADS, + allowAdditionalExtensions: null, + resolutions: {} + } } - const defaultValues: BuildFormDefaultValues = {} + const defaultValues = { + transcoding: { + resolutions: {} + } + } for (const resolution of this.resolutions) { - const key = this.getResolutionKey(resolution) - defaultValues[key] = 'false' - formGroupData[key] = null + defaultValues.transcoding.resolutions[resolution] = 'false' + formGroupData.transcoding.resolutions[resolution] = null } this.buildForm(formGroupData) @@ -102,9 +136,6 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { res => { this.customConfig = res - this.oldCustomCSS = this.customConfig.instance.customizations.css - this.oldCustomJavascript = this.customConfig.instance.customizations.javascript - this.updateForm() // Force form validation this.forceCheck() @@ -115,78 +146,15 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { } isTranscodingEnabled () { - return this.form.value['transcodingEnabled'] === true + return this.form.value['transcoding']['enabled'] === true } isSignupEnabled () { - return this.form.value['signupEnabled'] === true + return this.form.value['signup']['enabled'] === true } async formValidated () { - const data: CustomConfig = { - instance: { - name: this.form.value['instanceName'], - shortDescription: this.form.value['instanceShortDescription'], - description: this.form.value['instanceDescription'], - terms: this.form.value['instanceTerms'], - defaultClientRoute: this.form.value['instanceDefaultClientRoute'], - defaultNSFWPolicy: this.form.value['instanceDefaultNSFWPolicy'], - customizations: { - javascript: this.form.value['customizationJavascript'], - css: this.form.value['customizationCSS'] - } - }, - services: { - twitter: { - username: this.form.value['servicesTwitterUsername'], - whitelisted: this.form.value['servicesTwitterWhitelisted'] - } - }, - cache: { - previews: { - size: this.form.value['cachePreviewsSize'] - }, - captions: { - size: this.form.value['cacheCaptionsSize'] - } - }, - signup: { - enabled: this.form.value['signupEnabled'], - limit: this.form.value['signupLimit'], - requiresEmailVerification: this.form.value['signupRequiresEmailVerification'] - }, - admin: { - email: this.form.value['adminEmail'] - }, - user: { - videoQuota: this.form.value['userVideoQuota'], - videoQuotaDaily: this.form.value['userVideoQuotaDaily'] - }, - transcoding: { - enabled: this.form.value['transcodingEnabled'], - allowAdditionalExtensions: this.form.value['transcodingAllowAdditionalExtensions'], - threads: this.form.value['transcodingThreads'], - resolutions: { - '240p': this.form.value[this.getResolutionKey('240p')], - '360p': this.form.value[this.getResolutionKey('360p')], - '480p': this.form.value[this.getResolutionKey('480p')], - '720p': this.form.value[this.getResolutionKey('720p')], - '1080p': this.form.value[this.getResolutionKey('1080p')] - } - }, - import: { - videos: { - http: { - enabled: this.form.value['importVideosHttpEnabled'] - }, - torrent: { - enabled: this.form.value['importVideosTorrentEnabled'] - } - } - } - } - - this.configService.updateCustomConfig(data) + this.configService.updateCustomConfig(this.form.value) .subscribe( res => { this.customConfig = res @@ -204,38 +172,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { } private updateForm () { - const data: { [key: string]: any } = { - instanceName: this.customConfig.instance.name, - instanceShortDescription: this.customConfig.instance.shortDescription, - instanceDescription: this.customConfig.instance.description, - instanceTerms: this.customConfig.instance.terms, - instanceDefaultClientRoute: this.customConfig.instance.defaultClientRoute, - instanceDefaultNSFWPolicy: this.customConfig.instance.defaultNSFWPolicy, - servicesTwitterUsername: this.customConfig.services.twitter.username, - servicesTwitterWhitelisted: this.customConfig.services.twitter.whitelisted, - cachePreviewsSize: this.customConfig.cache.previews.size, - cacheCaptionsSize: this.customConfig.cache.captions.size, - signupEnabled: this.customConfig.signup.enabled, - signupLimit: this.customConfig.signup.limit, - signupRequiresEmailVerification: this.customConfig.signup.requiresEmailVerification, - adminEmail: this.customConfig.admin.email, - userVideoQuota: this.customConfig.user.videoQuota, - userVideoQuotaDaily: this.customConfig.user.videoQuotaDaily, - transcodingThreads: this.customConfig.transcoding.threads, - transcodingEnabled: this.customConfig.transcoding.enabled, - transcodingAllowAdditionalExtensions: this.customConfig.transcoding.allowAdditionalExtensions, - customizationJavascript: this.customConfig.instance.customizations.javascript, - customizationCSS: this.customConfig.instance.customizations.css, - importVideosHttpEnabled: this.customConfig.import.videos.http.enabled, - importVideosTorrentEnabled: this.customConfig.import.videos.torrent.enabled - } - - for (const resolution of this.resolutions) { - const key = this.getResolutionKey(resolution) - data[key] = this.customConfig.transcoding.resolutions[resolution] - } - - this.form.patchValue(data) + this.form.patchValue(this.customConfig) } } diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts index 6eccb8336..5351f18d5 100644 --- a/client/src/app/core/server/server.service.ts +++ b/client/src/app/core/server/server.service.ts @@ -40,6 +40,9 @@ export class ServerService { email: { enabled: false }, + contactForm: { + enabled: false + }, serverVersion: 'Unknown', signup: { allowed: false, diff --git a/client/src/app/shared/forms/form-reactive.ts b/client/src/app/shared/forms/form-reactive.ts index 0bb7d25e6..2d0e8359f 100644 --- a/client/src/app/shared/forms/form-reactive.ts +++ b/client/src/app/shared/forms/form-reactive.ts @@ -1,11 +1,9 @@ import { FormGroup } from '@angular/forms' import { BuildFormArgument, BuildFormDefaultValues, FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' -export type FormReactiveErrors = { [ id: string ]: string } +export type FormReactiveErrors = { [ id: string ]: string | FormReactiveErrors } export type FormReactiveValidationMessages = { - [ id: string ]: { - [ name: string ]: string - } + [ id: string ]: { [ name: string ]: string } | FormReactiveValidationMessages } export abstract class FormReactive { @@ -23,29 +21,49 @@ export abstract class FormReactive { this.formErrors = formErrors this.validationMessages = validationMessages - this.form.valueChanges.subscribe(() => this.onValueChanged(false)) + this.form.valueChanges.subscribe(() => this.onValueChanged(this.form, this.formErrors, this.validationMessages, false)) + } + + protected forceCheck () { + return this.onValueChanged(this.form, this.formErrors, this.validationMessages, true) + } + + protected check () { + return this.onValueChanged(this.form, this.formErrors, this.validationMessages, false) } - protected onValueChanged (forceCheck = false) { - for (const field in this.formErrors) { + private onValueChanged ( + form: FormGroup, + formErrors: FormReactiveErrors, + validationMessages: FormReactiveValidationMessages, + forceCheck = false + ) { + for (const field of Object.keys(formErrors)) { + if (formErrors[field] && typeof formErrors[field] === 'object') { + this.onValueChanged( + form.controls[field] as FormGroup, + formErrors[field] as FormReactiveErrors, + validationMessages[field] as FormReactiveValidationMessages, + forceCheck + ) + continue + } + // clear previous error message (if any) - this.formErrors[ field ] = '' - const control = this.form.get(field) + formErrors[ field ] = '' + const control = form.get(field) if (control.dirty) this.formChanged = true // Don't care if dirty on force check const isDirty = control.dirty || forceCheck === true if (control && isDirty && !control.valid) { - const messages = this.validationMessages[ field ] + const messages = validationMessages[ field ] for (const key in control.errors) { - this.formErrors[ field ] += messages[ key ] + ' ' + formErrors[ field ] += messages[ key ] + ' ' } } } } - protected forceCheck () { - return this.onValueChanged(true) - } } diff --git a/client/src/app/shared/forms/form-validators/form-validator.service.ts b/client/src/app/shared/forms/form-validators/form-validator.service.ts index 19a8bef25..249fdf119 100644 --- a/client/src/app/shared/forms/form-validators/form-validator.service.ts +++ b/client/src/app/shared/forms/form-validators/form-validator.service.ts @@ -7,10 +7,10 @@ export type BuildFormValidator = { MESSAGES: { [ name: string ]: string } } export type BuildFormArgument = { - [ id: string ]: BuildFormValidator + [ id: string ]: BuildFormValidator | BuildFormArgument } export type BuildFormDefaultValues = { - [ name: string ]: string | string[] + [ name: string ]: string | string[] | BuildFormDefaultValues } @Injectable() @@ -29,7 +29,16 @@ export class FormValidatorService { formErrors[name] = '' const field = obj[name] - if (field && field.MESSAGES) validationMessages[name] = field.MESSAGES + if (this.isRecursiveField(field)) { + const result = this.buildForm(field as BuildFormArgument, defaultValues[name] as BuildFormDefaultValues) + group[name] = result.form + formErrors[name] = result.formErrors + validationMessages[name] = result.validationMessages + + continue + } + + if (field && field.MESSAGES) validationMessages[name] = field.MESSAGES as { [ name: string ]: string } const defaultValue = defaultValues[name] || '' @@ -52,13 +61,27 @@ export class FormValidatorService { formErrors[name] = '' const field = obj[name] - if (field && field.MESSAGES) validationMessages[name] = field.MESSAGES + if (this.isRecursiveField(field)) { + this.updateForm( + form[name], + formErrors[name] as FormReactiveErrors, + validationMessages[name] as FormReactiveValidationMessages, + obj[name] as BuildFormArgument, + defaultValues[name] as BuildFormDefaultValues + ) + continue + } + + if (field && field.MESSAGES) validationMessages[name] = field.MESSAGES as { [ name: string ]: string } const defaultValue = defaultValues[name] || '' - if (field && field.VALIDATORS) form.addControl(name, new FormControl(defaultValue, field.VALIDATORS)) + if (field && field.VALIDATORS) form.addControl(name, new FormControl(defaultValue, field.VALIDATORS as ValidatorFn[])) else form.addControl(name, new FormControl(defaultValue)) } } + private isRecursiveField (field: any) { + return field && typeof field === 'object' && !field.MESSAGES && !field.VALIDATORS + } } diff --git a/client/src/app/shared/misc/help.component.scss b/client/src/app/shared/misc/help.component.scss index 6a5c3b1fa..047e53fab 100644 --- a/client/src/app/shared/misc/help.component.scss +++ b/client/src/app/shared/misc/help.component.scss @@ -12,7 +12,7 @@ } /deep/ { - .popover-help.popover { + .help-popover { max-width: 300px; .popover-body { diff --git a/client/src/app/shared/user-subscription/remote-subscribe.component.ts b/client/src/app/shared/user-subscription/remote-subscribe.component.ts index 49722ce40..ba2a45df1 100644 --- a/client/src/app/shared/user-subscription/remote-subscribe.component.ts +++ b/client/src/app/shared/user-subscription/remote-subscribe.component.ts @@ -29,7 +29,7 @@ export class RemoteSubscribeComponent extends FormReactive implements OnInit { } onValidKey () { - this.onValueChanged() + this.check() if (!this.form.valid) return this.formValidated() diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts index 6b7e62042..fd85c28f2 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts +++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts @@ -70,7 +70,7 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit { } onValidKey () { - this.onValueChanged() + this.check() if (!this.form.valid) return this.formValidated() -- cgit v1.2.3 From d3e56c0c4b307c99e83fbafb7f2c5884cbc20055 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 10 Jan 2019 11:12:41 +0100 Subject: Implement contact form in the client --- .../about-instance/about-instance.component.html | 8 ++- .../about-instance/about-instance.component.scss | 16 ++++- .../about-instance/about-instance.component.ts | 17 ++++- .../contact-admin-modal.component.html | 50 +++++++++++++++ .../contact-admin-modal.component.scss | 11 ++++ .../contact-admin-modal.component.ts | 72 ++++++++++++++++++++++ client/src/app/+about/about.module.ts | 4 +- client/src/app/core/server/server.service.ts | 5 +- .../src/app/shared/forms/form-validators/index.ts | 1 + .../form-validators/instance-validators.service.ts | 48 +++++++++++++++ client/src/app/shared/instance/instance.service.ts | 36 +++++++++++ client/src/app/shared/shared.module.ts | 4 ++ 12 files changed, 260 insertions(+), 12 deletions(-) create mode 100644 client/src/app/+about/about-instance/contact-admin-modal.component.html create mode 100644 client/src/app/+about/about-instance/contact-admin-modal.component.scss create mode 100644 client/src/app/+about/about-instance/contact-admin-modal.component.ts create mode 100644 client/src/app/shared/forms/form-validators/instance-validators.service.ts create mode 100644 client/src/app/shared/instance/instance.service.ts (limited to 'client') diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html index 37ff795f5..8c700752e 100644 --- a/client/src/app/+about/about-instance/about-instance.component.html +++ b/client/src/app/+about/about-instance/about-instance.component.html @@ -1,7 +1,9 @@

- About {{ instanceName }} instance +

About {{ instanceName }} instance

+ +

Contact administrator

@@ -46,3 +48,5 @@

+ + diff --git a/client/src/app/+about/about-instance/about-instance.component.scss b/client/src/app/+about/about-instance/about-instance.component.scss index b451e85aa..75cf57322 100644 --- a/client/src/app/+about/about-instance/about-instance.component.scss +++ b/client/src/app/+about/about-instance/about-instance.component.scss @@ -2,9 +2,19 @@ @import '_mixins'; .about-instance-title { - font-size: 20px; - font-weight: bold; - margin-bottom: 15px; + display: flex; + justify-content: space-between; + + & > div { + font-size: 20px; + font-weight: bold; + margin-bottom: 15px; + } + + & > .contact-admin { + @include peertube-button; + @include orange-button; + } } .section-title { diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts index 36e7a8e5b..d3ee8a1e4 100644 --- a/client/src/app/+about/about-instance/about-instance.component.ts +++ b/client/src/app/+about/about-instance/about-instance.component.ts @@ -1,7 +1,9 @@ -import { Component, OnInit } from '@angular/core' +import { Component, OnInit, ViewChild } from '@angular/core' import { Notifier, ServerService } from '@app/core' import { MarkdownService } from '@app/videos/shared' import { I18n } from '@ngx-translate/i18n-polyfill' +import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' +import { InstanceService } from '@app/shared/instance/instance.service' @Component({ selector: 'my-about-instance', @@ -9,6 +11,8 @@ import { I18n } from '@ngx-translate/i18n-polyfill' styleUrls: [ './about-instance.component.scss' ] }) export class AboutInstanceComponent implements OnInit { + @ViewChild('contactAdminModal') contactAdminModal: ContactAdminModalComponent + shortDescription = '' descriptionHTML = '' termsHTML = '' @@ -16,6 +20,7 @@ export class AboutInstanceComponent implements OnInit { constructor ( private notifier: Notifier, private serverService: ServerService, + private instanceService: InstanceService, private markdownService: MarkdownService, private i18n: I18n ) {} @@ -32,8 +37,12 @@ export class AboutInstanceComponent implements OnInit { return this.serverService.getConfig().signup.allowed } + get isContactFormEnabled () { + return this.serverService.getConfig().email.enabled && this.serverService.getConfig().contactForm.enabled + } + ngOnInit () { - this.serverService.getAbout() + this.instanceService.getAbout() .subscribe( res => { this.shortDescription = res.instance.shortDescription @@ -45,4 +54,8 @@ export class AboutInstanceComponent implements OnInit { ) } + openContactModal () { + return this.contactAdminModal.show() + } + } diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.html b/client/src/app/+about/about-instance/contact-admin-modal.component.html new file mode 100644 index 000000000..2b3fb32f3 --- /dev/null +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.html @@ -0,0 +1,50 @@ + + + + + diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.scss b/client/src/app/+about/about-instance/contact-admin-modal.component.scss new file mode 100644 index 000000000..260d77888 --- /dev/null +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.scss @@ -0,0 +1,11 @@ +@import 'variables'; +@import 'mixins'; + +input[type=text] { + @include peertube-input-text(340px); + display: block; +} + +textarea { + @include peertube-textarea(100%, 200px); +} diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.ts b/client/src/app/+about/about-instance/contact-admin-modal.component.ts new file mode 100644 index 000000000..2f707bd53 --- /dev/null +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.ts @@ -0,0 +1,72 @@ +import { Component, OnInit, ViewChild } from '@angular/core' +import { Notifier } from '@app/core' +import { I18n } from '@ngx-translate/i18n-polyfill' +import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' +import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' +import { FormReactive, InstanceValidatorsService } from '@app/shared' +import { InstanceService } from '@app/shared/instance/instance.service' + +@Component({ + selector: 'my-contact-admin-modal', + templateUrl: './contact-admin-modal.component.html', + styleUrls: [ './contact-admin-modal.component.scss' ] +}) +export class ContactAdminModalComponent extends FormReactive implements OnInit { + @ViewChild('modal') modal: NgbModal + + error: string + + private openedModal: NgbModalRef + + constructor ( + protected formValidatorService: FormValidatorService, + private modalService: NgbModal, + private instanceValidatorsService: InstanceValidatorsService, + private instanceService: InstanceService, + private notifier: Notifier, + private i18n: I18n + ) { + super() + } + + ngOnInit () { + this.buildForm({ + fromName: this.instanceValidatorsService.FROM_NAME, + fromEmail: this.instanceValidatorsService.FROM_EMAIL, + body: this.instanceValidatorsService.BODY + }) + } + + show () { + this.openedModal = this.modalService.open(this.modal, { keyboard: false }) + } + + hide () { + this.form.reset() + this.error = undefined + + this.openedModal.close() + this.openedModal = null + } + + sendForm () { + const fromName = this.form.value['fromName'] + const fromEmail = this.form.value[ 'fromEmail' ] + const body = this.form.value[ 'body' ] + + this.instanceService.contactAdministrator(fromEmail, fromName, body) + .subscribe( + () => { + this.notifier.success(this.i18n('Your message has been sent.')) + this.hide() + }, + + err => { + this.error = err.status === 403 + ? this.i18n('You already sent this form recently') + : err.message + } + ) + } +} diff --git a/client/src/app/+about/about.module.ts b/client/src/app/+about/about.module.ts index ff6e8ef41..9c6b29740 100644 --- a/client/src/app/+about/about.module.ts +++ b/client/src/app/+about/about.module.ts @@ -5,6 +5,7 @@ import { AboutComponent } from './about.component' import { SharedModule } from '../shared' import { AboutInstanceComponent } from '@app/+about/about-instance/about-instance.component' import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertube.component' +import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' @NgModule({ imports: [ @@ -15,7 +16,8 @@ import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertub declarations: [ AboutComponent, AboutInstanceComponent, - AboutPeertubeComponent + AboutPeertubeComponent, + ContactAdminModalComponent ], exports: [ diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts index 5351f18d5..f33e6f20c 100644 --- a/client/src/app/core/server/server.service.ts +++ b/client/src/app/core/server/server.service.ts @@ -13,6 +13,7 @@ import { sortBy } from '@app/shared/misc/utils' @Injectable() export class ServerService { + private static BASE_SERVER_URL = environment.apiUrl + '/api/v1/server/' private static BASE_CONFIG_URL = environment.apiUrl + '/api/v1/config/' private static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/' private static BASE_LOCALE_URL = environment.apiUrl + '/client/locales/' @@ -147,10 +148,6 @@ export class ServerService { return this.videoPrivacies } - getAbout () { - return this.http.get(ServerService.BASE_CONFIG_URL + '/about') - } - private loadVideoAttributeEnum ( attributeName: 'categories' | 'licences' | 'languages' | 'privacies', hashToPopulate: VideoConstant[], diff --git a/client/src/app/shared/forms/form-validators/index.ts b/client/src/app/shared/forms/form-validators/index.ts index 74e385b3d..fdcbedb71 100644 --- a/client/src/app/shared/forms/form-validators/index.ts +++ b/client/src/app/shared/forms/form-validators/index.ts @@ -1,6 +1,7 @@ export * from './custom-config-validators.service' export * from './form-validator.service' export * from './host' +export * from './instance-validators.service' export * from './login-validators.service' export * from './reset-password-validators.service' export * from './user-validators.service' diff --git a/client/src/app/shared/forms/form-validators/instance-validators.service.ts b/client/src/app/shared/forms/form-validators/instance-validators.service.ts new file mode 100644 index 000000000..5bb852858 --- /dev/null +++ b/client/src/app/shared/forms/form-validators/instance-validators.service.ts @@ -0,0 +1,48 @@ +import { I18n } from '@ngx-translate/i18n-polyfill' +import { Validators } from '@angular/forms' +import { BuildFormValidator } from '@app/shared' +import { Injectable } from '@angular/core' + +@Injectable() +export class InstanceValidatorsService { + readonly FROM_EMAIL: BuildFormValidator + readonly FROM_NAME: BuildFormValidator + readonly BODY: BuildFormValidator + + constructor (private i18n: I18n) { + + this.FROM_EMAIL = { + VALIDATORS: [ Validators.required, Validators.email ], + MESSAGES: { + 'required': this.i18n('Email is required.'), + 'email': this.i18n('Email must be valid.') + } + } + + this.FROM_NAME = { + VALIDATORS: [ + Validators.required, + Validators.minLength(1), + Validators.maxLength(120) + ], + MESSAGES: { + 'required': this.i18n('Your name is required.'), + 'minlength': this.i18n('Your name must be at least 1 character long.'), + 'maxlength': this.i18n('Your name cannot be more than 120 characters long.') + } + } + + this.BODY = { + VALIDATORS: [ + Validators.required, + Validators.minLength(3), + Validators.maxLength(5000) + ], + MESSAGES: { + 'required': this.i18n('A message is required.'), + 'minlength': this.i18n('The message must be at least 3 characters long.'), + 'maxlength': this.i18n('The message cannot be more than 5000 characters long.') + } + } + } +} diff --git a/client/src/app/shared/instance/instance.service.ts b/client/src/app/shared/instance/instance.service.ts new file mode 100644 index 000000000..61321ecce --- /dev/null +++ b/client/src/app/shared/instance/instance.service.ts @@ -0,0 +1,36 @@ +import { catchError } from 'rxjs/operators' +import { HttpClient } from '@angular/common/http' +import { Injectable } from '@angular/core' +import { environment } from '../../../environments/environment' +import { RestExtractor, RestService } from '../rest' +import { About } from '../../../../../shared/models/server' + +@Injectable() +export class InstanceService { + private static BASE_CONFIG_URL = environment.apiUrl + '/api/v1/config' + private static BASE_SERVER_URL = environment.apiUrl + '/api/v1/server' + + constructor ( + private authHttp: HttpClient, + private restService: RestService, + private restExtractor: RestExtractor + ) { + } + + getAbout () { + return this.authHttp.get(InstanceService.BASE_CONFIG_URL + '/about') + .pipe(catchError(res => this.restExtractor.handleError(res))) + } + + contactAdministrator (fromEmail: string, fromName: string, message: string) { + const body = { + fromEmail, + fromName, + body: message + } + + return this.authHttp.post(InstanceService.BASE_SERVER_URL + '/contact', body) + .pipe(catchError(res => this.restExtractor.handleError(res))) + + } +} diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index c99c87c00..d1320aeec 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts @@ -37,6 +37,7 @@ import { LoginValidatorsService, ReactiveFileComponent, ResetPasswordValidatorsService, + InstanceValidatorsService, TextareaAutoResizeDirective, UserValidatorsService, VideoAbuseValidatorsService, @@ -65,6 +66,7 @@ import { TopMenuDropdownComponent } from '@app/shared/menu/top-menu-dropdown.com import { UserHistoryService } from '@app/shared/users/user-history.service' import { UserNotificationService } from '@app/shared/users/user-notification.service' import { UserNotificationsComponent } from '@app/shared/users/user-notifications.component' +import { InstanceService } from '@app/shared/instance/instance.service' @NgModule({ imports: [ @@ -185,8 +187,10 @@ import { UserNotificationsComponent } from '@app/shared/users/user-notifications OverviewService, VideoChangeOwnershipValidatorsService, VideoAcceptOwnershipValidatorsService, + InstanceValidatorsService, BlocklistService, UserHistoryService, + InstanceService, I18nPrimengCalendarService, ScreenService, -- cgit v1.2.3 From 26a008fe8d71b1bba818dd5f4fae760e0f7fc47c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 10 Jan 2019 11:51:25 +0100 Subject: Update translations --- .../contact-admin-modal.component.ts | 7 +- client/src/app/shared/forms/form-reactive.ts | 2 +- client/src/locale/source/angular_en_US.xml | 1654 +++++++++----------- 3 files changed, 781 insertions(+), 882 deletions(-) (limited to 'client') diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.ts b/client/src/app/+about/about-instance/contact-admin-modal.component.ts index 2f707bd53..7d79c2215 100644 --- a/client/src/app/+about/about-instance/contact-admin-modal.component.ts +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, ViewChild } from '@angular/core' -import { Notifier } from '@app/core' +import { Notifier, ServerService } from '@app/core' import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' @@ -24,12 +24,17 @@ export class ContactAdminModalComponent extends FormReactive implements OnInit { private modalService: NgbModal, private instanceValidatorsService: InstanceValidatorsService, private instanceService: InstanceService, + private serverService: ServerService, private notifier: Notifier, private i18n: I18n ) { super() } + get instanceName () { + return this.serverService.getConfig().instance.name + } + ngOnInit () { this.buildForm({ fromName: this.instanceValidatorsService.FROM_NAME, diff --git a/client/src/app/shared/forms/form-reactive.ts b/client/src/app/shared/forms/form-reactive.ts index 2d0e8359f..b9873af2c 100644 --- a/client/src/app/shared/forms/form-reactive.ts +++ b/client/src/app/shared/forms/form-reactive.ts @@ -11,7 +11,7 @@ export abstract class FormReactive { protected formChanged = false form: FormGroup - formErrors: FormReactiveErrors + formErrors: any // To avoid casting in template because of string | FormReactiveErrors validationMessages: FormReactiveValidationMessages buildForm (obj: BuildFormArgument, defaultValues: BuildFormDefaultValues = {}) { diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml index 7ebdd8e07..d61d4f9f2 100644 --- a/client/src/locale/source/angular_en_US.xml +++ b/client/src/locale/source/angular_en_US.xml @@ -210,7 +210,7 @@ app/login/login.component.html - 72 + 77 app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html @@ -226,6 +226,113 @@ app/shared/forms/reactive-file.component.html 11 + + You don't have notifications. + + app/shared/users/user-notifications.component.html + 1 + +

+ + <x id="INTERPOLATION" equiv-text="{{ notification.video.channel.displayName }}"/> published a <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>new video<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> + + + app/shared/users/user-notifications.component.html + 7 + +

+ + Your video <x id="START_LINK" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION" equiv-text="{{ notification.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> has been unblacklisted + + + app/shared/users/user-notifications.component.html + 11 + +

+ + Your video <x id="START_LINK" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoBlacklist.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> has been blacklisted + + + app/shared/users/user-notifications.component.html + 15 + +

+ + <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>A new video abuse<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> has been created on video <x id="START_LINK_1" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoAbuse.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> + + + app/shared/users/user-notifications.component.html + 19 + +

+ + <x id="INTERPOLATION" equiv-text="{{ notification.comment.account.displayName }}"/> commented your video <x id="START_LINK" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION_1" equiv-text="{{ notification.comment.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> + + + app/shared/users/user-notifications.component.html + 23 + +

+ + Your video <x id="START_LINK" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION" equiv-text="{{ notification.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> has been published + + + app/shared/users/user-notifications.component.html + 27 + +

+ + <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>Your video import<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> <x id="INTERPOLATION" equiv-text="{{ notification.videoImportIdentifier }}"/> succeeded + + + app/shared/users/user-notifications.component.html + 31 + +

+ + <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>Your video import<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> <x id="INTERPOLATION" equiv-text="{{ notification.videoImportIdentifier }}"/> failed + + + app/shared/users/user-notifications.component.html + 35 + +

+ + User <x id="START_LINK" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION" equiv-text="{{ notification.account.name }}"/> registered<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> on your instance + + + app/shared/users/user-notifications.component.html + 39 + +

+ + <x id="START_LINK" ctype="x-a" equiv-text="<a>"/><x id="INTERPOLATION" equiv-text="{{ notification.actorFollow.follower.displayName }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> is following + + <x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="<ng-container>"/> + your channel <x id="INTERPOLATION_1" equiv-text="{{ notification.actorFollow.following.displayName }}"/> + <x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="</ng-container>"/> + <x id="START_TAG_NG-CONTAINER_1" ctype="x-ng-container" equiv-text="<ng-container>"/>your account<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="</ng-container>"/> + + + app/shared/users/user-notifications.component.html + 43 + +

+ + <x id="INTERPOLATION" equiv-text="{{ notification.comment.account.displayName }}"/> mentioned you on <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>video <x id="INTERPOLATION_1" equiv-text="{{ notification.comment.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> + + + app/shared/users/user-notifications.component.html + 52 + +

+ + <x id="START_TAG_DIV" ctype="x-div" equiv-text="<div>"/><x id="CLOSE_TAG_DIV" ctype="x-div" equiv-text="</div>"/> + + + app/shared/users/user-notifications.component.html + 57 +

Unlisted @@ -256,7 +363,7 @@

app/videos/+video-edit/shared/video-edit.component.html - 161 + 162

app/videos/+video-watch/video-watch.component.html @@ -412,7 +519,7 @@

app/videos/+video-watch/modal/video-report.component.html - 11 + 16

app/videos/+video-watch/modal/video-blacklist.component.html @@ -432,6 +539,12 @@ app/shared/moderation/user-ban-modal.component.html 25 +

+ <x id="INTERPOLATION" equiv-text="{{ menuEntry.label }}"/> + + app/shared/menu/top-menu-dropdown.component.html + 11 +

I forgot my password @@ -536,7 +649,7 @@ app/menu/menu.component.html - 38 + 36

Forgot your password @@ -544,11 +657,19 @@ app/login/login.component.html 57 +

+ + We are sorry, you cannot recover you password because your instance administrator did not configure the PeerTube email system. + + + app/login/login.component.html + 63 +

Email app/login/login.component.html - 63 + 68 app/signup/signup.component.html @@ -570,6 +691,10 @@ app/+admin/users/user-list/user-list.component.html 41 + + app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html + 4 +

app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html 8 @@ -578,7 +703,7 @@ Email address app/login/login.component.html - 65 + 70

app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html @@ -588,7 +713,7 @@ Send me an email to reset my password app/login/login.component.html - 75 + 80

@@ -658,11 +783,11 @@ app/+about/about-instance/about-instance.component.html - 22 + 26

app/+admin/config/edit-custom-config/edit-custom-config.component.html - 88 + 78

Features found on this instance @@ -721,7 +846,15 @@ app/menu/menu.component.html - 88 + 86 + +

+ + Help to translate PeerTube! + + + app/menu/language-chooser.component.html + 8

@@ -729,7 +862,7 @@ app/menu/menu.component.html - 18 + 16

@@ -737,7 +870,7 @@ app/menu/menu.component.html - 22 + 20

@@ -745,7 +878,7 @@ app/menu/menu.component.html - 26 + 24

@@ -753,19 +886,19 @@ app/menu/menu.component.html - 30 + 28

Create an account app/menu/menu.component.html - 39 + 37

Videos app/menu/menu.component.html - 43 + 41

app/+accounts/accounts.component.html @@ -779,49 +912,49 @@ Subscriptions app/menu/menu.component.html - 47 + 45

Overview app/menu/menu.component.html - 52 + 50

Trending app/menu/menu.component.html - 57 + 55

Recently added app/menu/menu.component.html - 62 + 60

Local app/menu/menu.component.html - 67 + 65

More app/menu/menu.component.html - 72 + 70

Administration app/menu/menu.component.html - 76 + 74

About app/menu/menu.component.html - 81 + 79

app/+accounts/accounts.component.html @@ -835,13 +968,41 @@ Show keyboard shortcuts app/menu/menu.component.html - 91 + 89

Toggle dark interface app/menu/menu.component.html - 94 + 92 + +

+ View your notifications + + app/menu/avatar-notification.component.html + 3 + +

+ Notifications + + app/menu/avatar-notification.component.html + 12 + + + app/+my-account/my-account-settings/my-account-settings.component.html + 10 + +

+ Update your notification preferences + + app/menu/avatar-notification.component.html + 15 + +

+ See all your notifications + + app/menu/avatar-notification.component.html + 22

Search... @@ -1067,19 +1228,85 @@ app/+about/about.component.html 7 -

+ Contact <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> administrator + + app/+about/about-instance/contact-admin-modal.component.html + 3 + +

+ Your name + + app/+about/about-instance/contact-admin-modal.component.html + 11 + +

+ Your email + + app/+about/about-instance/contact-admin-modal.component.html + 20 + +

+ Your message + + app/+about/about-instance/contact-admin-modal.component.html + 29 + +

- About <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> instance - + Cancel + + + app/+about/about-instance/contact-admin-modal.component.html + 38 + + + app/videos/+video-watch/modal/video-report.component.html + 24 + + + app/videos/+video-watch/modal/video-blacklist.component.html + 19 + +

+ Submit + + app/+about/about-instance/contact-admin-modal.component.html + 43 + + + app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html + 25 + + + app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html + 28 + + + app/videos/+video-watch/modal/video-report.component.html + 29 + + + app/videos/+video-watch/modal/video-blacklist.component.html + 24 + +

+ About <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> instance app/+about/about-instance/about-instance.component.html - 1 + 4 + +

+ Contact administrator + + app/+about/about-instance/about-instance.component.html + 6

Description app/+about/about-instance/about-instance.component.html - 10 + 14

app/+accounts/account-about/account-about.component.html @@ -1087,7 +1314,7 @@

app/+admin/config/edit-custom-config/edit-custom-config.component.html - 33 + 30

app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html @@ -1113,41 +1340,41 @@ Terms app/+about/about-instance/about-instance.component.html - 16 + 20

app/+admin/config/edit-custom-config/edit-custom-config.component.html - 44 + 39

User registration is allowed and app/+about/about-instance/about-instance.component.html - 25 + 29 -

- this instance provides a baseline quota of <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/> space for the videos of its users. - + this instance provides a baseline quota of <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/> space for the videos of its users. + app/+about/about-instance/about-instance.component.html - 27 + 31 -

- this instance provides unlimited space for the videos of its users. - + this instance provides unlimited space for the videos of its users. + app/+about/about-instance/about-instance.component.html - 31 + 35 -

- User registration is currently not allowed. - + User registration is currently not allowed. + app/+about/about-instance/about-instance.component.html - 36 + 40

@@ -1433,7 +1660,7 @@ Name app/+admin/config/edit-custom-config/edit-custom-config.component.html - 11 + 12

app/+admin/follows/followers-list/followers-list.component.html @@ -1451,49 +1678,49 @@ Short description app/+admin/config/edit-custom-config/edit-custom-config.component.html - 22 + 21

Default client route app/+admin/config/edit-custom-config/edit-custom-config.component.html - 55 + 48

Videos Overview app/+admin/config/edit-custom-config/edit-custom-config.component.html - 58 + 51

Videos Trending app/+admin/config/edit-custom-config/edit-custom-config.component.html - 59 + 52

Videos Recently Added app/+admin/config/edit-custom-config/edit-custom-config.component.html - 60 + 53

Local videos app/+admin/config/edit-custom-config/edit-custom-config.component.html - 61 + 54

Policy on videos containing sensitive content app/+admin/config/edit-custom-config/edit-custom-config.component.html - 70 + 61

With <strong>Do not list</strong> or <strong>Blur thumbnails</strong>, a confirmation will be requested to watch the video. app/+admin/config/edit-custom-config/edit-custom-config.component.html - 73 + 64

app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html @@ -1503,7 +1730,7 @@ Do not list app/+admin/config/edit-custom-config/edit-custom-config.component.html - 78 + 69

app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html @@ -1513,7 +1740,7 @@ Blur thumbnails app/+admin/config/edit-custom-config/edit-custom-config.component.html - 79 + 70

app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html @@ -1523,7 +1750,7 @@ Display app/+admin/config/edit-custom-config/edit-custom-config.component.html - 80 + 71

app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html @@ -1533,28 +1760,46 @@ Signup enabled app/+admin/config/edit-custom-config/edit-custom-config.component.html - 93 + 84

Signup requires email verification app/+admin/config/edit-custom-config/edit-custom-config.component.html - 100 + 91

Signup limit app/+admin/config/edit-custom-config/edit-custom-config.component.html - 105 + 96 -

- Import +

+ Users app/+admin/config/edit-custom-config/edit-custom-config.component.html - 115 + 105 +

+ User default video quota - app/videos/+video-edit/video-add-components/video-import-url.component.html + app/+admin/config/edit-custom-config/edit-custom-config.component.html + 109 + +

+ User default daily upload limit + + app/+admin/config/edit-custom-config/edit-custom-config.component.html + 121 + +

+ Import + + app/+admin/config/edit-custom-config/edit-custom-config.component.html + 133 + + + app/videos/+video-edit/video-add-components/video-import-url.component.html 34

@@ -1565,43 +1810,31 @@ Video import with HTTP URL (i.e. YouTube) enabled app/+admin/config/edit-custom-config/edit-custom-config.component.html - 120 + 141

Video import with a torrent file or a magnet URI enabled app/+admin/config/edit-custom-config/edit-custom-config.component.html - 127 + 148

Administrator app/+admin/config/edit-custom-config/edit-custom-config.component.html - 131 + 155

Admin email app/+admin/config/edit-custom-config/edit-custom-config.component.html - 134 - -

- Users - - app/+admin/config/edit-custom-config/edit-custom-config.component.html - 144 + 158 -

- User default video quota - - app/+admin/config/edit-custom-config/edit-custom-config.component.html - 147 - -

- User default daily upload limit +

+ Enable contact form app/+admin/config/edit-custom-config/edit-custom-config.component.html - 161 + 169

Basic configuration @@ -1619,27 +1852,27 @@ Your Twitter username app/+admin/config/edit-custom-config/edit-custom-config.component.html - 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. app/+admin/config/edit-custom-config/edit-custom-config.component.html - 184 + 187

Instance whitelisted by Twitter app/+admin/config/edit-custom-config/edit-custom-config.component.html - 198 + 199 -

If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> - If the instance is not whitelisted, we use an image link card that will redirect on 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 whitelisted. + If the instance is not whitelisted, we use an image link card that will redirect on 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 whitelisted. app/+admin/config/edit-custom-config/edit-custom-config.component.html - 199 + 200

Services @@ -1651,31 +1884,43 @@ Transcoding app/+admin/config/edit-custom-config/edit-custom-config.component.html - 210 + 215

Transcoding enabled app/+admin/config/edit-custom-config/edit-custom-config.component.html - 215 + 221

If you disable transcoding, many videos from your users will not work! app/+admin/config/edit-custom-config/edit-custom-config.component.html - 216 + 222 + +

+ Allow additional extensions + + app/+admin/config/edit-custom-config/edit-custom-config.component.html + 231 + +

+ Allow your users to upload .mkv, .mov, .avi, .flv videos + + app/+admin/config/edit-custom-config/edit-custom-config.component.html + 232

Transcoding threads app/+admin/config/edit-custom-config/edit-custom-config.component.html - 223 + 237

Resolution <x id="INTERPOLATION" equiv-text="{{resolution}}"/> enabled app/+admin/config/edit-custom-config/edit-custom-config.component.html - 239 + 252

@@ -1685,81 +1930,81 @@ app/+admin/config/edit-custom-config/edit-custom-config.component.html - 244 + 260

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. app/+admin/config/edit-custom-config/edit-custom-config.component.html - 249 + 265

Previews cache size app/+admin/config/edit-custom-config/edit-custom-config.component.html - 254 + 271

Video captions cache size app/+admin/config/edit-custom-config/edit-custom-config.component.html - 265 + 280

Customizations app/+admin/config/edit-custom-config/edit-custom-config.component.html - 275 + 289

JavaScript app/+admin/config/edit-custom-config/edit-custom-config.component.html - 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> app/+admin/config/edit-custom-config/edit-custom-config.component.html - 281 + 297 -

- Write directly CSS code. Example:<br /> - <pre> - body <x id="INTERPOLATION" equiv-text="{{ '{' }}"/> - background-color: red; - <x id="INTERPOLATION_1" equiv-text="{{ '}' }}"/> - </pre> + Write directly CSS code. Example:<br /> + <pre> + body <x id="INTERPOLATION" equiv-text="{{ '{' }}"/> + background-color: red; + <x id="INTERPOLATION_1" equiv-text="{{ '}' }}"/> + </pre> - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email <x id="INTERPOLATION" equiv-text="{{ '{' }}"/> - color: red; - <x id="INTERPOLATION_1" equiv-text="{{ '}' }}"/> - </pre> - + Prepend with <em>#custom-css</em> to override styles. Example: + <pre> + #custom-css .logged-in-email <x id="INTERPOLATION" equiv-text="{{ '{' }}"/> + color: red; + <x id="INTERPOLATION_1" equiv-text="{{ '}' }}"/> + </pre> + app/+admin/config/edit-custom-config/edit-custom-config.component.html - 297 + 311

Advanced configuration app/+admin/config/edit-custom-config/edit-custom-config.component.html - 207 + 212

Update configuration app/+admin/config/edit-custom-config/edit-custom-config.component.html - 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. app/+admin/config/edit-custom-config/edit-custom-config.component.html - 326 + 341

@@ -2256,10 +2501,6 @@ app/+admin/moderation/moderation.component.html 9 - - app/+my-account/my-account.component.html - 29 - app/+my-account/my-account-blocklist/my-account-blocklist.component.html 2 @@ -2316,64 +2557,6 @@ app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html 23 -

- My settings - - app/+my-account/my-account.component.html - 3 - -

- My library - - app/+my-account/my-account.component.html - 7 - -

- My channels - - app/+my-account/my-account.component.html - 12 - -

- My videos - - app/+my-account/my-account.component.html - 14 - -

- My subscriptions - - app/+my-account/my-account.component.html - 16 - -

- My imports - - app/+my-account/my-account.component.html - 18 - -

- Misc - - app/+my-account/my-account.component.html - 24 - -

- Muted instances - - app/+my-account/my-account.component.html - 31 - - - app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html - 2 - -

- Ownership changes - - app/+my-account/my-account.component.html - 33 -

Video quota: @@ -2384,19 +2567,19 @@ Profile app/+my-account/my-account-settings/my-account-settings.component.html - 8 + 7

Video settings app/+my-account/my-account-settings/my-account-settings.component.html - 15 + 16

Danger zone app/+my-account/my-account-settings/my-account-settings.component.html - 18 + 19

Change ownership @@ -2430,24 +2613,6 @@ app/videos/+video-edit/shared/video-caption-add-modal.component.html 35 -

- Submit - - app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html - 25 - - - app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html - 28 - - - app/videos/+video-watch/modal/video-report.component.html - 24 - - - app/videos/+video-watch/modal/video-blacklist.component.html - 24 -

<x id="INTERPOLATION" equiv-text="{{ video.createdAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> views @@ -2612,6 +2777,48 @@ When you will upload a video in this channel, the video support field will be au app/+my-account/my-account-ownership/my-account-ownership.component.html 47 +

+ Muted instances + + app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html + 2 + +

+ History enabled + + app/+my-account/my-account-history/my-account-history.component.html + 4 + +

+ Delete history + + app/+my-account/my-account-history/my-account-history.component.html + 8 + +

+ You don't have videos history yet. + + app/+my-account/my-account-history/my-account-history.component.html + 13 + +

+ <x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> views + + app/+my-account/my-account-history/my-account-history.component.html + 22 + +

+ Notification preferences + + app/+my-account/my-account-notifications/my-account-notifications.component.html + 2 + +

+ Mark all as read + + app/+my-account/my-account-notifications/my-account-notifications.component.html + 4 +

Change password @@ -2700,6 +2907,18 @@ When you will upload a video in this channel, the video support field will be au app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.html 4 +

+ Activities + + app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html + 2 + +

+ Web + + app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html + 3 +

Sorry, but we couldn't find the page you were looking for. @@ -2874,13 +3093,13 @@ When you will upload a video in this channel, the video support field will be au Publish will be available when upload is finished app/videos/+video-edit/video-add-components/video-upload.component.html - 53 + 54

Publish app/videos/+video-edit/video-add-components/video-upload.component.html - 60 + 61

Select the torrent to import @@ -3038,13 +3257,13 @@ When you will upload a video in this channel, the video support field will be au Wait transcoding before publishing the video app/videos/+video-edit/shared/video-edit.component.html - 130 + 131

If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. app/videos/+video-edit/shared/video-edit.component.html - 131 + 132

Basic info @@ -3056,43 +3275,43 @@ When you will upload a video in this channel, the video support field will be au Add another caption app/videos/+video-edit/shared/video-edit.component.html - 146 + 147

See the subtitle file app/videos/+video-edit/shared/video-edit.component.html - 155 + 156

Already uploaded ✔ app/videos/+video-edit/shared/video-edit.component.html - 159 + 160

Will be created on update app/videos/+video-edit/shared/video-edit.component.html - 167 + 168

Cancel create app/videos/+video-edit/shared/video-edit.component.html - 169 + 170

Will be deleted on update app/videos/+video-edit/shared/video-edit.component.html - 175 + 176

Cancel deletion app/videos/+video-edit/shared/video-edit.component.html - 177 + 178

@@ -3100,31 +3319,31 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-edit/shared/video-edit.component.html - 182 + 183

Captions app/videos/+video-edit/shared/video-edit.component.html - 139 + 140

Upload thumbnail app/videos/+video-edit/shared/video-edit.component.html - 195 + 196

Upload preview app/videos/+video-edit/shared/video-edit.component.html - 202 + 203

Support app/videos/+video-edit/shared/video-edit.component.html - 208 + 209

app/videos/+video-watch/modal/video-support.component.html @@ -3138,13 +3357,13 @@ When you will upload a video in this channel, the video support field will be au Short text to tell people how they can support you (membership platform...). app/videos/+video-edit/shared/video-edit.component.html - 209 + 210

Advanced settings app/videos/+video-edit/shared/video-edit.component.html - 190 + 191

@@ -3206,17 +3425,14 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-watch/modal/video-report.component.html 3 -

- Cancel - + Your report will be sent to moderators of <x id="INTERPOLATION" equiv-text="{{ currentHost }}"/>. + <x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="<ng-container>"/> It will be forwarded to origin instance <x id="INTERPOLATION_1" equiv-text="{{ originHost }}"/> too.<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="</ng-container>"/> + app/videos/+video-watch/modal/video-report.component.html - 19 - - - app/videos/+video-watch/modal/video-blacklist.component.html - 19 + 9

Share @@ -3531,647 +3747,99 @@ When you will upload a video in this channel, the video support field will be au 14 - - Error getting about from server + + Cannot get about information from server src/app/+about/about-instance/about-instance.component.ts 1 - - No description - - src/app/+accounts/account-about/account-about.component.ts - 1 - + + Your message has been sent. - src/app/+video-channels/video-channel-about/video-channel-about.component.ts + src/app/+about/about-instance/contact-admin-modal.component.ts 1 - - Published videos - - src/app/+accounts/account-videos/account-videos.component.ts - 1 - + + You already sent this form recently - src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts + src/app/+about/about-instance/contact-admin-modal.component.ts 1 - - Published <x id="INTERPOLATION" equiv-text="{{totalVideos}}"/> videos + + No description - src/app/+accounts/account-videos/account-videos.component.ts + src/app/+accounts/account-about/account-about.component.ts 1

- src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts + src/app/+video-channels/video-channel-about/video-channel-about.component.ts 1

- - Error - - src/app/+accounts/accounts.component.ts - 1 - - - src/app/+accounts/accounts.component.ts - 1 - - - src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts - 1 - - - src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts - 1 - - - src/app/+admin/follows/followers-list/followers-list.component.ts - 1 - - - src/app/+admin/follows/following-add/following-add.component.ts - 1 - - - src/app/+admin/follows/following-list/following-list.component.ts - 1 - - - src/app/+admin/follows/following-list/following-list.component.ts - 1 - - - src/app/+admin/follows/shared/redundancy-checkbox.component.ts - 1 - - - src/app/+admin/jobs/jobs-list/jobs-list.component.ts - 1 - - - src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts - 1 - - - src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts - 1 - - - src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts - 1 - - - src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts - 1 - + + Published videos - src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts - 1 - - - src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts - 1 - - - src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts - 1 - - - src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts - 1 - - - src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts - 1 - - - src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.ts - 1 - - - src/app/+my-account/my-account-ownership/my-account-ownership.component.ts - 1 - - - src/app/+my-account/my-account-ownership/my-account-ownership.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-settings.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts - 1 - - - src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.ts - 1 - - - src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts - 1 - - - src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts - 1 - - - src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts - 1 - - - src/app/+my-account/my-account-videos/my-account-videos.component.ts - 1 - - - src/app/+my-account/my-account-videos/my-account-videos.component.ts - 1 - - - src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.ts - 1 - - - src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts - 1 - - - src/app/+verify-account/verify-account-email/verify-account-email.component.ts - 1 - - - src/app/+verify-account/verify-account-email/verify-account-email.component.ts - 1 - - - src/app/core/auth/auth.service.ts - 1 - - - src/app/login/login.component.ts - 1 - - - src/app/reset-password/reset-password.component.ts - 1 - - - src/app/search/search.component.ts - 1 - - - src/app/shared/forms/reactive-file.component.ts - 1 - - - src/app/shared/moderation/user-ban-modal.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/user-subscription/subscribe-button.component.ts - 1 - - - src/app/shared/user-subscription/subscribe-button.component.ts - 1 - - - src/app/shared/user-subscription/subscribe-button.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-import-url.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-upload.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-upload.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-upload.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-upload.component.ts - 1 - - - src/app/videos/+video-edit/video-update.component.ts - 1 - - - src/app/videos/+video-edit/video-update.component.ts - 1 - - - src/app/videos/+video-watch/comment/video-comment-add.component.ts - 1 - - - src/app/videos/+video-watch/comment/video-comments.component.ts - 1 - - - src/app/videos/+video-watch/comment/video-comments.component.ts - 1 - - - src/app/videos/+video-watch/comment/video-comments.component.ts - 1 - - - src/app/videos/+video-watch/modal/video-blacklist.component.ts - 1 - - - src/app/videos/+video-watch/modal/video-report.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - - src/app/videos/+video-watch/video-watch.component.ts - 1 - - - - 240p - - src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts - 1 - - - - 360p - - src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts - 1 - - - - 480p - - src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts - 1 - - - - 720p - - src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts - 1 - - - - 1080p - - src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts - 1 - - - - Auto (via ffmpeg) - - src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts - 1 - - - - Success - - src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts - 1 - - - src/app/+admin/follows/following-add/following-add.component.ts - 1 - - - src/app/+admin/follows/following-list/following-list.component.ts - 1 - - - src/app/+admin/follows/shared/redundancy-checkbox.component.ts - 1 - - - src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts - 1 - - - src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts - 1 - - - src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts - 1 - - - src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts - 1 - - - src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts - 1 - - - src/app/+admin/users/user-edit/user-create.component.ts - 1 - - - src/app/+admin/users/user-edit/user-update.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+admin/users/user-list/user-list.component.ts - 1 - - - src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts - 1 - - - src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts - 1 - - - src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-settings.component.ts - 1 - - - src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts - 1 - - - src/app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts - 1 - - - src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts - 1 - - - src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts - 1 - - - src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts - 1 - - - src/app/+my-account/my-account-videos/my-account-videos.component.ts - 1 - - - src/app/+my-account/my-account-videos/my-account-videos.component.ts - 1 - - - src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.ts - 1 - - - src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts - 1 - - - src/app/login/login.component.ts - 1 - - - src/app/reset-password/reset-password.component.ts - 1 - - - src/app/shared/moderation/user-ban-modal.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/shared/moderation/user-moderation-dropdown.component.ts - 1 - - - src/app/signup/signup.component.ts - 1 - - - src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts + src/app/+accounts/account-videos/account-videos.component.ts 1 - src/app/videos/+video-edit/video-add-components/video-import-url.component.ts + src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts 1 + + + Published <x id="INTERPOLATION" equiv-text="{{totalVideos}}"/> videos - src/app/videos/+video-edit/video-add-components/video-upload.component.ts + src/app/+accounts/account-videos/account-videos.component.ts 1 - src/app/videos/+video-edit/video-update.component.ts + src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts 1 + + + 240p - src/app/videos/+video-watch/modal/video-blacklist.component.ts + src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts 1 + + + 360p - src/app/videos/+video-watch/modal/video-download.component.ts + src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts 1 + + + 480p - src/app/videos/+video-watch/modal/video-report.component.ts + src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts 1 + + + 720p - src/app/videos/+video-watch/modal/video-share.component.ts + src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts 1 + + + 1080p - src/app/videos/+video-watch/video-watch.component.ts + src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts 1 + + + Auto (via ffmpeg) - src/app/videos/+video-watch/video-watch.component.ts + src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts 1 @@ -4575,6 +4243,48 @@ When you will upload a video in this channel, the video support field will be au 1 + + My videos history + + src/app/+my-account/my-account-history/my-account-history.component.ts + 1 + + + + Videos history is enabled + + src/app/+my-account/my-account-history/my-account-history.component.ts + 1 + + + + Videos history is disabled + + src/app/+my-account/my-account-history/my-account-history.component.ts + 1 + + + + Delete videos history + + src/app/+my-account/my-account-history/my-account-history.component.ts + 1 + + + + Are you sure you want to delete all your videos history? + + src/app/+my-account/my-account-history/my-account-history.component.ts + 1 + + + + Videos history deleted + + src/app/+my-account/my-account-history/my-account-history.component.ts + 1 + + Ownership accepted @@ -4624,6 +4334,76 @@ When you will upload a video in this channel, the video support field will be au 1 + + New video from your subscriptions + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + New comment on your video + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + New video abuse on local video + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + One of your video is blacklisted/unblacklisted + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + Video published (after transcoding/scheduled update) + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + Video import finished + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + A new user registered on your instance + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + You or your channel(s) has a new follower + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + Someone mentioned you in video comments + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + + + Preferences saved + + src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts + 1 + + Profile updated. @@ -4698,6 +4478,17 @@ When you will upload a video in this channel, the video support field will be au 1 + + My videos + + src/app/+my-account/my-account-videos/my-account-videos.component.ts + 1 + + + src/app/+my-account/my-account.component.ts + 1 + + Do you really want to delete <x id="INTERPOLATION" equiv-text="{{deleteLength}}"/> videos? @@ -4772,15 +4563,57 @@ When you will upload a video in this channel, the video support field will be au 1 - - Channels + + My library + + src/app/+my-account/my-account.component.ts + 1 + + + + My channels + + src/app/+my-account/my-account.component.ts + 1 + + + + My subscriptions + + src/app/+my-account/my-account.component.ts + 1 + + + + My history + + src/app/+my-account/my-account.component.ts + 1 + + + + Misc + + src/app/+my-account/my-account.component.ts + 1 + + + + Ownership changes + + src/app/+my-account/my-account.component.ts + 1 + + + + My settings src/app/+my-account/my-account.component.ts 1 - - Video imports + + My notifications src/app/+my-account/my-account.component.ts 1 @@ -4914,6 +4747,17 @@ When you will upload a video in this channel, the video support field will be au 1 + + Error + + src/app/core/auth/auth.service.ts + 1 + + + src/app/core/notification/notifier.service.ts + 1 + + You need to reconnect. @@ -4935,6 +4779,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Info + + src/app/core/notification/notifier.service.ts + 1 + + + + Success + + src/app/core/notification/notifier.service.ts + 1 + + Incorrect username or password. @@ -5156,10 +5014,10 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username is required. + + Email is required. - src/app/shared/forms/form-validators/login-validators.service.ts + src/app/shared/forms/form-validators/instance-validators.service.ts 1

@@ -5167,10 +5025,10 @@ When you will upload a video in this channel, the video support field will be au 1

- - Password is required. + + Email must be valid. - src/app/shared/forms/form-validators/login-validators.service.ts + src/app/shared/forms/form-validators/instance-validators.service.ts 1

@@ -5178,43 +5036,93 @@ When you will upload a video in this channel, the video support field will be au 1

- - Confirmation of the password is required. + + Your name is required. - src/app/shared/forms/form-validators/reset-password-validators.service.ts + src/app/shared/forms/form-validators/instance-validators.service.ts + 1 + + + + Your name must be at least 1 character long. + + src/app/shared/forms/form-validators/instance-validators.service.ts + 1 + + + + Your name cannot be more than 120 characters long. + + src/app/shared/forms/form-validators/instance-validators.service.ts + 1 + + + + A message is required. + + src/app/shared/forms/form-validators/instance-validators.service.ts + 1 + + + + The message must be at least 3 characters long. + + src/app/shared/forms/form-validators/instance-validators.service.ts + 1 + + + + The message cannot be more than 5000 characters long. + + src/app/shared/forms/form-validators/instance-validators.service.ts 1 - - Username must be at least 3 characters long. + + Username is required. + + src/app/shared/forms/form-validators/login-validators.service.ts + 1 +

src/app/shared/forms/form-validators/user-validators.service.ts 1

- - Username cannot be more than 20 characters long. + + Password is required. + + src/app/shared/forms/form-validators/login-validators.service.ts + 1 +

src/app/shared/forms/form-validators/user-validators.service.ts 1

- - Username should be only lowercase alphanumeric characters. + + Confirmation of the password is required. + + src/app/shared/forms/form-validators/reset-password-validators.service.ts + 1 + + + + Username must be at least 1 character long. src/app/shared/forms/form-validators/user-validators.service.ts 1 - - Email is required. + + Username cannot be more than 50 characters long. src/app/shared/forms/form-validators/user-validators.service.ts 1 - - Email must be valid. + + Username should be lowercase alphanumeric; dots and underscores are allowed. src/app/shared/forms/form-validators/user-validators.service.ts 1 @@ -5287,8 +5195,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. + + Display name must be at least 1 character long. src/app/shared/forms/form-validators/user-validators.service.ts 1 @@ -5298,8 +5206,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name cannot be more than 120 characters long. + + Display name cannot be more than 50 characters long. src/app/shared/forms/form-validators/user-validators.service.ts 1 @@ -5450,22 +5358,22 @@ When you will upload a video in this channel, the video support field will be au 1 - - Name must be at least 3 characters long. + + Name must be at least 1 character long. src/app/shared/forms/form-validators/video-channel-validators.service.ts 1 - - Name cannot be more than 20 characters long. + + Name cannot be more than 50 characters long. src/app/shared/forms/form-validators/video-channel-validators.service.ts 1 - - Name should be only lowercase alphanumeric characters. + + Name should be lowercase alphanumeric; dots and underscores are allowed. src/app/shared/forms/form-validators/video-channel-validators.service.ts 1 @@ -6313,29 +6221,29 @@ When you will upload a video in this channel, the video support field will be au 1 - - Subscribed + + Subscribed to <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> src/app/shared/user-subscription/subscribe-button.component.ts 1 - - Subscribed to <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> + + Subscribed src/app/shared/user-subscription/subscribe-button.component.ts 1 - - Unsubscribed + + Unsubscribed from <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> src/app/shared/user-subscription/subscribe-button.component.ts 1 - - Unsubscribed from <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> + + Unsubscribed src/app/shared/user-subscription/subscribe-button.component.ts 1 @@ -6415,13 +6323,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Info - - src/app/videos/+video-edit/video-add-components/video-upload.component.ts - 1 - - Upload cancelled @@ -6429,13 +6330,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - We are sorry but PeerTube cannot handle videos > 8GB - - src/app/videos/+video-edit/video-add-components/video-upload.component.ts - 1 - -

Your video quota is exceeded with this video (video size: <x id="INTERPOLATION" equiv-text="{{videoSize}}"/>, used: <x id="INTERPOLATION_1" equiv-text="{{videoQuotaUsed}}"/>, quota: <x id="INTERPOLATION_2" equiv-text="{{videoQuota}}"/>) -- cgit v1.2.3 From 5abb9fbbd12e7097e348d6a38622d364b1fa47ed Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 10 Jan 2019 15:39:51 +0100 Subject: Add ability to unfederate a local video (on blacklist) --- .../video-blacklist-list/video-blacklist-list.component.html | 6 ++++-- .../video-blacklist-list/video-blacklist-list.component.ts | 6 ++++++ client/src/app/+admin/users/user-list/user-list.component.html | 3 +++ .../src/app/shared/video-blacklist/video-blacklist.service.ts | 7 +++++-- .../videos/+video-watch/modal/video-blacklist.component.html | 7 +++++++ .../app/videos/+video-watch/modal/video-blacklist.component.ts | 10 +++++++--- 6 files changed, 32 insertions(+), 7 deletions(-) (limited to 'client') diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html index 7cef787d2..6398af218 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html @@ -7,6 +7,7 @@ Video name Sensitive + Unfederated Date @@ -26,7 +27,8 @@ - {{ videoBlacklist.video.nsfw }} + {{ booleanToText(videoBlacklist.video.nsfw) }} + {{ booleanToText(videoBlacklist.unfederated) }} {{ videoBlacklist.createdAt }} @@ -37,7 +39,7 @@ - + Blacklist reason: {{ videoBlacklist.reason }} diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts index a02e84f67..6c6f17f0c 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts @@ -46,6 +46,12 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit { return Video.buildClientUrl(videoBlacklist.video.uuid) } + booleanToText (value: boolean) { + if (value === true) return this.i18n('yes') + + return this.i18n('no') + } + async removeVideoFromBlacklist (entry: VideoBlacklist) { const confirmMessage = this.i18n( 'Do you really want to remove this video from the blacklist? It will be available again in the videos list.' diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html index 556ab3c5d..8c03a924b 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.html +++ b/client/src/app/+admin/users/user-list/user-list.component.html @@ -65,7 +65,9 @@ (banned) + {{ user.email }} + ? {{ user.email }} @@ -76,6 +78,7 @@ + {{ user.videoQuotaUsed }} / {{ user.videoQuota }} {{ user.roleLabel }} {{ user.createdAt }} diff --git a/client/src/app/shared/video-blacklist/video-blacklist.service.ts b/client/src/app/shared/video-blacklist/video-blacklist.service.ts index 7d39fd4f2..94e46d7c2 100644 --- a/client/src/app/shared/video-blacklist/video-blacklist.service.ts +++ b/client/src/app/shared/video-blacklist/video-blacklist.service.ts @@ -36,8 +36,11 @@ export class VideoBlacklistService { ) } - blacklistVideo (videoId: number, reason?: string) { - const body = reason ? { reason } : {} + blacklistVideo (videoId: number, reason: string, unfederate: boolean) { + const body = { + unfederate, + reason + } return this.authHttp.post(VideoBlacklistService.BASE_VIDEOS_URL + videoId + '/blacklist', body) .pipe( diff --git a/client/src/app/videos/+video-watch/modal/video-blacklist.component.html b/client/src/app/videos/+video-watch/modal/video-blacklist.component.html index c436501b4..83600fa81 100644 --- a/client/src/app/videos/+video-watch/modal/video-blacklist.component.html +++ b/client/src/app/videos/+video-watch/modal/video-blacklist.component.html @@ -15,6 +15,13 @@

+ +

Cancel diff --git a/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts b/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts index 357ce39ce..50a7cadd1 100644 --- a/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-blacklist.component.ts @@ -34,9 +34,12 @@ export class VideoBlacklistComponent extends FormReactive implements OnInit { } ngOnInit () { + const defaultValues = { unfederate: 'true' } + this.buildForm({ - reason: this.videoBlacklistValidatorsService.VIDEO_BLACKLIST_REASON - }) + reason: this.videoBlacklistValidatorsService.VIDEO_BLACKLIST_REASON, + unfederate: null + }, defaultValues) } show () { @@ -50,8 +53,9 @@ export class VideoBlacklistComponent extends FormReactive implements OnInit { blacklist () { const reason = this.form.value[ 'reason' ] || undefined + const unfederate = this.video.isLocal ? this.form.value[ 'unfederate' ] : undefined - this.videoBlacklistService.blacklistVideo(this.video.id, reason) + this.videoBlacklistService.blacklistVideo(this.video.id, reason, unfederate) .subscribe( () => { this.notifier.success(this.i18n('Video blacklisted.')) -- cgit v1.2.3 From 9b4b15f91c485f9a7fe2ed314b4101f4b7506b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20B=C3=A9ranger?= <43744761+auberanger@users.noreply.github.com> Date: Mon, 14 Jan 2019 09:06:48 +0100 Subject: WIP : Indicate to users how "trending" works (#1458) * Get the INTERVAL_DAYS const in the video-trending component * Change Trending section title * Add a tooltip to explain how trending section works * Minor CSS fix for the my-feed popover next to the titlepage --- client/src/app/core/server/server.service.ts | 5 +++++ client/src/app/shared/video/abstract-video-list.html | 5 ++++- client/src/app/shared/video/abstract-video-list.scss | 2 +- client/src/app/shared/video/abstract-video-list.ts | 2 ++ client/src/app/videos/video-list/video-trending.component.ts | 12 ++++++++++-- 5 files changed, 22 insertions(+), 4 deletions(-) (limited to 'client') diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts index f33e6f20c..4ae72427b 100644 --- a/client/src/app/core/server/server.service.ts +++ b/client/src/app/core/server/server.service.ts @@ -87,6 +87,11 @@ export class ServerService { enabled: false } } + }, + trending: { + videos: { + intervalDays: 0 + } } } private videoCategories: Array> = [] diff --git a/client/src/app/shared/video/abstract-video-list.html b/client/src/app/shared/video/abstract-video-list.html index 29492351b..1f97bc389 100644 --- a/client/src/app/shared/video/abstract-video-list.html +++ b/client/src/app/shared/video/abstract-video-list.html @@ -1,8 +1,11 @@

- {{ titlePage }} +

+ {{ titlePage }} +

diff --git a/client/src/app/shared/video/abstract-video-list.scss b/client/src/app/shared/video/abstract-video-list.scss index 9fb3fd4d6..292ede698 100644 --- a/client/src/app/shared/video/abstract-video-list.scss +++ b/client/src/app/shared/video/abstract-video-list.scss @@ -19,8 +19,8 @@ my-feed { display: inline-block; - position: relative; top: 1px; + min-width: 60px; } .moderation-block { diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts index d234c8bfa..d74384293 100644 --- a/client/src/app/shared/video/abstract-video-list.ts +++ b/client/src/app/shared/video/abstract-video-list.ts @@ -39,6 +39,8 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy { ownerDisplayType: OwnerDisplayType = 'account' firstLoadedPage: number displayModerationBlock = false + trendingDays: number + titleTooltip: string protected baseVideoWidth = 215 protected baseVideoHeight = 205 diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/videos/video-list/video-trending.component.ts index accc5bfe5..d3c0f5316 100644 --- a/client/src/app/videos/video-list/video-trending.component.ts +++ b/client/src/app/videos/video-list/video-trending.component.ts @@ -8,7 +8,7 @@ import { VideoSortField } from '../../shared/video/sort-field.type' import { VideoService } from '../../shared/video/video.service' import { I18n } from '@ngx-translate/i18n-polyfill' import { ScreenService } from '@app/shared/misc/screen.service' -import { Notifier } from '@app/core' +import { Notifier, ServerService } from '@app/core' @Component({ selector: 'my-videos-trending', @@ -19,6 +19,7 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, titlePage: string currentRoute = '/videos/trending' defaultSort: VideoSortField = '-trending' + trendingDays: number constructor ( protected router: Router, @@ -27,12 +28,19 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, protected authService: AuthService, protected location: Location, protected screenService: ScreenService, + private serverService: ServerService, protected i18n: I18n, private videoService: VideoService ) { super() - this.titlePage = i18n('Trending') + this.trendingDays = this.serverService.getConfig().trending.videos.intervalDays + + this.titlePage = this.i18n('Trending for the last ') + this.trendingDays === 1 ? this.titlePage += '24 hours' : this.titlePage += this.trendingDays + ' days' + + this.titleTooltip = this.i18n('trending videos are those totalizing the greatest number of views during the last ') + this.trendingDays === 1 ? this.titleTooltip += '24 hours.' : this.titleTooltip += this.trendingDays + ' days.' } ngOnInit () { -- cgit v1.2.3 From f242c2e01e3423ad63a9a6d904062256d60b6971 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 10 Jan 2019 16:28:31 +0100 Subject: Improve "no notifications" message --- client/src/app/menu/avatar-notification.component.scss | 1 + client/src/app/shared/users/user-notifications.component.scss | 7 +++++++ 2 files changed, 8 insertions(+) (limited to 'client') diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss index c86667469..47d04ace3 100644 --- a/client/src/app/menu/avatar-notification.component.scss +++ b/client/src/app/menu/avatar-notification.component.scss @@ -11,6 +11,7 @@ font-family: $main-fonts; overflow-y: auto; max-height: 500px; + min-width: 200px; box-shadow: 0 6px 14px rgba(0, 0, 0, 0.30); .notifications-header { diff --git a/client/src/app/shared/users/user-notifications.component.scss b/client/src/app/shared/users/user-notifications.component.scss index 0493b10d9..0ae26ea39 100644 --- a/client/src/app/shared/users/user-notifications.component.scss +++ b/client/src/app/shared/users/user-notifications.component.scss @@ -1,3 +1,10 @@ +.no-notification { + display: flex; + justify-content: center; + align-items: center; + padding: 20px 0; +} + .notification { display: flex; justify-content: space-between; -- cgit v1.2.3 From c32bf839c11557cac527ca5f181d1ce39fc80974 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 11 Jan 2019 16:44:45 +0100 Subject: Fix captions in HTTP fallback --- client/src/assets/player/peertube-player.ts | 8 ++++++++ client/src/assets/player/peertube-videojs-plugin.ts | 5 +++++ client/src/assets/player/settings-menu-item.ts | 13 +++++++++++++ 3 files changed, 26 insertions(+) (limited to 'client') diff --git a/client/src/assets/player/peertube-player.ts b/client/src/assets/player/peertube-player.ts index e0e063838..2de6d7fef 100644 --- a/client/src/assets/player/peertube-player.ts +++ b/client/src/assets/player/peertube-player.ts @@ -254,6 +254,10 @@ function loadLocaleInVideoJS (serverUrl: string, videojs: any, locale: string) { loadLocaleInVideoJS.cache[path] = json return json }) + .catch(err => { + console.error('Cannot get player translations', err) + return undefined + }) } const completeLocale = getCompleteLocale(locale) @@ -270,6 +274,10 @@ function getServerTranslations (serverUrl: string, locale: string) { return fetch(path + '/server.json') .then(res => res.json()) + .catch(err => { + console.error('Cannot get server translations', err) + return undefined + }) } // ############################################################################ diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/peertube-videojs-plugin.ts index 4a280b7ef..e9fb90c61 100644 --- a/client/src/assets/player/peertube-videojs-plugin.ts +++ b/client/src/assets/player/peertube-videojs-plugin.ts @@ -620,6 +620,9 @@ class PeerTubePlugin extends Plugin { this.player.src = this.savePlayerSrcFunction this.player.src(httpUrl) + // We changed the source, so reinit captions + this.initCaptions() + return this.tryToPlay(err => { if (err && done) return done(err) @@ -720,6 +723,8 @@ class PeerTubePlugin extends Plugin { default: this.defaultSubtitle === caption.language }, false) } + + this.player.trigger('captionsChanged') } // Thanks: https://github.com/videojs/video.js/issues/4460#issuecomment-312861657 diff --git a/client/src/assets/player/settings-menu-item.ts b/client/src/assets/player/settings-menu-item.ts index 698f4627a..2a3460ae5 100644 --- a/client/src/assets/player/settings-menu-item.ts +++ b/client/src/assets/player/settings-menu-item.ts @@ -48,6 +48,19 @@ class SettingsMenuItem extends MenuItem { // Update on rate change player.on('ratechange', this.submenuClickHandler) + if (subMenuName === 'CaptionsButton') { + // Hack to regenerate captions on HTTP fallback + player.on('captionsChanged', () => { + setTimeout(() => { + this.settingsSubMenuEl_.innerHTML = '' + this.settingsSubMenuEl_.appendChild(this.subMenu.menu.el_) + this.update() + this.bindClickEvents() + + }, 0) + }) + } + this.reset() }, 0) }) -- cgit v1.2.3 From 033bc0efc2ab2c517b4d7d53d09930b85f092b50 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 11 Jan 2019 16:58:33 +0100 Subject: Fix NSFW blur on search --- client/src/app/search/search.component.html | 2 +- client/src/app/search/search.component.ts | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'client') diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html index 3a87ea1de..82a5f0f26 100644 --- a/client/src/app/search/search.component.html +++ b/client/src/app/search/search.component.html @@ -48,7 +48,7 @@

- +

{{ result.name }} diff --git a/client/src/app/search/search.component.ts b/client/src/app/search/search.component.ts index 474b72824..c4a4b1fde 100644 --- a/client/src/app/search/search.component.ts +++ b/client/src/app/search/search.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' -import { AuthService, Notifier } from '@app/core' +import { AuthService, Notifier, ServerService } from '@app/core' import { forkJoin, Subscription } from 'rxjs' import { SearchService } from '@app/search/search.service' import { ComponentPagination } from '@app/shared/rest/component-pagination.model' @@ -41,7 +41,8 @@ export class SearchComponent implements OnInit, OnDestroy { private metaService: MetaService, private notifier: Notifier, private searchService: SearchService, - private authService: AuthService + private authService: AuthService, + private serverService: ServerService ) { } ngOnInit () { @@ -75,6 +76,10 @@ export class SearchComponent implements OnInit, OnDestroy { if (this.subActivatedRoute) this.subActivatedRoute.unsubscribe() } + isVideoBlur (video: Video) { + return video.isVideoNSFWForUser(this.authService.getUser(), this.serverService.getConfig()) + } + isVideoChannel (d: VideoChannel | Video): d is VideoChannel { return d instanceof VideoChannel } -- cgit v1.2.3 From 7b95f31385eca59ac18197539de30268acc18986 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 09:11:28 +0100 Subject: Help translators to translate trending title/tooltip --- client/src/app/shared/video/abstract-video-list.ts | 1 - .../videos/video-list/video-trending.component.ts | 22 +++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) (limited to 'client') diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts index d74384293..b0633be4a 100644 --- a/client/src/app/shared/video/abstract-video-list.ts +++ b/client/src/app/shared/video/abstract-video-list.ts @@ -39,7 +39,6 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy { ownerDisplayType: OwnerDisplayType = 'account' firstLoadedPage: number displayModerationBlock = false - trendingDays: number titleTooltip: string protected baseVideoWidth = 215 diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/videos/video-list/video-trending.component.ts index d3c0f5316..881ab2174 100644 --- a/client/src/app/videos/video-list/video-trending.component.ts +++ b/client/src/app/videos/video-list/video-trending.component.ts @@ -19,7 +19,6 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, titlePage: string currentRoute = '/videos/trending' defaultSort: VideoSortField = '-trending' - trendingDays: number constructor ( protected router: Router, @@ -33,20 +32,25 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, private videoService: VideoService ) { super() - - this.trendingDays = this.serverService.getConfig().trending.videos.intervalDays - - this.titlePage = this.i18n('Trending for the last ') - this.trendingDays === 1 ? this.titlePage += '24 hours' : this.titlePage += this.trendingDays + ' days' - - this.titleTooltip = this.i18n('trending videos are those totalizing the greatest number of views during the last ') - this.trendingDays === 1 ? this.titleTooltip += '24 hours.' : this.titleTooltip += this.trendingDays + ' days.' } ngOnInit () { super.ngOnInit() this.generateSyndicationList() + + const trendingDays = this.serverService.getConfig().trending.videos.intervalDays + + if (trendingDays === 1) { + this.titlePage = this.i18n('Trending for the last 24 hours') + this.titleTooltip = this.i18n('Trending videos are those totalizing the greatest number of views during the last 24 hours.') + } else { + this.titlePage = this.i18n('Trending for the last {{days}} days', { days: trendingDays }) + this.titleTooltip = this.i18n( + 'Trending videos are those totalizing the greatest number of views during the last {{days}} days.', + { days: trendingDays } + ) + } } ngOnDestroy () { -- cgit v1.2.3 From b4593cd7ff34b94b60f6bfa0b57e371d74d63aa2 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 10:24:49 +0100 Subject: Warn user when they want to delete a channel Because they will not be able to create another channel with the same actor name --- .../my-account-video-channels.component.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'client') diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts index 0ab3e2067..da2c5bcd3 100644 --- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts +++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts @@ -35,10 +35,14 @@ export class MyAccountVideoChannelsComponent implements OnInit { async deleteVideoChannel (videoChannel: VideoChannel) { const res = await this.confirmService.confirmWithInput( this.i18n( - 'Do you really want to delete {{videoChannelName}}? It will delete all videos uploaded in this channel too.', - { videoChannelName: videoChannel.displayName } + 'Do you really want to delete {{channelDisplayName}}? It will delete all videos uploaded in this channel, ' + + 'and you will not be able to create another channel with the same name ({{channelName}})!', + { channelDisplayName: videoChannel.displayName, channelName: videoChannel.name } + ), + this.i18n( + 'Please type the display name of the video channel ({{displayName}}) to confirm', + { displayName: videoChannel.displayName } ), - this.i18n('Please type the name of the video channel to confirm'), videoChannel.displayName, this.i18n('Delete') ) -- cgit v1.2.3 From b5487ff4a5c0bb2acaca79ee00df26a83886c889 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 11:52:15 +0100 Subject: Add error message when trying to upload .ass subtitles --- client/src/app/shared/forms/reactive-file.component.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'client') diff --git a/client/src/app/shared/forms/reactive-file.component.ts b/client/src/app/shared/forms/reactive-file.component.ts index c3986838f..f60c38e8d 100644 --- a/client/src/app/shared/forms/reactive-file.component.ts +++ b/client/src/app/shared/forms/reactive-file.component.ts @@ -53,6 +53,17 @@ export class ReactiveFileComponent implements OnInit, ControlValueAccessor { return } + const extension = '.' + file.name.split('.').pop() + if (this.extensions.includes(extension) === false) { + const message = this.i18n( + 'PeerTube cannot handle this kind of file. Accepted extensions are {{extensions}}.', + { extensions: this.allowedExtensionsMessage } + ) + this.notifier.error(message) + + return + } + this.file = file this.propagateChange(this.file) -- cgit v1.2.3 From 674a66bbda7ceb7aed3c2e6aefddc2793207d94b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 14:55:43 +0100 Subject: Add unload listener on video upload/update --- .../video-add-components/video-upload.component.html | 4 ++++ .../app/videos/+video-edit/video-add.component.ts | 14 ++++++++++++-- .../app/videos/+video-edit/video-update.component.ts | 20 ++++++++++++++++---- 3 files changed, 32 insertions(+), 6 deletions(-) (limited to 'client') diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html index 289a28c66..826e54d25 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html +++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html @@ -42,6 +42,10 @@ {{ error }}

+ Congratulations! Your video is now available in your private library. +

Date: Mon, 14 Jan 2019 15:12:20 +0100 Subject: Fix scroll in notifications page --- client/src/app/menu/avatar-notification.component.scss | 1 + client/src/app/shared/users/user-notifications.component.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'client') diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss index 47d04ace3..807385022 100644 --- a/client/src/app/menu/avatar-notification.component.scss +++ b/client/src/app/menu/avatar-notification.component.scss @@ -13,6 +13,7 @@ max-height: 500px; min-width: 200px; box-shadow: 0 6px 14px rgba(0, 0, 0, 0.30); + overflow-y: auto; .notifications-header { display: flex; diff --git a/client/src/app/shared/users/user-notifications.component.ts b/client/src/app/shared/users/user-notifications.component.ts index 682116226..50c495a9a 100644 --- a/client/src/app/shared/users/user-notifications.component.ts +++ b/client/src/app/shared/users/user-notifications.component.ts @@ -21,7 +21,7 @@ export class UserNotificationsComponent implements OnInit { componentPagination: ComponentPagination = { currentPage: 1, - itemsPerPage: 10, + itemsPerPage: 20, totalItems: null } -- cgit v1.2.3 From 9a39392a7e6b3f180104856a4ea893e5baf86a02 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 15:32:09 +0100 Subject: Fix notification socket Should be in core module to share the same subject to all the app --- client/src/app/core/auth/auth.service.ts | 4 +-- client/src/app/core/core.module.ts | 4 ++- client/src/app/core/notification/index.ts | 1 + .../user-notification-socket.service.ts | 41 +++++++++++++++++++++ .../app/menu/avatar-notification.component.html | 2 +- .../src/app/menu/avatar-notification.component.ts | 5 +-- .../app/shared/users/user-notification.service.ts | 42 ++++++---------------- .../shared/users/user-notifications.component.ts | 3 +- 8 files changed, 63 insertions(+), 39 deletions(-) create mode 100644 client/src/app/core/notification/user-notification-socket.service.ts (limited to 'client') diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts index 79ea32ced..eaa822e0f 100644 --- a/client/src/app/core/auth/auth.service.ts +++ b/client/src/app/core/auth/auth.service.ts @@ -3,12 +3,12 @@ import { catchError, map, mergeMap, share, tap } from 'rxjs/operators' import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' import { Router } from '@angular/router' -import { Notifier } from '@app/core/notification' +import { Notifier } from '@app/core/notification/notifier.service' import { OAuthClientLocal, User as UserServerModel, UserRefreshToken } from '../../../../../shared' import { User } from '../../../../../shared/models/users' import { UserLogin } from '../../../../../shared/models/users/user-login.model' import { environment } from '../../../environments/environment' -import { RestExtractor } from '../../shared/rest' +import { RestExtractor } from '../../shared/rest/rest-extractor.service' import { AuthStatus } from './auth-status.model' import { AuthUser } from './auth-user.model' import { objectToUrlEncoded } from '@app/shared/misc/utils' diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts index 7c0d4ac8f..3bc0e2885 100644 --- a/client/src/app/core/core.module.ts +++ b/client/src/app/core/core.module.ts @@ -18,6 +18,7 @@ import { CheatSheetComponent } from './hotkeys' import { ToastModule } from 'primeng/toast' import { Notifier } from './notification' import { MessageService } from 'primeng/api' +import { UserNotificationSocket } from '@app/core/notification/user-notification-socket.service' @NgModule({ imports: [ @@ -60,7 +61,8 @@ import { MessageService } from 'primeng/api' UserRightGuard, RedirectService, Notifier, - MessageService + MessageService, + UserNotificationSocket ] }) export class CoreModule { diff --git a/client/src/app/core/notification/index.ts b/client/src/app/core/notification/index.ts index 8b0cfde5f..3e8d9ea65 100644 --- a/client/src/app/core/notification/index.ts +++ b/client/src/app/core/notification/index.ts @@ -1 +1,2 @@ export * from './notifier.service' +export * from './user-notification-socket.service' diff --git a/client/src/app/core/notification/user-notification-socket.service.ts b/client/src/app/core/notification/user-notification-socket.service.ts new file mode 100644 index 000000000..f367d9ae4 --- /dev/null +++ b/client/src/app/core/notification/user-notification-socket.service.ts @@ -0,0 +1,41 @@ +import { Injectable } from '@angular/core' +import { environment } from '../../../environments/environment' +import { UserNotification as UserNotificationServer } from '../../../../../shared' +import { Subject } from 'rxjs' +import * as io from 'socket.io-client' +import { AuthService } from '../auth' + +export type NotificationEvent = 'new' | 'read' | 'read-all' + +@Injectable() +export class UserNotificationSocket { + private notificationSubject = new Subject<{ type: NotificationEvent, notification?: UserNotificationServer }>() + + private socket: SocketIOClient.Socket + + constructor ( + private auth: AuthService + ) {} + + dispatch (type: NotificationEvent, notification?: UserNotificationServer) { + this.notificationSubject.next({ type, notification }) + } + + getMyNotificationsSocket () { + const socket = this.getSocket() + + socket.on('new-notification', (n: UserNotificationServer) => this.dispatch('new', n)) + + return this.notificationSubject.asObservable() + } + + private getSocket () { + if (this.socket) return this.socket + + this.socket = io(environment.apiUrl + '/user-notifications', { + query: { accessToken: this.auth.getAccessToken() } + }) + + return this.socket + } +} diff --git a/client/src/app/menu/avatar-notification.component.html b/client/src/app/menu/avatar-notification.component.html index 2f0b7c669..4ef3f0e89 100644 --- a/client/src/app/menu/avatar-notification.component.html +++ b/client/src/app/menu/avatar-notification.component.html @@ -17,7 +17,7 @@ >

- + See all your notifications diff --git a/client/src/app/menu/avatar-notification.component.ts b/client/src/app/menu/avatar-notification.component.ts index 60e090726..f1af08096 100644 --- a/client/src/app/menu/avatar-notification.component.ts +++ b/client/src/app/menu/avatar-notification.component.ts @@ -2,7 +2,7 @@ import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core' import { User } from '../shared/users/user.model' import { UserNotificationService } from '@app/shared/users/user-notification.service' import { Subscription } from 'rxjs' -import { Notifier } from '@app/core' +import { Notifier, UserNotificationSocket } from '@app/core' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' import { NavigationEnd, Router } from '@angular/router' import { filter } from 'rxjs/operators' @@ -23,6 +23,7 @@ export class AvatarNotificationComponent implements OnInit, OnDestroy { constructor ( private userNotificationService: UserNotificationService, + private userNotificationSocket: UserNotificationSocket, private notifier: Notifier, private router: Router ) {} @@ -53,7 +54,7 @@ export class AvatarNotificationComponent implements OnInit, OnDestroy { } private subscribeToNotifications () { - this.notificationSub = this.userNotificationService.getMyNotificationsSocket() + this.notificationSub = this.userNotificationSocket.getMyNotificationsSocket() .subscribe(data => { if (data.type === 'new') return this.unreadNotifications++ if (data.type === 'read') return this.unreadNotifications-- diff --git a/client/src/app/shared/users/user-notification.service.ts b/client/src/app/shared/users/user-notification.service.ts index 2dfee8060..67ed8f74e 100644 --- a/client/src/app/shared/users/user-notification.service.ts +++ b/client/src/app/shared/users/user-notification.service.ts @@ -1,30 +1,28 @@ import { Injectable } from '@angular/core' import { HttpClient, HttpParams } from '@angular/common/http' -import { RestExtractor, RestService } from '@app/shared/rest' +import { RestExtractor, RestService } from '../rest' import { catchError, map, tap } from 'rxjs/operators' import { environment } from '../../../environments/environment' import { ResultList, UserNotification as UserNotificationServer, UserNotificationSetting } from '../../../../../shared' -import { UserNotification } from '@app/shared/users/user-notification.model' -import { Subject } from 'rxjs' -import * as io from 'socket.io-client' -import { AuthService } from '@app/core' -import { ComponentPagination } from '@app/shared/rest/component-pagination.model' -import { User } from '@app/shared' +import { UserNotification } from './user-notification.model' +import { AuthService } from '../../core' +import { ComponentPagination } from '../rest/component-pagination.model' +import { User } from '..' +import { UserNotificationSocket } from '@app/core/notification/user-notification-socket.service' @Injectable() export class UserNotificationService { static BASE_NOTIFICATIONS_URL = environment.apiUrl + '/api/v1/users/me/notifications' static BASE_NOTIFICATION_SETTINGS = environment.apiUrl + '/api/v1/users/me/notification-settings' - private notificationSubject = new Subject<{ type: 'new' | 'read' | 'read-all', notification?: UserNotification }>() - private socket: SocketIOClient.Socket constructor ( private auth: AuthService, private authHttp: HttpClient, private restExtractor: RestExtractor, - private restService: RestService + private restService: RestService, + private userNotificationSocket: UserNotificationSocket ) {} listMyNotifications (pagination: ComponentPagination, unread?: boolean, ignoreLoadingBar = false) { @@ -48,16 +46,6 @@ export class UserNotificationService { .pipe(map(n => n.total)) } - getMyNotificationsSocket () { - const socket = this.getSocket() - - socket.on('new-notification', (n: UserNotificationServer) => { - this.notificationSubject.next({ type: 'new', notification: new UserNotification(n) }) - }) - - return this.notificationSubject.asObservable() - } - markAsRead (notification: UserNotification) { const url = UserNotificationService.BASE_NOTIFICATIONS_URL + '/read' @@ -67,7 +55,7 @@ export class UserNotificationService { return this.authHttp.post(url, body, { headers }) .pipe( map(this.restExtractor.extractDataBool), - tap(() => this.notificationSubject.next({ type: 'read' })), + tap(() => this.userNotificationSocket.dispatch('read')), catchError(res => this.restExtractor.handleError(res)) ) } @@ -79,7 +67,7 @@ export class UserNotificationService { return this.authHttp.post(url, {}, { headers }) .pipe( map(this.restExtractor.extractDataBool), - tap(() => this.notificationSubject.next({ type: 'read-all' })), + tap(() => this.userNotificationSocket.dispatch('read-all')), catchError(res => this.restExtractor.handleError(res)) ) } @@ -94,16 +82,6 @@ export class UserNotificationService { ) } - private getSocket () { - if (this.socket) return this.socket - - this.socket = io(environment.apiUrl + '/user-notifications', { - query: { accessToken: this.auth.getAccessToken() } - }) - - return this.socket - } - private formatNotification (notification: UserNotificationServer) { return new UserNotification(notification) } diff --git a/client/src/app/shared/users/user-notifications.component.ts b/client/src/app/shared/users/user-notifications.component.ts index 50c495a9a..e3913ba56 100644 --- a/client/src/app/shared/users/user-notifications.component.ts +++ b/client/src/app/shared/users/user-notifications.component.ts @@ -13,6 +13,7 @@ import { UserNotification } from '@app/shared/users/user-notification.model' export class UserNotificationsComponent implements OnInit { @Input() ignoreLoadingBar = false @Input() infiniteScroll = true + @Input() itemsPerPage = 20 notifications: UserNotification[] = [] @@ -21,7 +22,7 @@ export class UserNotificationsComponent implements OnInit { componentPagination: ComponentPagination = { currentPage: 1, - itemsPerPage: 20, + itemsPerPage: this.itemsPerPage, totalItems: null } -- cgit v1.2.3 From 1506307f2f903ce0f80155072a33345c702b7c76 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 16:48:38 +0100 Subject: Increase abuse length to 3000 And correctly handle new lines --- .../about-instance/about-instance.component.ts | 2 +- .../account-about/account-about.component.ts | 4 +- .../+admin/moderation/moderation.component.scss | 1 + .../video-abuse-list.component.html | 4 +- .../video-abuse-list/video-abuse-list.component.ts | 8 +- .../video-blacklist-list.component.html | 2 +- .../video-blacklist-list.component.ts | 6 ++ .../video-channel-about.component.ts | 2 +- .../video-abuse-validators.service.ts | 8 +- .../shared/forms/markdown-textarea.component.ts | 2 +- client/src/app/shared/misc/help.component.ts | 2 +- client/src/app/shared/misc/utils.ts | 13 ++- .../app/shared/renderer/html-renderer.service.ts | 35 +++++++ client/src/app/shared/renderer/index.ts | 3 + .../src/app/shared/renderer/linkifier.service.ts | 115 +++++++++++++++++++++ client/src/app/shared/renderer/markdown.service.ts | 79 ++++++++++++++ client/src/app/shared/shared.module.ts | 9 +- .../app/shared/video-abuse/video-abuse.service.ts | 4 +- .../+video-watch/comment/linkifier.service.ts | 115 --------------------- .../comment/video-comment.component.ts | 27 +---- .../+video-watch/comment/video-comment.service.ts | 6 +- .../+video-watch/modal/video-support.component.ts | 3 +- .../videos/+video-watch/video-watch.component.ts | 2 +- .../app/videos/+video-watch/video-watch.module.ts | 4 - client/src/app/videos/shared/index.ts | 1 - client/src/app/videos/shared/markdown.service.ts | 79 -------------- 26 files changed, 284 insertions(+), 252 deletions(-) create mode 100644 client/src/app/shared/renderer/html-renderer.service.ts create mode 100644 client/src/app/shared/renderer/index.ts create mode 100644 client/src/app/shared/renderer/linkifier.service.ts create mode 100644 client/src/app/shared/renderer/markdown.service.ts delete mode 100644 client/src/app/videos/+video-watch/comment/linkifier.service.ts delete mode 100644 client/src/app/videos/shared/index.ts delete mode 100644 client/src/app/videos/shared/markdown.service.ts (limited to 'client') diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts index d3ee8a1e4..a1b30fa8c 100644 --- a/client/src/app/+about/about-instance/about-instance.component.ts +++ b/client/src/app/+about/about-instance/about-instance.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, ViewChild } from '@angular/core' import { Notifier, ServerService } from '@app/core' -import { MarkdownService } from '@app/videos/shared' import { I18n } from '@ngx-translate/i18n-polyfill' import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' import { InstanceService } from '@app/shared/instance/instance.service' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-about-instance', diff --git a/client/src/app/+accounts/account-about/account-about.component.ts b/client/src/app/+accounts/account-about/account-about.component.ts index 6f3e6caa0..13890a0ee 100644 --- a/client/src/app/+accounts/account-about/account-about.component.ts +++ b/client/src/app/+accounts/account-about/account-about.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit, OnDestroy } from '@angular/core' +import { Component, OnDestroy, OnInit } from '@angular/core' import { Account } from '@app/shared/account/account.model' import { AccountService } from '@app/shared/account/account.service' import { I18n } from '@ngx-translate/i18n-polyfill' import { Subscription } from 'rxjs' -import { MarkdownService } from '@app/videos/shared' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-account-about', diff --git a/client/src/app/+admin/moderation/moderation.component.scss b/client/src/app/+admin/moderation/moderation.component.scss index 02ccfc8ca..13b019c5b 100644 --- a/client/src/app/+admin/moderation/moderation.component.scss +++ b/client/src/app/+admin/moderation/moderation.component.scss @@ -10,6 +10,7 @@ font-weight: $font-semibold; min-width: 200px; display: inline-block; + vertical-align: top; } .moderation-expanded-text { diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html index e862d5162..05b549de6 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html @@ -51,11 +51,11 @@

Reason: - {{ videoAbuse.reason }} +

Moderation comment: - {{ videoAbuse.moderationComment }} +

diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts index f64234b74..00c871659 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts @@ -9,6 +9,7 @@ import { DropdownAction } from '../../../shared/buttons/action-dropdown.componen import { ConfirmService } from '../../../core/index' import { ModerationCommentModalComponent } from './moderation-comment-modal.component' import { Video } from '../../../shared/video/video.model' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-abuse-list', @@ -30,7 +31,8 @@ export class VideoAbuseListComponent extends RestTable implements OnInit { private notifier: Notifier, private videoAbuseService: VideoAbuseService, private confirmService: ConfirmService, - private i18n: I18n + private i18n: I18n, + private markdownRenderer: MarkdownService ) { super() @@ -108,6 +110,10 @@ export class VideoAbuseListComponent extends RestTable implements OnInit { } + toHtml (text: string) { + return this.markdownRenderer.textMarkdownToHTML(text) + } + protected loadData () { return this.videoAbuseService.getVideoAbuses(this.pagination, this.sort) .subscribe( diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html index 6398af218..247f441c1 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html @@ -41,7 +41,7 @@ Blacklist reason: - {{ videoBlacklist.reason }} + diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts index 6c6f17f0c..b27bbbfef 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts @@ -7,6 +7,7 @@ import { VideoBlacklist } from '../../../../../../shared' import { I18n } from '@ngx-translate/i18n-polyfill' import { DropdownAction } from '../../../shared/buttons/action-dropdown.component' import { Video } from '../../../shared/video/video.model' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-blacklist-list', @@ -26,6 +27,7 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit { private notifier: Notifier, private confirmService: ConfirmService, private videoBlacklistService: VideoBlacklistService, + private markdownRenderer: MarkdownService, private i18n: I18n ) { super() @@ -52,6 +54,10 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit { return this.i18n('no') } + toHtml (text: string) { + return this.markdownRenderer.textMarkdownToHTML(text) + } + async removeVideoFromBlacklist (entry: VideoBlacklist) { const confirmMessage = this.i18n( 'Do you really want to remove this video from the blacklist? It will be available again in the videos list.' diff --git a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts index ea7b0e118..895b19064 100644 --- a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts +++ b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts @@ -3,7 +3,7 @@ import { VideoChannelService } from '@app/shared/video-channel/video-channel.ser import { VideoChannel } from '@app/shared/video-channel/video-channel.model' import { I18n } from '@ngx-translate/i18n-polyfill' import { Subscription } from 'rxjs' -import { MarkdownService } from '@app/videos/shared' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-channel-about', diff --git a/client/src/app/shared/forms/form-validators/video-abuse-validators.service.ts b/client/src/app/shared/forms/form-validators/video-abuse-validators.service.ts index 6e9806611..fcc966b84 100644 --- a/client/src/app/shared/forms/form-validators/video-abuse-validators.service.ts +++ b/client/src/app/shared/forms/form-validators/video-abuse-validators.service.ts @@ -10,20 +10,20 @@ export class VideoAbuseValidatorsService { constructor (private i18n: I18n) { this.VIDEO_ABUSE_REASON = { - VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(300) ], + VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(3000) ], MESSAGES: { 'required': this.i18n('Report reason is required.'), 'minlength': this.i18n('Report reason must be at least 2 characters long.'), - 'maxlength': this.i18n('Report reason cannot be more than 300 characters long.') + 'maxlength': this.i18n('Report reason cannot be more than 3000 characters long.') } } this.VIDEO_ABUSE_MODERATION_COMMENT = { - VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(300) ], + VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(3000) ], MESSAGES: { 'required': this.i18n('Moderation comment is required.'), 'minlength': this.i18n('Moderation comment must be at least 2 characters long.'), - 'maxlength': this.i18n('Moderation comment cannot be more than 300 characters long.') + 'maxlength': this.i18n('Moderation comment cannot be more than 3000 characters long.') } } } diff --git a/client/src/app/shared/forms/markdown-textarea.component.ts b/client/src/app/shared/forms/markdown-textarea.component.ts index b99169ed2..e87aca0d4 100644 --- a/client/src/app/shared/forms/markdown-textarea.component.ts +++ b/client/src/app/shared/forms/markdown-textarea.component.ts @@ -1,10 +1,10 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators' import { Component, forwardRef, Input, OnInit } from '@angular/core' import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms' -import { MarkdownService } from '@app/videos/shared' import { Subject } from 'rxjs' import truncate from 'lodash-es/truncate' import { ScreenService } from '@app/shared/misc/screen.service' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-markdown-textarea', diff --git a/client/src/app/shared/misc/help.component.ts b/client/src/app/shared/misc/help.component.ts index ba0452e77..f3426f70f 100644 --- a/client/src/app/shared/misc/help.component.ts +++ b/client/src/app/shared/misc/help.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core' -import { MarkdownService } from '@app/videos/shared' import { I18n } from '@ngx-translate/i18n-polyfill' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-help', diff --git a/client/src/app/shared/misc/utils.ts b/client/src/app/shared/misc/utils.ts index 78e8e9682..7cc6055c2 100644 --- a/client/src/app/shared/misc/utils.ts +++ b/client/src/app/shared/misc/utils.ts @@ -102,12 +102,18 @@ function objectToFormData (obj: any, form?: FormData, namespace?: string) { return fd } -function lineFeedToHtml (obj: any, keyToNormalize: string) { +function objectLineFeedToHtml (obj: any, keyToNormalize: string) { return immutableAssign(obj, { - [keyToNormalize]: obj[keyToNormalize].replace(/\r?\n|\r/g, '
') + [keyToNormalize]: lineFeedToHtml(obj[keyToNormalize]) }) } +function lineFeedToHtml (text: string) { + if (!text) return text + + return text.replace(/\r?\n|\r/g, '
') +} + function removeElementFromArray (arr: T[], elem: T) { const index = arr.indexOf(elem) if (index !== -1) arr.splice(index, 1) @@ -131,6 +137,7 @@ function scrollToTop () { export { sortBy, durationToString, + lineFeedToHtml, objectToUrlEncoded, getParameterByName, populateAsyncUserVideoChannels, @@ -138,7 +145,7 @@ export { dateToHuman, immutableAssign, objectToFormData, - lineFeedToHtml, + objectLineFeedToHtml, removeElementFromArray, scrollToTop } diff --git a/client/src/app/shared/renderer/html-renderer.service.ts b/client/src/app/shared/renderer/html-renderer.service.ts new file mode 100644 index 000000000..d49df9b6d --- /dev/null +++ b/client/src/app/shared/renderer/html-renderer.service.ts @@ -0,0 +1,35 @@ +import { Injectable } from '@angular/core' +import { LinkifierService } from '@app/shared/renderer/linkifier.service' +import * as sanitizeHtml from 'sanitize-html' + +@Injectable() +export class HtmlRendererService { + + constructor (private linkifier: LinkifierService) { + + } + + toSafeHtml (text: string) { + // Convert possible markdown to html + const html = this.linkifier.linkify(text) + + return sanitizeHtml(html, { + allowedTags: [ 'a', 'p', 'span', 'br' ], + allowedSchemes: [ 'http', 'https' ], + allowedAttributes: { + 'a': [ 'href', 'class', 'target' ] + }, + transformTags: { + a: (tagName, attribs) => { + return { + tagName, + attribs: Object.assign(attribs, { + target: '_blank', + rel: 'noopener noreferrer' + }) + } + } + } + }) + } +} diff --git a/client/src/app/shared/renderer/index.ts b/client/src/app/shared/renderer/index.ts new file mode 100644 index 000000000..39202b385 --- /dev/null +++ b/client/src/app/shared/renderer/index.ts @@ -0,0 +1,3 @@ +export * from './html-renderer.service' +export * from './linkifier.service' +export * from './markdown.service' diff --git a/client/src/app/shared/renderer/linkifier.service.ts b/client/src/app/shared/renderer/linkifier.service.ts new file mode 100644 index 000000000..2529c9eaf --- /dev/null +++ b/client/src/app/shared/renderer/linkifier.service.ts @@ -0,0 +1,115 @@ +import { Injectable } from '@angular/core' +import { getAbsoluteAPIUrl } from '@app/shared/misc/utils' +// FIXME: use @types/linkify when https://github.com/DefinitelyTyped/DefinitelyTyped/pull/29682/files is merged? +const linkify = require('linkifyjs') +const linkifyHtml = require('linkifyjs/html') + +@Injectable() +export class LinkifierService { + + static CLASSNAME = 'linkified' + + private linkifyOptions = { + className: { + mention: LinkifierService.CLASSNAME + '-mention', + url: LinkifierService.CLASSNAME + '-url' + } + } + + constructor () { + // Apply plugin + this.mentionWithDomainPlugin(linkify) + } + + linkify (text: string) { + return linkifyHtml(text, this.linkifyOptions) + } + + private mentionWithDomainPlugin (linkify: any) { + const TT = linkify.scanner.TOKENS // Text tokens + const { TOKENS: MT, State } = linkify.parser // Multi tokens, state + const MultiToken = MT.Base + const S_START = linkify.parser.start + + const TT_AT = TT.AT + const TT_DOMAIN = TT.DOMAIN + const TT_LOCALHOST = TT.LOCALHOST + const TT_NUM = TT.NUM + const TT_COLON = TT.COLON + const TT_SLASH = TT.SLASH + const TT_TLD = TT.TLD + const TT_UNDERSCORE = TT.UNDERSCORE + const TT_DOT = TT.DOT + + function MENTION (this: any, value: any) { + this.v = value + } + + linkify.inherits(MultiToken, MENTION, { + type: 'mentionWithDomain', + isLink: true, + toHref () { + return getAbsoluteAPIUrl() + '/services/redirect/accounts/' + this.toString().substr(1) + } + }) + + const S_AT = S_START.jump(TT_AT) // @ + const S_AT_SYMS = new State() + const S_MENTION = new State(MENTION) + const S_MENTION_DIVIDER = new State() + const S_MENTION_DIVIDER_SYMS = new State() + + // @_, + S_AT.on(TT_UNDERSCORE, S_AT_SYMS) + + // @_* + S_AT_SYMS + .on(TT_UNDERSCORE, S_AT_SYMS) + .on(TT_DOT, S_AT_SYMS) + + // Valid mention (not made up entirely of symbols) + S_AT + .on(TT_DOMAIN, S_MENTION) + .on(TT_LOCALHOST, S_MENTION) + .on(TT_TLD, S_MENTION) + .on(TT_NUM, S_MENTION) + + S_AT_SYMS + .on(TT_DOMAIN, S_MENTION) + .on(TT_LOCALHOST, S_MENTION) + .on(TT_TLD, S_MENTION) + .on(TT_NUM, S_MENTION) + + // More valid mentions + S_MENTION + .on(TT_DOMAIN, S_MENTION) + .on(TT_LOCALHOST, S_MENTION) + .on(TT_TLD, S_MENTION) + .on(TT_COLON, S_MENTION) + .on(TT_NUM, S_MENTION) + .on(TT_UNDERSCORE, S_MENTION) + + // Mention with a divider + S_MENTION + .on(TT_AT, S_MENTION_DIVIDER) + .on(TT_SLASH, S_MENTION_DIVIDER) + .on(TT_DOT, S_MENTION_DIVIDER) + + // Mention _ trailing stash plus syms + S_MENTION_DIVIDER.on(TT_UNDERSCORE, S_MENTION_DIVIDER_SYMS) + S_MENTION_DIVIDER_SYMS.on(TT_UNDERSCORE, S_MENTION_DIVIDER_SYMS) + + // Once we get a word token, mentions can start up again + S_MENTION_DIVIDER + .on(TT_DOMAIN, S_MENTION) + .on(TT_LOCALHOST, S_MENTION) + .on(TT_TLD, S_MENTION) + .on(TT_NUM, S_MENTION) + + S_MENTION_DIVIDER_SYMS + .on(TT_DOMAIN, S_MENTION) + .on(TT_LOCALHOST, S_MENTION) + .on(TT_TLD, S_MENTION) + .on(TT_NUM, S_MENTION) + } +} diff --git a/client/src/app/shared/renderer/markdown.service.ts b/client/src/app/shared/renderer/markdown.service.ts new file mode 100644 index 000000000..07017eca5 --- /dev/null +++ b/client/src/app/shared/renderer/markdown.service.ts @@ -0,0 +1,79 @@ +import { Injectable } from '@angular/core' + +import * as MarkdownIt from 'markdown-it' + +@Injectable() +export class MarkdownService { + static TEXT_RULES = [ + 'linkify', + 'autolink', + 'emphasis', + 'link', + 'newline', + 'list' + ] + static ENHANCED_RULES = MarkdownService.TEXT_RULES.concat([ 'image' ]) + + private textMarkdownIt: MarkdownIt.MarkdownIt + private enhancedMarkdownIt: MarkdownIt.MarkdownIt + + constructor () { + this.textMarkdownIt = this.createMarkdownIt(MarkdownService.TEXT_RULES) + this.enhancedMarkdownIt = this.createMarkdownIt(MarkdownService.ENHANCED_RULES) + } + + textMarkdownToHTML (markdown: string) { + if (!markdown) return '' + + const html = this.textMarkdownIt.render(markdown) + return this.avoidTruncatedTags(html) + } + + enhancedMarkdownToHTML (markdown: string) { + if (!markdown) return '' + + const html = this.enhancedMarkdownIt.render(markdown) + return this.avoidTruncatedTags(html) + } + + private createMarkdownIt (rules: string[]) { + const markdownIt = new MarkdownIt('zero', { linkify: true, breaks: true }) + + for (let rule of rules) { + markdownIt.enable(rule) + } + + this.setTargetToLinks(markdownIt) + + return markdownIt + } + + private setTargetToLinks (markdownIt: MarkdownIt.MarkdownIt) { + // Snippet from markdown-it documentation: https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md#renderer + const defaultRender = markdownIt.renderer.rules.link_open || function (tokens, idx, options, env, self) { + return self.renderToken(tokens, idx, options) + } + + markdownIt.renderer.rules.link_open = function (tokens, index, options, env, self) { + const token = tokens[index] + + const targetIndex = token.attrIndex('target') + if (targetIndex < 0) token.attrPush([ 'target', '_blank' ]) + else token.attrs[targetIndex][1] = '_blank' + + const relIndex = token.attrIndex('rel') + if (relIndex < 0) token.attrPush([ 'rel', 'noopener noreferrer' ]) + else token.attrs[relIndex][1] = 'noopener noreferrer' + + // pass token to default renderer. + return defaultRender(tokens, index, options, env, self) + } + } + + private avoidTruncatedTags (html: string) { + return html.replace(/\*\*?([^*]+)$/, '$1') + .replace(/]+>([^<]+)<\/a>\s*...((<\/p>)|(<\/li>)|(<\/strong>))?$/mi, '$1...') + .replace(/\[[^\]]+\]?$?([^$]+)$/, '$1') + + } +} diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index d1320aeec..384f5d722 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts @@ -6,7 +6,6 @@ import { RouterModule } from '@angular/router' import { MarkdownTextareaComponent } from '@app/shared/forms/markdown-textarea.component' import { HelpComponent } from '@app/shared/misc/help.component' import { InfiniteScrollerDirective } from '@app/shared/video/infinite-scroller.directive' -import { MarkdownService } from '@app/videos/shared' import { BytesPipe, KeysPipe, NgPipesModule } from 'ngx-pipes' import { SharedModule as PrimeSharedModule } from 'primeng/components/common/shared' @@ -34,10 +33,10 @@ import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { CustomConfigValidatorsService, + InstanceValidatorsService, LoginValidatorsService, ReactiveFileComponent, ResetPasswordValidatorsService, - InstanceValidatorsService, TextareaAutoResizeDirective, UserValidatorsService, VideoAbuseValidatorsService, @@ -67,6 +66,7 @@ import { UserHistoryService } from '@app/shared/users/user-history.service' import { UserNotificationService } from '@app/shared/users/user-notification.service' import { UserNotificationsComponent } from '@app/shared/users/user-notifications.component' import { InstanceService } from '@app/shared/instance/instance.service' +import { HtmlRendererService, LinkifierService, MarkdownService } from '@app/shared/renderer' @NgModule({ imports: [ @@ -167,7 +167,6 @@ import { InstanceService } from '@app/shared/instance/instance.service' UserService, VideoService, AccountService, - MarkdownService, VideoChannelService, VideoCaptionService, VideoImportService, @@ -192,6 +191,10 @@ import { InstanceService } from '@app/shared/instance/instance.service' UserHistoryService, InstanceService, + MarkdownService, + LinkifierService, + HtmlRendererService, + I18nPrimengCalendarService, ScreenService, diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts index 61b7e1b98..b0b59ea0c 100644 --- a/client/src/app/shared/video-abuse/video-abuse.service.ts +++ b/client/src/app/shared/video-abuse/video-abuse.service.ts @@ -32,9 +32,7 @@ export class VideoAbuseService { reportVideo (id: number, reason: string) { const url = VideoAbuseService.BASE_VIDEO_ABUSE_URL + id + '/abuse' - const body = { - reason - } + const body = { reason } return this.authHttp.post(url, body) .pipe( diff --git a/client/src/app/videos/+video-watch/comment/linkifier.service.ts b/client/src/app/videos/+video-watch/comment/linkifier.service.ts deleted file mode 100644 index 2529c9eaf..000000000 --- a/client/src/app/videos/+video-watch/comment/linkifier.service.ts +++ /dev/null @@ -1,115 +0,0 @@ -import { Injectable } from '@angular/core' -import { getAbsoluteAPIUrl } from '@app/shared/misc/utils' -// FIXME: use @types/linkify when https://github.com/DefinitelyTyped/DefinitelyTyped/pull/29682/files is merged? -const linkify = require('linkifyjs') -const linkifyHtml = require('linkifyjs/html') - -@Injectable() -export class LinkifierService { - - static CLASSNAME = 'linkified' - - private linkifyOptions = { - className: { - mention: LinkifierService.CLASSNAME + '-mention', - url: LinkifierService.CLASSNAME + '-url' - } - } - - constructor () { - // Apply plugin - this.mentionWithDomainPlugin(linkify) - } - - linkify (text: string) { - return linkifyHtml(text, this.linkifyOptions) - } - - private mentionWithDomainPlugin (linkify: any) { - const TT = linkify.scanner.TOKENS // Text tokens - const { TOKENS: MT, State } = linkify.parser // Multi tokens, state - const MultiToken = MT.Base - const S_START = linkify.parser.start - - const TT_AT = TT.AT - const TT_DOMAIN = TT.DOMAIN - const TT_LOCALHOST = TT.LOCALHOST - const TT_NUM = TT.NUM - const TT_COLON = TT.COLON - const TT_SLASH = TT.SLASH - const TT_TLD = TT.TLD - const TT_UNDERSCORE = TT.UNDERSCORE - const TT_DOT = TT.DOT - - function MENTION (this: any, value: any) { - this.v = value - } - - linkify.inherits(MultiToken, MENTION, { - type: 'mentionWithDomain', - isLink: true, - toHref () { - return getAbsoluteAPIUrl() + '/services/redirect/accounts/' + this.toString().substr(1) - } - }) - - const S_AT = S_START.jump(TT_AT) // @ - const S_AT_SYMS = new State() - const S_MENTION = new State(MENTION) - const S_MENTION_DIVIDER = new State() - const S_MENTION_DIVIDER_SYMS = new State() - - // @_, - S_AT.on(TT_UNDERSCORE, S_AT_SYMS) - - // @_* - S_AT_SYMS - .on(TT_UNDERSCORE, S_AT_SYMS) - .on(TT_DOT, S_AT_SYMS) - - // Valid mention (not made up entirely of symbols) - S_AT - .on(TT_DOMAIN, S_MENTION) - .on(TT_LOCALHOST, S_MENTION) - .on(TT_TLD, S_MENTION) - .on(TT_NUM, S_MENTION) - - S_AT_SYMS - .on(TT_DOMAIN, S_MENTION) - .on(TT_LOCALHOST, S_MENTION) - .on(TT_TLD, S_MENTION) - .on(TT_NUM, S_MENTION) - - // More valid mentions - S_MENTION - .on(TT_DOMAIN, S_MENTION) - .on(TT_LOCALHOST, S_MENTION) - .on(TT_TLD, S_MENTION) - .on(TT_COLON, S_MENTION) - .on(TT_NUM, S_MENTION) - .on(TT_UNDERSCORE, S_MENTION) - - // Mention with a divider - S_MENTION - .on(TT_AT, S_MENTION_DIVIDER) - .on(TT_SLASH, S_MENTION_DIVIDER) - .on(TT_DOT, S_MENTION_DIVIDER) - - // Mention _ trailing stash plus syms - S_MENTION_DIVIDER.on(TT_UNDERSCORE, S_MENTION_DIVIDER_SYMS) - S_MENTION_DIVIDER_SYMS.on(TT_UNDERSCORE, S_MENTION_DIVIDER_SYMS) - - // Once we get a word token, mentions can start up again - S_MENTION_DIVIDER - .on(TT_DOMAIN, S_MENTION) - .on(TT_LOCALHOST, S_MENTION) - .on(TT_TLD, S_MENTION) - .on(TT_NUM, S_MENTION) - - S_MENTION_DIVIDER_SYMS - .on(TT_DOMAIN, S_MENTION) - .on(TT_LOCALHOST, S_MENTION) - .on(TT_TLD, S_MENTION) - .on(TT_NUM, S_MENTION) - } -} diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.ts b/client/src/app/videos/+video-watch/comment/video-comment.component.ts index 00f0460a1..aba7f9d1c 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment.component.ts +++ b/client/src/app/videos/+video-watch/comment/video-comment.component.ts @@ -1,11 +1,10 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core' -import { LinkifierService } from '@app/videos/+video-watch/comment/linkifier.service' -import * as sanitizeHtml from 'sanitize-html' import { UserRight } from '../../../../../../shared/models/users' import { VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model' import { AuthService } from '../../../core/auth' import { Video } from '../../../shared/video/video.model' import { VideoComment } from './video-comment.model' +import { HtmlRendererService } from '@app/shared/renderer' @Component({ selector: 'my-video-comment', @@ -29,7 +28,7 @@ export class VideoCommentComponent implements OnInit, OnChanges { newParentComments: VideoComment[] = [] constructor ( - private linkifierService: LinkifierService, + private htmlRenderer: HtmlRendererService, private authService: AuthService ) {} @@ -87,27 +86,7 @@ export class VideoCommentComponent implements OnInit, OnChanges { } private init () { - // Convert possible markdown to html - const html = this.linkifierService.linkify(this.comment.text) - - this.sanitizedCommentHTML = sanitizeHtml(html, { - allowedTags: [ 'a', 'p', 'span', 'br' ], - allowedSchemes: [ 'http', 'https' ], - allowedAttributes: { - 'a': [ 'href', 'class', 'target' ] - }, - transformTags: { - a: (tagName, attribs) => { - return { - tagName, - attribs: Object.assign(attribs, { - target: '_blank', - rel: 'noopener noreferrer' - }) - } - } - } - }) + this.sanitizedCommentHTML = this.htmlRenderer.toSafeHtml(this.comment.text) this.newParentComments = this.parentComments.concat([ this.comment ]) } diff --git a/client/src/app/videos/+video-watch/comment/video-comment.service.ts b/client/src/app/videos/+video-watch/comment/video-comment.service.ts index 921447d5b..b8e5878c5 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment.service.ts +++ b/client/src/app/videos/+video-watch/comment/video-comment.service.ts @@ -1,7 +1,7 @@ import { catchError, map } from 'rxjs/operators' import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' -import { lineFeedToHtml } from '@app/shared/misc/utils' +import { objectLineFeedToHtml } from '@app/shared/misc/utils' import { Observable } from 'rxjs' import { ResultList, FeedFormat } from '../../../../../../shared/models' import { @@ -28,7 +28,7 @@ export class VideoCommentService { addCommentThread (videoId: number | string, comment: VideoCommentCreate) { const url = VideoCommentService.BASE_VIDEO_URL + videoId + '/comment-threads' - const normalizedComment = lineFeedToHtml(comment, 'text') + const normalizedComment = objectLineFeedToHtml(comment, 'text') return this.authHttp.post<{ comment: VideoCommentServerModel }>(url, normalizedComment) .pipe( @@ -39,7 +39,7 @@ export class VideoCommentService { addCommentReply (videoId: number | string, inReplyToCommentId: number, comment: VideoCommentCreate) { const url = VideoCommentService.BASE_VIDEO_URL + videoId + '/comments/' + inReplyToCommentId - const normalizedComment = lineFeedToHtml(comment, 'text') + const normalizedComment = objectLineFeedToHtml(comment, 'text') return this.authHttp.post<{ comment: VideoCommentServerModel }>(url, normalizedComment) .pipe( diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.ts b/client/src/app/videos/+video-watch/modal/video-support.component.ts index 154002120..deb8fbc67 100644 --- a/client/src/app/videos/+video-watch/modal/video-support.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-support.component.ts @@ -1,8 +1,7 @@ import { Component, Input, ViewChild } from '@angular/core' -import { MarkdownService } from '@app/videos/shared' - import { VideoDetails } from '../../../shared/video/video-details.model' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-support', diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index 67c5254b3..ee504bc58 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts @@ -19,7 +19,6 @@ import { AuthService, ConfirmService } from '../../core' import { RestExtractor, VideoBlacklistService } from '../../shared' import { VideoDetails } from '../../shared/video/video-details.model' import { VideoService } from '../../shared/video/video.service' -import { MarkdownService } from '../shared' import { VideoDownloadComponent } from './modal/video-download.component' import { VideoReportComponent } from './modal/video-report.component' import { VideoShareComponent } from './modal/video-share.component' @@ -30,6 +29,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill' import { environment } from '../../../environments/environment' import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils' import { VideoCaptionService } from '@app/shared/video-caption' +import { MarkdownService } from '@app/shared/renderer' @Component({ selector: 'my-video-watch', diff --git a/client/src/app/videos/+video-watch/video-watch.module.ts b/client/src/app/videos/+video-watch/video-watch.module.ts index 54a12c126..2f448db78 100644 --- a/client/src/app/videos/+video-watch/video-watch.module.ts +++ b/client/src/app/videos/+video-watch/video-watch.module.ts @@ -1,9 +1,7 @@ import { NgModule } from '@angular/core' -import { LinkifierService } from '@app/videos/+video-watch/comment/linkifier.service' import { VideoSupportComponent } from '@app/videos/+video-watch/modal/video-support.component' import { ClipboardModule } from 'ngx-clipboard' import { SharedModule } from '../../shared' -import { MarkdownService } from '../shared' import { VideoCommentAddComponent } from './comment/video-comment-add.component' import { VideoCommentComponent } from './comment/video-comment.component' import { VideoCommentService } from './comment/video-comment.service' @@ -46,8 +44,6 @@ import { RecommendationsModule } from '@app/videos/recommendations/recommendatio ], providers: [ - MarkdownService, - LinkifierService, VideoCommentService ] }) diff --git a/client/src/app/videos/shared/index.ts b/client/src/app/videos/shared/index.ts deleted file mode 100644 index 7a66944b9..000000000 --- a/client/src/app/videos/shared/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './markdown.service' diff --git a/client/src/app/videos/shared/markdown.service.ts b/client/src/app/videos/shared/markdown.service.ts deleted file mode 100644 index 07017eca5..000000000 --- a/client/src/app/videos/shared/markdown.service.ts +++ /dev/null @@ -1,79 +0,0 @@ -import { Injectable } from '@angular/core' - -import * as MarkdownIt from 'markdown-it' - -@Injectable() -export class MarkdownService { - static TEXT_RULES = [ - 'linkify', - 'autolink', - 'emphasis', - 'link', - 'newline', - 'list' - ] - static ENHANCED_RULES = MarkdownService.TEXT_RULES.concat([ 'image' ]) - - private textMarkdownIt: MarkdownIt.MarkdownIt - private enhancedMarkdownIt: MarkdownIt.MarkdownIt - - constructor () { - this.textMarkdownIt = this.createMarkdownIt(MarkdownService.TEXT_RULES) - this.enhancedMarkdownIt = this.createMarkdownIt(MarkdownService.ENHANCED_RULES) - } - - textMarkdownToHTML (markdown: string) { - if (!markdown) return '' - - const html = this.textMarkdownIt.render(markdown) - return this.avoidTruncatedTags(html) - } - - enhancedMarkdownToHTML (markdown: string) { - if (!markdown) return '' - - const html = this.enhancedMarkdownIt.render(markdown) - return this.avoidTruncatedTags(html) - } - - private createMarkdownIt (rules: string[]) { - const markdownIt = new MarkdownIt('zero', { linkify: true, breaks: true }) - - for (let rule of rules) { - markdownIt.enable(rule) - } - - this.setTargetToLinks(markdownIt) - - return markdownIt - } - - private setTargetToLinks (markdownIt: MarkdownIt.MarkdownIt) { - // Snippet from markdown-it documentation: https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md#renderer - const defaultRender = markdownIt.renderer.rules.link_open || function (tokens, idx, options, env, self) { - return self.renderToken(tokens, idx, options) - } - - markdownIt.renderer.rules.link_open = function (tokens, index, options, env, self) { - const token = tokens[index] - - const targetIndex = token.attrIndex('target') - if (targetIndex < 0) token.attrPush([ 'target', '_blank' ]) - else token.attrs[targetIndex][1] = '_blank' - - const relIndex = token.attrIndex('rel') - if (relIndex < 0) token.attrPush([ 'rel', 'noopener noreferrer' ]) - else token.attrs[relIndex][1] = 'noopener noreferrer' - - // pass token to default renderer. - return defaultRender(tokens, index, options, env, self) - } - } - - private avoidTruncatedTags (html: string) { - return html.replace(/\*\*?([^*]+)$/, '$1') - .replace(/]+>([^<]+)<\/a>\s*...((<\/p>)|(<\/li>)|(<\/strong>))?$/mi, '$1...') - .replace(/\[[^\]]+\]?$?([^$]+)$/, '$1') - - } -} -- cgit v1.2.3 From ad3fa0c56715f98886b1b6400fc54ce7d568d899 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jan 2019 17:45:02 +0100 Subject: Add missing translations in embed template --- client/src/locale/source/angular_en_US.xml | 141 +- client/src/locale/source/server_en_US.xml | 16 + client/src/locale/target/angular_ar_001.xml | 388 +- client/src/locale/target/angular_ca_ES.xml | 331 +- client/src/locale/target/angular_cs_CZ.xml | 705 ++-- client/src/locale/target/angular_de_DE.xml | 1010 +++-- client/src/locale/target/angular_eo.xml | 407 +- client/src/locale/target/angular_es_ES.xml | 2512 ++++++++++-- client/src/locale/target/angular_eu_ES.xml | 606 +-- client/src/locale/target/angular_fa_IR.xml | 88 +- client/src/locale/target/angular_fr_FR.xml | 1201 ++++-- client/src/locale/target/angular_gl_ES.xml | 154 +- client/src/locale/target/angular_it_IT.xml | 588 +-- client/src/locale/target/angular_ja_JP.xml | 290 +- client/src/locale/target/angular_jbo.xml | 262 +- client/src/locale/target/angular_nl_NL.xml | 4701 +++++++++++++++++++++-- client/src/locale/target/angular_oc.xml | 810 ++-- client/src/locale/target/angular_pl_PL.xml | 458 +-- client/src/locale/target/angular_pt_BR.xml | 569 +-- client/src/locale/target/angular_ru_RU.xml | 355 +- client/src/locale/target/angular_sv_SE.xml | 750 ++-- client/src/locale/target/angular_ta.xml | 22 +- client/src/locale/target/angular_zh_Hans_CN.xml | 604 +-- client/src/locale/target/angular_zh_Hant_TW.xml | 611 +-- client/src/locale/target/iso639_nl_NL.xml | 22 +- client/src/locale/target/player_nl_NL.xml | 4 + client/src/locale/target/server_cs_CZ.json | 2 +- client/src/locale/target/server_fr_FR.json | 2 +- client/src/locale/target/server_nl_NL.xml | 34 +- client/src/standalone/videos/embed.html | 2 +- client/src/standalone/videos/embed.ts | 30 +- 31 files changed, 11669 insertions(+), 6006 deletions(-) (limited to 'client') diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml index d61d4f9f2..3aa178825 100644 --- a/client/src/locale/source/angular_en_US.xml +++ b/client/src/locale/source/angular_en_US.xml @@ -1120,45 +1120,45 @@ Display unlisted and private videos app/shared/video/abstract-video-list.html - 11 + 14

app/shared/video/abstract-video-list.html - 11 + 14

No results. app/shared/video/abstract-video-list.html - 17 + 20

app/shared/video/abstract-video-list.html - 17 + 20

app/videos/video-list/video-overview.component.html @@ -1166,7 +1166,7 @@

app/shared/video/abstract-video-list.html - 17 + 20

app/+my-account/my-account-videos/my-account-videos.component.html @@ -1174,7 +1174,7 @@

app/shared/video/abstract-video-list.html - 17 + 20

@@ -1266,7 +1266,7 @@ app/videos/+video-watch/modal/video-blacklist.component.html - 19 + 26

Submit @@ -1288,7 +1288,7 @@ app/videos/+video-watch/modal/video-blacklist.component.html - 24 + 31

About <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> instance @@ -2347,19 +2347,19 @@ User's email must be verified to login app/+admin/users/user-list/user-list.component.html - 70 + 72

User's email is verified / User can login without email verification app/+admin/users/user-list/user-list.component.html - 74 + 76

Ban reason: app/+admin/users/user-list/user-list.component.html - 92 + 95

Moderation comment @@ -2425,7 +2425,7 @@ app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html - 24 + 25

app/+my-account/my-account-ownership/my-account-ownership.component.html @@ -2439,7 +2439,7 @@

app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html - 33 + 35

Reason: @@ -2465,17 +2465,23 @@ app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html 9 +

+ Unfederated + + app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html + 10 +

Date <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="<p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="</p-sortIcon>"/> app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html - 10 + 11

Blacklist reason: app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html - 41 + 43

Moderation @@ -3089,17 +3095,25 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-edit/video-add-components/video-upload.component.html 25 +

+ + Congratulations! Your video is now available in your private library. + + + app/videos/+video-edit/video-add-components/video-upload.component.html + 45 +

Publish will be available when upload is finished app/videos/+video-edit/video-add-components/video-upload.component.html - 54 + 58

Publish app/videos/+video-edit/video-add-components/video-upload.component.html - 61 + 65

Select the torrent to import @@ -3476,6 +3490,12 @@ When you will upload a video in this channel, the video support field will be au app/videos/+video-watch/modal/video-blacklist.component.html 3 +

+ Unfederate the video (ask for its deletion from the remote instances) + + app/videos/+video-watch/modal/video-blacklist.component.html + 21 +

The video is being imported, it will be available when the import is finished. @@ -4091,6 +4111,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + yes + + src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts + 1 + + + + no + + src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts + 1 + + Do you really want to remove this video from the blacklist? It will be available again in the videos list. @@ -4457,15 +4491,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Do you really want to delete <x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/>? It will delete all videos uploaded in this channel too. - - src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts - 1 - - - - Please type the name of the video channel to confirm + + Please type the display name of the video channel (<x id="INTERPOLATION" equiv-text="{{displayName}}"/>) to confirm src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts 1 @@ -5274,8 +5301,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Report reason cannot be more than 300 characters long. + + Report reason cannot be more than 3000 characters long. src/app/shared/forms/form-validators/video-abuse-validators.service.ts 1 @@ -5295,8 +5322,8 @@ When you will upload a video in this channel, the video support field will be au 1 - - Moderation comment cannot be more than 300 characters long. + + Moderation comment cannot be more than 3000 characters long. src/app/shared/forms/form-validators/video-abuse-validators.service.ts 1 @@ -5505,6 +5532,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + PeerTube cannot handle this kind of file. Accepted extensions are <x id="INTERPOLATION" equiv-text="{{extensions}}"/>. + + src/app/shared/forms/reactive-file.component.ts + 1 + + All unsaved data will be lost, are you sure you want to leave this page? @@ -6351,6 +6385,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + You have unsaved changes! If you leave, your changes will be lost. + + src/app/videos/+video-edit/video-update.component.ts + 1 + + Video updated. @@ -6439,6 +6480,34 @@ When you will upload a video in this channel, the video support field will be au 1 + + Trending for the last 24 hours + + src/app/videos/video-list/video-trending.component.ts + 1 + + + + Trending videos are those totalizing the greatest number of views during the last 24 hours. + + src/app/videos/video-list/video-trending.component.ts + 1 + + + + Trending for the last <x id="INTERPOLATION" equiv-text="{{days}}"/> days + + src/app/videos/video-list/video-trending.component.ts + 1 + + + + Trending videos are those totalizing the greatest number of views during the last <x id="INTERPOLATION" equiv-text="{{days}}"/> days. + + src/app/videos/video-list/video-trending.component.ts + 1 + + Videos from your subscriptions diff --git a/client/src/locale/source/server_en_US.xml b/client/src/locale/source/server_en_US.xml index b6e62ce80..f5e125549 100644 --- a/client/src/locale/source/server_en_US.xml +++ b/client/src/locale/source/server_en_US.xml @@ -137,6 +137,22 @@ Failed undefined + + This video does not exist. + undefined + + + We cannot fetch the video. Please try again later. + undefined + + + Sorry + undefined + + + This video is not available because the remote instance is not responding. + undefined +

Misc undefined diff --git a/client/src/locale/target/angular_ar_001.xml b/client/src/locale/target/angular_ar_001.xml index 894798226..978f69571 100644 --- a/client/src/locale/target/angular_ar_001.xml +++ b/client/src/locale/target/angular_ar_001.xml @@ -430,7 +430,7 @@ Password الكلمة السرية

- 12 + 13

@@ -444,7 +444,7 @@ Login تسجيل الدخول

- 38 + 36

@@ -472,7 +472,7 @@ Send me an email to reset my password أرسل لي رسالة لإعادة تعيين كلمتي السرية

- 75 + 80

@@ -532,7 +532,7 @@ Signup سجل

- 88 + 78

@@ -576,7 +576,7 @@ Change the language تغيير اللغة

- 88 + 86

@@ -585,7 +585,7 @@ صفحتي العمومية

- 18 + 16

@@ -594,7 +594,7 @@ حسابي

- 22 + 20

@@ -603,7 +603,7 @@ فيديوهاتي

- 26 + 24

@@ -612,14 +612,14 @@ الخروج

- 30 + 28

Create an account إنشاء حساب

- 39 + 37

@@ -633,49 +633,49 @@ Subscriptions الإشتراكات

- 47 + 45

Overview نظرة شاملة

- 52 + 50

Trending الشائعة

- 57 + 55

Recently added التي تم إضافتها حديثًا

- 62 + 60

Local المحلية

- 67 + 65

More المزيد

- 72 + 70

Administration الإدارة

- 76 + 74

@@ -689,7 +689,7 @@ Toggle dark interface الإنتقال إلى الواجهة الداكنة

- 94 + 92

@@ -794,7 +794,7 @@ No results. لا نتائج

- 17 + 20

@@ -811,15 +811,20 @@ 7 - + - About instance - - - حول مثيل الخدوم - + Cancel + + إلغاء - 1 + 26 + + + + Submit + إرسال + + 31

@@ -833,44 +838,14 @@ Terms الشروط

- 44 + 39

User registration is allowed and التسجيل مسموح و - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - -مثيل الخادوم هذا يوفر مساحة لفيديوهات المستخدمين. - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - -مثيل الخادوم هذا يوفر مساحة غير محددة لفيديوهات المستخدمين. - - 31 - - - - - User registration is currently not allowed. - - -التسجيل غير مسموح حاليا. - - 36 + 29

@@ -1052,42 +1027,42 @@ Short description الوصف القصير

- 22 + 21

Videos Overview نظرة شاملة عن الفيديوهات

- 58 + 51

Videos Trending الفيديوهات الشائعة

- 59 + 52

Videos Recently Added الفيديوهات المُضافة حديثًا

- 60 + 53

Local videos الفيديوهات المحلية

- 61 + 54

Policy on videos containing sensitive content سياسة الفيديوهات التي تحتوي على محتوى حساس

- 70 + 61

@@ -1108,23 +1083,44 @@ Signup enabled التسجيل مُفعل

- 93 + 84

Signup requires email verification يتطلب التسجيل رسالة تأكيد

- 100 + 91

Signup limit حد التسجيل + + 96 + + + + Users + المستخدِمون

105

+ + User default video quota + حصة الفيديو الافتراضية للمستخدم + + 109 + + + + User default daily upload limit + حد الرفع الإفتراضي للمستخدِم + + 121 + +

Import استيراد @@ -1136,35 +1132,14 @@ Administrator المدير

- 131 + 155

Admin email البريد الإلكتروني للمدير - 134 - - - - Users - المستخدِمون - - 144 - - - - User default video quota - حصة الفيديو الافتراضية للمستخدم - - 147 - - - - User default daily upload limit - حد الرفع الإفتراضي للمستخدِم - - 161 + 158

@@ -1185,7 +1160,7 @@ Your Twitter username اسم المستخدِم الخاص بك على تويتر

- 181 + 184

@@ -1199,21 +1174,21 @@ Customizations التخصيصات

- 275 + 289

JavaScript الجافا سكريبت

- 278 + 294

Advanced configuration الإعدادات المتقدمة

- 207 + 212

@@ -1391,7 +1366,7 @@ Ban reason: سبب الحظر:

- 92 + 95

@@ -1440,7 +1415,7 @@ Actions الإجراءات

- 33 + 35

@@ -1468,7 +1443,7 @@ Blacklist reason: سبب الحجب:

- 41 + 43

@@ -1499,62 +1474,6 @@ 23 - - My settings - إعداداتي - - 3 - - - - My library - مكتبتي - - 7 - - - - My channels - قنواتي - - 12 - - - - My videos - فيديوهاتي - - 14 - - - - My subscriptions - اشتراكاتي - - 16 - - - - My imports - وارداتي - - 18 - - - - Misc - أخرى - - 24 - - - - Muted instances - مثيلات الخوادم المكتومة - - 2 - -

Video quota: تقم الفيديو: @@ -1566,21 +1485,21 @@ Profile الملف الشخصي

- 8 + 7

Video settings إعدادات الفيديو

- 15 + 16

Danger zone منطقة الخطر

- 18 + 19

@@ -1606,13 +1525,6 @@ 35 - - Submit - إرسال - - 24 - - Blacklisted تم حجبه @@ -1699,6 +1611,13 @@ 47 + + Muted instances + مثيلات الخوادم المكتومة + + 2 + +

Change password تغيير الكلمة السرية @@ -1836,7 +1755,7 @@ Publish أنشر

- 60 + 65

@@ -1920,28 +1839,28 @@ Cancel create إلغاء الإنشاء

- 169 + 170

Cancel deletion إلغاء الحذف

- 177 + 178

Upload thumbnail تحديث الصورة المصغرة

- 195 + 196

Upload preview إرسال معاينة

- 202 + 203

@@ -1955,7 +1874,7 @@ Advanced settings الإعدادات المتقدمة

- 190 + 191

@@ -2009,15 +1928,6 @@ 3 - - - Cancel - - إلغاء - - 19 - - Share شارك @@ -2259,13 +2169,6 @@ 1 - - Error - خطأ - - 1 - - 240p 240p @@ -2301,13 +2204,6 @@ 1 - - Success - تم بنجاح - - 1 - - Configuration updated. تم تحديث الإعدادات @@ -2490,9 +2386,9 @@ 1 - - Please type the name of the video channel to confirm - رجاء أدخل اسم القنات للتأكيد + + My videos + فيديوهاتي 1 @@ -2511,9 +2407,37 @@ 1 - - Channels - القنوات + + My library + مكتبتي + + 1 + + + + My channels + قنواتي + + 1 + + + + My subscriptions + اشتراكاتي + + 1 + + + + Misc + أخرى + + 1 + + + + My settings + إعداداتي 1 @@ -2602,6 +2526,13 @@ 1 + + Error + خطأ + + 1 + + You need to reconnect. يجب عليك إعادة الإتصال. @@ -2623,6 +2554,20 @@ 1 + + Info + معلومات + + 1 + + + + Success + تم بنجاح + + 1 + + Incorrect username or password. اسم المستخدم أو كلمة المرور خاطئة. @@ -2721,6 +2666,20 @@ 1 + + Email is required. + البريد الإلكتروني مطلوب. + + 1 + + + + Email must be valid. + يجب أن يكون عنوان البريد الإلكتروني عنوانًا صالحًا. + + 1 + + Username is required. اسم المستخدم مطلوب. @@ -2742,27 +2701,6 @@ 1 - - Username must be at least 3 characters long. - يجب أن يكون طول اسم المستخدِم أكبر مِن 3 أحرف. - - 1 - - - - Email is required. - البريد الإلكتروني مطلوب. - - 1 - - - - Email must be valid. - يجب أن يكون عنوان البريد الإلكتروني عنوانًا صالحًا. - - 1 - - User role is required. دور المستخدم مطلوب. @@ -2826,13 +2764,6 @@ 1 - - Name cannot be more than 20 characters long. - طول الاسم لا يجب أن يتجاوز 20 حرفا. - - 1 - - Comment is required. التعليق مطلوب. @@ -3288,13 +3219,6 @@ 1 - - Info - معلومات - - 1 - -

Upload cancelled تم إلغاء الإرسال diff --git a/client/src/locale/target/angular_ca_ES.xml b/client/src/locale/target/angular_ca_ES.xml index 7444b71b0..15c1bbca0 100644 --- a/client/src/locale/target/angular_ca_ES.xml +++ b/client/src/locale/target/angular_ca_ES.xml @@ -116,7 +116,7 @@ Password Contrasenya

- 12 + 13

@@ -130,7 +130,7 @@ Login Iniciar sessió

- 38 + 36

@@ -158,7 +158,7 @@ Send me an email to reset my password Envia'm un correu per reiniciar la meva contrasenya

- 75 + 80

@@ -215,7 +215,7 @@ Signup Registra't

- 88 + 78

@@ -251,14 +251,14 @@ Change the language Canvia la llengua

- 88 + 86

Create an account Registrar un compte

- 39 + 37

@@ -272,35 +272,35 @@ Trending Tendència

- 57 + 55

Recently added Afegits fa poc

- 62 + 60

Local Local

- 67 + 65

More Més

- 72 + 70

Administration Administració

- 76 + 74

@@ -412,7 +412,7 @@ No results. Sense resultats.

- 17 + 20

@@ -429,15 +429,11 @@ 7 - - - About instance - - - Quant a la instància - + + Submit + Envia

- 1 + 31

@@ -451,47 +447,14 @@ Terms Termes

- 44 + 39

User registration is allowed and El registre d'usuaris és permès i - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - aquesta instància proporciona una quota bàsica de d''espai per els vídeos dels seus usuaris. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - aquesta instància proporciona espai il·limitat per els vídeos del seus usuaris. - - - 31 - - - - - User registration is currently not allowed. - - - El registre d'usuaris actualment no és permès. - - - 36 + 29

@@ -777,42 +740,42 @@ Short description Descripció curta

- 22 + 21

Default client route Ruta per defecte del client

- 55 + 48

Videos Trending Vídeos tendència

- 59 + 52

Videos Recently Added Vídeos afegits fa poc

- 60 + 53

Local videos Vídeos locals

- 61 + 54

Policy on videos containing sensitive content Política sobre vídeos que contenen contingut sensible

- 70 + 61

@@ -847,42 +810,42 @@ Signup enabled Registre activat

- 93 + 84

Signup limit Limit de registres + + 96 + + + + Users + Usuaris

105

+ + User default video quota + Quota de vídeo per defecte de l'usuari + + 109 + +

Administrator Administrador

- 131 + 155

Admin email Correu del Administrador - 134 - - - - Users - Usuaris - - 144 - - - - User default video quota - Quota de vídeo per defecte de l'usuari - - 147 + 158

@@ -903,21 +866,21 @@ Your Twitter username El teu nom d'usuari de Twitter

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Indica el compte de Twitter del lloc web o plataforma en què es va publicar el contingut.

- 184 + 187

Instance whitelisted by Twitter Instància a la llista blanca de Twitter

- 198 + 199

@@ -931,77 +894,77 @@ Transcoding Transcodificació

- 210 + 215

Transcoding enabled Transcodificació activada

- 215 + 221

If you disable transcoding, many videos from your users will not work! Si desactives la transcodificació, molts vídeos dels teus usuaris no funcionaran.

- 216 + 222

Transcoding threads Subprocessos per la transcodificació

- 223 + 237

Previews cache size Memòria cau per a visualitzacions prèvies

- 254 + 271

Customizations Personalitzacions

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escriu directament el codi JavaScript.<br />Exemple: <pre>console.log('la meva instància és sorprenent');</pre>

- 281 + 297

Advanced configuration Configuració avançada

- 207 + 212

Update configuration Actualitza la configuració

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Sembla que la configuració no és vàlida. Cerca possibles errors a les diferents pestanyes.

- 326 + 341

@@ -1254,20 +1217,6 @@ 7 - - My settings - La meva configuració - - 3 - - - - My videos - Els meus vídeos - - 14 - -

Video quota: Quota de vídeo: @@ -1279,21 +1228,14 @@ Profile Perfil

- 8 + 7

Video settings Ajustos de vídeo - 15 - - - - Submit - Envia - - 24 + 16

@@ -1485,14 +1427,14 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir Publish will be available when upload is finished La publicació estarà disponible quan finalitzi la càrrega

- 53 + 58

Publish Publica

- 60 + 65

@@ -1548,7 +1490,7 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir Wait transcoding before publishing the video Espera la transcodificació abans de publicar el vídeo

- 130 + 131

@@ -1562,14 +1504,14 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir Upload thumbnail Puja miniatura

- 195 + 196

Upload preview Previsualitza la càrrega

- 202 + 203

@@ -1583,14 +1525,14 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir Short text to tell people how they can support you (membership platform...). Text breu per dir a la gent com us poden ajudar (plataforma de pertinença ...).

- 209 + 210

Advanced settings Ajustos avançats

- 190 + 191

@@ -1841,13 +1783,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 14 - - Error getting about from server - S'ha produït un error en obtenir quant a del servidor - - 1 - - No description Sense descripció @@ -1869,20 +1804,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Error - Error - - 1 - - - - Success - Èxit - - 1 - - Configuration updated. S'ha actualitzat la configuració. @@ -2044,23 +1965,16 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Estàs segur que vols eliminar ? També s''esborraràn tots els vídeos carregats en aquest canal. - - 1 - - - - Please type the name of the video channel to confirm - Escriu el nom del canal de vídeo per confirmar + + Video channel deleted. + Canal de vídeo eliminat.

- - Video channel deleted. - Canal de vídeo eliminat. + + My videos + Els meus vídeos 1 @@ -2121,6 +2035,13 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 + + My settings + La meva configuració + + 1 + + Unable to find user id or verification string. No es pot trobar l'identificador d'usuari ni la cadena de verificació. @@ -2144,6 +2065,13 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 + + Error + Error + + 1 + + You need to reconnect. Necessites tornar a connectar. @@ -2158,6 +2086,20 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 + + Info + Informació + + 1 + + + + Success + Èxit + + 1 + + Your password has been successfully reset! La contrasenya s'ha restablit correctament. @@ -2263,6 +2205,20 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 + + Email is required. + Es requereix un correu electrònic. + + 1 + + + + Email must be valid. + El correu electrònic ha de ser vàlid. + + 1 + + Username is required. Es requereix nom d'usuari. @@ -2284,41 +2240,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Username must be at least 3 characters long. - El nom d'usuari ha de tenir com a mínim 3 caràcters. - - 1 - - - - Username cannot be more than 20 characters long. - El nom d'usuari no pot tenir més de 20 caràcters. - - 1 - - - - Username should be only lowercase alphanumeric characters. - El nom d'usuari ha de ser només caràcters alfanumèrics en minúscules. - - 1 - - - - Email is required. - Es requereix un correu electrònic. - - 1 - - - - Email must be valid. - El correu electrònic ha de ser vàlid. - - 1 - - Password must be at least 6 characters long. La contrasenya ha de tenir com a mínim 6 caràcters. @@ -2368,20 +2289,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Display name must be at least 3 characters long. - El nom de visualització ha de tenir un mínim de 3 caràcters. - - 1 - - - - Display name cannot be more than 120 characters long. - El nom de visualització no pot tenir més de 120 caràcters. - - 1 - - Description must be at least 3 characters long. La descripció ha de tenir almenys 3 caràcters de longitud. @@ -2403,13 +2310,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Report reason cannot be more than 300 characters long. - El motiu de l'informe no pot tenir més de 300 caràcters. - - 1 - - Support text must be at least 3 characters long. El text de suport ha de tenir un mínim de 3 caràcters. @@ -3054,13 +2954,6 @@ Quan pugis un vídeo en aquest canal, el camp d'assistència de vídeo s'omplir 1 - - Info - Informació - - 1 - -

Upload cancelled Pujada cancel·lada diff --git a/client/src/locale/target/angular_cs_CZ.xml b/client/src/locale/target/angular_cs_CZ.xml index 59af08639..7b6f99ddb 100644 --- a/client/src/locale/target/angular_cs_CZ.xml +++ b/client/src/locale/target/angular_cs_CZ.xml @@ -309,7 +309,8 @@ Unsubscribe -Přestat odebírat + Přestat odebírat + 18 @@ -337,14 +338,21 @@ Přestat odebírat

Subscribe with a Mastodon account: - Odebírat přes Mastodon účet + Odebírat přes účet na Mastodonu:

+ + Using a syndication feed + Použít syndikační proud + + 48 + + Subscribe via RSS - Odebírat RSS + Odebírat přes RSS 49 @@ -362,6 +370,20 @@ Přestat odebírat 10 + + You can subscribe to the channel via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the channel URL in the search box and subscribe there. + Tento kanál můžete odebírat z jakékoliv instance na fediverse používající ActivityPub. Například u Mastodonu nebo Pleromy můžete napsat URL adresu kanálu do vyhledávacího pole a tam začít odebírat. + + 17 + + + + You can interact with this via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the current URL in the search box and interact with it there. + S tímto videem můžete interagovat z jakékoliv instance na fediverse používající ActivityPub. Například u Mastodonu nebo Pleromy můžete napsat aktuální URL adresu do vyhledávacího pole a odtamtud interagovat. + + 22 + +

Video quota Limit na videa @@ -438,7 +460,7 @@ Blokovaný uživatel se už nebude moci přihlásit.

Username or email address - Uživatelské jméno nebo email + Uživatelské jméno nebo e-mail 15 @@ -476,7 +498,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Password Heslo

- 12 + 13

@@ -490,7 +512,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Login Přihlásit

- 38 + 36

@@ -502,23 +524,23 @@ Blokovaný uživatel se už nebude moci přihlásit.

Email - Email + E-mail

Email address - Emailová adresa + E-mailová adresa

Send me an email to reset my password - Poslat email pro resetování hesla + Poslat e-mail pro resetování hesla

- 75 + 80

@@ -589,7 +611,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Signup Registrovat

- 88 + 78

@@ -659,7 +681,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Change the language Změnit jazyk

- 88 + 86

@@ -670,7 +692,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Můj veřejný profil - 18 + 16

@@ -681,7 +703,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Můj účet - 22 + 20

@@ -692,7 +714,7 @@ Blokovaný uživatel se už nebude moci přihlásit. Moje videa - 26 + 24

@@ -703,14 +725,14 @@ Blokovaný uživatel se už nebude moci přihlásit. Odhlásit - 30 + 28

Create an account Vytvořit účet

- 39 + 37

@@ -724,49 +746,49 @@ Blokovaný uživatel se už nebude moci přihlásit. Subscriptions Odběry

- 47 + 45

Overview Přehled

- 52 + 50

Trending Trendy

- 57 + 55

Recently added Nedávno přidané

- 62 + 60

Local Místní

- 67 + 65

More Další

- 72 + 70

Administration Administrace

- 76 + 74

@@ -776,11 +798,18 @@ Blokovaný uživatel se už nebude moci přihlásit. 25 + + Show keyboard shortcuts + Zobrazit klávesové zkratky + + 89 + +

Toggle dark interface Přepnout tmavé rozhraní

- 94 + 92

@@ -811,6 +840,20 @@ Blokovaný uživatel se už nebude moci přihlásit. 15 + + Duration + Trvání + + 24 + + + + Display sensitive content + Zobrazit citlivý obsah + + 33 + + Yes Ano @@ -867,11 +910,18 @@ Blokovaný uživatel se už nebude moci přihlásit. 94 + + Display unlisted and private videos + Zobrazit neuvedená a soukromá videa + + 14 + +

No results. Žádné výsledky.

- 17 + 20

@@ -929,15 +979,11 @@ Blokovaný uživatel se už nebude moci přihlásit. 7 - - - About instance - - - O instanci - + + Submit + Odeslat

- 1 + 31

@@ -951,47 +997,14 @@ Blokovaný uživatel se už nebude moci přihlásit. Terms Podmínky

- 44 + 39

User registration is allowed and Registrace uživatelů je povolena a - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - tato instance poskytuje základní limit místa pro videa svým uživatelům. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - tato instance poskytuje neomezený prostor pro videa svých uživatelů. - - - 31 - - - - - User registration is currently not allowed. - - - Registrace uživatelů není momentálně povolena. - - - 36 + 29 @@ -1126,6 +1139,21 @@ Blokovaný uživatel se už nebude moci přihlásit. 51 + + + Web peers are not publicly accessible: because we use WebRTC inside the web browser (with the WebTorrent library), the protocol is different from classic BitTorrent. + When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers to forward the information to. + See this document for more information + + + Webové peery nejsou veřejně dostupné: jelikož používáme WebRTC v prohlížeči (s knihovnou WebTorrent), je protokol odlišný od klasického BitTorrentu. + Když jste ve webovém prohlížeči, pošlete trackeru signál obsahující vaši IP adresu. Tracker pak náhodně vybere další peery, kterým přepošle informace. + Pro více informací si přečtěte tento dokument + + + 55 + +

The worst-case scenario of an average person spying on their friends is quite unlikely. @@ -1141,7 +1169,7 @@ Blokovaný uživatel se už nebude moci přihlásit.

How does PeerTube compare with YouTube? - Jaký e PeerTube v porovnání s YouTube? + Jaký je PeerTube v porovnání s YouTube? 67 @@ -1153,9 +1181,9 @@ Blokovaný uživatel se už nebude moci přihlásit. Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics). - Ohrožení soukromí je na YouTube odlišné od toho na PeerTube. + Ohrožení soukromí je na YouTubu odlišné od toho na PeerTubu. V případě YouTube, tato služba o vás sbírá obrovské mnžoství osobních informací (nejen vaší IP adresu), aby je poté analyzovala a sledovala vás. - Kromě toho, YouTube je vlastněn Google/Alphabet, společností, která vás sleduje napříč různými webovými stránkami (přes AdSense nebo Google Analytics). + Kromě toho je YouTube vlastněn Googlem/Alphabetem, společností, která vás sleduje napříč různými webovými stránkami (přes AdSense nebo Google Analytics).

69 @@ -1190,6 +1218,19 @@ Blokovaný uživatel se už nebude moci přihlásit. 83

+ + + PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released. + In the meantime, we want to test different ideas related to this issue: + + + PeerTube je v rané fázi a chceme vám doručit ta nejlepší možná opatření, dokud nebude vydána stabilní verze. + Mezitím chceme vyzkoušet různé nápady spojené s tímto problémem: + + + 85 + + Set a limit to the number of peers sent by the tracker Nastavit limit počtu peerů odeslaných trackerem @@ -1225,6 +1266,13 @@ Blokovaný uživatel se už nebude moci přihlásit. 95 + + Banned + Zablokován + + 12 + +

subscribers odběratelů @@ -1278,42 +1326,49 @@ Blokovaný uživatel se už nebude moci přihlásit. Short description Krátký popis

- 22 + 21

Default client route Výchozí hlavní stránka - 55 + 48 + + + + Videos Overview + Přehled videí + + 51

Videos Trending Trendy

- 59 + 52

Videos Recently Added Naposledy přidaná videa

- 60 + 53

Local videos Místní videa

- 61 + 54

Policy on videos containing sensitive content Pravidla pro videa obsahující citlivý obsah

- 70 + 61

@@ -1348,42 +1403,63 @@ Blokovaný uživatel se už nebude moci přihlásit. Signup enabled Povolit registrace - 93 + 84 + + + + Signup requires email verification + Registrace vyžaduje ověření e-mailem. + + 91 Signup limit Limit registrací + + 96 + + + + Users + Uživatelé

105

- - Administrator - Administrátor + + User default video quota + Výchozí limit na uživatele

- 131 + 109

- - Admin email - Email administrátora + + Import + Import

- 134 + 42

- - Users - Uživatelé + + Video import with HTTP URL (i.e. YouTube) enabled + Import videa pomocí URL HTTP (např. YouTube) povolen

- 144 + 141

- - User default video quota - Výchozí limit na uživatele + + Administrator + Administrátor + + 155 + + + + Admin email + E-mail administrátora

- 147 + 158

@@ -1404,21 +1480,21 @@ Blokovaný uživatel se už nebude moci přihlásit. Your Twitter username Váš účet na Twitteru

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Uveďte Twitter účet stránky nebo služby, na které byl obsah publikován.

- 184 + 187

Instance whitelisted by Twitter Twitter povolil tuto instanci

- 198 + 199

@@ -1432,77 +1508,99 @@ Blokovaný uživatel se už nebude moci přihlásit. Transcoding Překódování

- 210 + 215

Transcoding enabled Překódování povoleno

- 215 + 221

If you disable transcoding, many videos from your users will not work! Pokud zakážete překódování, mnoho videí od vašich uživatelů nebude fungovat!

- 216 + 222

Transcoding threads Vlákna na překódování - 223 + 237 + + + + Resolution enabled + Rozlišení povoleno + + 252 + + + + + Cache + + + + + Mezipaměť + + + + + 260

Previews cache size Velikost mezipaměti náhledů

- 254 + 271

Customizations Přizpůsobení

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Pište přímo JavaScript kód.<br />Například: <pre>console.log('moje instance je úžasná');</pre>

- 281 + 297

Advanced configuration Pokročilá nastavení

- 207 + 212

Update configuration Aktualizovat nastavení

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Zdá se, že vaše konfigurace není validní. Prosím, vyhledejte potencialní chyby v jiné záložce.

- 326 + 341

@@ -1527,6 +1625,17 @@ Blokovaný uživatel se už nebude moci přihlásit. 7 + + + Moderation + + + Moderace + + + 11 + + Jobs @@ -1574,6 +1683,13 @@ Blokovaný uživatel se už nebude moci přihlásit. 21 + + Filter... + Filtrovat... + + 27 + + ID ID @@ -1713,6 +1829,13 @@ Blokovaný uživatel se už nebude moci přihlásit. 40 + + (banned) + (zablokován) + + 65 + + Go to the account page Přejít na stránku kanálu @@ -1720,6 +1843,31 @@ Blokovaný uživatel se už nebude moci přihlásit. 133 + + Ban reason: + Důvod zablokování: + + 95 + + + + + This comment can only be seen by you or the other moderators. + + + Tento komentář můžete vidět pouze vy nebo ostatní moderátoři. + + + 17 + + + + Update this comment + Aktualizovat tento komentář + + 25 + + Reporter Autor nahlášení @@ -1748,25 +1896,25 @@ Blokovaný uživatel se už nebude moci přihlásit. 33 - - Blacklisted videos - Videa na černé listině + + Actions + Akce

- 7 + 35

- - My settings - Moje nastavení + + Reason: + Důvod:

- 3 + 53

- - My videos - Moje videa + + Blacklisted videos + Videa na černé listině

- 14 + 7

@@ -1780,21 +1928,14 @@ Blokovaný uživatel se už nebude moci přihlásit. Profile Profil

- 8 + 7

Video settings Nastavení videí - 15 - - - - Submit - Odeslat - - 24 + 16 @@ -1915,6 +2056,13 @@ When you will upload a video in this channel, the video support field will be au 27 + + subscribers + odběratelů + + 10 + +

(extensions: , max size: ) (typ souboru: , maximální velikost: ) @@ -1986,14 +2134,14 @@ When you will upload a video in this channel, the video support field will be au Publish will be available when upload is finished Publikovat lze jakmile bude dokončeno nahrávání

- 53 + 58

Publish Publikovat

- 60 + 65

@@ -2005,11 +2153,18 @@ When you will upload a video in this channel, the video support field will be au

Tags - Tagy + Štítky

191

+ + Tags could be used to suggest relevant recommendations.</br>Press Enter to add a new tag. + Štítky mohou být použity pro navržení relevantních doporučení.</br>Stisknutím klávesy Enter přidáte nový štítek. + + 18 + +

Video descriptions are truncated by default and require manual action to expand them. Popisy videí jsou ve výchozím stavu sbaleny a rozbalují se kliknutím. @@ -2049,7 +2204,7 @@ When you will upload a video in this channel, the video support field will be au Wait transcoding before publishing the video Čekat na překódování před publikováním videa

- 130 + 131

@@ -2063,14 +2218,14 @@ When you will upload a video in this channel, the video support field will be au Upload thumbnail Nahrát miniaturu

- 195 + 196

Upload preview Nahrát náhled

- 202 + 203

@@ -2084,14 +2239,14 @@ When you will upload a video in this channel, the video support field will be au Short text to tell people how they can support you (membership platform...). Krátký text, co řekne lidem, jak vás mohou podpořit.

- 209 + 210

Advanced settings Rozšířená nastavení

- 190 + 191

@@ -2342,13 +2497,6 @@ When you will upload a video in this channel, the video support field will be au 14 - - Error getting about from server - Chyba při získávání popisu - - 1 - - No description Žádný popis @@ -2370,20 +2518,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Error - Chyba - - 1 - - - - Success - Úspěšně - - 1 - - Configuration updated. Nastavení aktualizováno. @@ -2489,6 +2623,27 @@ When you will upload a video in this channel, the video support field will be au 1 + + Unban + Odblokovat + + 1 + + + + Do you really want to unban users? + Opravdu chcete odblokovat uživatelů? + + 1 + + + + users unbanned. + uživatelů odblokováno. + + 1 + + You cannot delete root. Uživatel root nelze odstranit. @@ -2545,23 +2700,16 @@ When you will upload a video in this channel, the video support field will be au 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Opravdu chcete odstranit ? Tato akce odstraní i veškerá videa na tomto kanálu. - - 1 - - - - Please type the name of the video channel to confirm - Prosím, napište název tohoto kanálu pro potvrzení + + Video channel deleted. + Video kanál odstraněn.

- - Video channel deleted. - Video kanál odstraněn. + + My videos + Moje videa 1 @@ -2622,6 +2770,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + My subscriptions + Moje odběry + + 1 + + + + My settings + Moje nastavení + + 1 + + Unable to find user id or verification string. Nelze najít uživatelovo id nebo verifikační řetězec. @@ -2629,6 +2791,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Subscribe to the account + Odebírat účet + + 1 + + Cannot retrieve OAuth Client credentials: . @@ -2645,6 +2814,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Error + Chyba + + 1 + + You need to reconnect. Musíte se znovu připojit. @@ -2659,6 +2835,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Info + Info + + 1 + + + + Success + Úspěšně + + 1 + +

Your password has been successfully reset! Vaše heslo bylo úspěšně resetováno! @@ -2745,14 +2935,14 @@ When you will upload a video in this channel, the video support field will be au

Admin email is required. - Email administrátora je vyžadován. + E-mail administrátora je vyžadován.

Admin email must be valid. - Email administrátora musí být platný. + E-mail administrátora musí být platný. 1 @@ -2764,6 +2954,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Email is required. + E-mail je vyžadován. + + 1 + + + + Email must be valid. + E-mail musí být platný. + + 1 + + Username is required. Uživatelské jméno je vyžadováno. @@ -2785,41 +2989,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username must be at least 3 characters long. - Uživatelské jméno musí mít délku minimálně 3 znaky. - - 1 - - - - Username cannot be more than 20 characters long. - Uživatelské jméno nemůže být delší než 20 znaků. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Uživatelské jméno by mělo obsahovat pouze malá písmena a číslice. - - 1 - - - - Email is required. - Email je vyžadován. - - 1 - - - - Email must be valid. - Email musí být platný. - - 1 - - Password must be at least 6 characters long. Heslo musí mít délku minimálně 6 znaků. @@ -2869,20 +3038,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. - Zobrazované jméno musí mít delku minimálně 3 znaky. - - 1 - - - - Display name cannot be more than 120 characters long. - Zobrazované jméno nesmí být delší než 120 znaků. - - 1 - - Description must be at least 3 characters long. Popis musí mít délku minimálně 3 znaky. @@ -2904,13 +3059,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Report reason cannot be more than 300 characters long. - Důvod nahlášení nesmí být delší než 300 znaků. - - 1 - - Support text must be at least 3 characters long. Text pro podporu musí mít délku minimálně 3 znaky. @@ -3506,6 +3654,34 @@ When you will upload a video in this channel, the video support field will be au 1 + + users banned. + uživatelů zablokováno. + + 1 + + + + User banned. + Uživatel zablokován. + + 1 + + + + Do you really want to unban ? + Opravdu chcete odblokovat uživatele ? + + 1 + + + + User unbanned. + Uživatel odblokován. + + 1 + + User deleted. Uživatel odstraněn. @@ -3541,16 +3717,51 @@ When you will upload a video in this channel, the video support field will be au 1 + + Subscribed to + Odebíráte kanál + + 1 + + Subscribed - Odebírám + Odebíráte + + 1 + + + + Unsubscribed from + Již neodebíráte kanál + + 1 + + + + Unsubscribed + Odběr zrušen + + 1 + + + + Anyone can see this video + Kdokoliv může vidět toto video + + 1 + + + + You are now logged in as ! + Nyní jste přihlášen/a jako !

But associated data (tags, description...) will be lost, are you sure you want to leave this page? - Přiřazená data (tagy, popis...) budou ztraceny, opravdu chcete opustit tuto stránku? + Ovšem přidružená data (štítky, popis...) budou ztraceny, opravdu chcete opustit tuto stránku? 1 @@ -3562,13 +3773,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Info - Info - - 1 - - Upload cancelled Nahrávání zrušeno @@ -3611,6 +3815,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Like the video + To se mi líbí + + 1 + + + + Dislike the video + To se mi nelíbí + + 1 + +

Do you really want to delete this video? Opravdu chcete odstranit toto video? @@ -3620,7 +3838,7 @@ When you will upload a video in this channel, the video support field will be au

likes / dislikes - se to líbí / se to nelíbí + se to líbí / lidem se to nelíbí 1 @@ -3639,5 +3857,12 @@ When you will upload a video in this channel, the video support field will be au 1 + + Videos from your subscriptions + Videa od vašich odběrů + + 1 + + \ No newline at end of file diff --git a/client/src/locale/target/angular_de_DE.xml b/client/src/locale/target/angular_de_DE.xml index 46e622908..39610dfdb 100644 --- a/client/src/locale/target/angular_de_DE.xml +++ b/client/src/locale/target/angular_de_DE.xml @@ -499,7 +499,7 @@ Password Passwort

- 12 + 13

@@ -513,7 +513,7 @@ Login Anmelden

- 38 + 36

@@ -541,7 +541,7 @@ Send me an email to reset my password Mir eine E-Mail schicken, um mein Passwort zurückzusetzen

- 75 + 80

@@ -600,11 +600,18 @@ Konto erstellen 17 + + I am at least 16 years old and agree to the <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Terms</a> of this instance + Ich bin mindestens 16 Jahre alt und stimme den <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Bestimmungen</a> dieser Instanz zu + + 55 + +

Signup Registrieren

- 88 + 78

@@ -632,6 +639,19 @@ Konto erstellen 6 + + + Filters + + + + Filter + + + + 16 + +

No results found @@ -661,7 +681,7 @@ Konto erstellen Change the language Sprache wechseln

- 88 + 86

@@ -672,7 +692,7 @@ Konto erstellen Mein öffentliches Profil - 18 + 16

@@ -683,7 +703,7 @@ Konto erstellen Mein Konto - 22 + 20

@@ -694,7 +714,7 @@ Konto erstellen Meine Videos - 26 + 24

@@ -705,14 +725,14 @@ Konto erstellen Abmelden - 30 + 28

Create an account Konto erstellen

- 39 + 37

@@ -726,49 +746,49 @@ Konto erstellen Subscriptions Abos

- 47 + 45

Overview Übersicht

- 52 + 50

Trending Beliebt

- 57 + 55

Recently added Kürzlich hinzugefügt

- 62 + 60

Local Lokal

- 67 + 65

More Mehr

- 72 + 70

Administration Administration

- 76 + 74

@@ -782,14 +802,14 @@ Konto erstellen Show keyboard shortcuts Zeige Tastatur-Kürzel

- 91 + 89

Toggle dark interface Dunkle Oberfläche umschalten

- 94 + 92

@@ -894,14 +914,14 @@ Konto erstellen Display unlisted and private videos Private und nicht gelisteten Videos aufzeigen

- 11 + 14

No results. Keine Ergebnisse.

- 17 + 20

@@ -959,15 +979,22 @@ Konto erstellen 7 - + - About instance - + Cancel + - Über die Instanz - + Abbrechen + - 1 + 26 + + + + Submit + Abschicken + + 31

@@ -981,47 +1008,14 @@ Konto erstellen Terms Bestimmungen

- 44 + 39

User registration is allowed and Benutzerregistrierung ist möglich und - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - für die Videos ihrer Nutzer stellt diese Instanz einen Speicherplatz von zur Verfügung. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - für die Videos ihrer Nutzer stellt diese Instanz unbegrenzten Speicherplatz zur Verfügung. - - - 31 - - - - - User registration is currently not allowed. - - - Die Benutzerregistrierung ist zur Zeit nicht erlaubt. - - - 36 + 29

@@ -1037,7 +1031,7 @@ Konto erstellen

PeerTube is a federated (ActivityPub) video streaming platform using P2P (WebTorrent) directly in the web browser. - PeerTube ist eine föderierte Videostreamingplattform basierend auf dem ActivityPub-Protokoll, die mit WebTorrent P2P-Technologie direkt im Browser verwendet. + PeerTube ist eine föderierte Videostreamingplattform basierend auf dem ActivityPub-Protokoll, die WebTorrent P2P-Technologie direkt im Browser verwendet. 6 @@ -1242,6 +1236,19 @@ Konto erstellen 83 + + + PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released. + In the meantime, we want to test different ideas related to this issue: + + + PeerTube ist in der frühen Entwicklungsphase und es ist geplant, die besten Gegenmaßnahmen in der nächsten stabilen Version zu implementieren. + Bis dahin wollen wir verschiedene Ideen für dieses Problem testen: + + + 85 + +

Set a limit to the number of peers sent by the tracker Die Zahl der Peers, die durch einen Tracker gesendet wird, begrenzen. @@ -1278,27 +1285,37 @@ Konto erstellen

- BannedBanned

+ Banned + Gebannt + 12

- MutedMuted

+ Muted + Stummgeschaltet + 13

- Muted by your instanceMuted by your instance

+ Muted by your instance + Von deiner Instanz stummgeschaltet + 14

- Instance mutedInstance muted

+ Instance muted + Instanz stummgeschaltet + 15

- Instance muted by your instanceInstance muted by your instance

+ Instance muted by your instance + Diese Instanz wurde deiner Instanz stummgeschaltet + 16

@@ -1355,49 +1372,49 @@ Konto erstellen Short description Kurze Beschreibung

- 22 + 21

Default client route Standardpfad (Client)

- 55 + 48

Videos Overview Video-Übersicht

- 58 + 51

Videos Trending Beliebte Videos

- 59 + 52

Videos Recently Added Kürzlich hinzugefügte Videos

- 60 + 53

Local videos Lokale Videos

- 61 + 54

Policy on videos containing sensitive content Verhalten bei Videos mit anstößigen Inhalten

- 70 + 61

@@ -1432,23 +1449,44 @@ Konto erstellen Signup enabled Registrierung aktiviert

- 93 + 84

Signup requires email verification Registrierung erfordert eine Bestätigung der E-Mail-Adresse

- 100 + 91

Signup limit Obergrenze für Registrierungen + + 96 + + + + Users + Benutzer

105

+ + User default video quota + Standardkontingent für die Videos eines Nutzers + + 109 + + + + User default daily upload limit + Tägliches Obergrenze eines Nutzers beim Hochladen + + 121 + +

Import Importieren @@ -1460,49 +1498,28 @@ Konto erstellen Video import with HTTP URL (i.e. YouTube) enabled Video durch HTTP URL (z.b. YouTube©) import erlaubt.

- 120 + 141

Video import with a torrent file or a magnet URI enabled Video-Import über eine Torrent-Datei oder einen Magnet-Link aktiviert

- 127 + 148

Administrator Administrator

- 131 + 155

Admin email Admin E-Mail - 134 - - - - Users - Benutzer - - 144 - - - - User default video quota - Standardkontingent für die Videos eines Nutzers - - 147 - - - - User default daily upload limit - Tägliches Obergrenze eines Nutzers beim Hochladen - - 161 + 158

@@ -1523,21 +1540,21 @@ Konto erstellen Your Twitter username Dein Twitter-Benutzername

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Zeigt den Twitter-Account für die Webseite, auf der der Inhalt veröffentlicht wurde.

- 184 + 187

Instance whitelisted by Twitter Instanz von Twitter vertraut

- 198 + 199

@@ -1551,35 +1568,35 @@ Konto erstellen Transcoding Transkodierung

- 210 + 215

Transcoding enabled Transkodierung an

- 215 + 221

If you disable transcoding, many videos from your users will not work! Wenn du die Transkodierung abschaltest, werden viele Videos nicht laufen!

- 216 + 222

Transcoding threads Transcodierungsthreads

- 223 + 237

Resolution enabled Eingestellte Auflösung:

- 239 + 252

@@ -1594,82 +1611,47 @@ Konto erstellen

- 244 + 260

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Einige Dateien (Vorschau, Untertitel) werden nicht verteilt gespeichert. Wir laden sie direkt von der Ursprungsinstanz und speichern sie zwischen.

- 249 + 265

Previews cache size Cachegröße der Vorschau

- 254 + 271

Video captions cache size Cachegröße der Untertitel

- 265 + 280

Customizations Personalisierung

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Füge dein JavaScript ein.<br />Beispiel: <pre>console.log('Meine Instanz ist großartig');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Schreibe direkt CSS-Code. Beispiel:<br /> - <pre> - body - background-color: red; - - </pre> - - Stelle <em>#custom-css</em> voran, um den Stil zu überschreiben. Beispiel: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1678,21 +1660,21 @@ Konto erstellen Advanced configuration Erweiterte Einstellungen

- 207 + 212

Update configuration Einstellungen aktualisieren

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Die Einstellungen sind anscheinend ungültig. Bitte suche nach potentiellen Fehlern in den verschiedenen Reitern.

- 326 + 341

@@ -1963,7 +1945,9 @@ Konto erstellen

- (banned)(banned)

+ (banned) + (gebannt) + 65

@@ -1974,11 +1958,25 @@ Konto erstellen 133 + + User's email must be verified to login + Die E-Mail-Adresse des Nutzers muss vor dem Einloggen bestätigt werden + + 72 + + + + User's email is verified / User can login without email verification + Die E-Mail-Addresse des Nutzers wurde bestätigt / Nutzer kann ohne E-Mail-Bestätigung einloggen + + 76 + +

Ban reason: Grund für die Sperrung:

- 92 + 95

@@ -2045,7 +2043,7 @@ Konto erstellen Actions Aktionen

- 33 + 35

@@ -2080,14 +2078,14 @@ Konto erstellen Date Datum

- 10 + 11

Blacklist reason: Grund für die Sperre:

- 41 + 43

@@ -2112,12 +2110,16 @@ Konto erstellen

- Muted accountsMuted accounts

+ Muted accounts + Stummgeschaltete Accounts + 2

- Muted serversMuted servers

+ Muted servers + Stummgeschaltete Server + 11

@@ -2129,109 +2131,59 @@ Konto erstellen

- Muted at Muted at

+ Muted at + Stummgeschaltet am + 13

- UnmuteUnmute

+ Unmute + Stummschalten aufheben + 23

- - My settings - Meine Einstellungen + + Video quota: + Videokontingent:

- 3 + 4

- - My library - Meine Bibliothek + + Profile + Profil

- - My channels - Meine Kanäle + + Video settings + Videoeinstellungen

- 12 + 16

- - My videos - Meine Videos + + Danger zone + Gefahrenzone

- 14 + 19

- - My subscriptions - Meine Abos + + Change ownership + Besitzer ändern

- 16 + 46

- - My imports - Meine Importe + + Select the next owner + Wähle den nächsten Besitzer - 18 - - - - Muted instancesMuted instances - 2 - - - - Ownership changes - Besitzer ändern - - 33 - - - - Video quota: - Videokontingent: - - 4 - - - - Profile - Profil - - 8 - - - - Video settings - Videoeinstellungen - - 15 - - - - Danger zone - Gefahrenzone - - 18 - - - - Change ownership - Besitzer ändern - - 46 - - - - Select the next owner - Wähle den nächsten Besitzer - - 9 + 9 @@ -2245,13 +2197,6 @@ Konto erstellen 35 - - Submit - Abschicken - - 24 - - - views - Aufrufe @@ -2411,6 +2356,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 47 + + Muted instances + Stummgeschaltete Instanzen + + 2 + + Change password Passwort ändern @@ -2616,6 +2568,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 159 + + Sorry, but something went wrong + Entschuldigung, etwas ist schiefgegangen + + 49 + +

Congratulations, the video behind will be imported! You can already add information about this video. @@ -2652,14 +2611,14 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Publish will be available when upload is finished Veröffentlichung ist möglich, sobald das Hochladen abgeschlossen ist

- 53 + 58

Publish Veröffentlichen

- 60 + 65

@@ -2842,14 +2801,14 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Wait transcoding before publishing the video Transkodieren abwarten, bevor das Video veröffentlicht wird

- 130 + 131

If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Wenn du dich entschließt, das Transkodieren nicht abzuwarten, kann das Video unabspielbar sein, bis das Transkodieren beendet ist.

- 131 + 132

@@ -2863,49 +2822,49 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Add another caption Weitere Untertitel hinzufügen

- 146 + 147

See the subtitle file Siehe in der Untertiteldatei

- 155 + 156

Already uploaded ✔ Fast hochgeladen ✔

- 159 + 160

Will be created on update Wird bei einer Aktualisierung erstellt

- 167 + 168

Cancel create Erstellen abbrechen

- 169 + 170

Will be deleted on update Wird bei einer Aktualisierung gelöscht

- 175 + 176

Cancel deletion Löschen abbrechen

- 177 + 178

@@ -2916,28 +2875,28 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Bis auf Weiteres keine Untertitel. - 182 + 183

Captions Untertitel

- 139 + 140

Upload thumbnail Miniaturansicht hochladen

- 195 + 196

Upload preview Vorschau hochladen

- 202 + 203

@@ -2951,14 +2910,14 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa Short text to tell people how they can support you (membership platform...). Ein kurzer Text, der anderen erklärt, wie sie dich unterstützen können.

- 209 + 210

Advanced settings Erweiterte Einstellungen

- 190 + 191

@@ -3025,17 +2984,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 3 - - - Cancel - - - Abbrechen - - - 19 - - Share Teilen @@ -3422,13 +3370,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 14 - - Error getting about from server - Server-Fehler. - - 1 - - No description Keine Beschreibung @@ -3450,13 +3391,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Error - Fehler - - 1 - - 240p 240p @@ -3499,13 +3433,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Success - Erfolg - - 1 - -

Configuration updated. Einstellungen aktualisiert. @@ -3668,7 +3595,16 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa

- Account unmuted by your instance.Account unmuted by your instance.

+ Account unmuted by your instance. + Account ist von deiner Instanz nicht mehr stummgeschatet. + + 1 + +

+ + Instance unmuted by your instance. + Instance ist von deiner Instanz nicht mehr stummgeschaltet. + 1 @@ -3679,6 +3615,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Delete this report + Missbrauchsmeldung löschen + + 1 + + Update moderation comment Moderationskommentar aktualisieren @@ -3700,6 +3643,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Do you really want to delete this abuse report? + Wollen Sie wirklich diese Missbrauchsmeldung löschen? + + 1 + + Abuse deleted. Missbrauchsmeldung gelöscht. @@ -3749,6 +3699,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Set Email as Verified + E-Mail als bestätigt setzen + + 1 + + You cannot ban root. Du kannst root nicht sperren. @@ -3756,6 +3713,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Do you really want to unban users? + Willst du wirklich den Bann von Benutzern aufheben? + + 1 + + + + users unbanned. + Bann von Benutzern aufgehoben. + + 1 + +

You cannot delete root. Du kannst die Wurzel nicht löschen. @@ -3764,7 +3735,37 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa

- If you remove these users, you will not be able to create others with the same username!If you remove these users, you will not be able to create others with the same username!

+ If you remove these users, you will not be able to create others with the same username! + Wenn du diesen Benutzer löschst, kannst du keine neuen Benutzer mit gleichem Benutzernamen einrichten ! + + 1 + +

+ + users deleted. + Benutzer gelöscht. + + 1 + + + + users email set as verified. + E-Mail von Benutzern als bestätigt markiert. + + 1 + + + + Account unmuted. + Stummschaltung von Account aufgehoben. + + 1 + + + + Instance unmuted. + Stummschaltung von Instanz aufgehoben. + 1 @@ -3845,6 +3846,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + This name already exists on this instance. + Dieser Name existiert bereits auf dieser Instanz. + + 1 + + Create Erstellen @@ -3859,23 +3867,16 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Willst du wirklich löschen? Alle hochgeladenen Videos des Kanals werden dann ebenfalls unwiderruflich gelöscht. - - 1 - - - - Please type the name of the video channel to confirm - Bitte gib zur Bestätigung den Namen des Videokanals ein + + Video channel deleted. + Videokanal entfernt.

- - Video channel deleted. - Videokanal entfernt. + + My videos + Meine Videos 1 @@ -3950,16 +3951,44 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Channels - Kanäle + + My library + Meine Bibliothek + + 1 + + + + My channels + Meine Kanäle + + 1 + + + + My subscriptions + Meine Abos + + 1 + + + + Misc + Verschiedenes

- - Video imports - Video-Importe + + Ownership changes + Besitzer ändern + + 1 + + + + My settings + Meine Einstellungen 1 @@ -3979,7 +4008,23 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa - Subscribe to the accountSubscribe to the account

+ Subscribe to the account + Diesen Account abonnieren + + 1 + +

+ + Focus the search bar + Die Suchleiste fokussieren + + 1 + + + + Toggle the left menu + Linkes Menü umschalten + 1 @@ -4018,6 +4063,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Toggle Dark theme + Dunkles Theme umschalten + + 1 + + + + Go to my subscriptions + Gehe zu meinen Abos + + 1 + + Go to my videos zur meine Videos gehen @@ -4025,6 +4084,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Go to my imports + Gehe zu meinen Importen + + 1 + + + + Go to my channels + Gehe zu meinen Kanälen + + 1 + + Cannot retrieve OAuth Client credentials: . @@ -4041,6 +4114,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Error + Fehler + + 1 + + You need to reconnect. Bitte verbinde dich erneut. @@ -4062,6 +4142,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Info + Infos + + 1 + + + + Success + Erfolg + + 1 + + Incorrect username or password. Falscher Benutzername oder falsches Passwort. @@ -4279,6 +4373,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Email is required. + Bitte gib eine E-Mail-Adresse ein. + + 1 + + + + Email must be valid. + Bitte gebe eine gültige E-Mail-Adresse ein. + + 1 + + Username is required. Bitte gib einen Benutzernamen ein. @@ -4300,41 +4408,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Username must be at least 3 characters long. - Der Benutzername muss mindestens 3 Zeichen lang sein. - - 1 - - - - Username cannot be more than 20 characters long. - Der Benutzername darf nicht länger als 20 Zeichen lang sein. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Der Benutzername sollte nur kleine alphanumerische Zeichen enthalten. - - 1 - - - - Email is required. - Bitte gib eine E-Mail-Adresse ein. - - 1 - - - - Email must be valid. - Bitte gebe eine gültige E-Mail-Adresse ein. - - 1 - - Password must be at least 6 characters long. Das Passwort muss mindestens 6 Zeichen lang sein. @@ -4398,23 +4471,16 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Display name must be at least 3 characters long. - Der Anzeigename muss mindestens 3 Zeichen lang sein. - - 1 - - - - Display name cannot be more than 120 characters long. - Der Anzeigename darf nicht länger als 120 Zeichen lang sein. + + Description must be at least 3 characters long. + Die Beschreibung muss mindestens 3 Zeichen umfassen.

- - Description must be at least 3 characters long. - Die Beschreibung muss mindestens 3 Zeichen umfassen. + + Description cannot be more than 1000 characters long. + Beschreibung kann nicht länger als 1000 Zeichen sein. 1 @@ -4454,13 +4520,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Report reason cannot be more than 300 characters long. - Der Grund für die Meldung darf nicht mehr als 300 Zeichen umfassen. - - 1 - - Moderation comment is required. Der Moderationskommentar muss angegeben werden. @@ -4475,13 +4534,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Moderation comment cannot be more than 300 characters long. - Der Moderationskommentar darf nicht mehr als 300 Zeichen umfassen. - - 1 - - The channel is required. Der Kanal muss angegeben werden. @@ -4524,37 +4576,30 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Name is required. - Der Name muss angegeben werden. - - 1 - - - - Name must be at least 3 characters long. - Der Name muss mindestens 3 Zeichen umfassen. + + You can only transfer ownership to a local account + Du kannst den Besitz nur auf einen lokalen Account übertragen

- - Name cannot be more than 20 characters long. - Der Name darf nicht mehr als 20 Zeichen umfassen. + + Name is required. + Der Name muss angegeben werden.

- - Name should be only lowercase alphanumeric characters. - Der Name sollte nur kleine alphanumerische Zeichen enthalten. + + Support text must be at least 3 characters long. + Die Beschreibung zur Unterstützung muss mindestens 3 Zeichen umfassen.

- - Support text must be at least 3 characters long. - Die Beschreibung zur Unterstützung muss mindestens 3 Zeichen umfassen. + + Support text cannot be more than 1000 characters long. + Die Beschreibung zur Unterstützung kann nicht mehr als 1000 Zeichen lang sein. 1 @@ -4650,6 +4695,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Video support cannot be more than 1000 characters long. + Die Beschreibung zur Unterstützung darf nicht mehr als 1000 Zeichen umfassen. + + 1 + + A date is required to schedule video update. Bitte gib ein ein Datum für die geplante Veröffentlichung ein. @@ -5175,6 +5227,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + users banned. + Benutzer gebannt. + + 1 + + User banned. Benutzer gesperrt. @@ -5210,6 +5269,111 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + User email set as verified + E-Mail des Benutzers als bestätigt markiert + + 1 + + + + Account muted. + Account stummgeschaltet. + + 1 + + + + Instance muted. + Instanz stummgeschaltet. + + 1 + + + + Account muted by the instance. + Account von der Instanz stummgeschaltet. + + 1 + + + + Account unmuted by the instance. + Account nicht mehr von der Instanz stummgeschaltet. + + 1 + + + + Instance muted by the instance. + Instanz von der Instanz stummgeschaltet. + + 1 + + + + Instance unmuted by the instance. + Instance nicht mehr von der Instanz stummgeschaltet. + + 1 + + + + Mute this account + Dieses Konto stummschalten + + 1 + + + + Unmute this account + Stummschaltung für dieses Konto aufheben + + 1 + + + + Mute the instance + Diese Instanz stummschalten + + 1 + + + + Unmute the instance + Stummschaltung für diese Instanz aufheben + + 1 + + + + Mute this account by your instance + Dieses Konto durch deine Instanz stummschalten lassen + + 1 + + + + Unmute this account by your instance + Stummschaltung dieses Kontos durch deine Instanz aufheben + + 1 + + + + Mute the instance by your instance + Diese Instanz durch deine Instanz stummschalten lassen + + 1 + + + + Unmute the instance by your instance + Stummschaltung dieser Instanz durch deine Instanz aufheben + + 1 + + Request is too large for the server. Please contact you administrator if you want to increase the limit size. Die Anfrage ist zu groß. Bitte kontaktiere den Administrator, um die Obergrenze für die Größe zu erhöhen. @@ -5238,13 +5402,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Subscribed - Abonniert - - 1 - - Subscribed to abonniert @@ -5252,9 +5409,9 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Unsubscribed - Abo beendet + + Subscribed + Abonniert 1 @@ -5266,6 +5423,13 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Unsubscribed + Abo beendet + + 1 + + Moderator Moderator @@ -5294,6 +5458,20 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 + + Welcome! Now please check your emails to verify your account and complete signup. + Wilkommen! Bitte überprüfe deine Mails um dein Benutzerkonto zu bestätigen und die Registrierung abzuschließen. + + 1 + + + + You are now logged in as ! + Du bist jetzt eingeloggt als ! + + 1 + + Video to import updated. Zu importierendes Video wurde aktualisiert. @@ -5322,13 +5500,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - Info - Infos - - 1 - - Upload cancelled Hochladen abgebrochen @@ -5336,13 +5507,6 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Leider kann PeerTube keine Videos verarbeiten, die größer als 8 GB sind. - - 1 - -

Your video quota is exceeded with this video (video size: , used: , quota: ) Dein Videokontingent wird mit diesem Video überschritten (Videogröße: , benutzt: , Kontingent: ) diff --git a/client/src/locale/target/angular_eo.xml b/client/src/locale/target/angular_eo.xml index faa52fbdb..0d54b5a5d 100644 --- a/client/src/locale/target/angular_eo.xml +++ b/client/src/locale/target/angular_eo.xml @@ -236,7 +236,7 @@ Password Pasvorto

- 12 + 13

@@ -250,7 +250,7 @@ Login Saluti

- 38 + 36

@@ -278,7 +278,7 @@ Send me an email to reset my password Sendu al mi retleteron por restarigi mian pasvorton

- 75 + 80

@@ -335,7 +335,7 @@ Signup Registriĝo

- 88 + 78

@@ -371,7 +371,7 @@ Change the language Ŝanĝi la lingvon

- 88 + 86

@@ -382,7 +382,7 @@ Miaj filmoj - 26 + 24

@@ -393,14 +393,14 @@ Adiaŭi - 30 + 28

Create an account Krei konton

- 39 + 37

@@ -414,49 +414,49 @@ Subscriptions Abonoj

- 47 + 45

Overview Superrigardo

- 52 + 50

Trending Furoraj

- 57 + 55

Recently added Freŝe aldonitaj

- 62 + 60

Local Lokaj

- 67 + 65

More Pli

- 72 + 70

Administration Administrado

- 76 + 74

@@ -568,7 +568,7 @@ No results. Nenio troviĝis.

- 17 + 20

@@ -585,15 +585,11 @@ 7 - - - About instance - - - Pri la nodo «  » - + + Submit + Sendi

- 1 + 31

@@ -607,47 +603,14 @@ Terms Kondiĉoj

- 44 + 39

User registration is allowed and Registrado de uzantoj estas permesata kaj - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - ĉi tiu nodo donas bazan datumlimon de da spaco por filmoj de siaj uzantoj. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - ĉi tiu nodo donas senliman spacon por filmoj de siaj uzantoj. - - - 31 - - - - - User registration is currently not allowed. - - - Registrado de novaj uzantoj nun ne estas permesata. - - - 36 + 29

@@ -956,49 +919,49 @@ Short description Mallonga priskribo

- 22 + 21

Default client route Norma klienta vojo

- 55 + 48

Videos Overview Filma superrigardo

- 58 + 51

Videos Trending Filmoj furoraj

- 59 + 52

Videos Recently Added Filmoj freŝe aldonitaj

- 60 + 53

Local videos Filmoj lokaj

- 61 + 54

Policy on videos containing sensitive content Politiko pri filmoj kun konsterna enhavo

- 70 + 61

@@ -1033,23 +996,37 @@ Signup enabled Registriĝoj ŝaltitaj

- 93 + 84

Signup requires email verification Registriĝo bezonas kontrolon de retpoŝtadreso

- 100 + 91

Signup limit Limo de registriĝoj + + 96 + + + + Users + Uzantoj

105

+ + User default video quota + Norma datumlimo por filmoj de uzantoj + + 109 + +

Import Enporti @@ -1061,35 +1038,21 @@ Video import with a torrent file or a magnet URI enabled Enporto de filmoj per torenta dosiero aŭ magneta ligilo ŝaltita

- 127 + 148

Administrator Administranto

- 131 + 155

Admin email Retpoŝtadreso de administranto - 134 - - - - Users - Uzantoj - - 144 - - - - User default video quota - Norma datumlimo por filmoj de uzantoj - - 147 + 158

@@ -1110,21 +1073,21 @@ Your Twitter username Via Tvitera salutnomo

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Indikas konton de Twitter por la retejo aŭ platformo, sur kiu la afero publikiĝis.

- 184 + 187

Instance whitelisted by Twitter Nodo permesata de Twitter

- 198 + 199

@@ -1138,98 +1101,98 @@ Transcoding Transkodado

- 210 + 215

Transcoding enabled Transkodado ŝaltita

- 215 + 221

If you disable transcoding, many videos from your users will not work! Se vi malŝaltos transkodadon, multaj filmoj de viaj uzantoj eble ne funkcios!

- 216 + 222

Transcoding threads Fadenoj por transkodado

- 223 + 237

Resolution enabled Distingo ŝaltita

- 239 + 252

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Iuj dosieroj ne estas federataj (antaŭrigardoj, transskriboj). Ni prenas kaj kaŝmemoras ilin rekte el la fonta nodo.

- 249 + 265

Previews cache size Grando de antaŭrigarda kaŝmemoro

- 254 + 271

Video captions cache size Grandeco de kaŝmemoro por filmaj transskriboj.

- 265 + 280

Customizations Adaptoj

- 275 + 289

JavaScript Ĝavoskripto

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Skribu rekte Ĝavoskriptan kodon.<br />Ekzemple: <pre>console.log('mia nodo bonegas');</pre>

- 281 + 297

Advanced configuration Specialaj agordoj

- 207 + 212

Update configuration Efektivigi agordojn

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Ŝajnas, ke la agordo estas nevalida. Bonvolu serĉi eblajn erarojn en la langetoj.

- 326 + 341

@@ -1496,41 +1459,6 @@ 7 - - My settings - Miaj agordoj - - 3 - - - - My channels - Miaj kanaloj - - 12 - - - - My videos - Miaj filmoj - - 14 - - - - My subscriptions - Miaj abonoj - - 16 - - - - My imports - Miaj enportoj - - 18 - -

Video quota: Datumlimo por filmoj: @@ -1542,28 +1470,21 @@ Profile Profilo

- 8 + 7

Video settings Filmaj agordoj:

- 15 + 16

Danger zone Danĝera areo - 18 - - - - Submit - Sendi - - 24 + 19

@@ -1801,14 +1722,14 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos Publish will be available when upload is finished Eldono eblos post fino de alŝuto

- 53 + 58

Publish Eldoni

- 60 + 65

@@ -1952,14 +1873,14 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos Wait transcoding before publishing the video Atendi transkodadon antaŭ publikigi la filmon

- 130 + 131

If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Se vi decidos ne atendi finon de transkodado antaŭ publikigo, ĝi povus esti neludebla ĝis la transkodo finiĝos.

- 131 + 132

@@ -1973,49 +1894,49 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos Add another caption Aldoni alian transskribon

- 146 + 147

See the subtitle file Rigardi la dosieron kun subtekstoj

- 155 + 156

Cancel create Nuligi kreon

- 169 + 170

Cancel deletion Nuligi forigon

- 177 + 178

Captions Transskriboj

- 139 + 140

Upload thumbnail Alŝuti miniaturon

- 195 + 196

Upload preview Alŝuti antaŭrigardon

- 202 + 203

@@ -2029,14 +1950,14 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos Short text to tell people how they can support you (membership platform...). Mallonga teksto por sciigi homojn, kiel ili povas subteni vin.

- 209 + 210

Advanced settings Specialaj agordoj

- 190 + 191

@@ -2319,13 +2240,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 14 - - Error getting about from server - Eraro ricevante prion de la servilo - - 1 - - No description Neniu priskribo @@ -2347,20 +2261,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Error - Eraro - - 1 - - - - Success - Sukceso - - 1 - - Configuration updated. Agordo ĝisdatigita @@ -2550,23 +2450,16 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Ĉu vi certe volas forigi kanalon ? Tiel vi ankaŭ forigos ĉiujn filmojn alŝutitajn al tiu ĉi kanalo. - - 1 - - - - Please type the name of the video channel to confirm - Bonvolu tajpi nomon de la filma kanalo por konfirmi + + Video channel deleted. + Filma kanalo forigita.

- - Video channel deleted. - Filma kanalo forigita. + + My videos + Miaj filmoj 1 @@ -2627,6 +2520,27 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 + + My channels + Miaj kanaloj + + 1 + + + + My subscriptions + Miaj abonoj + + 1 + + + + My settings + Miaj agordoj + + 1 + + Unable to find user id or verification string. Ne povas trovi identigilon aŭ kontrolan ĉenon de uzanto @@ -2650,6 +2564,13 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 + + Error + Eraro + + 1 + + You need to reconnect. Vi devas rekonektiĝi @@ -2664,6 +2585,20 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 + + Info + Informoj + + 1 + + + + Success + Sukceso + + 1 + + An email with the reset password instructions will be sent to . Retletero kun instrukcioj por restarigi la pasvorton sendiĝos al . @@ -2860,6 +2795,20 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 + + Email is required. + Necesas retpoŝtadreso. + + 1 + + + + Email must be valid. + Retpoŝtadreso devas esti valida. + + 1 + + Username is required. Necesas salutnomo. @@ -2881,41 +2830,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Username must be at least 3 characters long. - Salutnomo devas havi almenaŭ 3 signojn. - - 1 - - - - Username cannot be more than 20 characters long. - Salutnomo ne povas havi pli ol 20 signojn. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Salutnomo havu nur ciferojn kaj minusklajn literojn. - - 1 - - - - Email is required. - Necesas retpoŝtadreso. - - 1 - - - - Email must be valid. - Retpoŝtadreso devas esti valida. - - 1 - - Password must be at least 6 characters long. Pasvorto devas havi almenaŭ 6 signojn. @@ -2965,20 +2879,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Display name must be at least 3 characters long. - Prezenta nomo devas havi almenaŭ 3 signojn. - - 1 - - - - Display name cannot be more than 120 characters long. - Prezenta nomo ne povas havi pli ol 120 signojn. - - 1 - - Description must be at least 3 characters long. Priskribo havu almenaŭ 3 signojn. @@ -3007,13 +2907,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Report reason cannot be more than 300 characters long. - Kialo de raporto maldevas havi pli ol 300 signojn. - - 1 - - Video caption language is required. Necesas lingvo de filma transskribo. @@ -3686,13 +3579,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - Info - Informoj - - 1 - - Upload cancelled Alŝuto nuligita. @@ -3700,13 +3586,6 @@ Kiam vi alŝutos filmon al tiu ĉi kanalo, la kampo pri subteno memfare enhavos 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Pardonu nin, sed PeerTube ne kapablas trakti filmojn super 8GB - - 1 - -

Video published. Filmo publikigita. diff --git a/client/src/locale/target/angular_es_ES.xml b/client/src/locale/target/angular_es_ES.xml index 947c9a91d..828de2a57 100644 --- a/client/src/locale/target/angular_es_ES.xml +++ b/client/src/locale/target/angular_es_ES.xml @@ -5,7 +5,7 @@ Close - Cerrar + tppCerrar 2 @@ -227,6 +227,155 @@ 11 + + You don't have notifications. + No tiene notificaciones + + 1 + + + + + published a new video + + + ha publicado un nuevo vídeo + + + 7 + + + + + Your video has been unblacklisted + + + Su vídeo ha sido desbloqueado + + + 11 + + + + + Your video has been blacklisted + + + Su vídeo ha sido bloqueado + + + 15 + + + + + A new video abuse has been created on video + + + Una nueva denuncia de abuso ha sido creada sobre el vídeo + + + 19 + + + + + commented your video + + + ha comentado su vídeo + + + 23 + + + + + Your video has been published + + + Su vídeo ha sido publicado + + + 27 + + + + + Your video import succeeded + + + Importación de vídeo exitosa + + + 31 + + + + + Your video import failed + + + Error durante la importación de vídeo + + + 35 + + + + + User registered on your instance + + + Nuevo usuario registrado en su instancia + + + 39 + + + + + is following + + + your channel + + your account + + + ahora sigue + + + su canal + + su cuenta + + + 43 + + + + + mentioned you on video + + + le ha mencionado en el vídeo + + + 52 + + + + + + + + + + + 57 + + Unlisted No listado @@ -433,6 +582,13 @@ Cancelar la subscripción 25 + + + + + 11 + +

- 12 + 13

@@ -511,7 +667,7 @@ Iniciar sesión Login Identificarse

- 38 + 36

@@ -521,6 +677,17 @@ Iniciar sesión 57 + + + We are sorry, you cannot recover you password because your instance administrator did not configure the PeerTube email system. + + + Lo sentimos, no puede recuperar su contraseña porque el administrador de su instancia no configuró el sistema de correos electrónicos de PeerTube. + + + 63 + +

Email Correo electrónico @@ -539,7 +706,7 @@ Iniciar sesión Send me an email to reset my password Enviar un correo electrónico para restablecer mi contraseña

- 75 + 80

@@ -608,7 +775,7 @@ Iniciar sesión Signup Registro

- 88 + 78

@@ -678,7 +845,18 @@ Iniciar sesión Change the language Cambiar el idioma - 88 + 86 + + + + + Help to translate PeerTube! + + + ¡Ayude a traducir PeerTube! + + + 8

@@ -689,7 +867,7 @@ Iniciar sesión Mi perfil público - 18 + 16

@@ -700,7 +878,7 @@ Iniciar sesión Mi cuenta - 22 + 20

@@ -711,7 +889,7 @@ Iniciar sesión Mis vídeos - 26 + 24

@@ -722,14 +900,14 @@ Iniciar sesión Desconectarse - 30 + 28

Create an account Crear una cuenta

- 39 + 37

@@ -743,49 +921,49 @@ Iniciar sesión Subscriptions Suscripciones

- 47 + 45

Overview Vista general

- 52 + 50

Trending Tendencias

- 57 + 55

Recently added Añadidos recientemente

- 62 + 60

Local Local

- 67 + 65

More Más

- 72 + 70

Administration Administración

- 76 + 74

@@ -799,14 +977,42 @@ Iniciar sesión Show keyboard shortcuts Mostrar los atajos de teclado

- 91 + 89

Toggle dark interface Alternar con la interfaz oscura - 94 + 92 + + + + View your notifications + Ver sus notificaciones + + 3 + + + + Notifications + Notificaciones + + 10 + + + + Update your notification preferences + Actualizar sus preferencias de notificación + + 15 + + + + See all your notifications + Ver todas sus notificaciones + + 22

@@ -911,14 +1117,14 @@ Iniciar sesión Display unlisted and private videos Mostrar los vídeos no listados y privados

- 11 + 14

No results. Ningún resultados

- 17 + 20

@@ -976,15 +1182,64 @@ Iniciar sesión 7 - + + Contact administrator + Contactar al administrador de + + 3 + + + + Your name + Su nombre + + 11 + + + + Your email + Su dirección de correo electrónico + + 20 + + + + Your message + Su mensaje + + 29 + + + - About instance - + Cancel + - Acerca del nodo - + Cancelar + - 1 + 26 + + + + Submit + Enviar + + 31 + + + + About instance + Acerca de la instancia + + 4 + + + + Contact administrator + Contactar al administrador + + 6

@@ -998,47 +1253,47 @@ Iniciar sesión Terms Términos de uso

- 44 + 39

User registration is allowed and El registro de usuarios está permitido y

- 25 + 29

- + - this instance provides a baseline quota of space for the videos of its users. - + this instance provides a baseline quota of space for the videos of its users. + - este nodo ofrece una cuota estándar de de espacio para los vídeos de sus usuarios. - + esta instancia provee un espacio máximo de para los vídeos de sus usuarios. + - 27 + 31 - + - this instance provides unlimited space for the videos of its users. - + this instance provides unlimited space for the videos of its users. + - este nodo ofrece espacio ilimitado para los vídeos de sus usuarios. - + esta instancia provee un espacio ilimitado para los vídeos de sus usuarios. + - 31 + 35 - + - User registration is currently not allowed. - + User registration is currently not allowed. + - El registro de usuarios no está permitido actualmente. - + El registro de usuarios no está abierto actualmente. + - 36 + 40

@@ -1395,49 +1650,49 @@ Iniciar sesión Short description Descripción corta

- 22 + 21

Default client route Routa de cliente por defecto

- 55 + 48

Videos Overview Vista general de los vídeos

- 58 + 51

Videos Trending Vídeos en Tendencia

- 59 + 52

Videos Recently Added Vídeos Recientemente Añadidos

- 60 + 53

Local videos Vídeos locales

- 61 + 54

Policy on videos containing sensitive content Política para los vídeos que contengan material sensible

- 70 + 61

@@ -1472,27 +1727,48 @@ Iniciar sesión Signup enabled Registro habilitado

- 93 + 84

Signup requires email verification La suscripción requiere una verificación mediante correo electrónico

- 100 + 91

Signup limit Límite de registro

- 105 + 96

- - Import - Importar - + + Users + Usuarios + + 105 + + + + User default video quota + Cuota de vídeo por defecto del usuario + + 109 + + + + User default daily upload limit + Límite diario de subida por día por usuario + + 121 + + + + Import + Importar + 42 @@ -1500,49 +1776,35 @@ Iniciar sesión Video import with HTTP URL (i.e. YouTube) enabled La importación de vídeos mediante URL HTTP (por ejemplo YouTube) está activada

- 120 + 141

Video import with a torrent file or a magnet URI enabled Importar video con un archivo torrent o un enlace magnet activado

- 127 + 148

Administrator Administrador

- 131 + 155

Admin email Correo del administrador - 134 - - - - Users - Usuarios - - 144 - - - - User default video quota - Cuota de vídeo por defecto del usuario - - 147 + 158 - - User default daily upload limit - Límite diario de subida por día por usuario + + Enable contact form + Habilitar el formulario de contacto

- 161 + 169

@@ -1563,21 +1825,32 @@ Iniciar sesión Your Twitter username Tu usuario de Twitter

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Indica la cuenta de Twitter del sitio web o de la plataforma en la que el contenido fue publicado

- 184 + 187

Instance whitelisted by Twitter Nodo en lista blanca de Twitter - 198 + 199 + + + + If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> + If the instance is not whitelisted, we use an image link card that will redirect on 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 whitelisted. + Si su instancia está autorizada por Twitter, un reproductor de vídeo estará incorporado al hilo Twitter cuando se comparta un vídeo desde PeerTube.<br /> + Si la instancia no está autorizada, usamos una tarjeta con una imagen con vínculo que redireccionará hacia su instancia PeerTube.<br /><br /> + Seleccione esta casilla, guarde la configuración y pruebe colocando el URL de un vídeo de su instancia (https://example.com/videos/watch/blabla) en <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> para verificar si su instancia está autorizada por Twitter. + + 200

@@ -1591,98 +1864,162 @@ Iniciar sesión Transcoding Transcodificar

- 210 + 215

Transcoding enabled Transcodificación activada

- 215 + 221

If you disable transcoding, many videos from your users will not work! ¡Si desactivas la transcodificación, muchos vídeos de tus usuarios no funcionarán! - 216 + 222 + + + + Allow additional extensions + Autorizar extensiones adicionales + + 231 + + + + Allow your users to upload .mkv, .mov, .avi, .flv videos + Autorizar sus usuarios a subir vídeos .mkv, .mov, .avi y .flv + + 232

Transcoding threads Hilos de transcodificaciones

- 223 + 237

Resolution enabled Resolución activada - 239 + 252 + + + + + Cache + + + + + Caché + + + + + 260

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Algunos archivos (previsualizaciones, subtítulos) no están federados. Los obtenemos directamente del nodo de origen y las ponemos en caché.

- 249 + 265

Previews cache size Tamaño de caché de las previsualizaciones

- 254 + 271

Video captions cache size Tamaño de caché de los subtítulos

- 265 + 280

Customizations Personalizaciones

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escribir código Javascript directamente.<br />Ejemplo: <pre>console.log('mi nodo es maravilloso');</pre> - 281 + 297 + + + + + Write directly CSS code. Example:<br /> + <pre> + body + background-color: red; + + </pre> + + Prepend with <em>#custom-css</em> to override styles. Example: + <pre> + #custom-css .logged-in-email + color: red; + + </pre> + + + Escriba directamente código CSS. Por ejemplo:<br /> + <pre> + body + background-color: red; + + </pre> + + Prefijar con <em>#custom-css</em> para sobrecargar estilos. Por ejemplo: + <pre> + #custom-css .logged-in-email + color: red; + + </pre> + + + 311

Advanced configuration Configuración avanzada

- 207 + 212

Update configuration Actualizar configuración

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Parece que la configuración no es válida. Por favor, busque errores potenciales en las diferentes pestañas.

- 326 + 341

@@ -1707,6 +2044,17 @@ Iniciar sesión 7 + + + Moderation + + + Moderación + + + 11 + + Jobs @@ -1754,6 +2102,13 @@ Iniciar sesión 21 + + Filter... + Filtrar... + + 27 + + ID ID @@ -1789,6 +2144,27 @@ Iniciar sesión 11 + + Accepted + Aceptado + + 32 + + + + Pending + Pendiente + + 33 + + + + Redundancy allowed + Redundancia autorizada + + 22 + + Manage follows Gestionar seguimientos @@ -1893,6 +2269,13 @@ Iniciar sesión 65 + + Daily video quota + Cuota diaria de vídeo + + 72 + + Users list Lista de usuarios @@ -1900,6 +2283,13 @@ Iniciar sesión 2 + + Batch actions + Acciones másivas + + 19 + + Username Nombre de usuario @@ -1907,6 +2297,13 @@ Iniciar sesión 40 + + (banned) + (expulsado) + + 65 + + Go to the account page Ir a la página de la cuenta @@ -1914,6 +2311,52 @@ Iniciar sesión 133 + + User's email must be verified to login + Se requiere validar la dirección de correo electrónico del usuario antes de conectarse + + 72 + + + + User's email is verified / User can login without email verification + La dirección de correo electrónico del usuario ha sido verificada / El usuario puede conectarse sin verificación de dirección de correo electrónico + + 76 + + + + Ban reason: + Razón de la expulsión: + + 95 + + + + Moderation comment + Comentarios de moderación + + 3 + + + + + This comment can only be seen by you or the other moderators. + + + Este comentario puede ser visto solo por usted y los otros moderadores. + + + 17 + + + + Update this comment + Actualizar este comentario + + 25 + + Reporter Reportador @@ -1928,6 +2371,13 @@ Iniciar sesión 14 + + State + Estado + + 11 + + Go to the account Ir a la cuenta @@ -1942,6 +2392,69 @@ Iniciar sesión 33 + + Actions + Acciones + + 35 + + + + Reason: + Razón: + + 53 + + + + Moderation comment: + Comentario de moderación: + + 57 + + + + Video name + Nombre del vídeo + + 8 + + + + Sensitive + Sensible + + 9 + + + + Date + Fecha + + 11 + + + + Blacklist reason: + Razón del bloqueo: + + 43 + + + + Moderation + Moderación + + 2 + + + + Video abuses + Vídeos denunciados como abusivos + + 5 + + Blacklisted videos Vídeos en lista negra @@ -1949,18 +2462,39 @@ Iniciar sesión 7 - - My settings - Mis ajustes + + Muted accounts + Cuentas silenciadas

- 3 + 2

- - My videos - Mis vídeos + + Muted servers + Servidores silenciados - 14 + 11 + + + + Account + Cuenta + + 12 + + + + Muted at + Silenciado en + + 13 + + + + Unmute + Dejar de silenciar + + 23

@@ -1974,28 +2508,46 @@ Iniciar sesión Profile Perfil

- 8 + 7

Video settings Ajustes de vídeo

- 15 + 16

Danger zone Zona peligrosa

- 18 + 19

- - Submit - Enviar + + Change ownership + Cambiar el titular - 24 + 46 + + + + Select the next owner + Seleccionar el próxima titular + + 9 + + + + + Cancel + + + Cancelar + + + 35 @@ -2005,6 +2557,13 @@ Iniciar sesión 19 + + Blacklisted + Bloqueado + + 22 + + Cancel @@ -2036,6 +2595,13 @@ Cancelar 6 + + Example: my_channel + Por ejemplo: mi_canal + + 15 + + Display name Nombre a mostrar @@ -2059,6 +2625,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 8 + + You don't have any subscriptions yet. + No tiene suscripciones todavía. + + 1 + + Created by Creado por @@ -2073,32 +2646,157 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 16 - - Change password - Cambiar contraseña + + Accept ownership + Aceptar la titularidad

- 30 + 3

- - New password - Nueva contraseña + + Select the target channel + Seleccionar el canal objetivo

- 15 + 9

- - Confirm new password - Confirmar nueva contraseña + + Initiator + Iniciador

- 23 + 13

- - Default policy on videos containing sensitive content - Política por defecto para vídeos que contengan material sensible - - 3 + + + Created + + + + Creado + + + + 15 + + + + Status + Estatus + + 19 + + + + Action + Acción + + 20 + + + + + + + 39 + + + + Refuse + Rechazar + + 47 + + + + Muted instances + Instancias silenciadas + + 2 + + + + History enabled + Historial habilitado + + 4 + + + + Delete history + Borrar el historial + + 8 + + + + You don't have videos history yet. + No tiene historial de vídeos todavía + + 13 + + + + views + vistas + + 22 + + + + Notification preferences + Preferencias de notificación + + 2 + + + + Mark all as read + Marcar todo como leído + + 4 + + + + Change password + Cambiar contraseña + + 30 + + + + Current password + Contraseña actual + + 7 + + + + New password + Nueva contraseña + + 15 + + + + Confirm new password + Confirmar nueva contraseña + + 23 + + + + Default policy on videos containing sensitive content + Política por defecto para vídeos que contengan material sensible + + 3 + + + + Use WebTorrent to exchange parts of the video with others + Usar WebTorrent para intercambiar partes del vídeo con otros + + 21

@@ -2143,6 +2841,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 18

+ + Once you delete your account, there is no going back. Please be certain. + Eliminar su cuenta es definitivo. ¿Está seguro? + + 2 + + Delete your account Eliminar tu cuenta @@ -2150,6 +2855,20 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 4 + + Activities + Actividades + + 2 + + + + Web + Web + + 3 + + Sorry, but we couldn't find the page you were looking for. @@ -2161,6 +2880,60 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 1 + + + Verify account email confirmation + + + Verificar la confirmación de la dirección de correo electrónico de la cuenta + + + 2 + + + + + Your email has been verified and you may now login. Redirecting... + + + Su dirección de correo electrónico ha sido verificada y puede conectarse ahora. En curso de redirección... + + + 6 + + + + An error occurred. + Un error ocurrió. + + 11 + + + + + Request email for account verification + + + Solicitar un correo electrónico de verificación de la cuenta + + + 2 + + + + Send verification email + Enviar un correo electrónico de verificación + + 17 + + + + This instance does not require email verification. + Esta instancia no requiere verificación por correo electrónico + + 20 + + Support this channel Apoyar este canal @@ -2203,6 +2976,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 159 + + Sorry, but something went wrong + Disculpas, algo salió mal + + 49 + + Congratulations, the video behind will be imported! You can already add information about this video. @@ -2228,18 +3008,25 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 6 + + Scheduled + Programado + + 25 + +

Publish will be available when upload is finished La publicación estará disponible cuando finalice la subida

- 53 + 58

Publish Publicar

- 60 + 65

@@ -2249,6 +3036,13 @@ Cuando subas un vídeo a este canal, el campo de soporte del vídeo se rellenar 6 + + Or + O + + 11 + + Paste magnet URI Pegar el enlace magnético @@ -2323,6 +3117,17 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 24 + + + This will replace an existing caption! + + + Eso remplazará el texto existente! + + + 29 + + Add this caption Añadir este subtítulo @@ -2344,6 +3149,27 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 191 + + Tags could be used to suggest relevant recommendations.</br>Press Enter to add a new tag. + Se puede utilizar etiquetas para sugerir recomendaciones relevantes.</br>Presione Enter para añadir una nueva etiqueta. + + 18 + + + + + Tag + + Etiqueta + + 21 + + + + Enter a new tag + Ingresar una nueva etiqueta + + 21 + +

Video descriptions are truncated by default and require manual action to expand them. Las descripciones de vídeo se muestran truncadas por defecto y requieren de acción manual para expandirlas. @@ -2383,14 +3209,14 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac Wait transcoding before publishing the video Esperar transcodificación antes de publicar el vídeo

- 130 + 131

If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Si decides no esperar a la transcodificación antes de publicar el vídeo, quizás no se pueda reproducir hasta que finalice la transcodificación.

- 131 + 132

@@ -2404,49 +3230,81 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac Add another caption Añadir otro subtítulo

- 146 + 147

See the subtitle file Ver el archivo de subtítulo - 155 + 156 + + + + Already uploaded ✔ + Ya ha sido subido ✔ + + 160 + + + + Will be created on update + Estará creado al actualizar + + 168 Cancel create Cancelar creación - 169 + 170 + + + + Will be deleted on update + Estará eliminado al actualizar + + 176 Cancel deletion Cancelar borrado - 177 + 178 + + + + + No captions for now. + + + Ningún texto por el momento. + + + 183

Captions Subtítulos

- 139 + 140

Upload thumbnail Subir miniatura

- 195 + 196

Upload preview Subir previsualización

- 202 + 203

@@ -2460,14 +3318,14 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac Short text to tell people how they can support you (membership platform...). Breve texto para explicar a la gente cómo pueden apoyarte (plataforma de miembros...).

- 209 + 210

Advanced settings Ajustes avanzados

- 190 + 191

@@ -2509,6 +3367,17 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 37 + + + Cancel + + + Cancelar + + + 47 + + Download Descargar @@ -2523,6 +3392,19 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 3 + + + Your report will be sent to moderators of . + It will be forwarded to origin instance too. + + + Su reporte estará enviado a los moderadores de . + También estará transferido a la instancia original . + + + 9 + + Share Compartir @@ -2544,6 +3426,31 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 34 + + + The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites). + + + El URL no es seguro (no utiliza HTTPS), por lo que el vídeo embebido no funcionará en los sitios web HTTPS (los navegadores web bloquean las consultas HTTP inseguras en los sitios web HTTPS). + + + 45 + + + + Close + Cerrar + + 51 + + + + Blacklist video + Bloquear el vídeo + + 3 + + The video is being imported, it will be available when the import is finished. @@ -2566,6 +3473,46 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 15 + + + This video will be published on . + + + Este vídeo será publicado el . + + + 19 + + + + This video is blacklisted. + Este vídeo está bloqueado + + 24 + + + + + Published - views + + + Publicado - vistas + + + 37 + + + + + Published - views + + + Publicado - vistas + + + 46 + + Like this video Me gusta este vídeo @@ -2629,6 +3576,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 100 + + Unblacklist this video + Desbloquear este vídeo + + 99 + + Delete this video Eliminar este vídeo @@ -2643,6 +3597,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 123 + + By + Por + + 134 + + Show more Mostrar más @@ -2657,6 +3618,24 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 152 + + Friendly Reminder: + Recuerdo amistoso: + + 208 + + + + + the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. + + + el sistema utilizado para compartir este vídeo implica que algunas informaciones técnicas acerca de su sistema (como la dirección IP pública) pueden estar enviadas a otros pares. + + + 209 + + More information Más información @@ -2682,6 +3661,17 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 215 + + + Other videos + + + Otros vídeos + + + 2 + + Comments @@ -2736,6 +3726,57 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 20 + + You are one step away from commenting + Está a un paso de poder comentar + + 28 + + + + + If you have an account on this instance, you can login: + + + Si tiene una cuenta en esta instancia, puede conectarse: + + + 32 + + + + login to comment + conectarse para comentar + + 35 + + + + + Otherwise you can comment using an account on any ActivityPub-compatible instance. + On most platforms, you can find the video by typing its URL in the search bar and then comment it + from within the software's interface. + + + Sino, puede comentar usando una cuenta de cualquier instancia compatible con ActivityPub. + En la mayoría de las plataformas, puede encontrar el vídeo colocando su URL en el campo de búsqueda y luego comentarlo + desde la interfaz del software. + + + 36 + + + + + If you have an account on Mastodon or Pleroma, you can open it directly in their interface: + + + Si tiene una cuenta en Mastodon o Pleroma, puede abrirlo directamente en su interfaz: + + + 41 + + Highlighted comment Comentario resaltado @@ -2750,9 +3791,23 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 14 - - Error getting about from server - Error al obtener información del servidor + + Cannot get about information from server + No se puede obtener información del servidor + + 1 + + + + Your message has been sent. + Su mensaje ha sido remitido + + 1 + + + + You already sent this form recently + Ya envió este formulario recientemente 1 @@ -2778,16 +3833,44 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Error - Error + + 240p + 240p

- - Success - Correcto + + 360p + 360p + + 1 + + + + 480p + 480p + + 1 + + + + 720p + 720p + + 1 + + + + 1080p + 1080p + + 1 + + + + Auto (via ffmpeg) + Auto (vía ffmpeg) 1 @@ -2806,6 +3889,69 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + 100MB + 100MB + + 1 + + + + 500MB + 500MB + + 1 + + + + 1GB + 1GB + + 1 + + + + 5GB + 5GB + + 1 + + + + 20GB + 20GB + + 1 + + + + 50GB + 50GB + + 1 + + + + 10MB + 10MB + + 1 + + + + 50MB + 50MB + + 1 + + + + 2GB + 2GB + + 1 + + is not valid no es válido @@ -2869,6 +4015,97 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + enabled + habilitada + + 1 + + + + disabled + deshabilitada + + 1 + + + + Redundancy for is + La redundancia para está + + 1 + + + + Account unmuted by your instance. + La cuenta no está silenciada por su instancia. + + 1 + + + + Instance unmuted by your instance. + La instancia no está silenciada por su instancia. + + 1 + + + + Comment updated. + Comentario actualizado + + 1 + + + + Delete this report + Eliminar este reporte + + 1 + + + + Update moderation comment + Actualizar el comentario de moderación + + 1 + + + + Mark as accepted + Marcar como aceptado + + 1 + + + + Mark as rejected + Marcar como rechazado + + 1 + + + + Do you really want to delete this abuse report? + ¿Confirma la eliminación del reporte de abuso? + + 1 + + + + Abuse deleted. + Reporte de abuso eliminado. + + 1 + + + + Do you really want to remove this video from the blacklist? It will be available again in the videos list. + ¿Confirmar el desbloqueo de este vídeo? Estará disponible de nuevo en la lista de vídeos. + + 1 + + Video removed from the blacklist. Vídeo eliminado de la lista negra. @@ -2897,6 +4134,41 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Unban + Dejar sin efecto la expulsión + + 1 + + + + Set Email as Verified + Establecer la dirección de correo electrónico como Verificada + + 1 + + + + You cannot ban root. + No puede expulsar al root. + + 1 + + + + Do you really want to unban users? + ¿Confirma dejar sin efecto la expulsión de usuarios? + + 1 + + + + users unbanned. + usuarios expulsados. + + 1 + + You cannot delete root. No puedes eliminar al root. @@ -2904,6 +4176,90 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + If you remove these users, you will not be able to create others with the same username! + ¡Si elimina estos usuarios, no será posible crear otros con el mismo nombre de usuario! + + 1 + + + + users deleted. + usuarios eliminados. + + 1 + + + + users email set as verified. + direcciones de correo electrónico de usuarios establecidas como verificadas. + + 1 + + + + Account unmuted. + La cuenta ya no está silenciada. + + 1 + + + + Instance unmuted. + La instancia ya no está silenciada. + + 1 + + + + My videos history + Mi historial de vídeos + + 1 + + + + Videos history is enabled + El historial de vídeos está habilitado + + 1 + + + + Videos history is disabled + El historial de vídeos está deshabilitado + + 1 + + + + Delete videos history + Eliminar el historial de vídeos + + 1 + + + + Are you sure you want to delete all your videos history? + ¿Confirma la eliminación de todo su historial de vídeos? + + 1 + + + + Videos history deleted + Historial de vídeos eliminado + + 1 + + + + Ownership accepted + Titularidad aceptada + + 1 + + Password updated. Contraseña actualizada. @@ -2911,6 +4267,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + You current password is invalid. + Su contraseña actual es invalida. + + 1 + + Are you sure you want to delete your account? This will delete all you data, including channels, videos etc. Estás seguro de querer eliminar tu cuenta? Todos tus datos serán eliminados, incluyendo canales, vídeos, etc. @@ -2939,6 +4302,76 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + New video from your subscriptions + Nuevo vídeo desde sus suscripciones + + 1 + + + + New comment on your video + Nuevo comentario en su vídeo + + 1 + + + + New video abuse on local video + Nueva denuncia de abuso sobre un vídeo local + + 1 + + + + One of your video is blacklisted/unblacklisted + Uno de sus vídeos ha sido bloqueado/desbloqueado + + 1 + + + + Video published (after transcoding/scheduled update) + Vídeo publicado (después de una transcodificación / actualización programada) + + 1 + + + + Video import finished + Importación de vídeo terminada + + 1 + + + + A new user registered on your instance + Un nuevo usuario se registró en su instancia + + 1 + + + + You or your channel(s) has a new follower + Usted o su(s) canal(es) tiene un nuevo seguidor + + 1 + + + + Someone mentioned you in video comments + Alguien le mencionó en comentarios de vídeo + + 1 + + + + Preferences saved + Preferencias guardadas + + 1 + + Profile updated. Perfil actualizado. @@ -2967,6 +4400,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + This name already exists on this instance. + El nombre ya existe en esta instancia. + + 1 + + Create Crear @@ -2981,23 +4421,16 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - ¿De verdad quieres eliminar ? Esto eliminará también todos los vídeos subidos a este canal. - - 1 - - - - Please type the name of the video channel to confirm - Por favor escribe el nombre del canal de vídeo para confirmar + + Video channel deleted. + Canal de vídeo eliminado.

- - Video channel deleted. - Canal de vídeo eliminado. + + My videos + Mis vídeos 1 @@ -3065,6 +4498,76 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Ownership change request sent. + Solicitud de cambio de titularidad enviada. + + 1 + + + + My library + Mi biblioteca + + 1 + + + + My channels + Mis canales + + 1 + + + + My subscriptions + Mis suscripciones + + 1 + + + + My history + Mi historial + + 1 + + + + Misc + Diversos + + 1 + + + + Ownership changes + Cambios de titularidad + + 1 + + + + My settings + Mis ajustes + + 1 + + + + My notifications + Mis notificaciones + + 1 + + + + An email with verification link will be sent to . + Un correo electrónico con un vínculo de verificación será enviado a . + + 1 + + Unable to find user id or verification string. No se pudo encontrar el id de usuario o la cadena de verificación. @@ -3072,6 +4575,97 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Subscribe to the account + Suscribirse a la cuenta + + 1 + + + + Focus the search bar + Enfocar la barra de búsqueda + + 1 + + + + Toggle the left menu + Conmutar el menú de la izquierda + + 1 + + + + Go to the videos overview page + Ir a la página general de vídeos + + 1 + + + + Go to the trending videos page + Ir a la página de vídeos populares + + 1 + + + + Go to the recently added videos page + Ir a la página de vídeos recientes + + 1 + + + + Go to the local videos page + Ir a la página de vídeos locales + + 1 + + + + Go to the videos upload page + Ir a la página de subida de vídeos + + 1 + + + + Toggle Dark theme + Conmutar el tema Oscuro + + 1 + + + + Go to my subscriptions + Ir a mis suscripciones + + 1 + + + + Go to my videos + Ir a mis vídeos + + 1 + + + + Go to my imports + Ir a mis importaciones + + 1 + + + + Go to my channels + Ir a mis canales + + 1 + + Cannot retrieve OAuth Client credentials: . @@ -3088,6 +4682,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Error + Error + + 1 + + You need to reconnect. Tienes que reconectar. @@ -3102,6 +4703,41 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Keyboard Shortcuts: + Atajos de teclado: + + 1 + + + + Info + Info + + 1 + + + + Success + Correcto + + 1 + + + + Incorrect username or password. + Nombre de usuario o contraseña incorrecta + + 1 + + + + You account is blocked. + Su cuenta ha sido bloqueada + + 1 + + An email with the reset password instructions will be sent to . Un correo con las instrucciones para restablecer la contraseña será enviado a . @@ -3270,30 +4906,93 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Signup limit must be a number. - El límite de registro debe ser un número. + + Signup limit must be a number. + El límite de registro debe ser un número. + + 1 + + + + Admin email is required. + Se requiere un correo de administrador. + + 1 + + + + Admin email must be valid. + El correo de adminstrador ha de ser válido. + + 1 + + + + Transcoding threads is required. + Se requieren hilos de transcodificación. + + 1 + + + + Transcoding threads must be greater or equal to 0. + El número de subprocesos de transcodificación tiene que ser superior o igual a 0. + + 1 + + + + Email is required. + Se requiere un correo electrónico. + + 1 + + + + Email must be valid. + El correo electrónico ha de ser válido. + + 1 + + + + Your name is required. + Su nombre es requerido. + + 1 + + + + Your name must be at least 1 character long. + Su nombre tiene que contener por lo menos 1 carácter. + + 1 + + + + Your name cannot be more than 120 characters long. + Su nombre no puede contener más de 120 caracteres.

- - Admin email is required. - Se requiere un correo de administrador. + + A message is required. + Se tiene que colocar un mensaje.

- - Admin email must be valid. - El correo de adminstrador ha de ser válido. + + The message must be at least 3 characters long. + El mensaje tiene que contener por lo menos 3 caracteres.

- - Transcoding threads is required. - Se requieren hilos de transcodificación. + + The message cannot be more than 5000 characters long. + El mensaje no puede contener más de 5.000 caracteres. 1 @@ -3319,37 +5018,23 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Username must be at least 3 characters long. - El nombre de usuario ha de ocupar más de 3 caracteres. - - 1 - - - - Username cannot be more than 20 characters long. - El nombre de usuario no puede ocupar más de 20 caracteres. - - 1 - - - - Username should be only lowercase alphanumeric characters. - El nombre de usuario debe utilizar únicamente caracteres alfanuméricos en minúscula. + + Username must be at least 1 character long. + El nombre de usuario tiene que contener por lo menos un carácter.

- - Email is required. - Se requiere un correo electrónico. + + Username cannot be more than 50 characters long. + El nombre de usuario no puede contener más de 50 caracteres.

- - Email must be valid. - El correo electrónico ha de ser válido. + + Username should be lowercase alphanumeric; dots and underscores are allowed. + El nombre de usuario puede contener minúsculas, cifras, puntos y barras bajas. 1 @@ -3389,6 +5074,20 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Daily upload limit is required. + Se requiere colocar un límite diario de subida. + + 1 + + + + Daily upload limit must be greater than -1. + El límite diario de subida tiene que ser superior a -1. + + 1 + + User role is required. Se requiere un rol de usuario. @@ -3403,16 +5102,16 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Display name must be at least 3 characters long. - El nombre para mostrar debe ocupar como mínimo 3 caracteres. + + Display name must be at least 1 character long. + El nombre mostrado tiene que contener por lo menos 1 carácter.

- - Display name cannot be more than 120 characters long. - El nombre a mostrar no puede ocupar más de 120 caracteres. + + Display name cannot be more than 50 characters long. + El nombre mostrado no puede contener más de 50 caracteres. 1 @@ -3424,6 +5123,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Description cannot be more than 1000 characters long. + La descripción no puede contener más de 1.000 caracteres. + + 1 + + You must to agree with the instance terms in order to registering on it. Debes aceptar los términos de uso del nodo para poder registrarte en él. @@ -3431,6 +5137,20 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Ban reason must be at least 3 characters long. + La razón de la expulsión tiene que contener por lo menos 3 caracteres. + + 1 + + + + Ban reason cannot be more than 250 characters long. + La razón de la expulsión no puede contener más de 250 caracteres. + + 1 + + Report reason is required. Se requiere un motivo para reportar. @@ -3445,9 +5165,37 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Report reason cannot be more than 300 characters long. - El motivo del reporte no puede ocupar más de 300 caracteres. + + Moderation comment is required. + Se requiere llenar el comentario de moderación. + + 1 + + + + Moderation comment must be at least 2 characters long. + El comentario de moderación tiene que contener por lo menos 2 caracteres. + + 1 + + + + The channel is required. + Se requiere llenar el canal. + + 1 + + + + Blacklist reason must be at least 2 characters long. + La razón del bloqueo tiene que contener por lo menos 2 caracteres. + + 1 + + + + Blacklist reason cannot be more than 300 characters long. + La razón del bloqueo no puede contener más de 300 caracteres. 1 @@ -3466,6 +5214,48 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + The username is required. + Se requiere llenar el nombre de usuario. + + 1 + + + + You can only transfer ownership to a local account + Solo puede transferir la titularidad a una cuenta local + + 1 + + + + Name is required. + Se requiere llenar el nombre. + + 1 + + + + Name must be at least 1 character long. + El nombre tiene que contener por lo menos 1 carácter. + + 1 + + + + Name cannot be more than 50 characters long. + El nombre no puede contener más de 50 caracteres. + + 1 + + + + Name should be lowercase alphanumeric; dots and underscores are allowed. + El nombre puede contener minúsculas, cifras, puntos y barras bajas. + + 1 + + Support text must be at least 3 characters long. El texto para el apoyo ha de ocupar como mínimo 3 caracteres. @@ -3473,6 +5263,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Support text cannot be more than 1000 characters long. + El texto de apoyo no puede contener más de 1.000 caracteres. + + 1 + + Comment is required. Se requiere comentario. @@ -3564,6 +5361,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Video support cannot be more than 1000 characters long. + El soporte de vídeo no puede contener más de 1.000 caracteres. + + 1 + + A date is required to schedule video update. Se requiere una fecha para actualizar la programación del vídeo. @@ -3914,6 +5718,27 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Transcode your videos in multiple resolutions + Transcodificar sus vídeos en múltiples resoluciones + + 1 + + + + HTTP import (YouTube, Vimeo, direct URL...) + Importación HTTP (YouTube, Vimeo, URL directo...) + + 1 + + + + Torrent import + Importación de torrent + + 1 + + ~ ~ @@ -4068,6 +5893,41 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + users banned. + usuarios bloqueados. + + 1 + + + + User banned. + Usuario bloqueado. + + 1 + + + + Do you really want to unban ? + ¿Confirma el desbloqueo de ? + + 1 + + + + User unbanned. + El usuario ha sido desbloqueado. + + 1 + + + + If you remove this user, you will not be able to create another with the same username! + ¡Si elimina este usuario, no podrá crear otro con el mismo nombre de usuario! + + 1 + + User deleted. Usuario eliminado. @@ -4075,6 +5935,111 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + User email set as verified + El correo electrónico del usuario establecido como verificado + + 1 + + + + Account muted. + Cuenta silenciada. + + 1 + + + + Instance muted. + Instancia silenciada. + + 1 + + + + Account muted by the instance. + Cuenta silenciada por la instancia. + + 1 + + + + Account unmuted by the instance. + Cuenta ya no silenciada por la instancia. + + 1 + + + + Instance muted by the instance. + Instancia silenciada por la instancia. + + 1 + + + + Instance unmuted by the instance. + La instancia ya no es silenciada por la instancia. + + 1 + + + + Mute this account + Silenciar esta cuenta + + 1 + + + + Unmute this account + Dejar de silenciar esta cuenta + + 1 + + + + Mute the instance + Silenciar esta instancia + + 1 + + + + Unmute the instance + Dejar de silenciar esta instancia + + 1 + + + + Mute this account by your instance + Silenciar esta cuenta por su instancia + + 1 + + + + Unmute this account by your instance + Dejar de silenciar esta cuenta por su instancia + + 1 + + + + Mute the instance by your instance + Silenciar esta instancia por su instancia + + 1 + + + + Unmute the instance by your instance + Dejar de silenciar esta instancia por su instancia + + 1 + + Request is too large for the server. Please contact you administrator if you want to increase the limit size. La petición es demasiado grande para el servidor. Por favor contacta con tu administrador si quieres aumentar el límite de tamaño. @@ -4103,6 +6068,76 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Subscribed to + Suscrito a + + 1 + + + + Subscribed + Suscrito + + 1 + + + + Unsubscribed from + Ya no está suscrito a + + 1 + + + + Unsubscribed + Ya no está suscrito + + 1 + + + + Moderator + Moderador + + 1 + + + + Only I can see this video + Soy el único que pueda ver este vídeo + + 1 + + + + Only people with the private link can see this video + Solo las personas que tengan el vínculo privado pueden ver este vídeo + + 1 + + + + Anyone can see this video + Todos pueden ver este vídeo + + 1 + + + + Welcome! Now please check your emails to verify your account and complete signup. + ¡Le damos la bienvenida! Ahora revise sus correos electrónicos para verificar su cuenta y terminar el proceso de registro. + + 1 + + + + You are now logged in as ! + ¡Está conectado como ! + + 1 + + Video to import updated. Video to import updated. @@ -4131,23 +6166,23 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 - - Info - Info + + Upload cancelled + Subida cancelada

- - Upload cancelled - Subida cancelada + + Your video quota is exceeded with this video (video size: , used: , quota: ) + Con este vídeo, está pasando su cuota de espacio (tamaño del vídeo: , espacio utilizado: , cuota: )

- - We are sorry but PeerTube cannot handle videos > 8GB - Lo sentimos pero PeerTube no puede manejar vídeos > 8 GB + + Your daily video quota is exceeded with this video (video size: , used: , quota: ) + Con este vídeo, su cuota de espacio diario ha sido excedido (tamaño del vídeo: , espacio usado: , cuota: ) 1 @@ -4173,6 +6208,13 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Video blacklisted. + Vídeo bloqueado + + 1 + + Copied Copiado @@ -4187,6 +6229,27 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Start at + Iniciar a + + 1 + + + + Like the video + Colocar Me gusta a este vídeo + + 1 + + + + Dislike the video + Eliminar Me gusta de este vídeo + + 1 + + Do you really want to delete this video? ¿De verdad quieres eliminar este vídeo? @@ -4215,5 +6278,12 @@ Enhorabuena, el vídeo sera importado con BitTorrent! Ya puedes añadir informac 1 + + Videos from your subscriptions + Vídeos desde sus suscripciones + + 1 + + \ No newline at end of file diff --git a/client/src/locale/target/angular_eu_ES.xml b/client/src/locale/target/angular_eu_ES.xml index d17189c7a..0393ab85c 100644 --- a/client/src/locale/target/angular_eu_ES.xml +++ b/client/src/locale/target/angular_eu_ES.xml @@ -499,7 +499,7 @@ Password Pasahitza

- 12 + 13

@@ -513,7 +513,7 @@ Login Hasi saioa

- 38 + 36

@@ -541,7 +541,7 @@ Send me an email to reset my password Bidali e-mail bat nire pasahitza berrezartzeko

- 75 + 80

@@ -612,7 +612,7 @@ Signup Eman izena

- 88 + 78

@@ -682,7 +682,7 @@ Change the language Aldatu hizkuntza

- 88 + 86

@@ -693,7 +693,7 @@ Nire profil publikoa - 18 + 16

@@ -704,7 +704,7 @@ Nire kontua - 22 + 20

@@ -715,7 +715,7 @@ Nire bideoak - 26 + 24

@@ -726,14 +726,14 @@ Amaitu saioa - 30 + 28

Create an account Sortu kontu bat

- 39 + 37

@@ -747,49 +747,49 @@ Subscriptions Harpidetzak

- 47 + 45

Overview Gainbegirada

- 52 + 50

Trending Joerak

- 57 + 55

Recently added Gehitutako azkenak

- 62 + 60

Local Tokikoa

- 67 + 65

More Gehiago

- 72 + 70

Administration Administrazioa

- 76 + 74

@@ -803,14 +803,14 @@ Show keyboard shortcuts Erakutsi teklatu-lasterbideak

- 91 + 89

Toggle dark interface Txandakatu interfaze iluna

- 94 + 92

@@ -915,14 +915,14 @@ Display unlisted and private videos Bistaratu zerrendatu gabeko bideoak eta bideo pribatuak

- 11 + 14

No results. Emaitzarik ez.

- 17 + 20

@@ -980,15 +980,22 @@ 7 - + - About instance - + Cancel + - instantziari buruz - + Utzi + - 1 + 26 + + + + Submit + Bidali + + 31

@@ -1002,45 +1009,14 @@ Terms Baldintzak

- 44 + 39

User registration is allowed and Erabiltzaile berriek izena ematea onartzen da eta - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - instantzia honek eskaintzen ditu erabiltzaileen bideoetarako oinarrizko kuota gisa. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - instantzia honek mugagabeko espazioa eskaintzen du bere erabiltzaileen bideoetarako. - - 31 - - - - - User registration is currently not allowed. - - -Erabiltzaile berriek izena ematea ez da onartzen orain. - - 36 + 29

@@ -1395,49 +1371,49 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Short description Deskripzio laburra

- 22 + 21

Default client route Lehenetsitako bezeroaren ibilbidea

- 55 + 48

Videos Overview Bideoen gainbegirada

- 58 + 51

Videos Trending Joera diren bideoak

- 59 + 52

Videos Recently Added Azkenaldian gehitutako bidoeak

- 60 + 53

Local videos Tokiko bideoak

- 61 + 54

Policy on videos containing sensitive content Eduki hunkigarria duten bideoen politika

- 70 + 61

@@ -1472,23 +1448,44 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Signup enabled Izena ematea gaituta

- 93 + 84

Signup requires email verification Izena emateko e-mail helbidea baieztatu behar da

- 100 + 91

Signup limit Izena emateko muga + + 96 + + + + Users + Erabiltzaileak

105

+ + User default video quota + Erabiltzailearen lehenetsitako bideo-kuota + + 109 + + + + User default daily upload limit + Erabiltzailearentzat lehenetsitako eguneko igoera muga + + 121 + +

Import Inportatu @@ -1500,49 +1497,28 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Video import with HTTP URL (i.e. YouTube) enabled HTTP URL bidezko bideoen inportazioa gaituta (adibidez YouTube)

- 120 + 141

Video import with a torrent file or a magnet URI enabled Bideoa torrent fitxategia edo magnet URL bidez inportatzea gaituta

- 127 + 148

Administrator Administratzailea

- 131 + 155

Admin email Administratzailearen e-maila - 134 - - - - Users - Erabiltzaileak - - 144 - - - - User default video quota - Erabiltzailearen lehenetsitako bideo-kuota - - 147 - - - - User default daily upload limit - Erabiltzailearentzat lehenetsitako eguneko igoera muga - - 161 + 158

@@ -1563,21 +1539,21 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Your Twitter username Zure Twitter erabiltzaile-izena

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Edukia argitaratuko den webgune edo plataformarentzat Twitter kontua adierazten du.

- 184 + 187

Instance whitelisted by Twitter Twitter-ek onartutako instantzia

- 198 + 199

@@ -1591,35 +1567,35 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Transcoding Transkodeketa

- 210 + 215

Transcoding enabled Transkodeketa gaituta

- 215 + 221

If you disable transcoding, many videos from your users will not work! Transkodeketa desgaitzen baduzu, erabiltzaileen bideo askok ez dute funtzionatuko!

- 216 + 222

Transcoding threads Transkodetze hariak

- 223 + 237

Resolution enabled bereizmena gaituta

- 239 + 252

@@ -1634,82 +1610,47 @@ Erabiltzaile berriek izena ematea ez da onartzen orain.

- 244 + 260

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Fitxategi batzuk ez dira federatzen (aurrebistak, azpitituluak). Zuzenean jatorrizko instantziatik jasotzen ditugu eta cachean gorde.

- 249 + 265

Previews cache size Aurrebisten cachearen tamaina

- 254 + 271

Video captions cache size Bideoaren azpitituluen cachearen tamaina

- 265 + 280

Customizations Pertsonalizazioak

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> IdatziJavaScript kodea zuzenean.<br />Adibidez: <pre>console.log('nire instantzia zoragarria da');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Idatzi CSS kodea zuzenean. Adibidez:<br /> - <pre> - body - background-color: red; - - </pre> - - Idatzi aurretik <em>#custom-css</em> estiloak gainidazteko. Adibidez: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1718,21 +1659,21 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Advanced configuration Konfigurazio aurreratua

- 207 + 212

Update configuration Eguneratu konfigurazioa

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Konfigurazioa baliogabea dela dirudi. Bilatu zer egon daitekeen gaizki fitxa desberdinetan begiratuz.

- 326 + 341

@@ -2021,21 +1962,21 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. User's email must be verified to login Erabiltzailearen e-mail helbidea baieztatu behar da saioa hasi aurretik

- 70 + 72

User's email is verified / User can login without email verification Erabiltzailearen e-mail helbidea baieztatuta dago / Erabiltzaileak e-mail helbidea baieztatu gabe saioa hasi dezake

- 74 + 76

Ban reason: Debekatzeko arrazoia:

- 92 + 95

@@ -2102,7 +2043,7 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Actions Ekintzak

- 33 + 35

@@ -2137,14 +2078,14 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Date Data

- 10 + 11

Blacklist reason: Zerrenda beltzean sartzeko arrazoia:

- 41 + 43

@@ -2196,69 +2137,6 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. 23 - - My settings - Nire ezarpenak - - 3 - - - - My library - Nire liburutegia - - 7 - - - - My channels - Nire kanalak - - 12 - - - - My videos - Nire bideoak - - 14 - - - - My subscriptions - Nire harpidetzak - - 16 - - - - My imports - Nire inportazioak - - 18 - - - - Misc - Denetarik - - 24 - - - - Muted instances - Mutututako instantziak - - 2 - - - - Ownership changes - Jabetza aldaketak - - 33 - -

Video quota: Bideo-kuota: @@ -2270,21 +2148,21 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. Profile Profila

- 8 + 7

Video settings Bideo ezarpenak

- 15 + 16

Danger zone Eremu arriskutsua

- 18 + 19

@@ -2312,13 +2190,6 @@ Erabiltzaile berriek izena ematea ez da onartzen orain. 35 - - Submit - Bidali - - 24 - - - views - ikustaldi @@ -2477,6 +2348,13 @@ Kanal honetara bideo bat igotzen duzunean, bideoa babesteko eremua testu honekin 47 + + Muted instances + Mutututako instantziak + + 2 + +

Change password Aldatu pasahitza @@ -2725,14 +2603,14 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Publish will be available when upload is finished Argitaratzea behin igoera bukatzean egongo da erabilgarri

- 53 + 58

Publish Argitaratu

- 60 + 65

@@ -2915,14 +2793,14 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Wait transcoding before publishing the video Itxaron transkodetzeari bideoa argitaratu aurretik

- 130 + 131

If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Bideoa argitaratu aurretik ez baduzu transkodetzea bukatu arte itxaroten, bideoa transkodetzea bukatu arte ezin ikustea gerta daiteke.

- 131 + 132

@@ -2936,49 +2814,49 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Add another caption Gehitu beste azpititulu bat

- 146 + 147

See the subtitle file Ikusi azpitituluen fitxategia

- 155 + 156

Already uploaded ✔ Jadanik igota ✔

- 159 + 160

Will be created on update Eguneratzean sortuko da

- 167 + 168

Cancel create Ezeztatu sorkuntza

- 169 + 170

Will be deleted on update Eguneratzean ezabatuko da

- 175 + 176

Cancel deletion Ezeztatu ezabaketa

- 177 + 178

@@ -2989,28 +2867,28 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Azpititulurik ez oraingoz. - 182 + 183

Captions Azpitituluak

- 139 + 140

Upload thumbnail Igo irudia

- 195 + 196

Upload preview Igo aurrebista

- 202 + 203

@@ -3024,14 +2902,14 @@ Ezin izan dugu bilatzen duzun orria aurkitu. Short text to tell people how they can support you (membership platform...). Jendeari zu nola babestu azaltzeko testu labur bat (kidetza plataforma...).

- 209 + 210

Advanced settings Ezarpen aurreratuak

- 190 + 191

@@ -3098,17 +2976,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 3 - - - Cancel - - - Utzi - - - 19 - - Share Partekatu @@ -3478,13 +3345,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 14 - - Error getting about from server - Errorea informazioa zerbitzaritik jasotzean - - 1 - - No description Deskripziorik ez @@ -3506,13 +3366,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Error - Errorea - - 1 - - 240p 240p @@ -3555,13 +3408,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Success - Arrakasta - - 1 - - Configuration updated. Konfigurazioa eguneratuta. @@ -3989,23 +3835,16 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Ziur ezabatu nahi duzula? Kanalera igotako bideo guztiak ezabatuko dira ere. - - 1 - - - - Please type the name of the video channel to confirm - Idatzi bideo kanalaren izena berresteko + + Video channel deleted. + bideo kanala ezabatuta.

- - Video channel deleted. - bideo kanala ezabatuta. + + My videos + Nire bideoak 1 @@ -4080,16 +3919,44 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Channels - Kanalak + + My library + Nire liburutegia

- - Video imports - Bideo inportazioak + + My channels + Nire kanalak + + 1 + + + + My subscriptions + Nire harpidetzak + + 1 + + + + Misc + Denetarik + + 1 + + + + Ownership changes + Jabetza aldaketak + + 1 + + + + My settings + Nire ezarpenak 1 @@ -4215,6 +4082,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Error + Errorea + + 1 + + You need to reconnect. Berriro konektatu behar duzu. @@ -4236,6 +4110,20 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Info + Informazioa + + 1 + + + + Success + Arrakasta + + 1 + + Incorrect username or password. Erabiltzaile-izen edo pasahitz okerra. @@ -4453,6 +4341,20 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Email is required. + E-maila behar da. + + 1 + + + + Email must be valid. + E-maila baliozkoa izan behar da. + + 1 + + Username is required. Erabiltzaile izena beha da. @@ -4474,41 +4376,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Username must be at least 3 characters long. - Erabiltzaile-izenak gutxienez 3 karaktere izan behar ditu. - - 1 - - - - Username cannot be more than 20 characters long. - Erabiltzaile-izenak ezin ditu 20 karaktere baino gehiago izan. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Erabiltzaile-izena minuskulaz dauden karaktere alfanumerikoak besterik ezin ditu izan. - - 1 - - - - Email is required. - E-maila behar da. - - 1 - - - - Email must be valid. - E-maila baliozkoa izan behar da. - - 1 - - Password must be at least 6 characters long. Pasahitza gutxienez 6 karaktere luze izan behar da. @@ -4572,20 +4439,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Display name must be at least 3 characters long. - Pantaila-izena gutxienez 3 karaktere luze izan behar da. - - 1 - - - - Display name cannot be more than 120 characters long. - Pantaila-izena ezin da 120 karaktere baino luzeagoa izan. - - 1 - - Description must be at least 3 characters long. Deskripzioa gutxienez 3 karaktere luze izan behar da. @@ -4635,13 +4488,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Report reason cannot be more than 300 characters long. - Salatzeko arrazoia ezin da 300 karaktere baino luzeagoa izan. - - 1 - - Moderation comment is required. Moderazio iruzkina derrigorrezkoa da. @@ -4656,13 +4502,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Moderation comment cannot be more than 300 characters long. - Moderazio iruzkina ezin da 300 karaktere baino luzeagoa izan. - - 1 - - The channel is required. Kanala derrigorrezkoa da. @@ -4719,27 +4558,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Name must be at least 3 characters long. - Izena gutxienez 3 karakterekoa izan behar da - - 1 - - - - Name cannot be more than 20 characters long. - Izena ezin da20 karaktere baino luzeagoa izan - - 1 - - - - Name should be only lowercase alphanumeric characters. - Izenak karaktere alfanumerikoak minuskulan besterik ezin ditu izan. - - 1 - - Support text must be at least 3 characters long. Babes testua gutxienez 3 karaktere luze izan behar da @@ -5552,13 +5370,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Subscribed - Harpidetuta - - 1 - - Subscribed to (e)ra harpidetuta @@ -5566,9 +5377,9 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Unsubscribed - Harpidetza kenduta + + Subscribed + Harpidetuta 1 @@ -5580,6 +5391,13 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 + + Unsubscribed + Harpidetza kenduta + + 1 + + Moderator Moderatzailea @@ -5650,13 +5468,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - Info - Informazioa - - 1 - - Upload cancelled Igoera ezeztatuta @@ -5664,13 +5475,6 @@ Ezin izan dugu bilatzen duzun orria aurkitu. 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Sentitzen dugu, PeerTubek ezin du 8GB baino gehiagoko bideorik kudeatu - - 1 - -

Your video quota is exceeded with this video (video size: , used: , quota: ) Zure bideo-kuota bideo honekin gainditzen da (bideoaren tamaina: , erabilita: , kuota: ) diff --git a/client/src/locale/target/angular_fa_IR.xml b/client/src/locale/target/angular_fa_IR.xml index fe2d0b0cf..2a59cfc34 100644 --- a/client/src/locale/target/angular_fa_IR.xml +++ b/client/src/locale/target/angular_fa_IR.xml @@ -288,7 +288,7 @@ Password گذرواژه

- 12 + 13

@@ -302,7 +302,7 @@ Login ورود

- 38 + 36

@@ -330,7 +330,7 @@ Send me an email to reset my password یک رایانامه برای بازنشانی گذرواژه برای من بفرست

- 75 + 80

@@ -392,7 +392,7 @@ Signup ثبت‌نام

- 88 + 78

@@ -410,7 +410,7 @@ Change the language تغییر زبان

- 88 + 86

@@ -421,7 +421,7 @@ نمایه‌ عمومی من - 18 + 16

@@ -432,7 +432,7 @@ حساب کاربری من - 22 + 20

@@ -443,7 +443,7 @@ ویدئو‌های من - 26 + 24

@@ -454,14 +454,14 @@ خروج - 30 + 28

Create an account ساخت حساب

- 39 + 37

@@ -475,49 +475,49 @@ Subscriptions اشتراک

- 47 + 45

Overview نمای‌کلی

- 52 + 50

Trending مورد بحث

- 57 + 55

Recently added به تازگی اضافه شده

- 62 + 60

Local محلی

- 67 + 65

More دیگر

- 72 + 70

Administration مدیریت

- 76 + 74

@@ -529,7 +529,7 @@

Toggle dark interfaceToggle dark interface

- 94 + 92

@@ -613,7 +613,7 @@ No results. بدون نتیجه.

- 17 + 20

@@ -659,14 +659,14 @@ Videos Overview نمای‌کلی ویدئو‌ها

- 58 + 51

Local videos ویدئو‌های محلی

- 61 + 54

@@ -680,7 +680,14 @@ Signup enabled ثبت‌نام فعال است - 93 + 84 + + + + Users + کاربران + + 105 @@ -694,14 +701,7 @@ Administrator مدیر - 131 - - - - Users - کاربران - - 144 + 155

@@ -715,14 +715,14 @@ Your Twitter username نام‌کاربری توییتر شما

- 181 + 184

JavaScript جاوااکسریپت

- 278 + 294

@@ -813,18 +813,25 @@ 14 + + My videos + ویديو‌های من + + 1 + + My settings تنظیمات من

- 3 + 1

- - My videos - ویديو‌های من + + Info + راهنما

- 14 + 1

@@ -1030,13 +1037,6 @@ 1 - - Info - راهنما - - 1 - - Upload cancelled بارگزاری لغوشد diff --git a/client/src/locale/target/angular_fr_FR.xml b/client/src/locale/target/angular_fr_FR.xml index 55f323009..23cfec618 100644 --- a/client/src/locale/target/angular_fr_FR.xml +++ b/client/src/locale/target/angular_fr_FR.xml @@ -227,6 +227,155 @@ 11 + + You don't have notifications. + Vous n'avez pas de notifications. + + 1 + + + + + published a new video + + + a publié une nouvelle vidéo + + + 7 + + + + + Your video has been unblacklisted + + + Votre vidéo a été débloquée + + + 11 + + + + + Your video has been blacklisted + + + Votre vidéo a été bloquée + + + 15 + + + + + A new video abuse has been created on video + + + Un nouveau signalement a été créé sur la vidéo + + + 19 + + + + + commented your video + + + a commenté votre vidéo + + + 23 + + + + + Your video has been published + + + Votre vidéo a été publiée + + + 27 + + + + + Your video import succeeded + + + Votre vidéo a été importée + + + 31 + + + + + Your video import failed + + + L'importation de votre vidéo a échoué + + + 35 + + + + + User registered on your instance + + + L'utilisateur a créé un compte sur votre instance + + + 39 + + + + + is following + + + your channel + + your account + + + suit + + + votre chaîne + + votre compte + + + 43 + + + + + mentioned you on video + + + vous a mentionné sur la vidéo + + + 52 + + + + + + + + + + + 57 + + Unlisted Non répertoriée @@ -434,6 +583,13 @@ 25 + + + + + 11 + +

- 12 + 13

@@ -512,7 +668,7 @@ Login Se connecter

- 38 + 36

@@ -522,6 +678,17 @@ 57 + + + We are sorry, you cannot recover you password because your instance administrator did not configure the PeerTube email system. + + + Désolé, vous ne pouvez pas récupérer votre mot de passe car l'administrateur de votre instance n'a pas configuré le système de mails de PeerTube. + + + 63 + +

Email Courriel @@ -540,7 +707,7 @@ Send me an email to reset my password M'envoyer un courriel pour réinitialiser mon mot de passe

- 75 + 80

@@ -611,7 +778,7 @@ Signup Créer un compte

- 88 + 78

@@ -681,7 +848,18 @@ Change the language Changer la langue - 88 + 86 + + + + + Help to translate PeerTube! + + + Aidez à traduire PeerTube ! + + + 8

@@ -692,7 +870,7 @@ Mon profil public - 18 + 16

@@ -703,7 +881,7 @@ Mon compte - 22 + 20

@@ -714,7 +892,7 @@ Mes vidéos - 26 + 24

@@ -725,14 +903,14 @@ Se déconnecter - 30 + 28

Create an account Créer un compte

- 39 + 37

@@ -746,49 +924,49 @@ Subscriptions Abonnements

- 47 + 45

Overview Vue d'ensemble

- 52 + 50

Trending Tendances

- 57 + 55

Recently added Récemment ajoutées

- 62 + 60

Local Locales

- 67 + 65

More Plus

- 72 + 70

Administration Administration

- 76 + 74

@@ -802,14 +980,42 @@ Show keyboard shortcuts Montrer les raccourcis clavier

- 91 + 89

Toggle dark interface (Dés)activer le thème sombre - 94 + 92 + + + + View your notifications + Voir vos notifications + + 3 + + + + Notifications + Notifications + + 10 + + + + Update your notification preferences + Mettre à jour vos préférences de notification + + 15 + + + + See all your notifications + Voir toutes vos notifications + + 22

@@ -914,14 +1120,14 @@ Display unlisted and private videos Afficher les vidéos privées et non répertoriées

- 11 + 14

No results. Aucun résultat.

- 17 + 20

@@ -979,14 +1185,64 @@ 7 - + + Contact administrator + Contacter l'administrateur de + + 3 + + + + Your name + Votre nom + + 11 + + + + Your email + Votre mail + + 20 + + + + Your message + Votre message + + 29 + + + - About instance - + Cancel + - À propos de l'instance : + Annuler + - 1 + 26 + + + + Submit + Envoyer + + 31 + + + + About instance + À propos de l'instance + + 4 + + + + Contact administrator + Contact de l'administrateur + + 6

@@ -1000,47 +1256,47 @@ Terms Conditions d'utilisation

- 44 + 39

User registration is allowed and La création de comptes utilisateurs est autorisée et

- 25 + 29

- + - this instance provides a baseline quota of space for the videos of its users. - + this instance provides a baseline quota of space for the videos of its users. + - cette instance fournit un quota de base de pour les vidéos de ses utilisateurs. - + cette instance propose un quota d'espace de pour les vidéos de ses utilisateurs. + - 27 + 31 - + - this instance provides unlimited space for the videos of its users. - + this instance provides unlimited space for the videos of its users. + - cette instance met à disposition de ses utilisateurs un espace de stockage vidéo illimité. - + cette instance propose un espace illimité pour les vidéos de ses utilisateurs. + - 31 + 35 - + - User registration is currently not allowed. - + User registration is currently not allowed. + - Vous ne pouvez pas créer de comptes utilisateurs pour le moment. - + La création de nouveaux compte n'est pas autorisée pour l'instant. + - 36 + 40

@@ -1397,49 +1653,49 @@ Short description Courte description

- 22 + 21

Default client route Route du client par défaut

- 55 + 48

Videos Overview Vue d'ensemble des vidéos

- 58 + 51

Videos Trending Vidéos tendance

- 59 + 52

Videos Recently Added Vidéos récemment ajoutées

- 60 + 53

Local videos Vidéos locales

- 61 + 54

Policy on videos containing sensitive content Politique concernant les vidéos ayant du contenu sensible

- 70 + 61

@@ -1474,23 +1730,44 @@ Signup enabled Enregistrement activé

- 93 + 84

Signup requires email verification L'inscription requiert la vérification par courriel

- 100 + 91

Signup limit Limitation des enregistrements + + 96 + + + + Users + Utilisateurs

105

+ + User default video quota + Quota de vidéos par défaut par utilisateur + + 109 + + + + User default daily upload limit + La limite journalière de téléversement est atteinte + + 121 + +

Import Importer @@ -1502,49 +1779,35 @@ Video import with HTTP URL (i.e. YouTube) enabled Import de vidéo via une URL (YouTube par exemple) activé

- 120 + 141

Video import with a torrent file or a magnet URI enabled Import de vidéo avec un fichier torrent ou URL magnet activé

- 127 + 148

Administrator Administrateur

- 131 + 155

Admin email Email de l'administrateur

- 134 + 158

- - Users - Utilisateurs + + Enable contact form + Activer le formulaire de contact - 144 - - - - User default video quota - Quota de vidéos par défaut par utilisateur - - 147 - - - - User default daily upload limit - La limite journalière de téléversement est atteinte - - 161 + 169

@@ -1565,21 +1828,32 @@ Your Twitter username Votre identifiant Twitter

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Indique le compte Twitter pour le site ou la plateforme sur laquelle le contenu a été publié.

- 184 + 187

Instance whitelisted by Twitter Instance sur la liste blanche de Twitter - 198 + 199 + + + + If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> + If the instance is not whitelisted, we use an image link card that will redirect on 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 whitelisted. + Si votre instance est autorisée par Twitter, un lecteur de vidéo sera inséré dans le flux Twitter pour les partages de vidéo depuis PeerTube.<br /> + Si votre instance n'est pas autorisée, une carte sera inséré avec une image et un lien vers votre instance PeerTube.<br /><br /> + Selectionnez cette case, sauvegardez la configuration et pour tester si votre instance est autorisée par Twitter, insérez l'URL d'une vidéo de votre instance (https://example.com/videos/watch/blabla) sur <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a>. + + 200

@@ -1593,35 +1867,49 @@ Transcoding Encodage

- 210 + 215

Transcoding enabled Encodage activé

- 215 + 221

If you disable transcoding, many videos from your users will not work! Si vous désactivez le transcodage, de nombreuses vidéos d'utilisateurs ne fonctionneront pas ! - 216 + 222 + + + + Allow additional extensions + Permettre des extensions additionnelles + + 231 + + + + Allow your users to upload .mkv, .mov, .avi, .flv videos + Autoriser vos utilisateurs à publier des vidéos .mkv, .mov, .avi et .flv. + + 232

Transcoding threads Nombre de threads pour l'encodage

- 223 + 237

Resolution enabled Résolution activée

- 239 + 252

@@ -1636,105 +1924,105 @@

- 244 + 260

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Certain fichiers ne sont pas fédérés (miniature, sous-titre). Nous les récupérons directement depuis l'instance d'origine et nous les gardons en cache.

- 249 + 265

Previews cache size Taille du cache des prévisualisations

- 254 + 271

Video captions cache size Taille du cache des sous-titres

- 265 + 280

Customizations Personnalisations

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Écrivez directement du code JavaScript.<br />Exemple : <pre>console.log('mon instance est super géniale');</pre>

- 281 + 297

- + - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> + Write directly CSS code. Example:<br /> + <pre> + body + background-color: red; + + </pre> - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - + Prepend with <em>#custom-css</em> to override styles. Example: + <pre> + #custom-css .logged-in-email + color: red; + + </pre> + - Écrivez directement du code CSS. Exemple :<br /> - <pre> - body - background-color: red; - - </pre> + Écrivez directement du code CSS. Par exemple:<br /> + <pre> + body + background-color: red; + + </pre> - Ajoutez le préfixe <em>#custom-css</em> pour remplacer les styles. Exemple: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - + Ajoutez le préfixe <em>#custom-css</em> pour surcharger les styles. Par exemple: + <pre> + #custom-css .logged-in-email + color: red; + + </pre> + - 297 + 311

Advanced configuration Configuration avancée

- 207 + 212

Update configuration Mettre à jour la configuration

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Il semblerait que la configuration soit invalide. Merci de chercher des erreurs potentielles dans les différents onglets.

- 326 + 341

@@ -2026,11 +2314,25 @@ 133 + + User's email must be verified to login + L'adresse mail de l'utilisateur doit être vérifiée afin de se connecter + + 72 + + + + User's email is verified / User can login without email verification + L'adresse mail de l'utilisateur est vérifié / L'utilisateur peut se connecter sans vérification mail + + 76 + +

Ban reason: Raison du bannissement :

- 92 + 95

@@ -2097,7 +2399,7 @@ Actions Actions

- 33 + 35

@@ -2132,14 +2434,14 @@ Date Date

- 10 + 11

Blacklist reason: Raison de mise sur liste noire :

- 41 + 43

@@ -2198,69 +2500,6 @@ 23 - - My settings - Mes paramètres - - 3 - - - - My library - Ma bibliothèque - - 7 - - - - My channels - Mes chaînes - - 12 - - - - My videos - Mes vidéos - - 14 - - - - My subscriptions - Mes abonnements - - 16 - - - - My imports - Mes imports - - 18 - - - - Misc - Divers - - 24 - - - - Muted instances - Instances muettes - - 2 - - - - Ownership changes - Changements de propriétaires - - 33 - -

Video quota: Quota de vidéos : @@ -2272,21 +2511,21 @@ Profile Profil

- 8 + 7

Video settings Paramètres de la vidéo

- 15 + 16

Danger zone Zone dangereuse

- 18 + 19

@@ -2314,13 +2553,6 @@ 35 - - Submit - Envoyer - - 24 - - - views - vues @@ -2480,6 +2712,55 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au 47 + + Muted instances + Instances muettes + + 2 + + + + History enabled + Historique activé + + 4 + + + + Delete history + Supprimer l'historique + + 8 + + + + You don't have videos history yet. + Vous n'avez pas d'historique de vidéos pour l'instant. + + 13 + + + + views + vues + + 22 + + + + Notification preferences + Préférences de notification + + 2 + + + + Mark all as read + Tout marqué comme lu + + 4 + + Change password Changer le mot de passe @@ -2578,6 +2859,20 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au 4 + + Activities + Activités + + 2 + + + + Web + Web + + 3 + + Sorry, but we couldn't find the page you were looking for. @@ -2686,6 +2981,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 159 + + Sorry, but something went wrong + Désolé, mais quelque chose s'est mal passé + + 49 + +

Congratulations, the video behind will be imported! You can already add information about this video. @@ -2722,14 +3024,14 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Publish will be available when upload is finished Vous pourrez publier cette vidéo lorsque l'envoi sera terminé

- 53 + 58

Publish Publier

- 60 + 65

@@ -2912,14 +3214,14 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Wait transcoding before publishing the video Attendre l'encodage avant de publier la vidéo

- 130 + 131

If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Si vous décidez de ne pas attendre la fin du traitement avant la publication de la vidéo, elle pourrait bien être injouable.

- 131 + 132

@@ -2933,49 +3235,49 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Add another caption Ajouter un nouveau sous-titre

- 146 + 147

See the subtitle file Voir le fichier de sous-titres

- 155 + 156

Already uploaded ✔ Déjà téléversé ✔

- 159 + 160

Will be created on update Sera créé après la mise à jour

- 167 + 168

Cancel create Annuler la création

- 169 + 170

Will be deleted on update Sera supprimé après la mise à jour

- 175 + 176

Cancel deletion Annuler la suppression

- 177 + 178

@@ -2986,28 +3288,28 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Pas de sous-titres pour le moment. - 182 + 183

Captions Sous-titres

- 139 + 140

Upload thumbnail Téléverser une vignette

- 195 + 196

Upload preview Téléverser un aperçu

- 202 + 203

@@ -3021,14 +3323,14 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute Short text to tell people how they can support you (membership platform...). Courte description des moyens qu'ont les utilisateurs de vous soutenir (financement participatif, etc.).

- 209 + 210

Advanced settings Paramétrage avancé

- 190 + 191

@@ -3095,15 +3397,17 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 3 - + - Cancel - + Your report will be sent to moderators of . + It will be forwarded to origin instance too. + - Annuler - + Votre signalement sera envoyé aux modérateurs de . + Il sera également transmis à l'instance d'origine + - 19 + 9 @@ -3491,9 +3795,23 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 14 - - Error getting about from server - Erreur lors de la récupération des informations 'à propos' du serveur + + Cannot get about information from server + Impossible d'obtenir la description du serveur + + 1 + + + + Your message has been sent. + Votre message a été envoyé + + 1 + + + + You already sent this form recently + Vous avez déjà rempli ce formulaire récemment 1 @@ -3519,13 +3837,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Error - Erreur - - 1 - - 240p 240p @@ -3559,18 +3870,11 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1080p 1 - - - - Auto (via ffmpeg) - Auto (avec ffmpeg) - - 1 - - - - Success - Réussite + + + + Auto (via ffmpeg) + Auto (avec ffmpeg) 1 @@ -3841,6 +4145,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Set Email as Verified + Définir l'adresse mail comme vérifiée + + 1 + + You cannot ban root. Vous ne pouvez pas bannir root. @@ -3883,6 +4194,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + users email set as verified. + adresses mail d'utilisateurs ont été vérifiées. + + 1 + + Account unmuted. Compte réactivé. @@ -3897,6 +4215,48 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + My videos history + Mon historique de vidéos + + 1 + + + + Videos history is enabled + Historique de vidéos activé + + 1 + + + + Videos history is disabled + Historique de vidéos désactivé + + 1 + + + + Delete videos history + Supprimer l'historique de vidéos + + 1 + + + + Are you sure you want to delete all your videos history? + Êtes vous sur de vouloir supprimer toutes les vidéos de votre historique ? + + 1 + + + + Videos history deleted + Historique de vidéos supprimé + + 1 + + Ownership accepted Changement de propriété accepté @@ -3946,6 +4306,76 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + New video from your subscriptions + Nouvelle vidéo depuis vos souscriptions + + 1 + + + + New comment on your video + Nouveau commentaire sur votre vidéo + + 1 + + + + New video abuse on local video + Nouveau signalement sur une vidéo locale + + 1 + + + + One of your video is blacklisted/unblacklisted + Une de vos vidéos a été bloquée/débloquée + + 1 + + + + Video published (after transcoding/scheduled update) + Vidéo publiée (après transcodage / mise à jour programmée) + + 1 + + + + Video import finished + Import de vidéo terminé + + 1 + + + + A new user registered on your instance + Nouveau compte créé sur votre instance + + 1 + + + + You or your channel(s) has a new follower + Vous (ou votre chaîne) avez un nouveau suiveur + + 1 + + + + Someone mentioned you in video comments + Quelqu'un vous a mentionné dans les commentaires d'une vidéo + + 1 + + + + Preferences saved + Préférences sauvegardées + + 1 + + Profile updated. Profil mis à jour. @@ -3995,23 +4425,16 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Voulez-vous vraiment supprimer ? Ceci supprimera aussi toutes les vidéos téléversées dans cette chaîne. - - 1 - - - - Please type the name of the video channel to confirm - Merci de confirmer le nom de la chaîne + + Video channel deleted. + Chaîne vidéo supprimée.

- - Video channel deleted. - Chaîne vidéo supprimée. + + My videos + Mes vidéos 1 @@ -4086,16 +4509,58 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Channels - Chaînes + + My library + Ma bibliothèque + + 1 + + + + My channels + Mes chaînes + + 1 + + + + My subscriptions + Mes abonnements + + 1 + + + + My history + Mon historique + + 1 + + + + Misc + Divers + + 1 + + + + Ownership changes + Changements de propriétaires + + 1 + + + + My settings + Mes paramètres

- - Video imports - Importations de vidéos + + My notifications + Mes notifications 1 @@ -4221,6 +4686,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Error + Erreur + + 1 + + You need to reconnect. Vous devez vous reconnecter. @@ -4242,6 +4714,20 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Info + Info + + 1 + + + + Success + Réussite + + 1 + + Incorrect username or password. Nom d'utilisateur ou mot de passe incorrects. @@ -4459,6 +4945,62 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Email is required. + Le courriel est requis. + + 1 + + + + Email must be valid. + Le courriel doit être valide. + + 1 + + + + Your name is required. + Votre nom doit être rempli. + + 1 + + + + Your name must be at least 1 character long. + Votre nom doit contenir au moins un caractère. + + 1 + + + + Your name cannot be more than 120 characters long. + Votre nom ne peut pas contenir plus de 120 caractères. + + 1 + + + + A message is required. + Votre message doit être rempli. + + 1 + + + + The message must be at least 3 characters long. + Votre message doit contenir au moins 3 caractères. + + 1 + + + + The message cannot be more than 5000 characters long. + Le message ne peut pas contenir plus de 5000 caractères. + + 1 + + Username is required. Le nom d'utilisateur est requis. @@ -4480,37 +5022,23 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Username must be at least 3 characters long. - Le nom d'utilisateur doit être composé d'au moins 3 caractères. - - 1 - - - - Username cannot be more than 20 characters long. - Le nom d'utilisateur ne peut pas faire plus de 20 caractères. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Le nom d'utilisateur ne doit être composé que de caractères alphanumériques en minuscule. + + Username must be at least 1 character long. + Votre nom d'utilisateur doit contenir au moins un caractère.

- - Email is required. - Le courriel est requis. + + Username cannot be more than 50 characters long. + Votre nom d'utilisateur ne peut pas contenir plus de 50 caractères.

- - Email must be valid. - Le courriel doit être valide. + + Username should be lowercase alphanumeric; dots and underscores are allowed. + Le nom d'utilisateur peut contenir des minuscules, des chiffres, des points et des tirets bas. 1 @@ -4578,16 +5106,16 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Display name must be at least 3 characters long. - Le nom d'affichage doit être composé d'au moins 3 caractères. + + Display name must be at least 1 character long. + Votre nom affiché doit contenir au moins un caractère.

- - Display name cannot be more than 120 characters long. - Le nom d'affichage ne peut pas faire plus de 120 caractères. + + Display name cannot be more than 50 characters long. + Votre nom affiché ne peut pas contenir plus de 50 caractères. 1 @@ -4641,13 +5169,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Report reason cannot be more than 300 characters long. - La raison du signalement ne peut pas dépasser 300 caractères. - - 1 - - Moderation comment is required. Un commentaire de modération est requis. @@ -4662,13 +5183,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Moderation comment cannot be more than 300 characters long. - Le commentaire de modération doit faire au plus 300 caractères. - - 1 - - The channel is required. La chaîne est requise. @@ -4725,23 +5239,23 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Name must be at least 3 characters long. - Le nom doit faire au moins 3 caractères. + + Name must be at least 1 character long. + Le nom doit contenir au moins un caractère.

- - Name cannot be more than 20 characters long. - Le nom doit faire au plus 20 caractères. + + Name cannot be more than 50 characters long. + Le nom ne peut pas contenir plus de 50 caractères.

- - Name should be only lowercase alphanumeric characters. - Le nom doit contenir seulement des caractères alphanumériques minuscules. + + Name should be lowercase alphanumeric; dots and underscores are allowed. + Le nom peut contenir des minuscules, des chiffres, des points et des tirets bas. 1 @@ -5425,6 +5939,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + User email set as verified + L'adresse mail de l'utilisateur a été vérifiée + + 1 + + Account muted. Comptes muets. @@ -5551,13 +6072,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Subscribed - Abonné - - 1 - - Subscribed to Abonné à @@ -5565,9 +6079,9 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Unsubscribed - Désabonné + + Subscribed + Abonné 1 @@ -5579,6 +6093,13 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Unsubscribed + Désabonné + + 1 + + Moderator Modérateur @@ -5607,6 +6128,20 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 + + Welcome! Now please check your emails to verify your account and complete signup. + Bienvenue ! Veuillez maintenant consulter vos mails afin de vérifier votre compte et compéter l'inscription. + + 1 + + + + You are now logged in as ! + Vous êtes maintenant connecté en tant que ! + + 1 + + Video to import updated. Les vidéos à importer ont été mises à jour @@ -5635,13 +6170,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - Info - Info - - 1 - - Upload cancelled Mise en ligne annulée @@ -5649,13 +6177,6 @@ Assurez-vous d'avoir les droits de diffusion de ce contenu afin d'éviter toute 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Désolé, mais PeerTube ne gère pas les vidéos d'une taille > 8 Go - - 1 - -

Your video quota is exceeded with this video (video size: , used: , quota: ) Votre quota est dépassé avec cette vidéo (taille de la vidéo : , used: , quota: ) diff --git a/client/src/locale/target/angular_gl_ES.xml b/client/src/locale/target/angular_gl_ES.xml index e2695304b..ab07180b2 100644 --- a/client/src/locale/target/angular_gl_ES.xml +++ b/client/src/locale/target/angular_gl_ES.xml @@ -103,7 +103,7 @@ Password Contrasinal

- 12 + 13

@@ -117,7 +117,7 @@ Login Conectar

- 38 + 36

@@ -145,7 +145,7 @@ Send me an email to reset my password Envíenme un correo para restablecer o contrasinal

- 75 + 80

@@ -202,7 +202,7 @@ Signup Abrir conta

- 88 + 78

@@ -238,14 +238,14 @@ Change the language Cambiar o idioma

- 88 + 86

Create an account Crear unha conta

- 39 + 37

@@ -259,35 +259,35 @@ Trending En voga

- 57 + 55

Recently added Últimos engadidos

- 62 + 60

Local Local

- 67 + 65

More Máis

- 72 + 70

Administration Administración

- 76 + 74

@@ -399,7 +399,7 @@ No results. Sin resultados.

- 17 + 20

@@ -416,17 +416,6 @@ 7 - - - About instance - - - Acerca da instancia - - - 1 - -

Description Descrición @@ -438,47 +427,14 @@ Terms Termos

- 44 + 39

User registration is allowed and O rexistro está aberto e - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - esta instancia proporciona unha cota inicial de para os vídeos das súas usuarias. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - esta instancia non limita o espazo para os videos das súas usuarias. - - - 31 - - - - - User registration is currently not allowed. - - - En este momento non está aberto o rexistro de novas usuarias. - - - 36 + 29

@@ -744,42 +700,42 @@ Short description Descrición curta

- 22 + 21

Default client route Ruta ao cliente por omisión

- 55 + 48

Videos Trending Vídeos de moda

- 59 + 52

Videos Recently Added Vídeos engadidos recentemente

- 60 + 53

Local videos Vídeos en local

- 61 + 54

Policy on videos containing sensitive content Política para os vídeos con contido sensible

- 70 + 61

@@ -814,16 +770,30 @@ Signup enabled Rexistro activado

- 93 + 84

Signup limit Rexistro limitado + + 96 + + + + Users + Usuarias

105

+ + User default video quota + Cota de vídeo por omisión para a usuaria + + 109 + +

Import Importar @@ -835,35 +805,21 @@ Video import with a torrent file or a magnet URI enabled Importación de vídeo con un ficheiro torrent ou URI magnet activada

- 127 + 148

Administrator Administración

- 131 + 155

Admin email Correo-e da Admin - 134 - - - - Users - Usuarias - - 144 - - - - User default video quota - Cota de vídeo por omisión para a usuaria - - 147 + 158

@@ -884,21 +840,21 @@ Your Twitter username O seu alcume na Twitter

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Indica a conta na Twitter para o sitio web ou plataforma para a cal o contido foi publicado.

- 184 + 187

Instance whitelisted by Twitter Instancia na lista blanca por Twitter

- 198 + 199

@@ -912,98 +868,98 @@ Transcoding Recodificando

- 210 + 215

Transcoding enabled Recodificación activada

- 215 + 221

If you disable transcoding, many videos from your users will not work! Si desactiva a recodificación moitos vídeos das súas usuarias non funcionarán!

- 216 + 222

Transcoding threads Fíos de recodificación

- 223 + 237

Resolution enabled Resolución activada

- 239 + 252

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Algúns ficheiros non se federan (vista previa, comentarios). Recollémolos directamente desde a instancia de orixe e almacenámolos.

- 249 + 265

Previews cache size Tamaño da caché de vista previa

- 254 + 271

Video captions cache size Tamaño da caché de comentarios no vídeo

- 265 + 280

Customizations Personalizacións

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escribir código JavaScript directamente.<br />Exemplo: <pre>console.log('a miña instancia é tremenda');</pre>

- 281 + 297

Advanced configuration Configuración avanzada

- 207 + 212

Update configuration Actualizar configuración

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Semella que a configuración non é válida. Por favor busque os erros potenciais nas diferentes pestanas.

- 326 + 341

diff --git a/client/src/locale/target/angular_it_IT.xml b/client/src/locale/target/angular_it_IT.xml index 2f5178484..c3bcc704c 100644 --- a/client/src/locale/target/angular_it_IT.xml +++ b/client/src/locale/target/angular_it_IT.xml @@ -479,7 +479,7 @@ Password Password

- 12 + 13

@@ -493,7 +493,7 @@ Login Accedi

- 38 + 36

@@ -521,7 +521,7 @@ Send me an email to reset my password Inviami un email per resettare la password

- 75 + 80

@@ -585,7 +585,7 @@ Signup Registrati

- 88 + 78

@@ -655,7 +655,7 @@ Change the language Cambia lingua

- 88 + 86

@@ -666,7 +666,7 @@ Il mio profilo pubblico - 18 + 16

@@ -677,7 +677,7 @@ Il mio account - 22 + 20

@@ -688,7 +688,7 @@ I miei video - 26 + 24

@@ -699,14 +699,14 @@ Esci - 30 + 28

Create an account Crea un account

- 39 + 37

@@ -720,49 +720,49 @@ Subscriptions Iscrizioni

- 47 + 45

Overview Panoramica

- 52 + 50

Trending Popolari

- 57 + 55

Recently added Aggiunti di recente

- 62 + 60

Local Locali

- 67 + 65

More Altro

- 72 + 70

Administration Amministrazione

- 76 + 74

@@ -776,14 +776,14 @@ Show keyboard shortcuts Mostra scorciatoie della tastiera

- 91 + 89

Toggle dark interface (Dis)attiva l'interfaccia sicura

- 94 + 92

@@ -888,14 +888,14 @@ Display unlisted and private videos Mostra video privati e non elencati

- 11 + 14

No results. Nessun risultato.

- 17 + 20

@@ -953,15 +953,22 @@ 7 - + - About instance - + Cancel + - Riguardo all'istanza - + Annulla + - 1 + 26 + + + + Submit + Invia + + 31

@@ -975,47 +982,14 @@ Terms Termini

- 44 + 39

User registration is allowed and È permessa la registrazione di nuovi utenti e - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - questa istanza fornisce una quota base di per i video dei suoi utenti. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - questa istanza fornisce spazio illimitato per i video dei suoi utenti. - - - 31 - - - - - User registration is currently not allowed. - - - La registrazione di nuovi utenti al momento non è permessa. - - - 36 + 29

@@ -1359,49 +1333,49 @@ Short description Breve descrizione

- 22 + 21

Default client route Percorso predefinito del client

- 55 + 48

Videos Overview Panoramica dei video

- 58 + 51

Videos Trending Video popolari

- 59 + 52

Videos Recently Added Video aggiunti di recente

- 60 + 53

Local videos Video locali

- 61 + 54

Policy on videos containing sensitive content Policy su video che contengono contenuti sensibili

- 70 + 61

@@ -1436,23 +1410,44 @@ Signup enabled Registrazione abilitata

- 93 + 84

Signup requires email verification La registrazione richiede una verifica via email

- 100 + 91

Signup limit Limite registrazioni + + 96 + + + + Users + Utenti

105

+ + User default video quota + Quota standard per i video dell'utente + + 109 + + + + User default daily upload limit + Limite giornaliero per il caricamento + + 121 + +

Import Carica @@ -1464,49 +1459,28 @@ Video import with HTTP URL (i.e. YouTube) enabled Importazione video con indirizzo HTTP (es. YouTube) abilitata

- 120 + 141

Video import with a torrent file or a magnet URI enabled Carica video con un file torrent o un URI magnete attivo

- 127 + 148

Administrator Amministratore

- 131 + 155

Admin email Email Amministratore - 134 - - - - Users - Utenti - - 144 - - - - User default video quota - Quota standard per i video dell'utente - - 147 - - - - User default daily upload limit - Limite giornaliero per il caricamento - - 161 + 158

@@ -1527,21 +1501,21 @@ Your Twitter username Il tuo username Twitter

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Indica l'account Twitter per il sito web o la piattaforma in cui il contenuto e' stato pubblicato.

- 184 + 187

Instance whitelisted by Twitter Istanza inserita in white list da Twitter

- 198 + 199

@@ -1555,35 +1529,35 @@ Transcoding Trascrizione

- 210 + 215

Transcoding enabled Trascrizione attivata

- 215 + 221

If you disable transcoding, many videos from your users will not work! Se disatitvi la trascrizione, molti video dai tuoi utenti non funzioneranno.

- 216 + 222

Transcoding threads Trascrizione thread

- 223 + 237

Resolution enabled Risoluzione abilitata

- 239 + 252

@@ -1598,82 +1572,47 @@

- 244 + 260

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Alcuni file non sono federati (anteprime, sottotitoli). Li recuperiamo direttamente dall'istanza di origine e li mettiamo in cache.

- 249 + 265

Previews cache size Dimensione del cache per la previsualizzazione

- 254 + 271

Video captions cache size Dimensione

- 265 + 280

Customizations Personalizzazioni

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Scrivi direttamente codice JavaScript .<br />Esempio: <pre>console.log('La mia istanza spacca!');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Scrivi direttamente codice CSS .Esempio:<br /> - <pre> - body - background-color: red; - - </pre> - - Precedi con <em>#custom-css</em> per sovrascrivere stili. Esempio: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1682,21 +1621,21 @@ Advanced configuration Configurazione avanzata

- 207 + 212

Update configuration Aggiorna configurazione

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Sembra che la configurazione sia valida. Per favore cerca potenziali errori nelle altre tab

- 326 + 341

@@ -1979,7 +1918,7 @@ Ban reason: Motivo ban:

- 92 + 95

@@ -2044,7 +1983,7 @@ Actions Azioni

- 33 + 35

@@ -2079,14 +2018,14 @@ Date Data

- 10 + 11

Blacklist reason: motivo per essere in Blacklist:

- 41 + 43

@@ -2138,69 +2077,6 @@ 23 - - My settings - Le mie impostazioni - - 3 - - - - My library - La mia libreria - - 7 - - - - My channels - I miei canali - - 12 - - - - My videos - I miei video - - 14 - - - - My subscriptions - Le mie sottoscrizioni - - 16 - - - - My imports - Le mie importazioni - - 18 - - - - Misc - Altro - - 24 - - - - Muted instances - Istanze silenziate - - 2 - - - - Ownership changes - Cambi di proprietario - - 33 - -

Video quota: Quota video: @@ -2212,21 +2088,21 @@ Profile Profilo

- 8 + 7

Video settings Impostazione video

- 15 + 16

Danger zone Zona pericolosa

- 18 + 19

@@ -2254,13 +2130,6 @@ 35 - - Submit - Invia - - 24 - - - views - visualizzazioni @@ -2420,6 +2289,13 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v 47 + + Muted instances + Istanze silenziate + + 2 + +

Change password Cambia password @@ -2650,14 +2526,14 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v Publish will be available when upload is finished La pubblicazione sarà disponibile quando il caricamento sarà completato

- 53 + 58

Publish Pubblica

- 60 + 65

@@ -2836,12 +2712,12 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v

Wait transcoding before publishing the videoWait transcoding before publishing the video

- 130 + 131

If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends.If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends.

- 131 + 132

@@ -2855,45 +2731,45 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v Add another caption Aggiungi un'altra descrizione

- 146 + 147

See the subtitle file Guarda il file dei sottotitoli

- 155 + 156

Cancel create Annulla creazione

- 169 + 170

Cancel deletion Annulla creazione

- 177 + 178

CaptionsCaptions

- 139 + 140

Upload thumbnail Carica miniatura

- 195 + 196

Upload previewUpload preview

- 202 + 203

@@ -2905,14 +2781,14 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v

Short text to tell people how they can support you (membership platform...).Short text to tell people how they can support you (membership platform...).

- 209 + 210

Advanced settings Impostazioni avanzate

- 190 + 191

@@ -2972,17 +2848,6 @@ Quando tu carichi un video su questo canale. il campo di supporto per il video v 3 - - - Cancel - - - Annulla - - - 19 - - Share Condividi @@ -3305,13 +3170,6 @@ Altri video 14 - - Error getting about from server - Errore durante la comunicazione con il server - - 1 - - No description Nessuna descrizione @@ -3333,13 +3191,6 @@ Altri video 1 - - Error - Errore - - 1 - - 240p 240p @@ -3354,11 +3205,6 @@ Altri video 1 - - SuccessSuccess - 1 - - Configuration updated. Configurazione aggiornata. @@ -3724,23 +3570,16 @@ Altri video 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Vuoi veramente eliminare ? Questo eliminerá anche tutti i video caricati su questo canale. - - 1 - - - - Please type the name of the video channel to confirm - Per favore digita il nome del canale video per confermare + + Video channel deleted. + Il canale video è stato cancellato.

- - Video channel deleted. - Il canale video è stato cancellato. + + My videos + I miei video 1 @@ -3811,16 +3650,44 @@ Altri video 1 - - Channels - Canali + + My library + La mia libreria + + 1 + + + + My channels + I miei canali + + 1 + + + + My subscriptions + Le mie sottoscrizioni + + 1 + + + + Misc + Altro + + 1 + + + + Ownership changes + Cambi di proprietario

- - Video imports - Caricamenti video + + My settings + Le mie impostazioni 1 @@ -3862,6 +3729,13 @@ Altri video 1 + + Error + Errore + + 1 + + You need to reconnect. Devi riconnetterti. @@ -3883,6 +3757,18 @@ Altri video 1 + + Info + Informazioni + + 1 + + + + SuccessSuccess + 1 + + Incorrect username or password. Username or password non corretti @@ -4100,6 +3986,20 @@ Altri video 1 + + Email is required. + L'email è richiesta. + + 1 + + + + Email must be valid. + L'email deve essere valida. + + 1 + + Username is required. L'username è necessario. @@ -4121,41 +4021,6 @@ Altri video 1 - - Username must be at least 3 characters long. - L'username deve essere almeno di 3 caratteri. - - 1 - - - - Username cannot be more than 20 characters long. - L'username non può essere più di 20 caratteri. - - 1 - - - - Username should be only lowercase alphanumeric characters. - L'username dovrebbe essere solo in minuscolo e contenere solo alfanumerici. - - 1 - - - - Email is required. - L'email è richiesta. - - 1 - - - - Email must be valid. - L'email deve essere valida. - - 1 - - Password must be at least 6 characters long. La password deve essere lunga almeno 6 caratteri. @@ -4219,16 +4084,6 @@ Altri video 1 - - Display name must be at least 3 characters long.Display name must be at least 3 characters long. - 1 - - - - Display name cannot be more than 120 characters long.Display name cannot be more than 120 characters long. - 1 - - Description must be at least 3 characters long. La descrizione deve avere al minino 3 caratteri. @@ -4271,13 +4126,6 @@ Altri video 1 - - Report reason cannot be more than 300 characters long. - Il motivo per la segnalazione non può essere più lungo di 300 caratteri. - - 1 - - Moderation comment is required. Il commento di moderazione è richiesto. @@ -4292,13 +4140,6 @@ Altri video 1 - - Moderation comment cannot be more than 300 characters long. - Il commento di moderazione non può essere più lungo di 300 caratteri. - - 1 - - The channel is required. Il canale è richiesto. @@ -4320,27 +4161,6 @@ Altri video 1 - - Name must be at least 3 characters long. - Il nome deve essere al minimo lunguo di tre caratteri. - - 1 - - - - Name cannot be more than 20 characters long. - Il nome non deve superare i 20 caratteri. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Il nome deve contenire solo caratteri minuscoli ed alfanumerichi; - - 1 - - Comment is required. Un commento è necessario. @@ -5000,13 +4820,6 @@ Altri video 1 - - Subscribed - Iscritto - - 1 - - Subscribed to Iscritto a @@ -5014,9 +4827,9 @@ Altri video 1 - - Unsubscribed - Disiscritto + + Subscribed + Iscritto 1 @@ -5028,6 +4841,13 @@ Altri video 1 + + Unsubscribed + Disiscritto + + 1 + + Moderator Moderatore @@ -5084,13 +4904,6 @@ Altri video 1 - - Info - Informazioni - - 1 - - Upload cancelled Caricamento annullato. @@ -5098,13 +4911,6 @@ Altri video 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Ci dispiace ma PeerTube non può gestire video di dimensioni > 8GB - - 1 - -

Your video quota is exceeded with this video (video size: , used: , quota: ) La tua quota è stata superata con questo video (dimensione del video: , stai utilizzando: , quota: ) diff --git a/client/src/locale/target/angular_ja_JP.xml b/client/src/locale/target/angular_ja_JP.xml index d0b592098..04bd5089a 100644 --- a/client/src/locale/target/angular_ja_JP.xml +++ b/client/src/locale/target/angular_ja_JP.xml @@ -342,7 +342,7 @@ Password パスワード

- 12 + 13

@@ -356,7 +356,7 @@ Login ログイン

- 38 + 36

@@ -382,7 +382,7 @@ Send me an email to reset my password 新しいパスワードをメールで送る

- 75 + 80

@@ -444,7 +444,7 @@ Signup サインアップ

- 88 + 78

@@ -456,7 +456,7 @@

Change the languageChange the language

- 88 + 86

@@ -465,7 +465,7 @@ マイアカウント

- 22 + 20

@@ -474,7 +474,7 @@ マイビデオ

- 26 + 24

@@ -483,14 +483,14 @@ ログアウト

- 30 + 28

Create an account アカウントを作成する

- 39 + 37

@@ -504,47 +504,47 @@ Subscriptions サブスクリプション

- 47 + 45

Overview 調査

- 52 + 50

TrendingTrending

- 57 + 55

Recently added 最近追加された

- 62 + 60

Local 地元

- 67 + 65

More 多くの

- 72 + 70

Administration 運営

- 76 + 74

@@ -635,7 +635,7 @@ No results. 結果がありません。

- 17 + 20

@@ -682,6 +682,24 @@ 7 + + + Cancel + + + キャンセル + + + 26 + + + + Submit + 差し出す + + 31 + +

Description 説明 @@ -693,23 +711,14 @@ Terms 条項

- 44 + 39

User registration is allowed and ユーザー登録が可能です - 25 - - - - - User registration is currently not allowed. - - ユーザー登録は現在受け付けておりません - - 36 + 29

@@ -762,14 +771,14 @@ Short description 簡単な説明

- 22 + 21

Videos Overview ビデオの概要

- 58 + 51

@@ -790,19 +799,26 @@ Signup enabled サインアップが有効

- 93 + 84

Signup requires email verification サインアップには電子メールの確認が必要です

- 100 + 91

Signup limit サインアップの制限 + + 96 + + + + Users + ユーザー 105 @@ -818,28 +834,21 @@ Video import with a torrent file or a magnet URI enabled Torrent ファイルまたは magnet リンクを使用して動画をインポートする

- 127 + 148

Administrator 管理者

- 131 + 155

Admin email 管理者の電子メール - 134 - - - - Users - ユーザー - - 144 + 158

@@ -860,7 +869,7 @@ Your Twitter username あなたのTwitterユーザー名

- 181 + 184

@@ -874,47 +883,47 @@ Transcoding トランスコード

- 210 + 215

Transcoding enabled トランスコードが有効になっています

- 215 + 221

Transcoding threadsTranscoding threads

- 223 + 237

Customizations カスタマイズ

- 275 + 289

JavaScript JavaScript

- 278 + 294

Advanced configuration 高度な構成

- 207 + 212

Update configuration 設定を更新する

- 325 + 340

@@ -1037,7 +1046,7 @@ Ban reason: 禁止理由：

- 92 + 95

@@ -1086,7 +1095,7 @@ Actions 行動

- 33 + 35

@@ -1110,46 +1119,25 @@ 2 - - My subscriptions - 私の輸入品 - - 16 - - - - My imports - 私の購読 - - 18 - - - - Ownership changes - 所有権の変更 - - 33 - -

Profile プロフィール

- 8 + 7

Video settings ビデオ設定

- 15 + 16

Danger zone 危険区域

- 18 + 19

@@ -1159,13 +1147,6 @@ 46 - - Submit - 差し出す - - 24 - -

Cancel @@ -1307,7 +1288,7 @@ Publish 出す

- 60 + 65

@@ -1384,17 +1365,6 @@ 3 - - - Cancel - - - キャンセル - - - 19 - - Share シェア @@ -1573,13 +1543,6 @@ 14 - - Error getting about from server - サーバーからのエラー - - 1 - - No description 説明はありません @@ -1594,20 +1557,6 @@ 1 - - Error - エラー - - 1 - - - - Success - 成功 - - 1 - - Configuration updated. 構成が更新されました。 @@ -1690,9 +1639,16 @@ 1 - - Channels - チャンネル + + My subscriptions + 私の輸入品 + + 1 + + + + Ownership changes + 所有権の変更 1 @@ -1712,6 +1668,13 @@ 1 + + Error + エラー + + 1 + + You need to reconnect. 再接続する必要があります。 @@ -1726,6 +1689,20 @@ 1 + + Info + 情報 + + 1 + + + + Success + 成功 + + 1 + + Incorrect username or password. ユーザーネームまたはパスワードが違います。 @@ -1796,6 +1773,20 @@ 1 + + Email is required. + 電子メールが必要です。 + + 1 + + + + Email must be valid. + 電子メールは有効である必要があります。 + + 1 + + Username is required. ユーザー名は必須です。 @@ -1817,41 +1808,6 @@ 1 - - Username must be at least 3 characters long. - ユーザー名は3文字以上でなければなりません。 - - 1 - - - - Username cannot be more than 20 characters long. - ユーザー名の長さは20文字を超えることはできません。 - - 1 - - - - Username should be only lowercase alphanumeric characters. - ユーザー名は小文字の英数字でなければなりません。 - - 1 - - - - Email is required. - 電子メールが必要です。 - - 1 - - - - Email must be valid. - 電子メールは有効である必要があります。 - - 1 - - Password must be at least 6 characters long. パスワードは6文字以上でなければなりません。 @@ -2419,16 +2375,16 @@ 1 - - Subscribed - 購読する + + Subscribed to + の登録が完了しました。

- - Subscribed to - の登録が完了しました。 + + Subscribed + 購読する 1 @@ -2461,13 +2417,6 @@ 1 - - Info - 情報 - - 1 - - Upload cancelled アップロードのキャンセル @@ -2475,13 +2424,6 @@ 1 - - We are sorry but PeerTube cannot handle videos > 8GB - 申し訳ありませんが、PeerTube は動画を処理出来ません。 > 8GB - - 1 - -

Video published. ビデオが公開されました。 diff --git a/client/src/locale/target/angular_jbo.xml b/client/src/locale/target/angular_jbo.xml index 83e61a714..6478b002c 100644 --- a/client/src/locale/target/angular_jbo.xml +++ b/client/src/locale/target/angular_jbo.xml @@ -33,7 +33,7 @@

Next month - la bavla'ima'i + lo bavla'ima'i 27 @@ -53,9 +53,7 @@

- «« - «« - + ««««

@@ -67,9 +65,7 @@ - « - « - + ««

@@ -81,9 +77,7 @@ - » - » - + »»

@@ -95,9 +89,7 @@ - »» - »» - + »»»»

@@ -237,6 +229,48 @@ sisti lo nu jersi pe'a 13 + + User registration is not allowed on this instance, but you can register on many others! + .i le samtcise'u cu curmi no nu cmiveigau .i ku'i do cmeveigau fo so'i drata ka'e + + 28 + + + + Password + lo lerpoijaspu + + 13 + + + + I forgot my password + .i mi nalmo'i le mi lerpoijaspu + + 44 + + + + Login + co'a cmisau + + 36 + + + + Forgot your password + .i mi nalmo'i le mi lerpoijaspu + + 57 + + + + Email + lo ve samymri + + 8 + +

Email address lo ve samymri @@ -248,7 +282,7 @@ sisti lo nu jersi pe'a Send me an email to reset my password samymri fi mi te zu'e lo nu galfi le mi japyvla

- 75 + 80

@@ -299,6 +333,13 @@ zbasu lo pilno 55 + + Signup + cmiveigau + + 78 + +

results lo te facki @@ -327,7 +368,7 @@ zbasu lo pilno Change the language galfi lo bangu

- 88 + 86

@@ -337,7 +378,7 @@ zbasu lo pilno lo predatni be mi be'o poi gubni

- 18 + 16

@@ -347,7 +388,7 @@ lo predatni be mi be'o poi gubni lo mi pilno

- 22 + 20

@@ -357,14 +398,14 @@ lo mi pilno lo mi vidvi

- 26 + 24

Create an account zbasu lo pilno

- 39 + 37

@@ -378,28 +419,28 @@ lo mi vidvi Subscriptions lo se jersi pe'a

- 47 + 45

Trending lo cabna misno

- 57 + 55

Local lo diklo

- 67 + 65

More lo drata

- 72 + 70

@@ -476,7 +517,7 @@ lo mi vidvi No results. .i facki fi no da

- 17 + 20

@@ -498,26 +539,6 @@ lo mi vidvi 27 - - - this instance provides unlimited space for the videos of its users. - - - .i le vi samtcise'u cu sabji lo na'e se jimte ke vidvi datni canlu lo pilno be sy. - - 31 - - - - - User registration is currently not allowed. - - - .i ca na'e curmi lo nu zbasu lo pilno - - 36 - -

About PeerTube @@ -638,28 +659,28 @@ lo mi vidvi Short description lo cmalu ve skicu

- 22 + 21

Local videos lo diklo vidvi

- 61 + 54

Policy on videos containing sensitive content loi javni be tu'a lo vidvi poi vasru lo ganvi poi te kajde

- 70 + 61

JavaScript la .djavascript.

- 278 + 294

@@ -686,53 +707,18 @@ lo pilno 12 - - My settings - lo mi se cuxna - - 3 - - - - My channels - lo mi te tivni - - 12 - - - - My videos - lo mi vidvi - - 14 - - - - My subscriptions - lo se jersi pe'a be mi - - 16 - - - - My imports - lo se nerbei be mi - - 18 - -

Profile lo predatni

- 8 + 7

Video settings lo se cuxna pe lo vidvi

- 15 + 16

@@ -942,14 +928,14 @@ lo pilno Cancel create co'u zbasu

- 169 + 170

Cancel deletion co'u vimcu

- 177 + 178

@@ -963,7 +949,7 @@ lo pilno Advanced settings lo certu se cuxna

- 190 + 191

@@ -1104,13 +1090,6 @@ lo pilno 14 - - Error - .i srera - - 1 - - 100MB pa no no lo megbivysamsle @@ -1195,6 +1174,27 @@ lo pilno 1 + + Delete this report + vimcu le notci + + 1 + + + + Do you really want to delete this abuse report? + .i .au ju'o pei vimcu le malpli notci + + 1 + + + + Abuse deleted. + .i mo'u vimcu le malpli notci + + 1 + + Password updated. .i mo'u galfi lo japyvla @@ -1237,23 +1237,30 @@ lo pilno 1 - - Create - zbasu + + Video channel created. + .i mo'u zbasu la'o ly. .ly. noi vidvi te tivni + + 1 + + + + This name already exists on this instance. + .i le cmene xa'o zasti ci'e le mupli

- - Do you really want to delete ? It will delete all videos uploaded in this channel too. - .i .au ju'o pei do vimcu la'o ly. .ly. .i la'e di'u vimcu ro lo vidvi ji'a poi se kibdu'a fi le vi te tivni + + Create + zbasu

- - Please type the name of the video channel to confirm - .i .e'o ko ciska le cmene be le vidvi te zu'e lo nu birti + + Video channel updated. + .i mo'u galfi la'o ly. .ly. noi vidvi te tivni 1 @@ -1265,6 +1272,13 @@ lo pilno 1 + + My videos + lo mi vidvi + + 1 + + Do you really want to delete videos? .i .au ju'o pei do vimcu lo vidvi @@ -1279,16 +1293,23 @@ lo pilno 1 - - Channels - lo te tivni + + My channels + lo mi te tivni

- - Video imports - lo vidvi poi se nerbei + + My subscriptions + lo se jersi pe'a be mi + + 1 + + + + My settings + lo mi se cuxna 1 @@ -1335,6 +1356,13 @@ lo pilno 1 + + Error + .i srera + + 1 + + Your password has been successfully reset! .i snada lo nu mo'u galfi le do japyvla @@ -1342,5 +1370,19 @@ lo pilno 1 + + The channel is required. + .i le vidvi te tivni cu sarcu + + 1 + + + + Video channel is required. + .i le vidvi te tivni cu sarcu + + 1 + + \ No newline at end of file diff --git a/client/src/locale/target/angular_nl_NL.xml b/client/src/locale/target/angular_nl_NL.xml index 3db9f0504..7e7a6abdd 100644 --- a/client/src/locale/target/angular_nl_NL.xml +++ b/client/src/locale/target/angular_nl_NL.xml @@ -3,6 +3,244 @@ + + Close + Sluiten + + 2 + + + + Previous + Vorige + + 13 + + + + Next + Volgende + + 17 + + + + Previous month + Vorige maand + + 5 + + + + Next month + Volgende maand + + 27 + + + + Select month + Selecteer maand + + 7 + + + + Select year + Selecteer jaar + + 16 + + + + «« + «« + + 7 + + + + First + Eerste + + 5 + + + + « + « + + 15 + + + + Previous + Vorige + + 13 + + + + » + » + + 29 + + + + Next + Volgende + + 27 + + + + »» + »» + + 36 + + + + Last + Laatste + + 34 + + + + % + % + + 6 + + + + Increment hours + Verhoog uren + + 9 + + + + HH + HH + + 12 + + + + Hours + Uren + + 14 + + + + Decrement hours + Verlaag uren + + 19 + + + + Increment minutes + Verhoog minuten + + 28 + + + + MM + MM + + 31 + + + + Minutes + Minuten + + 33 + + + + Decrement minutes + Verlaag minuten + + 38 + + + + Increment seconds + Verhoog seconden + + 47 + + + + SS + SS + + 50 + + + + Seconds + Seconden + + 52 + + + + Decrement seconds + Verlaag seconden + + 57 + + + + PM + PM + + 65 + + + + AM + AM + + 66 + + + + Cancel + Annuleren + + 10 + + + + (extensions: , max size: ) + (extensies: , max grootte: ) + + 11 + + + + Unlisted + Onvermeld + + 10 + + + + Private + Privé + + 11 + + - views - keer bekeken @@ -45,6 +283,105 @@ 19 + + + + Subscribe + + + + + + + + Abonneer + + + + + + 5 + + + + + Unsubscribe + + +Abonnement opzeggen + + 18 + + + + Using an ActivityPub account + Een ActivityPub-account gebruiken + + 36 + + + + Subscribe with an account on + Abonneer met een account op + + 39 + + + + Subscribe with your local account + Abonneer met je lokale account + + 40 + + + + Subscribe with a Mastodon account: + Abonneer met een Mastodon-account + + 43 + + + + Using a syndication feed + Een syndicaatfeed gebruiken + + 48 + + + + Subscribe via RSS + Abonneren met RSS + + 49 + + + + + Remote subscribe + Remote interact + + +Extern abonneren + Externe interactie + + + 10 + + + + You can subscribe to the channel via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the channel URL in the search box and subscribe there. + Je kan op het kanaal abonneren via elke ActivityPub-mogelijke fediverse instantie. Bijvoorbeeld met Mastodon of Pleroma kan je de URL van het kanaal in de zoekbalk invullen en daar abonneren. + + 17 + + + + You can interact with this via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the current URL in the search box and interact with it there. + Je kan hiermee interactie hebben via elke ActivityPub-mogelijke fediverse instantie. Bijvoorbeeld met Mastodon of Pleroma kan je de huidige URL in de zoekbalk typen en er daar interactie mee hebben. + + 22 + + Video quota Videoquotum @@ -52,15 +389,65 @@ 42 + + + Unlimited ( per day) + + +Oneindig ( per dag) + + + 14 + + + + Ban + Verbannen + + 3 + + + + Reason... + Reden... + + 11 + + + + + A banned user will no longer be able to login. + + +Een verbannen gebruiker kan niet langer inloggen. + + 17 + + + + Ban this user + Verban deze gebruiker + + 25 + + Login - Aanmelden + +Aanmelden

+ + Request new verification email. + Een nieuwe verificatie e-mail aanvragen. + + 12 + +

User Gebruiker @@ -79,7 +466,8 @@ or create an account - of maak een account + +of maak een account 18 @@ -88,14 +476,15 @@ or create an account on another instance - of maak een account aan op een andere server + +of maak een account aan op een andere instantie

User registration is not allowed on this instance, but you can register on many others! - Registratie is niet mogelijk op deze instantie, maar je kan een account maken op een van de vele anderen! + Registratie is niet mogelijk op deze instantie, maar je kan wel registreren op een van de vele anderen! 28 @@ -104,12 +493,12 @@ Password Wachtwoord

- 12 + 13

I forgot my password - Wachtwoord vergeten + Ik ben mijn wachtwoord vergeten 44 @@ -118,12 +507,12 @@ Login Aanmelden

- 38 + 36

Forgot your password - Wachtwoord vergeten + Jouw wachtwoord vergeten 57 @@ -146,14 +535,15 @@ Send me an email to reset my password Zend me een e-mail om een nieuw wachtwoord in te stellen

- 75 + 80

Reset my password - Wachtwoord opnieuw instellen + +Wachtwoord opnieuw instellen 2 @@ -183,7 +573,8 @@ Create an account - Account maken + +Account aanmaken 3 @@ -195,60 +586,195 @@ 8 - - Signup - Registratie + + Example: jane_doe + Bijvoorbeeld: jane-doe

- 88 + 17

- - Change the language - Taal veranderen + + I am at least 16 years old and agree to the <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Terms</a> of this instance + Ik ben minstens 16 jaar oud en accepteer de <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Voorwaarden</a> van deze instantie

- 88 + 55

- - Create an account - Account maken + + Signup + Registratie

- 39 + 78

- - Videos - Video's + + Features found on this instance + Kenmerken van deze instantie

- 24 + 67

- - Trending - Populair + + results + resultaten

- 57 + 5

- - Recently added - Recent toegevoegd + + + for + + +voor - 62 + 6 + + + + + Filters + + + + Filters + + + 16 + + + + + No results found + + +Geen resultaten gevonden + + 28 + + + + subscribers + abonnees + + 44 + + + + - views + - weergaven + + 55 + + + + Change the language + Taal veranderen + + 86 + + + + + My public profile + + +Mijn openbare profiel + + 16 + + + + + My account + + +Mijn account + + 20 + + + + + My videos + + +Mijn video's + + 24 + + + + + Log out + + +Uitloggen + + 28 + + + + Create an account + Account maken + + 37 + + + + Videos + Video's + + 24 + + + + Subscriptions + Abonnementen + + 45 + + + + Overview + Overzicht + + 50 + + + + Trending + Populair + + 55 + + + + Recently added + Recent toegevoegd + + 60 Local Lokaal - 67 + 65 + + + + More + Meer + + 70

Administration Administratie

- 76 + 74

@@ -258,6 +784,20 @@ 25 + + Show keyboard shortcuts + Laat keyboard shortcuts zien + + 89 + + + + Toggle dark interface + Schakel donkere interface aan of uit + + 92 + + Search... Zoeken … @@ -272,6 +812,48 @@ 9 + + Sort + Sorteren + + 6 + + + + Published date + Datum van publicatie + + 15 + + + + Duration + Duratie + + 24 + + + + Display sensitive content + Laat gevoelige inhoud zien + + 33 + + + + Yes + Ja + + 37 + + + + No + Nee + + 42 + + Category Categorie @@ -293,11 +875,77 @@ 182 + + All of these tags + Al deze tags + + 82 + + + + One of these tags + Een van deze tags + + 87 + + + + Filter + Filter + + 94 + + + + Display unlisted and private videos + Laat onvermelde en privé-video's zien + + 14 + + No results. Geen resultaten. - 17 + 20 + + + + + + + + + + 6 + + + + + # + + +# + + 14 + + + + + + + + + + + + + + + + + + 22 @@ -314,13 +962,21 @@ 7 - + - About instance - - Over de instantie + Cancel + + +Annuleer - 1 + 26 + + + + Submit + Voorleggen + + 31

@@ -334,48 +990,24 @@ Terms Voorwaarden

- 44 + 39

User registration is allowed and Een account aanmaken is mogelijk en - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - deze instantie voorziet een basis-opslagquotum van voor de video's van haar gebruikers. - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - deze instantie voorziet onbeperkte opslagruimte voor de video's van haar gebruikers. - - 31 - - - - - User registration is currently not allowed. - - Een account maken is momenteel niet toegelaten op deze instantie. - - 36 + 29 About PeerTube - Over PeerTube + +Over PeerTube + + 1 @@ -391,7 +1023,8 @@ It is a free and open-source software, under the AGPLv3 licence. - Het is vrije en open-source software, beschikbaar onder de AGPLv3. + +Het is vrije en open-source software, beschikbaar onder de AGPLv3 licentie. 8 @@ -400,7 +1033,8 @@ For more information, please visit joinpeertube.org. - Kijk voor meer informatie op joinpeertube.org. + +Kijk voor meer informatie op joinpeertube.org. 12 @@ -417,7 +1051,8 @@ PeerTube uses the BitTorrent protocol to share bandwidth between users. This implies that your IP address is stored in the instance's BitTorrent tracker as long as you download or watch the video. - PeerTube gebruikt het BitTorrent-protocol om bandbreedte tussen gebruikers te delen. Dat betekent ook dat jouw IP-adres bijgehouden wordt in de BitTorrent-tracker van de PeerTube-instantie zolang je de video aan het bekijken bent. + +PeerTube gebruikt het BitTorrent-protocol om bandbreedte tussen gebruikers te delen. Dat betekent ook dat jouw IP-adres bijgehouden wordt in de BitTorrent-tracker van de PeerTube-instantie zolang je de video aan het bekijken bent. 20 @@ -434,7 +1069,8 @@ In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video. In practice, this is much more difficult because: - In theorie kan iemand met technische kennis een script maken dat bijhoudt welk IP-adres welke video aan het downloaden is. In de praktijk is dat wat moeilijker: + +In theorie kan iemand met technische kennis een script maken dat bijhoudt welk IP-adres welke video aan het downloaden is. In de praktijk is dat wat moeilijker omdat: 27 @@ -444,7 +1080,8 @@ An HTTP request has to be sent on each tracker for each video to spy. If we want to spy all PeerTube's videos, we have to send as many requests as there are videos (so potentially a lot) - Voor elke video waarvan hij de kijkers wil bespioneren, moet hij een apart HTTP-request sturen. Om dat voor alle PeerTube-videos te doen, moeten er dus evenveel HTTP-requests als video's gebruikt worden (dat kan hoog oplopen). + +Voor elke video waarvan hij de kijkers wil bespioneren, moet hij een apart HTTP-request sturen. Om dat voor alle PeerTube-videos te doen, moeten er dus evenveel HTTP-requests als video's gebruikt worden (dat kan hoog oplopen). 33 @@ -454,7 +1091,8 @@ For each request sent, the tracker returns random peers at a limited number. For instance, if there are 1000 peers in the swarm and the tracker sends only 20 peers for each request, there must be at least 50 requests sent to know every peers in the swarm - Voor elk request geeft de tracker een beperkt aantal willekeurige peers terug. Als er bijvoorbeeld 1000 peers beschikbaar zijn en de tracker steeds 20 peers teruggeeft, moeten er op zijn minst 50 requests gestuurd worden om alle peers te weten te komen. + +Voor elk request geeft de tracker een beperkt aantal willekeurige peers terug. Als er bijvoorbeeld 1000 peers beschikbaar zijn en de tracker steeds 20 peers teruggeeft, moeten er op zijn minst 50 requests gestuurd worden om alle peers te weten te komen. 38 @@ -463,7 +1101,8 @@ Those requests have to be sent regularly to know who starts/stops watching a video. It is easy to detect that kind of behaviour - Die requests moeten regelmatig herhaald worden om te kunnen achterhalen wie begint of stopt met een video te bekijken. Het is gemakkelijk om zulk gedrag te detecteren. + +Die requests moeten regelmatig herhaald worden om te kunnen achterhalen wie begint of stopt met een video te kijken. Het is gemakkelijk om zulk gedrag te detecteren. 43 @@ -472,7 +1111,8 @@ If an IP address is stored in the tracker, it doesn't mean that the person behind the IP (if this person exists) has watched the video - Als een IP-adres opgeslagen is in de tracker, betekent dat niet dat de persoon achter dat adres (als die persoon bestaat) de video bekeken heeft + +Als een IP-adres opgeslagen is in de tracker, betekent dat niet dat de persoon achter dat adres (als die persoon bestaat) de video bekeken heeft 47 @@ -481,57 +1121,202 @@ The IP address is a vague information : usually, it regularly changes and can represent many persons or entities - Een IP-adres is vage + +Een IP-adres is vage informatie: Meestal veranderd het regelmatig en kan het meerdere personen en identiteiten representeren

+ + + Web peers are not publicly accessible: because we use WebRTC inside the web browser (with the WebTorrent library), the protocol is different from classic BitTorrent. + When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers to forward the information to. + See this document for more information + + +Web peers zijn niet openbaar bereikbaar: omdat we WebRTC in de webbrowser gebruiken (met de WebTorrent-bibliotheek), is het protocol anders dan in klassieke BitTorrent. + Wanneer je in een webbrowser zit, verstuur je een signaal die je IP adres bevat naar de tracker die willekeurig andere peers kiest om de informatie heen te sturen. + See dit document voor meer informatie + + 55 + + + + + The worst-case scenario of an average person spying on their friends is quite unlikely. + There are much more effective ways to get that kind of information. + + +Het worst-case scenario dat kan gebeuren van een gemiddeld persoon die hun vrienden bespioneert is erg onwaarschijnlijk. +Er zijn veel effectievere manieren om dat soort informatie te verkrijgen. + + 62 + + + + How does PeerTube compare with YouTube? + Hoe is PeerTube vergeleken met YouTube? + + 67 + + + + + The threats to privacy in YouTube are different from PeerTube's. + In YouTube's case, the platform gathers a huge amount of your personal information (not only your IP) to analyze them and track you. + Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics). + + +De bedreigingen tegen privacy in YouTube zijn verschillend dan in PeerTube's geval. +In YouTube's geval, verzamelt het platform een gigantisch aantal persoonlijke informatie (niet alleen je IP) om te analyseren en om je te tracken. +Verder nog, YouTube is eigendom van Google/Alphabet, een bedrijf die je trackt over meerdere websites (via AdSense of Google Analytics). + + 69 + + + + What can I do to limit the exposure of my IP address? + Wat kan ik doen om de blootstelling van mijn IP adress te verminderen? + + 75 + + Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing your IP in their connection logs: ISP/routers/trackers/CDN and more. PeerTube is transparent about it: we warn you that if you want to keep your IP private, you must use a VPN or Tor Browser. Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense. - Je IP-adres is geen privé-gegeven. Elke keer je een website bezoekt, is er een aantal entiteiten (bovenop de website die je effectief bezoekt) die je IP zien in hun logs: ISP's, routers, trackers, CDN's en meer. -PeerTube is transparant: we waarschuwen je dat je, als je je IP-adres privé wil afschermen, je een VPN of de Tor-Browser moet gebruiken. -Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit geven. + +Je IP-adres is openbaar dus elke keer dat je een website bezoekt, zijn er een aantal actoren (bovenop de website die je effectief bezoekt) die je IP zien in hun logs: ISP/routers/trackers/CDN en meer. +PeerTube is daarover transparant: we waarschuwen je dat je, als je je IP-adres wil afschermen, je een VPN of de Tor-Browser moet gebruiken. +Denken dat het P2P-mechanisme uit PeerTube halen je anonimiteit terug zou geven is onlogisch.

- - subscribers - abonnees + + What will be done to mitigate this problem? + Wat zal worden gedaan om dit probleem te verminderen?

- 24 + 83

- - Video channels - Videokanalen + + + PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released. + In the meantime, we want to test different ideas related to this issue: + + +PeerTube is in haar ontwikkelingsfasen, en wilt de beste tegenmaatregelen mogelijk geven tegen de tijd dat de stabiele versie is gereleased. +Ondertussen willen we verschillende ideeën testen die gerelateerd zijn aan dit probleem:

- 31 + 85

- - Stats - Statistieken + + Set a limit to the number of peers sent by the tracker + Zet een limiet op het aantal peers verzonden door de tracker

- 16 + 91

- - Joined - Account aangemaakt op + + Set a limit on the request frequency received by the tracker (being tested) + Zet een limiet op de verzoekfrequentie verkregen door de tracker (wordt getest)

- 10 + 92

- - subscribers - abonnees + + Ring a bell if there are unusual requests (being tested) + Laat iets horen als er ongebruikelijke requests zijn (wordt getest) - 14 + 93 + + + + Disable P2P from the administration interface + Schakel P2P uit vanuit het administratieinterface + + 94 + + + + An automatic video redundancy program: we wouldn't know if the IP downloaded the video on purpose or if it was the automatized program + Een automatisch video-overbodigheidsprogramma: we zouden niet weten of het IP de video met opzet heeft gedownload, of als het een geautomatiseerd programma was. + + 95 + + + + Banned + Verbannen + + 12 + + + + Muted + Gedempt + + 13 + + + + Muted by your instance + Gedempt door jouw instantie + + 14 + + + + Instance muted + Instantie gedempt + + 15 + + + + Instance muted by your instance + Instantie gedempt door jouw instantie + + 16 + + + + subscribers + abonnees + + 24 + + + + Video channels + Videokanalen + + 31 + + + + Stats + Statistieken + + 16 + + + + Joined + Account aangemaakt op + + 10 + + + + subscribers + abonnees + + 14

@@ -552,42 +1337,49 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Short description Korte omschrijving

- 22 + 21

Default client route Startpagina - 55 + 48 + + + + Videos Overview + Video-overzicht + + 51

Videos Trending Populaire video's

- 59 + 52

Videos Recently Added Recent toegevoegde video's

- 60 + 53

Local videos Video's op deze instantie

- 61 + 54

Policy on videos containing sensitive content Beleid rond video's met gevoelige inhoud

- 70 + 61

@@ -622,42 +1414,77 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Signup enabled Registratie mogelijk - 93 + 84 + + + + Signup requires email verification + E-mailverificatie nodig bij registratie + + 91 Signup limit Registratielimiet + + 96 + + + + Users + Gebruikers

105

- - Administrator - Beheerder + + User default video quota + Standaard video-quotum voor gebruikers

- 131 + 109

- - Admin email - E-mail van beheerder + + User default daily upload limit + Standaard dagelijks video-quotum voor gebruikers

- 134 + 121

- - Users - Gebruikers + + Import + Importeren

- 144 + 42

- - User default video quota - Standaard video-quotum voor gebruikers + + Video import with HTTP URL (i.e. YouTube) enabled + Video-import met HTTP URL (d.w.z. YouTube) ingeschakeld - 147 + 141 + + + + Video import with a torrent file or a magnet URI enabled + Video-import met een torrentbestand of een magnet URL ingeschakeld + + 148 + + + + Administrator + Administrator + + 155 + + + + Admin email + E-mail van administrator + + 158

@@ -678,21 +1505,21 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Your Twitter username Je Twitter-gebruikersnaam

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Geeft het Twitter-account aan voor de website of het platform waarop de inhoud gepubliceerd werd.

- 184 + 187

Instance whitelisted by Twitter - Instantie ge-whitelist door Twitter + Instantie gewhitelist door Twitter

- 198 + 199

@@ -706,77 +1533,120 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Transcoding Transcoding

- 210 + 215

Transcoding enabled Transcoding ingeschakeld

- 215 + 221

If you disable transcoding, many videos from your users will not work! - Als je transcoding niet inschakelt, zullen veel video's die je gebruikers uploaden niet overal werken! + Als je transcoding niet inschakelt, zullen veel video's die je gebruikers uploaden niet werken!

- 216 + 222

Transcoding threads Threads gebruikt voor transcoding - 223 + 237 + + + + Resolution enabled + Resolutie ingeschakeld + + 252 + + + + + Cache + + + + +Cache + + + + 260 + + + + Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. + Sommige bestanden zijn niet federaal (voorbeelden, ondertitelingen). We verkrijgen ze direct van hun afkomstige instantie en cachen ze. + + 265 Previews cache size Cachegrootte voor previews - 254 + 271 + + + + Video captions cache size + Cachegrootte van video-ondertiteling + + 280

Customizations Aanpassingen

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> - Schrijf JavaScriptcode.<br />Voorbeeld: <pre>console.log('mijn instantie is fantastisch');</pre> + Schrijf direct JavaScriptcode.<br />Bijvoorbeeld: <pre>console.log('mijn instantie is fantastisch');</pre>

- 281 + 297

Advanced configuration Geavanceerde configuratie

- 207 + 212

Update configuration - Updateconfiguratie + Bijwerkingsconfiguratie + + 340 + + + + It seems the configuration is invalid. Please search potential errors in the different tabs. + Het lijkt erop dat de configuratie invalide is. Zoek alstublieft potentiële foutmeldingen op in andere tabbladen.

- 325 + 341

Users - Gebruikers + +Gebruikers 3 @@ -785,16 +1655,28 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Manage follows - Volgers beheren + +Volgers beheren

+ + + Moderation + + +Moderatie + + 11 + +

Jobs - Jobs + +Banen 15 @@ -803,7 +1685,8 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Configuration - Configuratie + +Configuratie 19 @@ -819,18 +1702,26 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge It seems that you are not on a HTTPS server. Your webserver needs to have TLS activated in order to follow servers. - Het ziet ernaar uit dat je op een server bent zonder HTTPS. Op je webserver moet TLS geactiveerd zijn om servers te kunnen volgen. + +Het ziet ernaar uit dat je op een server bent zonder HTTPS. Op je webserver moet TLS geactiveerd zijn om servers te kunnen volgen.

Add following - Abonneren + Voeg volgend toe

+ + Filter... + Filtreren... + + 27 + + ID ID @@ -866,6 +1757,27 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 11 + + Accepted + Geaccepteerd + + 32 + + + + Pending + In behandeling + + 33 + + + + Redundancy allowed + Overtolligheid toegelaten + + 22 + + Manage follows Abonnementen beheren @@ -873,9 +1785,30 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 2 + + Following + Volgend + + 5 + + + + Follow + Volg + + 7 + + + + Followers + Volgers + + 9 + + Jobs list - Lijst van jobs + Banenlijst 2 @@ -887,6 +1820,20 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 19 + + Processed on + Behandeld op + + 22 + + + + Finished on + Voltooid op + + 23 + +

Create user Gebruiker aanmaken @@ -910,7 +1857,7 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge

mail@example.com - mail@example.org + mail@voorbeeld.org 21 @@ -935,6 +1882,13 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 65 + + Daily video quota + Dagelijks videoquotum + + 72 + + Users list Gebruikerslijst @@ -942,6 +1896,13 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 2 + + Batch actions + Batchacties + + 19 + + Username Gebruikersnaam @@ -949,6 +1910,65 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 40 + + (banned) + (verbannen) + + 65 + + + + Go to the account page + Ga naar accountpagina + + 133 + + + + User's email must be verified to login + Gebruiker's e-mail moet geverifieerd zijn om in te loggen + + 72 + + + + User's email is verified / User can login without email verification + Gebruiker's e-mail is geverifieerd / Gebruiker kan inloggen zonder e-mailverificatie + + 76 + + + + Ban reason: + Reden van verbanning: + + 95 + + + + Moderation comment + Beheerdersopmerking + + 3 + + + + + This comment can only be seen by you or the other moderators. + + +Deze opmerking kan alleen door jou en andere beheerders gezien worden. + + 17 + + + + Update this comment + Werk deze comment bij + + 25 + + Reporter Melder @@ -963,6 +1983,13 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 14 + + State + Status + + 11 + + Go to the account Naar account gaan @@ -977,60 +2004,183 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 33 - - Blacklisted videos - Video's op zwarte lijst + + Actions + Acties

- 7 + 35

- - My settings - Mijn instellingen + + Reason: + Reden:

- 3 + 53

- - My videos - Mijn video's + + Moderation comment: + Beheerderopmerking:

- 14 + 57

- - Video quota: - Videoquotum: + + Video name + Videonaam

- 4 + 8

- - Profile - Profiel + + Sensitive + Gevoelig

- 8 + 9

- - Video settings - Video-instellingen + + Date + Datum - 15 + 11 + + + + Blacklist reason: + Reden voor de zwarte lijst: + + 43 + + + + Moderation + Beheer + + 2 + + + + Video abuses + Videomisbruik + + 5 + + + + Blacklisted videos + Video's op zwarte lijst + + 7 + + + + Muted accounts + Gedempte accounts + + 2 + + + + Muted servers + Gedempte servers + + 11 + + + + Account + Account + + 12 + + + + Muted at + Gedempt bij + + 13 + + + + Unmute + Demping opheffen + + 23 + + + + Video quota: + Videoquotum: + + 4 + + + + Profile + Profiel + + 7 + + + + Video settings + Video-instellingen + + 16 + + + + Danger zone + Gevarenzone + + 19 + + + + Change ownership + Verander eigenaar + + 46 + + + + Select the next owner + Selecteer de volgende eigenaar + + 9 + + + + + Cancel + + +Annuleren + + 35 - views - Video’s - aantal keer bekeken + - weergaven

+ + Blacklisted + Op de zwarte lijst + + 22 + + Cancel - Annuleren + +Annuleren 30 @@ -1056,6 +2206,13 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge 6 + + Example: my_channel + Bijvoorbeeld: mijn_kanaal + + 15 + +

Display name Weergavenaam @@ -1066,12 +2223,26 @@ Het Peer-to-Peer-mechanisme uit PeerTube halen zou je niet méér anonimiteit ge Short text to tell people how they can support your channel (membership platform...).<br /><br /> When you will upload a video in this channel, the video support field will be automatically filled by this text. - Korte tekst om mensen te vertellen hoe ze je kanaal kunnen ondersteunen (lidmaatschap…).<br/><br/> -Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "ondersteun"-veld. + Korte tekst om mensen te vertellen hoe ze je kanaal kunnen ondersteunen (lidmaatschapsplatform…).<br /><br /> +Als je een video uploadt op dit kanaal, wordt deze tekst ingevuld in het "ondersteun"-veld.

+ + Target + Doelwit + + 8 + + + + You don't have any subscriptions yet. + Je hebt nog geen abonnementen. + + 1 + + Created by Gemaakt door @@ -1086,6 +2257,75 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 16 + + Accept ownership + Accepteer eigenaar + + 3 + + + + Select the target channel + Selecteer het doelwitkanaal + + 9 + + + + Initiator + Initiatiefnemer + + 13 + + + + + Created + + + + Gecreëerd op + + + + 15 + + + + Status + Status + + 19 + + + + Action + Actie + + 20 + + + + + + + 39 + + + + Refuse + Weigeren + + 47 + + + + Muted instances + Gedempte instanties + + 2 + + Change password Wachtwoord veranderen @@ -1093,6 +2333,13 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 30 + + Current password + Huidige wachtwoord + + 7 + + New password Nieuw wachtwoord @@ -1114,8 +2361,17 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 3 + + Use WebTorrent to exchange parts of the video with others + Gebruik WebTorrent om delen van de video over te maken naar anderen + + 21 + + - Automatically plays videoAutomatically plays video

+ Automatically plays video + Video automatisch afspelen + 28

@@ -1128,11 +2384,25 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders

Update my profile - Update mijn profiel + Werk mijn profiel bij

+ + subscribers + abonnees + + 10 + + + + Change the avatar + Verander de avatar + + 15 + + (extensions: , max size: ) (extensies: , maximale grootte: ) @@ -1140,15 +2410,84 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 18 + + Once you delete your account, there is no going back. Please be certain. + Als je je account verwijdert, kan je niet meer terug. +Wees alstublieft zeker. + + 2 + + + + Delete your account + Verwijder jouw account + + 4 + + Sorry, but we couldn't find the page you were looking for. - Sorry, maar die pagina kon niet gevonden worden. + +Sorry, maar die pagina kon niet gevonden worden. +

+ + + Verify account email confirmation + + +Verifieer e-mailbevestiging van account + + 2 + + + + + Your email has been verified and you may now login. Redirecting... + + +Jouw e-mail is geverifieerd en je mag nu inloggen. +Je wordt doorverwezen... + + 6 + + + + An error occurred. + Er is een probleem opgetreden. + + 11 + + + + + Request email for account verification + + +Vraag e-mail voor accountverificatie aan + + 2 + + + + Send verification email + Verzend e-mail voor verificatie + + 17 + + + + This instance does not require email verification. + Deze instantie heeft geen verificatie door e-mail nodig. + + 20 + + Support this channel Ondersteun dit kanaal @@ -1163,6 +2502,20 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 17 + + URL + URL + + 17 + + + + You can import any URL <a href='https://rg3.github.io/youtube-dl/supportedsites.html' target='_blank' rel='noopener noreferrer'>supported by youtube-dl</a> or URL that points to a raw MP4 file. You should make sure you have diffusion rights over the content it points to, otherwise it could cause legal trouble to yourself and your instance. + Je kan elke URL importeren <a href='https://rg3.github.io/youtube-dl/supportedsites.html' target='_blank' rel='noopener noreferrer'>ondersteunt door youtube-dl</a> of elke URL die naar een rauw MP4 bestand wijst. Je moet zeker weten dat je de diffusierechten hebt over de inhoud waar het naar wijst, anders kan het wettelijke problemen aan jou of je instantie geven. + + 9 + +

Channel Kanaal @@ -1172,11 +2525,37 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders

Privacy - Zichtbaarheid + Privacy

159

+ + Sorry, but something went wrong + Sorry, er is iets fout gegaan + + 49 + + + + + Congratulations, the video behind will be imported! You can already add information about this video. + + +Gefeliciteerd, de video achter zal worden geimporteerd! Je kan nu al informatie over deze video toevoegen. + + + + 46 + + + + Update + Bijwerken + + 92 + + Select the file to upload Selecteer het bestand om te uploaden @@ -1184,74 +2563,216 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 6 + + Scheduled + Ingeroosterd + + 25 + +

Publish will be available when upload is finished Publiceren is mogelijk wanneer de upload voltooid is

- 53 + 58

Publish Publiceren

- 60 + 65

- - Title - Titel + + Select the torrent to import + Selecteer de torrent om te importeren

- 9 + 6

- - Tags - Tags + + Or + Of

- 191 + 11

- - Video descriptions are truncated by default and require manual action to expand them. - Videobeschrijvingen worden standaard gedeeltelijk weergegeven, de kijker kan ze handmatig openvouwen. + + Paste magnet URI + Plak magnet URL

- 28 + 14

- - Schedule publication () - Publicatie uitstellen () + + You can import any torrent file that points to a mp4 file. You should make sure you have diffusion rights over the content it points to, otherwise it could cause legal trouble to yourself and your instance. + Je kan elk torrentbestand importeren die wijst naar een mp4 bestand. Je moet zeker weten dat je de diffusierechten over de inhoud waar het naar wijst hebt, anders kan het wettelijke problemen aan jezelf en je instantie geven.

- 105 + 17

- - This video contains mature or explicit content - Deze video bevat expliciete inhoud of inhoud die enkel voor volwassenen geschikt is + + + Congratulations, the video will be imported with BitTorrent! You can already add information about this video. + + +Gefeliciteerd, de video zal geimporteerd worden met BitTorrent! +Je kan nu al informatie toevoegen over deze video. + +

- 119 + 53

- - Some instances do not list videos containing mature or explicit content by default. - Op sommige instanties worden expliciete video's standaard niet in zoekresultaten en in lijsten getoond. + + Import + Importeer

- 120 + 3

- - Enable video comments - Videoreacties toelaten + + Upload + Uploaden - 125 + 4 + + + + Upload a file + Upload een bestand + + 10 + + + + Import with URL + Importeer met URL + + 17 + + + + Import with torrent + Importeer met torrent + + 24 + + + + Add caption + Voeg ondertiteling toe + + 5 + + + + Select the caption file + Selecteer het ondertitelingsbestand + + 24 + + + + + This will replace an existing caption! + + +Dit zal een bestaande ondertiteling vervangen! + + 29 + + + + Add this caption + Voeg deze ondertiteling toe + + 40 + + + + Title + Titel + + 9 + + + + Tags + Tags + + 191 + + + + Tags could be used to suggest relevant recommendations.</br>Press Enter to add a new tag. + Tags kunnen gebruikt worden om relevante aanraders te suggesteren. </br>Druk op Enter om een nieuwe tag toe te voegen. + + 18 + + + + + Tag + Tag + + 21 + + + + Enter a new tag + Vul een nieuwe tag in + + 21 + + + + Video descriptions are truncated by default and require manual action to expand them. + Videobeschrijvingen worden standaard gedeeltelijk weergegeven en moeten handmatig opengevouwen worden. + + 28 + + + + Schedule publication () + Publicatie inroosteren op () + + 105 + + + + This video contains mature or explicit content + Deze video bevat expliciete inhoud of inhoud die enkel voor volwassenen geschikt is + + 119 + + + + Some instances do not list videos containing mature or explicit content by default. + Op sommige instanties worden expliciete video's standaard niet in zoekresultaten en in lijsten getoond. + + 120 + + + + Enable video comments + Videoreacties inschakelen + + 125 Wait transcoding before publishing the video Wacht tot het transcoderen voltooid is om de video te publiceren - 130 + 131 + + + + If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. + Als je beslist om niet te wachten totdat de transcoding compleet is voordat je de video publiceert, kan de video onspeelbaar zijn totdat de transcoding eindigt. + + 132 @@ -1261,18 +2782,84 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 4 + + Add another caption + Voeg nog een ondertiteling toe + + 147 + + + + See the subtitle file + Zie het ondertitelingsbestand + + 156 + + + + Already uploaded ✔ + Al geupload ✔ + + 160 + + + + Will be created on update + Wordt gecreëerd bij bijwerking + + 168 + + + + Cancel create + Annuleer creatie + + 170 + + + + Will be deleted on update + Wordt verwijdert bij bijwerking + + 176 + + + + Cancel deletion + Annuleer verwijdering + + 178 + + + + + No captions for now. + + +Geen ondertiteling voor nu. + + 183 + + + + Captions + Ondertiteling + + 140 + +

Upload thumbnail Thumbnail uploaden

- 195 + 196

Upload preview Voorvertoning uploaden

- 202 + 203

@@ -1284,26 +2871,238 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders

Short text to tell people how they can support you (membership platform...). - Korte tekst om mensen te vertellen hoe ze je kanaal kunnen ondersteunen (bv. door gelddonaties). + Korte tekst om mensen te vertellen hoe ze je kanaal kunnen ondersteunen (lidmaatschapsplatforms...).

- 209 + 210

Advanced settings Geavanceerde instellingen

- 190 + 191

Update + + updaten

+ + Download video + Download video + + 3 + + + + Direct download + Directe download + + 27 + + + + Torrent (.torrent file) + Torrent (.torrent bestand) + + 32 + + + + Torrent (magnet link) + Torrent (magnet link) + + 37 + + + + + Cancel + + +Annuleren + + 47 + + + + Download + Downloaden + + 84 + + + + Report video + Rapporteer video + + 3 + + + + Share + Deel + + 74 + + + + QR-Code + QR-Code + + 29 + + + + Embed + Inbedden + + 34 + + + + + The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites). + + +Deze url is niet beveiligd (geen HTTPS), dus de ingebedde video werkt niet op HTTPS websites (web browsers blokkeren onbeveiligde HTTP verzoeken op HTTPS websites). + + 45 + + + + Close + Sluiten + + 51 + + + + Blacklist video + Video op de zwarte lijst zetten + + 3 + + + + + The video is being imported, it will be available when the import is finished. + + +De video wordt geimporteerd, hij zal beschikbaar worden wanneer de import klaar is. + + 11 + + + + + The video is being transcoded, it may not work properly. + + +De video wordt getranscode, hij kan misschien niet naar behoren werken. + + 15 + + + + + This video will be published on . + + +Deze video wordt gepubliceerd op . + + 19 + + + + This video is blacklisted. + Deze video staat op de zwarte lijst. + + 24 + + + + + Published - views + + +Gepubliceerde - weergaven + + 37 + + + + + Published - views + + +Gepubliceerde - weergaven + + 46 + + + + Like this video + Like deze video + + 57 + + + + Dislike this video + Dislike deze video + + 64 + + + + Download the video + Download de video + + 83 + + + + Report + Rapporteer + + 88 + + + + Report this video + Rapporteer deze video + + 87 + + + + Update this video + Werk deze video bij + + 91 + + + + Blacklist + Zet op de zwarte lijst + + 96 + + + + Blacklist this video + Zet deze video op de zwarte lijst + + 95 + + Unblacklist Van zwarte lijst halen @@ -1311,30 +3110,2464 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders 100 - - Publication scheduled on - Publicatie uitgesteld tot + + Unblacklist this video + Haal deze video van de zwarte lijst

- 1 + 99

- - Display name is required. - Een weergavenaam is verplicht + + Delete this video + Verwijder deze video + + 103 + + + + Go the channel page + Ga naar kanaalpagina + + 123 + + + + By + Door + + 134 + + + + Show more + Laat meer zien + + 146 + + + + Show less + Laat minder zien + + 152 + + + + Friendly Reminder: + Vriendelijke Herinnering: + + 208 + + + + + the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. + + + Uit het deelsysteem gebruikt voor deze video blijkt het dat sommige technische informatie over jouw systeem (zoals een openbaar IP adres) verstuurd kan worden naar andere peers. + + + 209 + + + + More information + Meer informatie + + 212 + + + + Get more information + Krijg meer informatie + + 212 + + + + + OK + + + OK + + + 215 + + + + + Other videos + + + Andere videos + + + 2 + + + + + Comments + + + Reacties + + + 3 + + + + No comments. + Geen reacties + + 17 + + + + View all replies + Laat alle antwoorden zien + + 54 + + + + + Comments are disabled. + + + Reacties zijn uitgeschakeld. + + + 63 + + + + Add comment... + Voeg reactie toe... + + 6 + + + + + Post comment + + + Post reactie. + + + 20 + + + + You are one step away from commenting + Je bent een stap verwijderd van reageren + + 28 + + + + + If you have an account on this instance, you can login: + + + Als je een account hebt op deze instantie, kan je inloggen: + + + 32 + + + + login to comment + log in om te reageren + + 35 + + + + + Otherwise you can comment using an account on any ActivityPub-compatible instance. + On most platforms, you can find the video by typing its URL in the search bar and then comment it + from within the software's interface. + + + Anders kan je reageren door een account te gebruiken op welke ActivityPub-compatibele instatie dan ook. + Op de meeste platforms kan je de video vinden door zijn URL in de zoekbalk te typen en vervolgens het vanuit binnenin de software's interface te reageren. + + 36 + + + + + If you have an account on Mastodon or Pleroma, you can open it directly in their interface: + + +Als je een account op Mastodon of Pleroma hebt, kan je het direct openen vanuit hun interface: + + 41 + + + + Highlighted comment + Belichte reactie + + 5 + + + + Reply + Antwoord + + 14 + + + + No description + Geen beschrijving + + 1 + + + + Published videos + Gepubliceerde videos + + 1 + + + + Published videos + Videos gepubliceerd + + 1 + + + + 240p + 240p + + 1 + + + + 360p + 360p + + 1 + + + + 480p + 480p + + 1 + + + + 720p + 720p + + 1 + + + + 1080p + 1080p + + 1 + + + + Auto (via ffmpeg) + Auto (via ffmpeg) + + 1 + + + + Configuration updated. + Configuratie bijgewerkt. + + 1 + + + + Unlimited + Oneindig + + 1 + + + + 100MB + 100MB + + 1 + + + + 500MB + 500MB + + 1 + + + + 1GB + 1GB + + 1 + + + + 5GB + 5GB + + 1 + + + + 20GB + 20GB + + 1 + + + + 50GB + 50GB + + 1 + + + + 10MB + 10MB + + 1 + + + + 50MB + 50MB + + 1 + + + + 2GB + 2GB + + 1 + + + + is not valid + is niet valide + + 1 + + + + You need to specify hosts to follow. + Je moet de hosts specificeren om te volgen. + + 1 + + + + Hosts need to be unique. + Hosts moeten uniek zijn. + + 1 + + + + If you confirm, you will send a follow request to: - + Als je bevestigd, verzend je een volgverzoek naar: - + + 1 + + + + Follow new server(s) + Volg nieuwe server(s) + + 1 + + + + Follow request(s) sent! + Volgverzoek(en) verstuurd! + + 1 + + + + Do you really want to unfollow ? + Wil je echt onvolgen? + + 1 + + + + Unfollow + Onvolgen + + 1 + + + + You are not following anymore. + Je volgt niet meer. + + 1 + + + + enabled + ingeschakeld + + 1 + + + + disabled + uitgeschakeld + + 1 + + + + Redundancy for is + Overtolligheid voor is + + 1 + + + + Account unmuted by your instance. + Account niet meer gedempt door jouw instantie. + + 1 + + + + Instance unmuted by your instance. + Instantie niet meer gedempt door jouw instantie. + + 1 + + + + Comment updated. + Reactie bijgewerkt. + + 1 + + + + Delete this report + Verwijder deze rapportage + + 1 + + + + Update moderation comment + Werk beheerder-reactie bij + + 1 + + + + Mark as accepted + Markeer als geaccepteerd + + 1 + + + + Mark as rejected + Markeer als afgewezen + + 1 + + + + Do you really want to delete this abuse report? + Wil je echt dit misbruiksrapportage verwijderen? + + 1 + + + + Abuse deleted. + Misbruik verwijdert. + + 1 + + + + Do you really want to remove this video from the blacklist? It will be available again in the videos list. + Wil je deze video echt verwijderen van je zwarte lijst? Hij zal weer beschikbaar zijn in de videolijst. + + 1 + + + + Video removed from the blacklist. + Video verwijdert van de zwarte lijst. + + 1 + + + + User created. + Gebruiker verwijdert. + + 1 + + + + User updated. + Gebruiker bijgewerkt. + + 1 + + + + Update user + Werk gebruiker bij + + 1 + + + + Unban + Onverban + + 1 + + + + Set Email as Verified + Zet E-mail als Geverifieerd + + 1 + + + + You cannot ban root. + Je kan root niet verbannen. + + 1 + + + + Do you really want to unban users? + Wil jij echt gebruikers onverbannen? + + 1 + + + + users unbanned. + gebruikers onverbannen. + + 1 + + + + You cannot delete root. + Je kan root niet verwijderen. + + 1 + + + + If you remove these users, you will not be able to create others with the same username! + Als jij deze gebruikers verwijdert, kan je niet meer anderen maken met dezelfde gebruikersnaam! + + 1 + + + + users deleted. + gebruikers verwijdert. + + 1 + + + + users email set as verified. + gebruikers'' gezet als geverifieerd. + + 1 + + + + Account unmuted. + Account niet meer gedempt. + + 1 + + + + Instance unmuted. + Instantie niet meer gedempt. + + 1 + + + + Ownership accepted + Eigendom geaccepteerd + + 1 + + + + Password updated. + Wachtwoord bijgewerkt. + + 1 + + + + You current password is invalid. + Jouw huide wachtwoord is invalide. + + 1 + + + + Are you sure you want to delete your account? This will delete all you data, including channels, videos etc. + Weet je zeker dat je jouw account wil verwijderen? Dit verwijdert al jouw data, inclusief kanalen, videos etc. + + 1 + + + + Type your username to confirm + Typ je gebruikersnaam in om te bevestigen + + 1 + + + + Delete my account + Verwijder mijn account + + 1 + + + + Your account is deleted. + Jouw account is verwijdert. + + 1 + + + + Profile updated. + Profiel bijgewerkt. + + 1 + + + + Avatar changed. + Avatar verandert. + + 1 + + + + Information updated. + Informatie bijgewerkt. + + 1 + + + + Video channel created. + Videokanaal gecreëerd. + + 1 + + + + This name already exists on this instance. + Deze naam bestaat al op deze instantie. + + 1 + + + + Create + Creeër + + 1 + + + + Video channel updated. + Videokanaal bijgewerkt. + + 1 + + + + Video channel deleted. + Videokanaal verwijdert. + + 1 + + + + My videos + Mijn video's + + 1 + + + + Do you really want to delete videos? + Wil jij echt videos verwijderen? + + 1 + + + + videos deleted. + videos verwijdert. + + 1 + + + + Do you really want to delete ? + Weet jij zeker dat je wilt verwijderen? + + 1 + + + + Video deleted. + Video verwijdert. + + 1 + + + + Published + Gepubliceerd + + 1 + + + + Publication scheduled on + Publicatie uitgesteld tot + + 1 + + + + Waiting transcoding + Wachten op transcoding + + 1 + + + + To transcode + Om te transcoden + + 1 + + + + To import + Om te importeren + + 1 + + + + Ownership change request sent. + Eigenaarsveranderingsaanvrag gestuurd. + + 1 + + + + My library + Mijn bibliotheek + + 1 + + + + My channels + Mijn kanalen + + 1 + + + + My subscriptions + Mijn abonnementen + + 1 + + + + Misc + Varia + + 1 + + + + Ownership changes + Veranderingen van eigenaar + + 1 + + + + My settings + Mijn instellingen + + 1 + + + + An email with verification link will be sent to . + Een e-mail met verificatielink wordt verstuurd naar . + + 1 + + + + Unable to find user id or verification string. + Niet in staat om gebruikersid of verificatiestring te vinden. + + 1 + + + + Subscribe to the account + Abonneer op het account + + 1 + + + + Focus the search bar + Focus de zoekbalk + + 1 + + + + Toggle the left menu + Schakel het linker menu aan of uit + + 1 + + + + Go to the videos overview page + Ga naar de video-overzichtspagina + + 1 + + + + Go to the trending videos page + Ga naar de trending videos pagina + + 1 + + + + Go to the recently added videos page + Ga naar recent toegevoegde videos pagina + + 1 + + + + Go to the local videos page + Ga naar de locale videos pagina + + 1 + + + + Go to the videos upload page + Ga naar de videos uploadpagina + + 1 + + + + Toggle Dark theme + Schakel donker thema aan of uit + + 1 + + + + Go to my subscriptions + Ga naar mijn abonnementen + + 1 + + + + Go to my videos + Ga naar mijn videos + + 1 + + + + Go to my imports + Ga naar mijn imports + + 1 + + + + Go to my channels + Ga naar mijn kanalen + + 1 + + + + Cannot retrieve OAuth Client credentials: . + + Kan niet credenties van OAuth Client verkrijgen: . + + + 1 + + + + Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section. + Weet zeker dat je correct PeerTube geconfigureerd hebt (config/directory), vooral de "webserver" sectie. + + 1 + + + + Error + Fout + + 1 + + + + You need to reconnect. + Je moet opnieuw verbinden. + + 1 + + + + Confirm + Bevestigen + + 1 + + + + Keyboard Shortcuts: + Keyboard Shortcuts: + + 1 + + + + Info + Info + + 1 + + + + Success + Success + + 1 + + + + Incorrect username or password. + Incorrecte gebruikersnaam of wachtwoord. + + 1 + + + + You account is blocked. + Jouw account is geblokkeerd. + + 1 + + + + An email with the reset password instructions will be sent to . + Een e-mail met de wachtwoord reset instructies wordt gestuurd naar . + + 1 + + + + Your password has been successfully reset! + Jouw wachtwoord is succesvol gereset! + + 1 + + + + Today + Vandaag + + 1 + + + + Last 7 days + Laatste 7 dagen + + 1 + + + + Last 30 days + Laatste 30 dagen + + 1 + + + + Last 365 days + Laatste 365 dagen + + 1 + + + + Short (< 4 min) + Kort (< 4 min) + + 1 + + + + Long (> 10 min) + Long (> 10 min) + + 1 + + + + Medium (4-10 min) + Middelmatig (4-10 min) + + 1 + + + + Relevance + Relevantie + + 1 + + + + Publish date + Publicatiedatum + + 1 + + + + Views + Weergaven + + 1 + + + + Search + Zoeken + + 1 + + + + Instance name is required. + Instantienaam is vereist. + + 1 + + + + Short description should not be longer than 250 characters. + Korte beschrijvingen moeten niet langer zijn dan 250 karakters. + + 1 + + + + Twitter username is required. + Twitter gebruikersnaam is vereist. + + 1 + + + + Previews cache size is required. + Cachegrootte van voorvertoning is vereist. + + 1 + + + + Previews cache size must be greater than 1. + Cachegrootte van voorvertoning moet groter zijn dan 1. + + 1 + + + + Previews cache size must be a number. + Cachegrootte van voorvertoning moet een nummer zijn. + + 1 + + + + Captions cache size is required. + Cachegrootte van ondertiteling is vereist. + + 1 + + + + Captions cache size must be greater than 1. + Cachegrootte van ondertiteling moet groter zijn dan 1. + + 1 + + + + Captions cache size must be a number. + Cachegrootte van ondertiteling moet een nummer zijn. + + 1 + + + + Signup limit is required. + Inschrijflimiet is vereist. + + 1 + + + + Signup limit must be greater than 1. + Inschrijflimiet moet groter zijn dan 1. + + 1 + + + + Signup limit must be a number. + Inschrijflimiet moet een nummer zijn. + + 1 + + + + Admin email is required. + Administrator e-mail is vereist. + + 1 + + + + Admin email must be valid. + Administrator e-mail moet valide zijn. + + 1 + + + + Transcoding threads is required. + Transcoding threads zijn vereist. + + 1 + + + + Transcoding threads must be greater or equal to 0. + Transcoding threads moeten groter of gelijk zijn aan 0. + + 1 + + + + Email is required. + E-mail is vereist. + + 1 + + + + Email must be valid. + E-mail moet valide zijn. + + 1 + + + + Username is required. + Gebruikersnaam is vereist. + + 1 + + + + Password is required. + Wachtwoord is vereist. + + 1 + + + + Confirmation of the password is required. + Bevestiging van het wachtwoord is vereist. + + 1 + + + + Password must be at least 6 characters long. + Wachtwoord moet minstens 6 karakters lang zijn. + + 1 + + + + Password cannot be more than 255 characters long. + Wachtwoord kan niet langer zijn dan 255 karakters. + + 1 + + + + The new password and the confirmed password do not correspond. + Het nieuwe wachtwoord en het bevestigde wachtwoord zijn niet hetzelfde. + + 1 + + + + Video quota is required. + Videoquotum is vereist. + + 1 + + + + Quota must be greater than -1. + Quota moet groter zijn dan -1 + + 1 + + + + Daily upload limit is required. + Dagelijks uploadlimiet is vereist. + + 1 + + + + Daily upload limit must be greater than -1. + Dagelijks uploadlimiet moet groter zijn dan -1. + + 1 + + + + User role is required. + Gebruikersrol is vereist. + + 1 + + + + Display name is required. + Een weergavenaam is verplicht. + + 1 + + + + Description must be at least 3 characters long. + Beschrijvingen moeten minstens 3 karakters lang zijn. + + 1 + + + + Description cannot be more than 1000 characters long. + Beschrijvingen mogen niet langer dan 1000 karakters zijn. + + 1 + + + + You must to agree with the instance terms in order to registering on it. + Je moet akkoord gaan met de instantie's termijnen om erop te registreren. + + 1 + + + + Ban reason must be at least 3 characters long. + Verbanningsreden moet minstens 3 karakters zijn. + + 1 + + + + Ban reason cannot be more than 250 characters long. + Verbanningsreden kan niet langer dan 250 tekens zijn. + + 1 + + + + Report reason is required. + Rapportagereden is vereist. + + 1 + + + + Report reason must be at least 2 characters long. + Rapportagereden moet minstens 2 tekens zijn. + + 1 + + + + Moderation comment is required. + Beheersreactie is vereist. + + 1 + + + + Moderation comment must be at least 2 characters long. + Beheersreactie moet minstens 2 karakters zijn. + + 1 + + + + The channel is required. + Het kanaal is vereist. + + 1 + + + + Blacklist reason must be at least 2 characters long. + Zwartelijstreden moet minstens 2 karakters zijn. + + 1 + + + + Blacklist reason cannot be more than 300 characters long. + Zwartelijstreden kan niet langer dan 300 karakters zijn. + + 1 + + + + Video caption language is required. + Video ondertitelingstaal is vereist. + + 1 + + + + Video caption file is required. + Video ondertitelingsbestand is vereist. + + 1 + + + + The username is required. + De gebruikersnaam is vereist. + + 1 + + + + You can only transfer ownership to a local account + Je kan alleen je eigendom transporteren naar een lokaal account + + 1 + + + + Name is required. + Naam is vereist. + + 1 + + + + Support text must be at least 3 characters long. + Supporttekst moet minstens 3 karakters zijn. + + 1 + + + + Support text cannot be more than 1000 characters long. + Supporttekst mag niet meer zijn dan 1000 karakters. + + 1 + + + + Comment is required. + Reactie is vereist. + + 1 + + + + Comment must be at least 2 characters long. + Reactie moet minstens 2 karakters zijn. + + 1 + + + + Comment cannot be more than 3000 characters long. + Reactie kan niet meer dan 3000 karakters zijn. + + 1 + + + + Video name is required. + Videonaam is vereist. + + 1 + + + + Video name must be at least 3 characters long. + Videonaam moet minstens 3 karakters zijn. + + 1 + + + + Video name cannot be more than 120 characters long. + Videonaam kan niet meer dan 120 karakters zijn. + + 1 + + + + Video privacy is required. + Videoprivacy is vereist. + + 1 + + + + Video channel is required. + Videokanaal is vereist. + + 1 + + + + Video description must be at least 3 characters long. + Videobeschrijving moet minstens 3 karakters zijn. + + 1 + + + + Video description cannot be more than 10000 characters long. + Videobeschrijving kan niet meer dan 10000 karakters zijn. + + 1 + + + + A tag should be more than 2 characters long. + Een tag moet minstens 2 karakters zijn. + + 1 + + + + A tag should be less than 30 characters long. + Een tag moet minder dan 30 karakters zijn. + + 1 + + + + Video support must be at least 3 characters long. + Videosupport moet minstens 3 karakters zijn. + + 1 + + + + Video support cannot be more than 1000 characters long. + Videosupport kan niet meer dan 1000 karakters zijn. + + 1 + + + + A date is required to schedule video update. + Een datum is vereist om videoupdates in te roosteren. + + 1 + + + + This file is too large. + Dit bestand is te groot. + + 1 + + + + All unsaved data will be lost, are you sure you want to leave this page? + Alle onopgeslagen data zal verloren worden, weet je zeker dat je deze pagina wil verlaten? + + 1 + + + + Warning + Waarschuwing + + 1 + + + + Sunday + Zondag + + 1 + + + + Monday + Maandag + + 1 + + + + Tuesday + Dinsdag + + 1 + + + + Wednesday + Woensdag + + 1 + + + + Thursday + Donderdag + + 1 + + + + Friday + Vrijdag + + 1 + + + + Saturday + Zaterdag + + 1 + + + + Sun + Zon + + 1 + + + + Mon + Maa + + 1 + + + + Tue + Din + + 1 + + + + Wed + Woe + + 1 + + + + Thu + Don + + 1 + + + + Fri + Vri + + 1 + + + + Sat + Zat + + 1 + + + + Su + Zon + + 1 + + + + Mo + Ma + + 1 + + + + Tu + Di + + 1 + + + + We + Wo + + 1 + + + + Th + Do + + 1 + + + + Fr + Vr + + 1 + + + + Sa + Za + + 1 + + + + January + Januari + + 1 + + + + February + Februari + + 1 + + + + March + Maart + + 1 + + + + April + April + + 1 + + + + May + Mei + + 1 + + + + June + Juni + + 1 + + + + July + July + + 1 + + + + August + Augustus + + 1 + + + + September + September + + 1 + + + + October + Oktober + + 1 + + + + November + November + + 1 + + + + December + December + + 1 + + + + Jan + Jan + + 1 + + + + Feb + Feb + + 1 + + + + Mar + Mar + + 1 + + + + Apr + Apr + + 1 + + + + Jun + Jun + + 1 + + + + Jul + Jul + + 1 + + + + Aug + Aug + + 1 + + + + Sep + Sep + + 1 + + + + Oct + Oct + + 1 + + + + Nov + Nov + + 1 + + + + Dec + Dec + + 1 + + + + Clear + Wissen + + 1 + + + + yy-mm-dd + jj-mm-dd + + 1 + + + + Transcode your videos in multiple resolutions + Transcodeer je videos in meerdere resoluties + + 1 + + + + HTTP import (YouTube, Vimeo, direct URL...) + HTTP import(Youtube, Vimeo, directe URL...) + + 1 + + + + Torrent import + Torrentimport + + 1 + + + + ~ + ~ + + 1 + + + + {VAR_PLURAL, plural, =1 {minute} other {minutes} } + {VAR_PLURAL, plural, =1 {minute} other {minutes} } + + 1 + + + + of full HD videos + aan full HD videos + + 1 + + + + of HD videos + aan HD videos + + 1 + + + + of average quality videos + aan gemiddelde kwaliteit videos + + 1 + + + + years ago + jaar geleden + + 1 + + + + months ago + maanden geleden + + 1 + + + + month ago + maand geleden + + 1 + + + + weeks ago + weken geleden + + 1 + + + + week ago + week geleden + + 1 + + + + days ago + dagen geleden + + 1 + + + + day ago + dag geleden + + 1 + + + + hours ago + uren geleden + + 1 + + + + hour ago + uur geleden + + 1 + + + + min ago + min geleden + + 1 + + + + sec ago + sec geleden + + 1 + + + + Markdown compatible that supports: + Markeer compatibele dat support: + + 1 + + + + Emphasis + Nadruk + + 1 + + + + Links + Links + + 1 + + + + New lines + Nieuwe lijnen + + 1 + + + + Lists + Lijsten + + 1 + + + + Images + Afbeeldingen + + 1 + + + + users banned. + gebruikers verbannen. + + 1 + + + + User banned. + Gebruiker verbannen. + + 1 + + + + Do you really want to unban ? + Weet je zeker dat je wilt onverbannen? + + 1 + + + + User unbanned. + Gebruiker onverbannen. + + 1 + + + + If you remove this user, you will not be able to create another with the same username! + Als je deze gebruiker verwijdert, is het niet meer mogelijk om een andere te maken met dezelfde gebruikersnaam! + + 1 + + + + User deleted. + Gebruiker verwijdert. + + 1 + + + + User email set as verified + Gebruiker e-mail gezet als geverifieerd + + 1 + + + + Account muted. + Account gedempt. + + 1 + + + + Instance muted. + Instantie gedempt. + + 1 + + + + Account muted by the instance. + Account gedempt door de instantie. + + 1 + + + + Account unmuted by the instance. + Account niet meer gedempt door de instantie. + + 1 + + + + Instance muted by the instance. + Instantie gedempt door de instantie. + + 1 + + + + Instance unmuted by the instance. + Instantie niet meer gedempt door de instantie. + + 1 + + + + Mute this account + Demp dit account + + 1 + + + + Unmute this account + Dempt dit account niet meer + + 1 + + + + Mute the instance + Demp de instantie + + 1 + + + + Unmute the instance + Demp de instantie niet meer + + 1 + + + + Mute this account by your instance + Demp dit account door jouw instantie + + 1 + + + + Unmute this account by your instance + Demp dit account niet meer door jouw instantie + + 1 + + + + Mute the instance by your instance + Demp de instantie door jouw instantie + + 1 + + + + Unmute the instance by your instance + Demp de instantie niet meer door jouw instantie + + 1 + + + + Request is too large for the server. Please contact you administrator if you want to increase the limit size. + Verzoek te groot voor de server. Alstublieft bereikt de administrator als je de limietgrote wilt vergroten. + + 1 + + + + Too many attempts, please try again after minutes. + Te vaak geprobeerd, probeer alstublieft weer na minuten. + + 1 + + + + Too many attempts, please try again later. + Te vaak geprobeerd, probeer alstublieft later. + + 1 + + + + Server error. Please retry later. + Serverfout. Probeer later alstublieft weer. + + 1 + + + + Subscribed to + Abonneer op + + 1 + + + + Subscribed + Geabonneert + + 1 + + + + Unsubscribed from + Ongeabonneert van + + 1 + + + + Unsubscribed + Ongeabonneert + + 1 + + + + Moderator + Beheerder + + 1 + + + + Only I can see this video + Ik kan deze video alleen zien + + 1 + + + + Only people with the private link can see this video + Alleen mensen met de privélink kunnen deze video zien + + 1 + + + + Anyone can see this video + Iedereen kan deze video zien + + 1 + + + + Welcome! Now please check your emails to verify your account and complete signup. + Welkom! Check alstublieft nu jouw e-mails om jouw accont te verifieren en de inschrijving te voltooien + + 1 + + + + You are now logged in as ! + Je bent nu ingelogd als ! + + 1 + + + + Video to import updated. + Video naar import bijgewerkt. + + 1 + + + + Your video was uploaded to your account and is private. + Jouw video is geupload naar jouw account en is privé. + + + 1 + + + + But associated data (tags, description...) will be lost, are you sure you want to leave this page? + Maar geassocieerde data(tags, beschrijving...) zullen verloren raken, weet je zeker dat je deze pagina wilt verlaten? + + 1 + + + + Your video is not uploaded yet, are you sure you want to leave this page? + Jouw video is nog niet geupload, weet je zeker dat je deze pagina wilt verlaten? + + 1 + + + + Upload cancelled + Upload geannuleerd + + 1 + + + + Your video quota is exceeded with this video (video size: , used: , quota: ) + Jouw videoquotum is overschreden met deze video (videogrootte: , gebruikt: , quotum: ) + + 1 + + + + Your daily video quota is exceeded with this video (video size: , used: , quota: ) + Jouw dagelijkse videoquotum is overschreden met deze video (videogrootte: , gebruikt: , quotum: ) + + 1 + + + + Video published. + Video gepubliceerd. + + 1 + + + + Video updated. + Video geupdate. + + 1 + + + + replies will be deleted too. + reacties zullen ook worden verwijdert. + + 1 + + + + Video blacklisted. + Video op de zwarte lijst. + + 1 + + + + Copied + Gekopieerd + + 1 + + + + Video reported. + Video gerapporteerd. + + 1 + + + + Start at + Start op + + 1 + + + + Like the video + Like de video + + 1 + + + + Dislike the video + Dislike de video + + 1 + + + + Do you really want to delete this video? + Weet je zeker dat je de video wil verwijderen? + + 1 + + + + likes / dislikes + likes / dislikes + + 1 + + + + This video contains mature or explicit content. Are you sure you want to watch it? + Deze video bevat volwassen of expliciete inhoud. Weet je zeker dat je hem wilt kijken?

- - Display name must be at least 3 characters long. - Je weergavenaam moet minstens 3 tekens lang zijn. + + Mature or explicit content + Volwassen of expliciete content

- - Display name cannot be more than 120 characters long. - Je weergavenaam kan niet langer dan 120 tekens zijn. + + Videos from your subscriptions + Videos van jou abonnementen 1 diff --git a/client/src/locale/target/angular_oc.xml b/client/src/locale/target/angular_oc.xml index 26ff5264e..106de7d5e 100644 --- a/client/src/locale/target/angular_oc.xml +++ b/client/src/locale/target/angular_oc.xml @@ -227,6 +227,57 @@ 11 + + You don't have notifications. + Avètz pas cap de notificacion. + + 1 + + + + + published a new video + + + a publicat una nòva vidèo + + + 7 + + + + + commented your video + + + a comentat vòstra vidèo + + + 23 + + + + + Your video has been published + + + Vòstra vidèo es publicada + + + 27 + + + + + + + + + + + 57 + + Unlisted Pas listada @@ -434,6 +485,13 @@ 25 + + + + + 11 + +

- 12 + 13

@@ -513,7 +571,7 @@ Login Connexion

- 38 + 36

@@ -541,7 +599,7 @@ Send me an email to reset my password Me mandar un corrièl per reïnicializar lo senhal

- 75 + 80

@@ -610,7 +668,7 @@ Signup Inscripcion

- 88 + 78

@@ -680,7 +738,18 @@ Change the language Cambiar la lenga - 88 + 86 + + + + + Help to translate PeerTube! + + + Ajudatz a traduire PeerTube ! + + + 8

@@ -691,7 +760,7 @@ Mon perfil public - 18 + 16

@@ -702,7 +771,7 @@ Mon compte - 22 + 20

@@ -713,7 +782,7 @@ Mas vidèos - 26 + 24

@@ -724,14 +793,14 @@ Desconnexion - 30 + 28

Create an account Crear un compte

- 39 + 37

@@ -745,49 +814,49 @@ Subscriptions Abonaments

- 47 + 45

Overview Apercebut

- 52 + 50

Trending Tendéncias

- 57 + 55

Recently added Apondons recents

- 62 + 60

Local Localas

- 67 + 65

More Mai

- 72 + 70

Administration Administracion

- 76 + 74

@@ -801,14 +870,42 @@ Show keyboard shortcuts Mostrar los acorchis clavièr

- 91 + 89

Toggle dark interface Passar a l’interfàcia escura - 94 + 92 + + + + View your notifications + Veire vòstras notificacions + + 3 + + + + Notifications + Notificacions + + 10 + + + + Update your notification preferences + Actualizar vòstras preferéncias de notificacion + + 15 + + + + See all your notifications + Veire totas vòstras notificacions + + 22

@@ -913,14 +1010,14 @@ Display unlisted and private videos Mostrar las vidèos pas listadas e las privadas

- 11 + 14

No results. Cap de resultat

- 17 + 20

@@ -978,67 +1075,78 @@ 7 - - - About instance - - - A prepaus de l’instància - + + Contact administrator + Contactar l’administrator de

- 1 + 3

- - Description - Descripcion + + Your name + Vòstre nom

- 27 + 11

- - Terms - Tèrmes + + Your email + Vòstra adreça

- 44 + 20

- - User registration is allowed and - Las inscripcions son autorizadas e + + Your message + Vòstre messatge

- 25 + 29

- + - this instance provides a baseline quota of space for the videos of its users. - + Cancel + - aquesta instància provesís un quòta de basa de d’espaci per las vidèos de sos utilizaires. - + Anullar + - 27 + 26 - - - this instance provides unlimited space for the videos of its users. - - - aquesta instància fornís un espaci sens limit per las vidèos de sos utilizaires. - + + Submit + Mandar

- - - User registration is currently not allowed. - - Las inscriptions son pas pel moment possiblas + + About instance + A prepaus de l’instància - 36 + 4 + + + + Description + Descripcion + + 27 + + + + Terms + Tèrmes + + 39 + + + + User registration is allowed and + Las inscripcions son autorizadas e + + 29

@@ -1393,49 +1501,49 @@ Short description Descripcion corta

- 22 + 21

Default client route Rota del client per defaut

- 55 + 48

Videos Overview Apercebuts de las vidèos

- 58 + 51

Videos Trending Vidèos a la mòda

- 59 + 52

Videos Recently Added Vidèos ajustadas recentament

- 60 + 53

Local videos Vidèos localas

- 61 + 54

Policy on videos containing sensitive content Politica tocant las vidèos amb de contengut sensible

- 70 + 61

@@ -1470,23 +1578,44 @@ Signup enabled Inscripcions activadas

- 93 + 84

Signup requires email verification L’inscripcion demanda una verificacion d’adreça electronica

- 100 + 91

Signup limit Limit d’inscripcions + + 96 + + + + Users + Utilizaires

105

+ + User default video quota + Quòta per defaut per utilizaire + + 109 + + + + User default daily upload limit + Quòta jornalièr de mandadís per defaut dels utilizaires + + 121 + +

Import Importar @@ -1498,49 +1627,28 @@ Video import with HTTP URL (i.e. YouTube) enabled Import vidèo amb URL HTTP (per exemple YouTube) activat

- 120 + 141

Video import with a torrent file or a magnet URI enabled Import de vidèos via un fichièr torretn o un magnet URI activat

- 127 + 148

Administrator Administrator

- 131 + 155

Admin email Adreça de l’admin - 134 - - - - Users - Utilizaires - - 144 - - - - User default video quota - Quòta per defaut per utilizaire - - 147 - - - - User default daily upload limit - Quòta jornalièr de mandadís per defaut dels utilizaires - - 161 + 158

@@ -1561,30 +1669,19 @@ Your Twitter username Vòstre nom d’utilizaire Twitter

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Indica lo compte Twitter del site o de la plataforma ont lo contengut foguèt publicat.

- 184 + 187

Instance whitelisted by Twitter Instàncias en lista blanca per Twitter - - 198 - - - - If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> - If the instance is not whitelisted, we use an image link card that will redirect on 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 whitelisted. - Se vòstra instància es mesa en lista blanca per Twitter, un lector vidèo serà integrat pel fil Twitter sul partatge d’una vidèo PeerTube.<br /> - Se l’instància es pas en lista blanca, utilizam un imatge amb un ligam que mena a l’instància PeerTube.<br /><br /> - Clicatz aquesta bóstia, salvagardatz la configuracion e ensajatz amb l’URL d’una vidèo de vòstra instància (https://exemple.com/videos/watch/blabla) sus <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> per veire se vòstra instància es en lista blanca. 199 @@ -1600,35 +1697,35 @@ Transcoding Transcodatge

- 210 + 215

Transcoding enabled Transcodatge activat

- 215 + 221

If you disable transcoding, many videos from your users will not work! Se desactivatz lo transcodatge, un fum de vidèos de vòstres utilizaires foncionaràn pas !

- 216 + 222

Transcoding threads Transcodatge dels threads

- 223 + 237

Resolution enabled Resolucion activada

- 239 + 252

@@ -1643,82 +1740,47 @@

- 244 + 260

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Qualques fichièrs son pas federats (apercebuts, legendas). Los recuperam de l’instància d’origina estant e los metèm en cache.

- 249 + 265

Previews cache size Talha del cache d’apercebut

- 254 + 271

Video captions cache size Talha del cache per las legendas de las vidèos

- 265 + 280

Customizations Personalizacions

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escrivètz dirèctament de JavaScript còdi.<br />Exemple : <pre>console.log('mon instància es tròp crana');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Escrivètz dirèctament lo còdi CSS. Exemple :<br /> - <pre> - body - background-color: red; - - </pre> - - Prefixatz amb <em>#custom-css</em> per subrecargar los estiles. Exemple : - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1727,21 +1789,21 @@ Advanced configuration Configuracion avançada

- 207 + 212

Update configuration Actualizar la configuracion

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Sembla que la configuracion es invalida. Mercés de cercar d’errors possiblas pels diferents onglets.

- 326 + 341

@@ -2037,21 +2099,21 @@ User's email must be verified to login Lo corrièl de l’utilizaire deu èsser verificat abans la connexion

- 70 + 72

User's email is verified / User can login without email verification Lo corrièl de l’utilizaire es verificat / Pòt se connectar sens verificacion de l’adreça

- 74 + 76

Ban reason: Rason del bandiment :

- 92 + 95

@@ -2118,7 +2180,7 @@ Actions Accions

- 33 + 35

@@ -2153,14 +2215,14 @@ Date Data

- 10 + 11

Blacklist reason: Rason de la mesa en lista negra :

- 41 + 43

@@ -2184,102 +2246,39 @@ 7 - - Muted accounts - Comptes muts - - 2 - - - - Muted servers - Servidors muts - - 11 - - - - Account - Compte - - 12 - - - - Muted at - Mut lo - - 13 - - - - Unmute - Restablir - - 23 - - - - My settings - Mos paramètres - - 3 - - - - My library - Ma bibliotèca - - 7 - - - - My channels - Mas cadenas - - 12 - - - - My videos - Mas vidèos - - 14 - - - - My subscriptions - Mos abonaments + + Muted accounts + Comptes muts

- 16 + 2

- - My imports - Mas importacions + + Muted servers + Servidors muts

- 18 + 11

- - Misc - Divèrs + + Account + Compte

- 24 + 12

- - Muted instances - Instàncias mudas + + Muted at + Mut lo

- 2 + 13

- - Ownership changes - Cambiaments de proprietats + + Unmute + Restablir

- 33 + 23

@@ -2293,21 +2292,21 @@ Profile Perfil

- 8 + 7

Video settings Paramètres vidèo

- 15 + 16

Danger zone Zòna perilhosa

- 18 + 19

@@ -2335,13 +2334,6 @@ 35 - - Submit - Mandar - - 24 - - - views - vistas @@ -2500,6 +2492,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 47 + + Muted instances + Instàncias mudas + + 2 + + Change password Cambiar lo senhal @@ -2598,6 +2597,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 4 + + Web + Site web + + 3 + +

Sorry, but we couldn't find the page you were looking for. @@ -2748,14 +2754,14 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Publish will be available when upload is finished La publicacion serà possibla un còp lo mandadís acabat

- 53 + 58

Publish Publicar

- 60 + 65

@@ -2938,14 +2944,14 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Wait transcoding before publishing the video Esperar lo transcodatge abans de publicar la vidèo

- 130 + 131

If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Se decidissètz d’esperar pas lo transcodatge abans de publicar la vidèo, serà pas legibla fins a la fin del transcodatge.

- 131 + 132

@@ -2959,49 +2965,49 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Add another caption Ajustar una legenda mai

- 146 + 147

See the subtitle file Veire lo fichièr de sostítols

- 155 + 156

Already uploaded ✔ Ja enviada ✔

- 159 + 160

Will be created on update Serà creada en actualizar

- 167 + 168

Cancel create Anullar la creacion

- 169 + 170

Will be deleted on update Serà suprimida en actualizar

- 175 + 176

Cancel deletion Anullar la supression

- 177 + 178

@@ -3012,28 +3018,28 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Encara cap de legendas. - 182 + 183

Captions Legendas

- 139 + 140

Upload thumbnail Enviar una vinheta d’apercebut

- 195 + 196

Upload preview Enviar un apercebut

- 202 + 203

@@ -3047,14 +3053,14 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto Short text to tell people how they can support you (membership platform...). Pichon tèxte per explicar al monde cossí pòdon vos sosténer (plataforma pels sòcis...).

- 209 + 210

Advanced settings Paramètres avançats

- 190 + 191

@@ -3121,17 +3127,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 3 - - - Cancel - - - Anullar - - - 19 - - Share Partejar @@ -3518,13 +3513,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 14 - - Error getting about from server - Error en recuperar las informacions de la seccion «A prepaus» del servidor - - 1 - - No description Cap de descripcion @@ -3546,13 +3534,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Error - Error - - 1 - - 240p 240p @@ -3595,13 +3576,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Success - Succès - - 1 - - Configuration updated. Configuracion actualizada. @@ -3987,6 +3961,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Preferences saved + Preferéncias salvagardadas + + 1 + + Profile updated. Perfil actualizat @@ -4036,23 +4017,16 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Volètz vertadièrament suprimir ? Aquò suprimarà tanben totas las vidèos enviadas a la cadena. - - 1 - - - - Please type the name of the video channel to confirm - Tornatz picar lo nom de la cadena per confirmar + + Video channel deleted. + Cadena vidèo suprimida.

- - Video channel deleted. - Cadena vidèo suprimida. + + My videos + Mas vidèos 1 @@ -4127,16 +4101,58 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Channels - Cadenas + + My library + Ma bibliotèca + + 1 + + + + My channels + Mas cadenas + + 1 + + + + My subscriptions + Mos abonaments + + 1 + + + + My history + Mon istoric + + 1 + + + + Misc + Divèrs + + 1 + + + + Ownership changes + Cambiaments de proprietats + + 1 + + + + My settings + Mos paramètres

- - Video imports - Imports vidèo + + My notifications + Mas notificacions 1 @@ -4262,6 +4278,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Error + Error + + 1 + + You need to reconnect. Vos cal vos reconnectar. @@ -4283,6 +4306,20 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Info + Info + + 1 + + + + Success + Succès + + 1 + + Incorrect username or password. Nom d’utilizaire o senhal incorrècte. @@ -4500,58 +4537,58 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Username is required. - Lo nom d’utilizaire es requesit. + + Email is required. + L’adreça electronica es requesida.

- - Password is required. - Lo senhal es requesit. + + Email must be valid. + L’adreça electronica deu èsser valida.

- - Confirmation of the password is required. - La confirmacion del senhal es requesida. + + Your name is required. + Vòstre nom es requesit

- - Username must be at least 3 characters long. - Lo nom d’utilizaire deu conténer almens 3 caractèrs. + + Username is required. + Lo nom d’utilizaire es requesit.

- - Username cannot be more than 20 characters long. - Lo nom d’utilizaire pòt pas conténer mai de 20 caractèrs. + + Password is required. + Lo senhal es requesit.

- - Username should be only lowercase alphanumeric characters. - Lo nom d’utilizaire deu èsser alfanumeric e en minuscula. + + Confirmation of the password is required. + La confirmacion del senhal es requesida.

- - Email is required. - L’adreça electronica es requesida. + + Username must be at least 1 character long. + Lo nom d’utilizaire deu almens conténer 1 caractèr.

- - Email must be valid. - L’adreça electronica deu èsser valida. + + Username cannot be more than 50 characters long. + Lo nom d’utilizaire pòt pas conténer mai de 50 caractèrs. 1 @@ -4619,16 +4656,16 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Display name must be at least 3 characters long. - L’escais-nom deu almens conténer 3 caractèrs. + + Display name must be at least 1 character long. + Lo nom public deu almens conténer 1 caractèr.

- - Display name cannot be more than 120 characters long. - L’escais-nom pòt pas conténer mai de 120 caractèrs. + + Display name cannot be more than 50 characters long. + Lo nom public pòt pas conténer mai de 50 caractèrs. 1 @@ -4682,13 +4719,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Report reason cannot be more than 300 characters long. - La rason del senhalament pòt pas conténer mai de 300 caractèrs. - - 1 - - Moderation comment is required. Lo comentari de moderacion es requesit. @@ -4703,13 +4733,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Moderation comment cannot be more than 300 characters long. - Lo comentari de moderacion pòt pas conténer mai de 300 caractèrs. - - 1 - - The channel is required. La cadena es requesida. @@ -4766,23 +4789,16 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Name must be at least 3 characters long. - Lo nom deu almens conténer 3 caractèrs. - - 1 - - - - Name cannot be more than 20 characters long. - Lo nom pòt pas conténer mai de 20 caractèrs. + + Name must be at least 1 character long. + Lo nom deu almens conténer 1 caractèr.

- - Name should be only lowercase alphanumeric characters. - Lo nom deu èsser alfanumeric e en minuscula + + Name cannot be more than 50 characters long. + Lo nom pòt pas conténer mai de 50 caractèrs. 1 @@ -5599,13 +5615,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Subscribed - Abonat - - 1 - - Subscribed to S’abonèt a @@ -5613,9 +5622,9 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Unsubscribed - Pas mai abonat + + Subscribed + Abonat 1 @@ -5627,6 +5636,13 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 + + Unsubscribed + Pas mai abonat + + 1 + + Moderator Moderator @@ -5697,13 +5713,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - Info - Info - - 1 - - Upload cancelled Mandadís anullat @@ -5711,13 +5720,6 @@ Quand enviaretz una vidèo dins aquesta cadena, lo camp vidèo sosten serà auto 1 - - We are sorry but PeerTube cannot handle videos > 8GB - O planhèm mas PeerTube pòt pas gerir de vidèos de mai de 8 Go - - 1 - -

Your video quota is exceeded with this video (video size: , used: , quota: ) Vòstre quòta de vidèo es excedit amb aquesta vidèo (talha vidèo : , utilizat : , quòta : ) diff --git a/client/src/locale/target/angular_pl_PL.xml b/client/src/locale/target/angular_pl_PL.xml index e8494997a..6d5a06e53 100644 --- a/client/src/locale/target/angular_pl_PL.xml +++ b/client/src/locale/target/angular_pl_PL.xml @@ -342,7 +342,7 @@ Password Hasło

- 12 + 13

@@ -356,7 +356,7 @@ Login Zaloguj się

- 38 + 36

@@ -384,7 +384,7 @@ Send me an email to reset my password Wyślij mi wiadomość e-mail przywracającą hasło

- 75 + 80

@@ -448,7 +448,7 @@ Signup Zarejestruj się

- 88 + 78

@@ -498,7 +498,7 @@ Change the language Zmień język

- 88 + 86

@@ -509,7 +509,7 @@ Mój profil publiczny - 18 + 16

@@ -520,7 +520,7 @@ Moje konto - 22 + 20

@@ -531,7 +531,7 @@ Moje filmy - 26 + 24

@@ -542,14 +542,14 @@ Wyloguj się - 30 + 28

Create an account Utwórz konto

- 39 + 37

@@ -563,49 +563,49 @@ Subscriptions Subskrybcje

- 47 + 45

Overview Przegląd

- 52 + 50

Trending Na czasie

- 57 + 55

Recently added Ostatnio dodane

- 62 + 60

Local Lokalne

- 67 + 65

More Więcej

- 72 + 70

Administration Administracja

- 76 + 74

@@ -619,7 +619,7 @@ Toggle dark interface Przełącz ciemny interfejs

- 94 + 92

@@ -724,7 +724,7 @@ No results. Brak wyników.

- 17 + 20

@@ -771,15 +771,22 @@ 7 - + - About instance - + Cancel + - O instancji - + Anuluj + - 1 + 26 + + + + Submit + Wyślij + + 31

@@ -793,47 +800,14 @@ Terms Zasady

- 44 + 39

User registration is allowed and Rejestracja użytkowników jest dozwolona i - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - ta instancja oferuje podstawową powierzchnię na filmy swoich użytkowników. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - ta instancja oferuje nieograniczoną powierzchnię na filmy dla swoich użytkowników. - - - 31 - - - - - User registration is currently not allowed. - - - Rejestracja użytkowników nie jest obecnie dozwolona. - - - 36 + 29

@@ -1118,47 +1092,47 @@ Short description Krótki opis

- 22 + 21

Default client routeDefault client route

- 55 + 48

Videos Overview Przegląd Filmów

- 58 + 51

Videos Trending Filmy na czasie

- 59 + 52

Videos Recently Added Ostatnio dodane filmy

- 60 + 53

Local videos Lokalne filmy

- 61 + 54

Policy on videos containing sensitive content Polityka dotycząca filmów zawierających wrażliwą zawartość

- 70 + 61

@@ -1193,23 +1167,44 @@ Signup enabled Wymagana rejestracja

- 93 + 84

Signup requires email verification Rejestracja wymaga weryfikacji emaila

- 100 + 91

Signup limit Limit rejestracji + + 96 + + + + Users + Użytkownicy

105

+ + User default video quota + Domyślna powierzchnia na filmy dla użytkownika + + 109 + + + + User default daily upload limit + Domyślny limit dziennego wysyłania przez użytkownika + + 121 + +

Import Importuj @@ -1221,35 +1216,14 @@ Administrator Administrator

- 131 + 155

Admin email E-mail administratora - 134 - - - - Users - Użytkownicy - - 144 - - - - User default video quota - Domyślna powierzchnia na filmy dla użytkownika - - 147 - - - - User default daily upload limit - Domyślny limit dziennego wysyłania przez użytkownika - - 161 + 158

@@ -1270,21 +1244,21 @@ Your Twitter username Twoja nazwa użytkownika na Twitterze

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Oznacza konto Twittera dla strony lub platformy na której została opublikowana zawartość.

- 184 + 187

Instance whitelisted by Twitter Instancja jest na białej liście Twittera

- 198 + 199

@@ -1298,35 +1272,35 @@ Transcoding Transkodowanie

- 210 + 215

Transcoding enabled Transkodowanie jest włączone

- 215 + 221

If you disable transcoding, many videos from your users will not work! Jeżeli wyłączysz transkodowanie, wiele filmów od użytkowników może nie działać!

- 216 + 222

Transcoding threads Wątki transkodowania

- 223 + 237

Resolution enabled Włączono rozdzielczość

- 239 + 252

@@ -1341,56 +1315,56 @@

- 244 + 260

Previews cache size Rozmiar pamięci podręcznej podglądu

- 254 + 271

Customizations Dostosowywanie

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Wprowadź kod JavaScript.<br />Przykład: <pre>console.log('moja instancja jest świetna');</pre>

- 281 + 297

Advanced configuration Zaawansowana konfiguracja

- 207 + 212

Update configuration Aktualizuj konfigurację

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Wygląda na to, że konfiguracja jest nieprawidłowa. Poszukaj możliwych błędów w innych kartach.

- 326 + 341

@@ -1669,7 +1643,7 @@ Actions Akcje

- 33 + 35

@@ -1683,7 +1657,7 @@ Date Data

- 10 + 11

@@ -1700,48 +1674,6 @@ 7 - - My settings - Moje ustawienia - - 3 - - - - My library - Moja biblioteka - - 7 - - - - My channels - Moje kanały - - 12 - - - - My videos - Moje filmy - - 14 - - - - My subscriptions - Moje subskrybcje - - 16 - - - - My imports - Moje importy - - 18 - -

Video quota: Powierzchnia na filmy: @@ -1753,14 +1685,14 @@ Profile Profil

- 8 + 7

Video settings Ustawienia wideo

- 15 + 16

@@ -1774,13 +1706,6 @@ 35 - - Submit - Wyślij - - 24 - -

- views - wyświetlenia @@ -2012,14 +1937,14 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia Publish will be available when upload is finished Opublikuj automatycznie po ukończeniu wysyłania

- 53 + 58

Publish Opublikuj

- 60 + 65

@@ -2131,7 +2056,7 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia Wait transcoding before publishing the video Poczekaj na transkodowanie przed opublikowaniem filmu

- 130 + 131

@@ -2145,14 +2070,14 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia Upload thumbnail Wyślij miniaturę

- 195 + 196

Upload preview Podgląd wysyłania

- 202 + 203

@@ -2166,14 +2091,14 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia Short text to tell people how they can support you (membership platform...). Krótki tekst informujący innych, jak mogą Cię wesprzeć (platforma członkowska…).

- 209 + 210

Advanced settings Ustawienia zaawansowane

- 190 + 191

@@ -2240,17 +2165,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 3 - - - Cancel - - - Anuluj - - - 19 - - Share Udostępnij @@ -2526,13 +2440,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 14 - - Error getting about from server - Błąd podczas uzyskiwania informacji z serwera - - 1 - - No description Brak opisu @@ -2554,13 +2461,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Error - Błąd - - 1 - - 240p 240p @@ -2596,13 +2496,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Success - Pomyślnie - - 1 - - Configuration updated. Zaktualizowano konfigurację. @@ -2848,23 +2741,16 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Czy na pewno chcesz usunąć ? Skutkuje to usunięciem wszystkich filmów wysłanych na ten kanał. - - 1 - - - - Please type the name of the video channel to confirm - Wprowadź nazwę kanału wideo, aby potwierdzić + + Video channel deleted. + Usunięto kanał wideo .

- - Video channel deleted. - Usunięto kanał wideo . + + My videos + Moje filmy 1 @@ -2925,9 +2811,30 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Channels - Kanały + + My library + Moja biblioteka + + 1 + + + + My channels + Moje kanały + + 1 + + + + My subscriptions + Moje subskrybcje + + 1 + + + + My settings + Moje ustawienia 1 @@ -2955,6 +2862,13 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 + + Error + Błąd + + 1 + + You need to reconnect. Musisz połączyć się ponownie. @@ -2969,6 +2883,20 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 + + Info + Informacja + + 1 + + + + Success + Pomyślnie + + 1 + + Your password has been successfully reset! Pomyślnie zresetowano hasło! @@ -3130,6 +3058,20 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 + + Email is required. + Adres e-mail jest wymagany. + + 1 + + + + Email must be valid. + Adres e-mail musi być prawidłowy. + + 1 + + Username is required. Nazwa użytkownika jest wymagana. @@ -3151,41 +3093,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Username must be at least 3 characters long. - Nazwa użytkownika musi zawierać przynajmniej 3 znaki. - - 1 - - - - Username cannot be more than 20 characters long. - Nazwa użytkownika nie może być dłuższa niż 20 znaków. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Nazwa użytkownika może zawierać tylko małe znaki alfanumeryczne. - - 1 - - - - Email is required. - Adres e-mail jest wymagany. - - 1 - - - - Email must be valid. - Adres e-mail musi być prawidłowy. - - 1 - - Password must be at least 6 characters long. Hasło musi składać się z przynajmniej 6 znaków. @@ -3235,20 +3142,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Display name must be at least 3 characters long. - Nazwa wyświetlana musi zawierać przynajmniej 3 znaki. - - 1 - - - - Display name cannot be more than 120 characters long. - Nazwa wyświetlana nie może zawierać więcej niż 120 znaków. - - 1 - - Description must be at least 3 characters long. Opis musi zawierać przynajmniej 3 znaki. @@ -3270,13 +3163,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Report reason cannot be more than 300 characters long. - Przyczyna zgłoszenia nie może zawierać więcej niż 300 znaków. - - 1 - - The username is required. Nazwa użytkownika jest wymagana. @@ -3291,27 +3177,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Name must be at least 3 characters long. - Nazwa musi zawierać przynajmniej 3 znaki. - - 1 - - - - Name cannot be more than 20 characters long. - Nazwa nie może być dłuższa niż 20 znaków. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Nazwa może zawierać tylko małe znaki alfanumeryczne. - - 1 - - Support text must be at least 3 characters long. Tekst o wsparciu musi zawierać przynajmniej 3 znaki. @@ -4003,13 +3868,6 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia 1 - - Info - Informacja - - 1 - -

Upload cancelled Anulowano wysyłanie diff --git a/client/src/locale/target/angular_pt_BR.xml b/client/src/locale/target/angular_pt_BR.xml index 71aeac8d5..0227115e3 100644 --- a/client/src/locale/target/angular_pt_BR.xml +++ b/client/src/locale/target/angular_pt_BR.xml @@ -370,7 +370,7 @@ Password Senha

- 12 + 13

@@ -384,7 +384,7 @@ Login Entrar

- 38 + 36

@@ -412,7 +412,7 @@ Send me an email to reset my password Me envie um e-mail para redefinir minha senha

- 75 + 80

@@ -476,7 +476,7 @@ Signup Inscrever-se

- 88 + 78

@@ -533,7 +533,7 @@ Change the language Alterar o idioma

- 88 + 86

@@ -544,7 +544,7 @@ Meu perfil público - 18 + 16

@@ -555,7 +555,7 @@ Minha conta - 22 + 20

@@ -566,7 +566,7 @@ Meus vídeos - 26 + 24

@@ -577,14 +577,14 @@ Sair - 30 + 28

Create an account Criar uma conta

- 39 + 37

@@ -598,49 +598,49 @@ Subscriptions Inscrições

- 47 + 45

Overview Visão geral

- 52 + 50

Trending Tendências

- 57 + 55

Recently added Adicionado recentemente

- 62 + 60

Local Local

- 67 + 65

More Mais

- 72 + 70

Administration Administração

- 76 + 74

@@ -654,7 +654,7 @@ Toggle dark interface Alternar interface escura

- 94 + 92

@@ -759,7 +759,7 @@ No results. Nenhum resultado.

- 17 + 20

@@ -806,15 +806,22 @@ 7 - + - About instance - + Cancel + - Sobre a instância - + Cancelar + - 1 + 26 + + + + Submit + Enviar + + 31

@@ -828,47 +835,14 @@ Terms Termos

- 44 + 39

User registration is allowed and Registro de usuários não está permitida e - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - esta instância fornece uma cota base de espaço para os vídeos de seus usuários. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - esta instância fornece espaço ilimitado para os vídeos de seus usuários. - - - 31 - - - - - User registration is currently not allowed. - - - Registro de usuários atualmente não está permitido. - - - 36 + 29

@@ -1177,49 +1151,49 @@ Short description Descrição curta

- 22 + 21

Default client route Rota padrão do cliente

- 55 + 48

Videos Overview Visão geral dos vídeos

- 58 + 51

Videos Trending Vídeos em Tendência

- 59 + 52

Videos Recently Added Vídeos Adicionados Recentemente

- 60 + 53

Local videos Vídeos locais

- 61 + 54

Policy on videos containing sensitive content Política sobre vídeos que possuem conteúdo sensível

- 70 + 61

@@ -1254,23 +1228,44 @@ Signup enabled Inscrição permitida

- 93 + 84

Signup requires email verification Inscrição requer verificação de email

- 100 + 91

Signup limit Limite de inscrições + + 96 + + + + Users + Usuários

105

+ + User default video quota + Cota padrão de vídeos do usuário + + 109 + + + + User default daily upload limit + Padrão de limite diário de upload + + 121 + +

Import Importar @@ -1282,42 +1277,21 @@ Video import with a torrent file or a magnet URI enabled Importação de vídeo com um arquivo torrent ou URI magnética habilitada

- 127 + 148

Administrator Administrador

- 131 + 155

Admin email Email de administrador - 134 - - - - Users - Usuários - - 144 - - - - User default video quota - Cota padrão de vídeos do usuário - - 147 - - - - User default daily upload limit - Padrão de limite diário de upload - - 161 + 158

@@ -1338,21 +1312,21 @@ Your Twitter username Seu nome de usuário no Twitter

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Indica a conta Twitter do sítio web ou plataforma em que o conteúdo foi publicado.

- 184 + 187

Instance whitelisted by Twitter Instância listada como permitida pelo Twitter

- 198 + 199

@@ -1366,35 +1340,35 @@ Transcoding Transcodificação

- 210 + 215

Transcoding enabled Transcodificação ativada

- 215 + 221

If you disable transcoding, many videos from your users will not work! Se você desativar a transcodificação, muitos vídeos dos seus usuários não funcionarão!

- 216 + 222

Transcoding threads Threads de transcodificação

- 223 + 237

Resolution enabled Resolução habilitada

- 239 + 252

@@ -1409,82 +1383,47 @@

- 244 + 260

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Alguns arquivos não são federados (pré-visualizações, legendas ocultas). Nós as obtivemos diretamente da instância de origem e a colocamos em cache.

- 249 + 265

Previews cache size Tamanho do cache de pré-visualizações

- 254 + 271

Video captions cache size Tamanho do cache de legendas ocultas de vídeos

- 265 + 280

Customizations Personalizações

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Escreva diretamente código JavaScript.<br />Exemplo: <pre>console.log('minha instância é demais');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Escreva código CSS diretamente. Exemplo:<br /> - <pre> - body - background-color: red; - - </pre> - - Preceda com <em>#custom-css</em> para sobrescrever estilos. Exemplo: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1493,21 +1432,21 @@ Advanced configuration Configurações avançadas

- 207 + 212

Update configuration Atualizar configuração

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Aparentemente a configuração está valida. Por favor procure potenciais erros nas diferentes abas.

- 326 + 341

@@ -1761,7 +1700,7 @@ Ban reason: Motivo do banimento:

- 92 + 95

@@ -1828,7 +1767,7 @@ Actions Ações

- 33 + 35

@@ -1863,14 +1802,14 @@ Date Data

- 10 + 11

Blacklist reason: Motivo da lista negra:

- 41 + 43

@@ -1894,55 +1833,6 @@ 7 - - My settings - Minhas configurações - - 3 - - - - My library - Minha biblioteca - - 7 - - - - My channels - Meus canais - - 12 - - - - My videos - Meus vídeos - - 14 - - - - My subscriptions - Minhas inscrições - - 16 - - - - My imports - Minhas importações - - 18 - - - - Ownership changes - Mudanças de dono - - 33 - -

Video quota: Cota de vídeo: @@ -1954,21 +1844,21 @@ Profile Perfil

- 8 + 7

Video settings Configurações de vídeo

- 15 + 16

Danger zone Zona perigosa

- 18 + 19

@@ -1996,13 +1886,6 @@ 35 - - Submit - Enviar - - 24 - - - views - visualizações @@ -2162,6 +2045,13 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 30 + + Current password + Senha atual + + 7 + +

New password Nova senha @@ -2368,14 +2258,14 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen Publish will be available when upload is finished A publicação estará disponível quando o envio terminar

- 53 + 58

Publish Publicar

- 60 + 65

@@ -2537,14 +2427,14 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen Wait transcoding before publishing the video Aguarde a transcodificação antes de publicar o vídeo

- 130 + 131

If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Se você decidir não aguardar a transcodificação antes de publicar o vídeo, ele poderá não ser reproduzido até que a transcodificação termine.

- 131 + 132

@@ -2558,49 +2448,49 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen Add another caption Adicionar outra legenda oculta

- 146 + 147

See the subtitle file Veja o arquivo de legenda

- 155 + 156

Cancel create Cancelar criação

- 169 + 170

Cancel deletion Cancelar exclusão

- 177 + 178

Captions Legendas ocultas

- 139 + 140

Upload thumbnail Enviar miniatura

- 195 + 196

Upload preview Enviar pré-visualização

- 202 + 203

@@ -2614,14 +2504,14 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen Short text to tell people how they can support you (membership platform...). Texto curto para dizer às pessoas como elas podem apoiar você (plataforma de membros, etc.).

- 209 + 210

Advanced settings Configurações avançadas

- 190 + 191

@@ -2688,17 +2578,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 3 - - - Cancel - - - Cancelar - - - 19 - - Share Compartilhar @@ -3034,13 +2913,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 14 - - Error getting about from server - Erro ao obter detalhes do servidor - - 1 - - No description Nenhuma descrição @@ -3062,20 +2934,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Error - Erro - - 1 - - - - Success - Sucesso - - 1 - - Configuration updated. Configuração atualizada. @@ -3328,23 +3186,16 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Você realmente deseja excluir ? Isso também excluirá todos os vídeos enviados neste canal. - - 1 - - - - Please type the name of the video channel to confirm - Por favor, digite o nome do canal de vídeo para confirmar + + Video channel deleted. + Canal de vídeo excluído.

- - Video channel deleted. - Canal de vídeo excluído. + + My videos + Meus vídeos 1 @@ -3419,16 +3270,37 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Channels - Canais + + My library + Minha biblioteca

- - Video imports - Importações de vídeos + + My channels + Meus canais + + 1 + + + + My subscriptions + Minhas inscrições + + 1 + + + + Ownership changes + Mudanças de dono + + 1 + + + + My settings + Minhas configurações 1 @@ -3463,6 +3335,13 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 + + Error + Erro + + 1 + + You need to reconnect. você precisa se reconectar. @@ -3477,6 +3356,20 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 + + Info + Info + + 1 + + + + Success + Sucesso + + 1 + + Incorrect username or password. Nome de usuário ou senha incorretos. @@ -3694,6 +3587,20 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 + + Email is required. + E-mail é necessário. + + 1 + + + + Email must be valid. + E-mail deve ser válido. + + 1 + + Username is required. Nome de usuário é necessário. @@ -3715,41 +3622,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Username must be at least 3 characters long. - Nome de usuário deve ter pelo menos 3 caracteres. - - 1 - - - - Username cannot be more than 20 characters long. - Nome de usuário não pode ter mais que 20 caracteres. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Nome de usuário deve ter apenas caracteres alfanuméricos minúsculos. - - 1 - - - - Email is required. - E-mail é necessário. - - 1 - - - - Email must be valid. - E-mail deve ser válido. - - 1 - - Password must be at least 6 characters long. Senha deve ter pelo menos 6 caracteres. @@ -3813,20 +3685,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Display name must be at least 3 characters long. - Nome de exibição deve ter pelo menos 3 caracteres. - - 1 - - - - Display name cannot be more than 120 characters long. - Nome de exibição não pode ter mais que 120 caracteres. - - 1 - - Description must be at least 3 characters long. Descrição deve ter pelo menos 3 caracteres. @@ -3869,13 +3727,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Report reason cannot be more than 300 characters long. - Motivo da denúncia não pode ter mais que 300 caracteres. - - 1 - - Moderation comment is required. Comentário de moderação é obrigatório. @@ -3890,13 +3741,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Moderation comment cannot be more than 300 characters long. - Comentário de moderação não pode ter mais de 300 caracteres. - - 1 - - The channel is required. O canal é obrigatório. @@ -3946,27 +3790,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Name must be at least 3 characters long. - Nome deve ter pelo menos 3 caracteres. - - 1 - - - - Name cannot be more than 20 characters long. - Nome não pode ter mais de 20 caracteres. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Nome deve ser apenas caracteres alfanuméricos minúsculos. - - 1 - - Support text must be at least 3 characters long. Texto de apoio deve ter pelo menos 3 caracteres. @@ -4646,13 +4469,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Subscribed - Inscrito - - 1 - - Subscribed to Inscrito em @@ -4660,9 +4476,9 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Unsubscribed - Desinscrito + + Subscribed + Inscrito 1 @@ -4674,6 +4490,13 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 + + Unsubscribed + Desinscrito + + 1 + + Only I can see this video Apenas eu posso ver este vídeo @@ -4723,13 +4546,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - Info - Info - - 1 - - Upload cancelled Envio cancelado @@ -4737,13 +4553,6 @@ Quando você enviar um vídeo neste canal, o campo de apoio a vídeo será preen 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Lamentamos, mas o PeerTube não consegue lidar com vídeos> 8GB - - 1 - -

Your video quota is exceeded with this video (video size: , used: , quota: ) Sua quota de vídeos é excedida com este vídeo (tamanho do vídeo: , utilizado: , quota: ) diff --git a/client/src/locale/target/angular_ru_RU.xml b/client/src/locale/target/angular_ru_RU.xml index db2a690d5..b3e2afb96 100644 --- a/client/src/locale/target/angular_ru_RU.xml +++ b/client/src/locale/target/angular_ru_RU.xml @@ -356,7 +356,7 @@ Password Пароль

- 12 + 13

@@ -370,7 +370,7 @@ Login Авторизация

- 38 + 36

@@ -398,7 +398,7 @@ Send me an email to reset my password Отправить пароль на электронную почту

- 75 + 80

@@ -462,7 +462,7 @@ Signup Зарегистрироваться

- 88 + 78

@@ -519,7 +519,7 @@ Change the language Изменить язык

- 88 + 86

@@ -530,7 +530,7 @@ Мой побличный профиль - 18 + 16

@@ -541,7 +541,7 @@ Моя учетная запись - 22 + 20

@@ -552,7 +552,7 @@ Мои видео - 26 + 24

@@ -563,14 +563,14 @@ Выйти - 30 + 28

Create an account Создать учетную запись

- 39 + 37

@@ -584,49 +584,49 @@ Subscriptions Подписки

- 47 + 45

Overview Общий вид

- 52 + 50

Trending Тенденции

- 57 + 55

Recently added Недавно добавленный

- 62 + 60

Local Локальный

- 67 + 65

More Больше

- 72 + 70

Administration Администрация

- 76 + 74

@@ -640,7 +640,7 @@ Toggle dark interface Изменить интерфейс

- 94 + 92

@@ -745,7 +745,7 @@ No results. Нет результатов

- 17 + 20

@@ -792,15 +792,11 @@ 7 - - - About instance - - - О Инстанци - + + Submit + Отправить

- 1 + 31

@@ -814,47 +810,14 @@ Terms Условия пользователя

- 44 + 39

User registration is allowed and Создания учетной записи разрешено и - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - этот сервер предоставляет места для видео для пользователей. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - этот сервер предоставляет неограниченное место для пользователей. - - - 31 - - - - - User registration is currently not allowed. - - - Создание учетной записи не разрешено в данный момент. - - - 36 + 29

@@ -1163,49 +1126,49 @@ Short description Краткое описание

- 22 + 21

Default client route Default client route

- 55 + 48

Videos Overview Все видео

- 58 + 51

Videos Trending Тенденции видео

- 59 + 52

Videos Recently Added Недавно добавленное видео

- 60 + 53

Local videos Местное видео

- 61 + 54

Policy on videos containing sensitive content Политика касательно видео содержащих нежелательный контент

- 70 + 61

@@ -1240,23 +1203,44 @@ Signup enabled Регистрация активирована

- 93 + 84

Signup requires email verification Для регистрации нужно подтвержение через электронную почту

- 100 + 91

Signup limit Лимит регистрации + + 96 + + + + Users + Пользователи

105

+ + User default video quota + Квота видео по умолчанию на одного пользователя + + 109 + + + + User default daily upload limit + Ежедневный лимит загрузок по умолчанию на одгого пользователя + + 121 + +

Import Импортировать @@ -1268,42 +1252,21 @@ Video import with a torrent file or a magnet URI enabled Импорт видео с помощью файла торент или magnet URI активирован

- 127 + 148

Administrator Администратор

- 131 + 155

Admin email Электронная почта администратора - 134 - - - - Users - Пользователи - - 144 - - - - User default video quota - Квота видео по умолчанию на одного пользователя - - 147 - - - - User default daily upload limit - Ежедневный лимит загрузок по умолчанию на одгого пользователя - - 161 + 158

@@ -1324,21 +1287,21 @@ Your Twitter username Ваше имя пользователя в Twitter

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Показывает учетнаю запись в Twitter сайта или платформы с которых было опубликован контент

- 184 + 187

Instance whitelisted by Twitter Сервер имеет аккредитацию Twitter

- 198 + 199

@@ -1352,35 +1315,35 @@ Transcoding Транскодирование

- 210 + 215

Transcoding enabled Транскодирование активировано

- 215 + 221

If you disable transcoding, many videos from your users will not work! Если вы дезактивируете транскодирование, многие видео пользователей перестанут работать

- 216 + 222

Transcoding threads Количество threads для транскодирования

- 223 + 237

Resolution enabled Разрешение активировано

- 239 + 252

@@ -1395,82 +1358,47 @@

- 244 + 260

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Некоторые миниатюры не федератные (миниатюры, названия). Они взяты непосредственно из их оригинального сервера и мы их не храним.

- 249 + 265

Previews cache size Размер кеша предпросмотра

- 254 + 271

Video captions cache size Размер кеша предпросмотра надписей

- 265 + 280

Customizations Персонализация

- 275 + 289

JavaScript Ява Скрипт

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Напишите непосредственно код Ява Скрипта .<br />Пример : <pre>console.log('мой сервер крут');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Напишите непосредственно код CSS. Пример:<br /> - <pre> - body - background-color: red; - - </pre> - - Начните с <em>#custom-css</em> чтоб получить приоритет. Пример: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1479,21 +1407,21 @@ Advanced configuration Продвинутая конфигурация

- 207 + 212

Update configuration Обновить конфигурацию

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Конфигурация неудачная. Пожалуйста, найдите потенциальную ошибку в разных окнах.

- 326 + 341

@@ -1740,7 +1668,7 @@ Ban reason: Причины бана:

- 92 + 95

@@ -1807,7 +1735,7 @@ Actions Действия

- 33 + 35

@@ -1842,14 +1770,14 @@ Date Дата

- 10 + 11

Blacklist reason: Причина блокирования:

- 41 + 43

@@ -1873,55 +1801,6 @@ 7 - - My settings - Мои настройки - - 3 - - - - My library - Моя библиотека - - 7 - - - - My channels - Мои каналы - - 12 - - - - My videos - Мои видео - - 14 - - - - My subscriptions - Мои подписки - - 16 - - - - My imports - Мои импортированные видео - - 18 - - - - Ownership changes - Смена собственника - - 33 - -

Video quota: Квота видео @@ -1933,21 +1812,21 @@ Profile Профиль

- 8 + 7

Video settings Настройки видео

- 15 + 16

Danger zone Орасная зона

- 18 + 19

@@ -1975,13 +1854,6 @@ 35 - - Submit - Отправить - - 24 - - - views - просмотры @@ -2279,6 +2151,48 @@ When you will upload a video in this channel, the video support field will be au 17 + + My videos + Мои видео + + 1 + + + + My library + Моя библиотека + + 1 + + + + My channels + Мои каналы + + 1 + + + + My subscriptions + Мои подписки + + 1 + + + + Ownership changes + Смена собственника + + 1 + + + + My settings + Мои настройки + + 1 + + Transcoding threads is required. Транскодирование потоки требуется. @@ -2307,13 +2221,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username must be at least 3 characters long. - Имя пользователя должно быть длиной не менее 3-х символов. - - 1 - - Password must be at least 6 characters long. Пароль должен быть длиной не менее 6 символов. @@ -2321,13 +2228,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. - Отображаемое имя должно иметь длину не менее 3-х символов. - - 1 - - Description must be at least 3 characters long. Описание должно быть длиной не менее 3-х символов. @@ -2363,13 +2263,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Name must be at least 3 characters long. - Длина имени должна быть не менее 3 символов. - - 1 - -

Support text must be at least 3 characters long. Текст поддержки должен содержать не менее 3 символов. diff --git a/client/src/locale/target/angular_sv_SE.xml b/client/src/locale/target/angular_sv_SE.xml index eadcfa444..ffa8b19ca 100644 --- a/client/src/locale/target/angular_sv_SE.xml +++ b/client/src/locale/target/angular_sv_SE.xml @@ -499,7 +499,7 @@ Password Lösenord

- 12 + 13

@@ -513,7 +513,7 @@ Login Logga in

- 38 + 36

@@ -541,7 +541,7 @@ Send me an email to reset my password Skicka ett e-postmeddelande för att återställa mitt lösenord

- 75 + 80

@@ -612,7 +612,7 @@ Signup Registrering

- 88 + 78

@@ -682,7 +682,7 @@ Change the language Ändra språk

- 88 + 86

@@ -693,7 +693,7 @@ Min offentliga profil - 18 + 16

@@ -704,7 +704,7 @@ Mitt konto - 22 + 20

@@ -715,7 +715,7 @@ Mina videor - 26 + 24

@@ -726,14 +726,14 @@ Logga ut - 30 + 28

Create an account Skapa ett konto

- 39 + 37

@@ -747,49 +747,49 @@ Subscriptions Prenumerationer

- 47 + 45

Overview Översikt

- 52 + 50

Trending Populärt

- 57 + 55

Recently added Nyligen tillagt

- 62 + 60

Local Lokalt

- 67 + 65

More Mer

- 72 + 70

Administration Administration

- 76 + 74

@@ -803,14 +803,14 @@ Show keyboard shortcuts Visa kortkommandon

- 91 + 89

Toggle dark interface Växla mörkt gränssnitt

- 94 + 92

@@ -915,14 +915,14 @@ Display unlisted and private videos Visa olistade och privata videor

- 11 + 14

No results. Inga resultat.

- 17 + 20

@@ -980,15 +980,22 @@ 7 - + - About instance - + Cancel + - Om instansen - + Avbryt + - 1 + 26 + + + + Submit + Skicka + + 31

@@ -1002,47 +1009,14 @@ Terms Villkor

- 44 + 39

User registration is allowed and Användarregistrering är tillåten och - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - den här instansen tillhandahåller en grundkvot på utrymme för sina användares videor. - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - den här instansen tillhandahåller obegränsat utrymme för sina användares videor. - - - 31 - - - - - User registration is currently not allowed. - - - Användarregistrering tillåts inte för tillfället. - - - 36 + 29

@@ -1319,22 +1293,30 @@

- MutedMuted

+ Muted + Ignorerad + 13

- Muted by your instanceMuted by your instance

+ Muted by your instance + Ignorerad av din instans + 14

- Instance mutedInstance muted

+ Instance muted + Instans ignorerad + 15

- Instance muted by your instanceInstance muted by your instance

+ Instance muted by your instance + Instans ignorerad av din instans + 16

@@ -1391,49 +1373,49 @@ Short description Kort beskrivning

- 22 + 21

Default client route Klientens standardrouting

- 55 + 48

Videos Overview Videoöversikt

- 58 + 51

Videos Trending Populära videor

- 59 + 52

Videos Recently Added Nyligen tillagda videor

- 60 + 53

Local videos Lokala videor

- 61 + 54

Policy on videos containing sensitive content Policy för videor med känsligt innehåll

- 70 + 61

@@ -1468,23 +1450,44 @@ Signup enabled Registrering aktiverad

- 93 + 84

Signup requires email verification Registrering kräver e-postverifikation

- 100 + 91

Signup limit Registreringsgräns + + 96 + + + + Users + Användare

105

+ + User default video quota + Standardkvot för användares videor + + 109 + + + + User default daily upload limit + Standarduppladdningsgräns för användare + + 121 + +

Import Importera @@ -1496,49 +1499,28 @@ Video import with HTTP URL (i.e. YouTube) enabled Videoimport med HTTP-URL tillåten (t.ex. YouTube)

- 120 + 141

Video import with a torrent file or a magnet URI enabled Videoimport med torrentfil eller magnet-URI är tillåten

- 127 + 148

Administrator Administratör

- 131 + 155

Admin email Administratörens e-postadress - 134 - - - - Users - Användare - - 144 - - - - User default video quota - Standardkvot för användares videor - - 147 - - - - User default daily upload limit - Standarduppladdningsgräns för användare - - 161 + 158

@@ -1559,21 +1541,21 @@ Your Twitter username Ditt användarnamn på Twitter

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. Webbplatsens eller plattformens Twitterkonto, på vilken innehållet publicerades.

- 184 + 187

Instance whitelisted by Twitter Instans vitlistad av Twitter

- 198 + 199

@@ -1587,35 +1569,35 @@ Transcoding Omkodning

- 210 + 215

Transcoding enabled Omkodning aktiverad

- 215 + 221

If you disable transcoding, many videos from your users will not work! Om du avaktiverar omkodning, kommer många av dina användares videor inte fungera!

- 216 + 222

Transcoding threads Omkodningstrådar

- 223 + 237

Resolution enabled Upplösningen tillåten

- 239 + 252

@@ -1630,82 +1612,47 @@

- 244 + 260

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. Vissa filer är inte federerade (till exempel förhandsvisningar och undertexter). Vi kan hämta dem direkt från ursprungsinstansen och cachelagra dem.

- 249 + 265

Previews cache size Förhandsvisningens cachestorlek

- 254 + 271

Video captions cache size Undertexternas cachestorlek

- 265 + 280

Customizations Anpassningar

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> Skriv direkt med JavaScript-kod.<br />Exempel: <pre>console.log('min instans är fantastisk');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - Skriv CSS-kod direkt. Exempel:<br /> - <pre> - body - background-color: red; - - </pre> - - Lägg till <em>#custom-css</em> först för att åsidosätta stilmallen. Exempel: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1714,21 +1661,21 @@ Advanced configuration Avancerade inställningar

- 207 + 212

Update configuration Uppdatera inställningar

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. Det verkar som att konfigurationen inte stämmer. Sök efter eventuella fel i de olika flikarna.

- 326 + 341

@@ -2015,11 +1962,25 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a 133 + + User's email must be verified to login + Användarens e-post måste verifieras innan inloggning + + 72 + + + + User's email is verified / User can login without email verification + Användarens e-post har verifierats / Användaren behöver inte verifiera sin e-post för att logga in + + 76 + +

Ban reason: Blockeringsanledning:

- 92 + 95

@@ -2086,7 +2047,7 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a Actions Åtgärder

- 33 + 35

@@ -2121,14 +2082,14 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a Date Datum

- 10 + 11

Blacklist reason: Anledning för svartlistning:

- 41 + 43

@@ -2153,12 +2114,16 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a

- Muted accountsMuted accounts

+ Muted accounts + Ignorerade konton + 2

- Muted serversMuted servers

+ Muted servers + Ignorerade servrar + 11

@@ -2170,74 +2135,17 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a

- Muted at Muted at

+ Muted at + Ignorerad på + 13

- UnmuteUnmute - 23 - - - - My settings - Mina inställningar - - 3 - - - - My library - Mitt bibliotek - - 7 - - - - My channels - Mina kanaler - - 12 - - - - My videos - Mina videor - - 14 - - - - My subscriptions - Mina prenumerationer - - 16 - - - - My imports - Mina importeringar + Unmute + Sluta ignorera - 18 - - - - Misc - Diverse - - 24 - - - - Muted instancesMuted instances - 2 - - - - Ownership changes - Ändringar av ägarskap - - 33 + 23

@@ -2251,21 +2159,21 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a Profile Profil

- 8 + 7

Video settings Videoinställningar

- 15 + 16

Danger zone Riskzon

- 18 + 19

@@ -2293,13 +2201,6 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a 35 - - Submit - Skicka - - 24 - - - views - visningar @@ -2459,6 +2360,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 47 + + Muted instances + Ignorerade instanser + + 2 + + Change password Ändra lösenord @@ -2664,6 +2572,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 159 + + Sorry, but something went wrong + Någonting har tyvärr gått fel + + 49 + +

Congratulations, the video behind will be imported! You can already add information about this video. @@ -2700,14 +2615,14 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Publish will be available when upload is finished Du kan publicera när uppladdningen är klar

- 53 + 58

Publish Publisera

- 60 + 65

@@ -2890,14 +2805,14 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Wait transcoding before publishing the video Publicera video när omkodningen är avklarad

- 130 + 131

If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. Om du väljer att inte vänta på omkodningen innan publicering, kommer videon inte gå att spela förrän omkodningen är färdig.

- 131 + 132

@@ -2911,49 +2826,49 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Add another caption Lägg till ännu en text

- 146 + 147

See the subtitle file Se undertextfilen

- 155 + 156

Already uploaded ✔ Redan uppladdad ✔

- 159 + 160

Will be created on update Kommer skapas vid uppdatering

- 167 + 168

Cancel create Avbryt skapande

- 169 + 170

Will be deleted on update Kommer raderas vid uppdatering

- 175 + 176

Cancel deletion Avbryt radering

- 177 + 178

@@ -2964,28 +2879,28 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Inga undertexter för tillfället. - 182 + 183

Captions Texter

- 139 + 140

Upload thumbnail Ladda upp miniatyrbild

- 195 + 196

Upload preview Ladda upp förhandsvisning

- 202 + 203

@@ -2999,14 +2914,14 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt Short text to tell people how they can support you (membership platform...). Kort text för att berätta hur andra kan stödja dig (medlemsplattform …).

- 209 + 210

Advanced settings Avancerade inställningar

- 190 + 191

@@ -3073,17 +2988,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 3 - - - Cancel - - - Avbryt - - - 19 - - Share Dela @@ -3309,7 +3213,7 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. - den här videons delningssystem medför att en del teknisk information om ditt system (såsom publik IP-adress) kan skickas till andra serventer. + den här videons delningssystem gör att en del teknisk information om ditt system (som publik IP-adress) kan skickas till andra serventer.

209 @@ -3470,13 +3374,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 14

- - Error getting about from server - Kan inte hämta information om instansen från servern - - 1 - - No description Ingen beskrivning @@ -3498,13 +3395,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Error - Fel - - 1 - - 240p 240p @@ -3547,13 +3437,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Success - Åtgärden lyckades - - 1 - -

Configuration updated. Konfigurering uppdaterad. @@ -3716,12 +3599,16 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt

- Account unmuted by your instance.Account unmuted by your instance.

+ Account unmuted by your instance. + Kontot ignoreras inte längre av din instans. + 1

- Instance unmuted by your instance.Instance unmuted by your instance.

+ Instance unmuted by your instance. + Instansen ignoreras inte längre av din instans. + 1

@@ -3816,6 +3703,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Set Email as Verified + Markera e-post som verifierad + + 1 + + You cannot ban root. Du kan inte blockera root. @@ -3858,13 +3752,24 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + users email set as verified. + användares e-post har markerats som verifierade. + + 1 + +

- Account unmuted.Account unmuted.

+ Account unmuted. + Kontot ignoreras inte längre. + 1

- Instance unmuted.Instance unmuted.

+ Instance unmuted. + Instansen ignoreras inte längre. + 1

@@ -3966,23 +3871,16 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - Vill du verkligen radera ? Det kommer radera samtliga videor som laddats upp till kanalen. - - 1 - - - - Please type the name of the video channel to confirm - Fyll i kanalens namn för att bekräfta + + Video channel deleted. + Kanalen har raderats.

- - Video channel deleted. - Kanalen har raderats. + + My videos + Mina videor 1 @@ -4057,16 +3955,44 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Channels - Kanaler + + My library + Mitt bibliotek + + 1 + + + + My channels + Mina kanaler

- - Video imports - Videoimporteringar + + My subscriptions + Mina prenumerationer + + 1 + + + + Misc + Diverse + + 1 + + + + Ownership changes + Ändringar av ägarskap + + 1 + + + + My settings + Mina inställningar 1 @@ -4192,6 +4118,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Error + Fel + + 1 + + You need to reconnect. Du måste återansluta. @@ -4213,6 +4146,20 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Info + Information + + 1 + + + + Success + Åtgärden lyckades + + 1 + + Incorrect username or password. Felaktigt användarnamn eller lösenord. @@ -4430,6 +4377,20 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Email is required. + E-postadress måste uppges. + + 1 + + + + Email must be valid. + E-postadressen måste vara giltig. + + 1 + + Username is required. Användarnamn måste fyllas i. @@ -4451,41 +4412,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Username must be at least 3 characters long. - Användarnamnet måste innehålla minst tre tecken. - - 1 - - - - Username cannot be more than 20 characters long. - Användarnamnet får inte vara mer än 20 tecken långt. - - 1 - - - - Username should be only lowercase alphanumeric characters. - Användarnamnet får endast bestå av små bokstäver och siffror. - - 1 - - - - Email is required. - E-postadress måste uppges. - - 1 - - - - Email must be valid. - E-postadressen måste vara giltig. - - 1 - - Password must be at least 6 characters long. Lösenordet måste innehålla minst sex tecken. @@ -4549,20 +4475,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Display name must be at least 3 characters long. - Visningsnamnet måste innehålla minst tre tecken. - - 1 - - - - Display name cannot be more than 120 characters long. - Visningsnamnet får inte vara mer än 120 tecken långt. - - 1 - - Description must be at least 3 characters long. Beskrivningen måste innehålla minst tre tecken. @@ -4612,13 +4524,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Report reason cannot be more than 300 characters long. - Orsak för rapportering får inte vara mer än 300 tecken lång. - - 1 - - Moderation comment is required. Moderationskommentar krävs. @@ -4633,13 +4538,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Moderation comment cannot be more than 300 characters long. - Moderationskommentaren får inte vara mer än 300 tecken lång. - - 1 - - The channel is required. Kanalen måste anges. @@ -4696,27 +4594,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Name must be at least 3 characters long. - Namnet måste innehålla minst tre tecken. - - 1 - - - - Name cannot be more than 20 characters long. - Namnet får inte vara mer än 20 tecken långt. - - 1 - - - - Name should be only lowercase alphanumeric characters. - Namnet kan endast bestå av små bokstäver och siffror - - 1 - - Support text must be at least 3 characters long. Supporttexten måste innehålla minst tre tecken. @@ -5396,73 +5273,108 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + User email set as verified + Användaren s e-post har markerats som verifierad. + + 1 + +

- Account muted.Account muted.

+ Account muted. + Kontot ignoreras. + 1

- Instance muted.Instance muted.

+ Instance muted. + Instansen ignoreras. + 1

- Account muted by the instance.Account muted by the instance.

+ Account muted by the instance. + Kontot ignoreras av instansen. + 1

- Account unmuted by the instance.Account unmuted by the instance.

+ Account unmuted by the instance. + Kontot ignoreras inte längre av instansen. + 1

- Instance muted by the instance.Instance muted by the instance.

+ Instance muted by the instance. + Instansen ignoreras av instansen. + 1

- Instance unmuted by the instance.Instance unmuted by the instance.

+ Instance unmuted by the instance. + Instansen ignoreras inte längre av instansen. + 1

- Mute this accountMute this account

+ Mute this account + Ignorera det här kontot + 1

- Unmute this accountUnmute this account

+ Unmute this account + Sluta ignorera det här kontot + 1

- Mute the instanceMute the instance

+ Mute the instance + Ignorera instansen + 1

- Unmute the instanceUnmute the instance

+ Unmute the instance + Sluta ignorera instansen + 1

- Mute this account by your instanceMute this account by your instance

+ Mute this account by your instance + Ignorera det här kontot av din instans + 1

- Unmute this account by your instanceUnmute this account by your instance

+ Unmute this account by your instance + Sluta ignorera det här kontot av din instans + 1

- Mute the instance by your instanceMute the instance by your instance

+ Mute the instance by your instance + Ignorera instansen av din instans + 1

- Unmute the instance by your instanceUnmute the instance by your instance

+ Unmute the instance by your instance + Sluta ignorera instansen av din instans + 1

@@ -5494,13 +5406,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Subscribed - Prenumererar - - 1 - - Subscribed to Prenumererar på @@ -5508,9 +5413,9 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Unsubscribed - Prenumeration avbruten + + Subscribed + Prenumererar 1 @@ -5522,6 +5427,13 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 + + Unsubscribed + Prenumeration avbruten + + 1 + + Moderator Moderator @@ -5592,13 +5504,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - Info - Information - - 1 - - Upload cancelled Uppladdningen avbröts @@ -5606,13 +5511,6 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt 1 - - We are sorry but PeerTube cannot handle videos > 8GB - Vi ber om ursäkt, PeerTube kan tyvärr inte hantera videor större än 8GB - - 1 - -

Your video quota is exceeded with this video (video size: , used: , quota: ) Den här videon kommer överskrida din videokvot (videostorlek: , använt: , kvot: ) diff --git a/client/src/locale/target/angular_ta.xml b/client/src/locale/target/angular_ta.xml index 35385cfdb..abd878aaa 100644 --- a/client/src/locale/target/angular_ta.xml +++ b/client/src/locale/target/angular_ta.xml @@ -201,14 +201,14 @@ Password கடவுச்சொல்

- 12 + 13

- 38 + 36

@@ -257,7 +257,7 @@ Change the language மொழியை மாற்று

- 88 + 86

@@ -268,28 +268,28 @@ வெளியேறு - 30 + 28

Create an account கணக்கை உருவாக்கு

- 39 + 37

Recently added சமீபத்தியவை

- 62 + 60

More மேலும்

- 72 + 70

@@ -352,7 +352,7 @@ No results. முடிவுகள் இல்லை.

- 17 + 20

@@ -394,7 +394,7 @@ Users பயணர்கள்

- 144 + 105

@@ -408,7 +408,7 @@ Your Twitter username உங்கள் Twitter பயணர்பெயர்

- 181 + 184

@@ -422,7 +422,7 @@ JavaScript JavaScript

- 278 + 294

diff --git a/client/src/locale/target/angular_zh_Hans_CN.xml b/client/src/locale/target/angular_zh_Hans_CN.xml index c8ed702f8..09ed78392 100644 --- a/client/src/locale/target/angular_zh_Hans_CN.xml +++ b/client/src/locale/target/angular_zh_Hans_CN.xml @@ -499,7 +499,7 @@ Password 密码

- 12 + 13

@@ -513,7 +513,7 @@ Login 登录

- 38 + 36

@@ -541,7 +541,7 @@ Send me an email to reset my password 发送密码重置邮件

- 75 + 80

@@ -610,7 +610,7 @@ Signup 注册

- 88 + 78

@@ -680,7 +680,7 @@ Change the language 更改语言

- 88 + 86

@@ -691,7 +691,7 @@ 我的公开个人资料 - 18 + 16

@@ -702,7 +702,7 @@ 我的帐户 - 22 + 20

@@ -713,7 +713,7 @@ 我的视频 - 26 + 24

@@ -724,14 +724,14 @@ 注销 - 30 + 28

Create an account 创建帐户

- 39 + 37

@@ -745,49 +745,49 @@ Subscriptions 订阅内容

- 47 + 45

Overview 总览

- 52 + 50

Trending 时下流行

- 57 + 55

Recently added 最近添加

- 62 + 60

Local 本地

- 67 + 65

More 更多

- 72 + 70

Administration 管理

- 76 + 74

@@ -801,14 +801,14 @@ Show keyboard shortcuts 显示键盘快捷键

- 91 + 89

Toggle dark interface 切换夜间模式

- 94 + 92

@@ -913,14 +913,14 @@ Display unlisted and private videos 显示不公开和私享视频

- 11 + 14

No results. 没有结果。

- 17 + 20

@@ -978,15 +978,22 @@ 7 - + - About instance - + Cancel + - 关于实例 - + 取消 + - 1 + 26 + + + + Submit + 提交 + + 31

@@ -1000,47 +1007,14 @@ Terms 条款

- 44 + 39

User registration is allowed and 当前开放注册，并且 - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - - 本实例为用户上传的视频提供的基本存储空间。 - - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - - 本实例为用户上传的视频提供无限制的存储空间。 - - - 31 - - - - - User registration is currently not allowed. - - - 当前不开放注册。 - - - 36 + 29

@@ -1395,49 +1369,49 @@ Short description 简介

- 22 + 21

Default client route 首页默认内容

- 55 + 48

Videos Overview 视频总览

- 58 + 51

Videos Trending 时下流行的视频

- 59 + 52

Videos Recently Added 最近添加的视频

- 60 + 53

Local videos 本地视频

- 61 + 54

Policy on videos containing sensitive content 针对包含敏感内容视频的策略

- 70 + 61

@@ -1472,23 +1446,44 @@ Signup enabled 开放注册

- 93 + 84

Signup requires email verification 注册需要验证电子邮件地址

- 100 + 91

Signup limit 注册限制 + + 96 + + + + Users + 用户

105

+ + User default video quota + 用户默认视频存储空间大小 + + 109 + + + + User default daily upload limit + 用户默认单日上传限额 + + 121 + +

Import 导入 @@ -1500,49 +1495,28 @@ Video import with HTTP URL (i.e. YouTube) enabled 允许通过 HTTP URL（例如 YouTube）导入视频

- 120 + 141

Video import with a torrent file or a magnet URI enabled 允许通过种子文件或磁力链导入视频

- 127 + 148

Administrator 管理员

- 131 + 155

Admin email 管理员电子邮件地址 - 134 - - - - Users - 用户 - - 144 - - - - User default video quota - 用户默认视频存储空间大小 - - 147 - - - - User default daily upload limit - 用户默认单日上传限额 - - 161 + 158

@@ -1563,21 +1537,21 @@ Your Twitter username 您的 Twitter 用户名

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. 显示此内容所在的发布平台对应的 Twitter 帐户。

- 184 + 187

Instance whitelisted by Twitter 实例已进入 Twitter 白名单

- 198 + 199

@@ -1591,35 +1565,35 @@ Transcoding 转码

- 210 + 215

Transcoding enabled 启用转码

- 215 + 221

If you disable transcoding, many videos from your users will not work! 如果禁用转码，用户上传的视频很有可能无法正常播放！

- 216 + 222

Transcoding threads 转码线程数

- 223 + 237

Resolution enabled 启用分辨率

- 239 + 252

@@ -1634,82 +1608,47 @@

- 244 + 260

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. 部分文件不会自动同步（如预览图、字幕）。我们会直接从源实例拉取并进行缓存。

- 249 + 265

Previews cache size 预览图缓存大小

- 254 + 271

Video captions cache size 视频字幕缓存大小

- 265 + 280

Customizations 自定义

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> 在此处直接输入 JavaScript 代码。<br />示例：<pre>console.log('我的实例太棒了');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - 在此处直接输入 CSS 代码。示例：<br /> - <pre> - body - background-color: red; - - </pre> - - 您可以通过插入 <em>#custom-css</em> 来覆盖样式设置。示例： - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1718,21 +1657,21 @@ Advanced configuration 高级设置

- 207 + 212

Update configuration 更新设置

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. 设置信息不合法。请检查各选项卡中的设置是否存在错误。

- 326 + 341

@@ -2028,7 +1967,7 @@ Ban reason: 封禁理由：

- 92 + 95

@@ -2095,7 +2034,7 @@ Actions 操作

- 33 + 35

@@ -2130,14 +2069,14 @@ Date 日期

- 10 + 11

Blacklist reason: 黑名单理由：

- 41 + 43

@@ -2196,69 +2135,6 @@ 23 - - My settings - 我的设置 - - 3 - - - - My library - 我的库 - - 7 - - - - My channels - 我的频道 - - 12 - - - - My videos - 我的视频 - - 14 - - - - My subscriptions - 我的订阅 - - 16 - - - - My imports - 我的导入 - - 18 - - - - Misc - 杂项 - - 24 - - - - Muted instances - 已屏蔽的实例 - - 2 - - - - Ownership changes - 视频转移 - - 33 - -

Video quota: 视频存储空间： @@ -2270,21 +2146,21 @@ Profile 个人资料

- 8 + 7

Video settings 视频设置

- 15 + 16

Danger zone 危险选项

- 18 + 19

@@ -2312,13 +2188,6 @@ 35 - - Submit - 提交 - - 24 - - - views - 次观看 @@ -2478,6 +2347,13 @@ When you will upload a video in this channel, the video support field will be au 47 + + Muted instances + 已屏蔽的实例 + + 2 + +

Change password 更改密码 @@ -2719,14 +2595,14 @@ When you will upload a video in this channel, the video support field will be au Publish will be available when upload is finished 上传完毕后即可发布

- 53 + 58

Publish 发布

- 60 + 65

@@ -2909,14 +2785,14 @@ When you will upload a video in this channel, the video support field will be au Wait transcoding before publishing the video 等待转码完毕后再发布视频

- 130 + 131

If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. 如果您选择不等待转码就发布视频，则视频在转码完毕前很有可能无法正常播放。

- 131 + 132

@@ -2930,49 +2806,49 @@ When you will upload a video in this channel, the video support field will be au Add another caption 添加字幕

- 146 + 147

See the subtitle file 查看字幕文件

- 155 + 156

Already uploaded ✔ 已上传 ✔

- 159 + 160

Will be created on update 将在更新时创建

- 167 + 168

Cancel create 取消创建

- 169 + 170

Will be deleted on update 将在更新时删除

- 175 + 176

Cancel deletion 取消删除

- 177 + 178

@@ -2983,28 +2859,28 @@ When you will upload a video in this channel, the video support field will be au 当前没有字幕。 - 182 + 183

Captions 字幕

- 139 + 140

Upload thumbnail 上传缩略图

- 195 + 196

Upload preview 上传预览图

- 202 + 203

@@ -3018,14 +2894,14 @@ When you will upload a video in this channel, the video support field will be au Short text to tell people how they can support you (membership platform...). 用一段简短的文字告知观众支持您的频道的方法（赞助社区等）。

- 209 + 210

Advanced settings 高级设置

- 190 + 191

@@ -3092,17 +2968,6 @@ When you will upload a video in this channel, the video support field will be au 3 - - - Cancel - - - 取消 - - - 19 - - Share 分享 @@ -3488,13 +3353,6 @@ When you will upload a video in this channel, the video support field will be au 14 - - Error getting about from server - 从服务器获取关于信息时发生错误 - - 1 - - No description 没有说明 @@ -3516,13 +3374,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Error - 错误 - - 1 - - 240p 240p @@ -3565,13 +3416,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Success - 成功 - - 1 - - Configuration updated. 设置已更新。 @@ -3993,23 +3837,16 @@ When you will upload a video in this channel, the video support field will be au 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - 您确定要删除吗？这将同时删除上传至该频道的所有视频。 - - 1 - - - - Please type the name of the video channel to confirm - 输入视频频道的显示名以确认操作 + + Video channel deleted. + 视频频道已删除。

- - Video channel deleted. - 视频频道已删除。 + + My videos + 我的视频 1 @@ -4084,16 +3921,44 @@ When you will upload a video in this channel, the video support field will be au 1 - - Channels - 频道 + + My library + 我的库

- - Video imports - 导入的视频 + + My channels + 我的频道 + + 1 + + + + My subscriptions + 我的订阅 + + 1 + + + + Misc + 杂项 + + 1 + + + + Ownership changes + 视频转移 + + 1 + + + + My settings + 我的设置 1 @@ -4219,6 +4084,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Error + 错误 + + 1 + + You need to reconnect. 请重新进行授权。 @@ -4240,6 +4112,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Info + 提示 + + 1 + + + + Success + 成功 + + 1 + + Incorrect username or password. 用户名或密码不正确。 @@ -4457,6 +4343,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Email is required. + 请输入电子邮件地址。 + + 1 + + + + Email must be valid. + 请输入合法的电子邮件地址。 + + 1 + + Username is required. 请输入用户名。 @@ -4478,41 +4378,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username must be at least 3 characters long. - 用户名应至少 3 个字符。 - - 1 - - - - Username cannot be more than 20 characters long. - 用户名不能超过 20 个字符。 - - 1 - - - - Username should be only lowercase alphanumeric characters. - 用户名只能使用小写字母和数字。 - - 1 - - - - Email is required. - 请输入电子邮件地址。 - - 1 - - - - Email must be valid. - 请输入合法的电子邮件地址。 - - 1 - - Password must be at least 6 characters long. 密码应至少 6 个字符。 @@ -4576,20 +4441,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. - 显示名称应至少 3 个字符。 - - 1 - - - - Display name cannot be more than 120 characters long. - 显示名称不能超过 120 个字符。 - - 1 - - Description must be at least 3 characters long. 说明应至少 3 个字符。 @@ -4639,13 +4490,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Report reason cannot be more than 300 characters long. - 举报理由不能超过 300 个字符。 - - 1 - - Moderation comment is required. 请输入运营备注信息。 @@ -4660,13 +4504,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Moderation comment cannot be more than 300 characters long. - 运营备注信息不能超过 300 个字符。 - - 1 - - The channel is required. 必须指定频道。 @@ -4723,27 +4560,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Name must be at least 3 characters long. - 频道用户名应至少 3 个字符。 - - 1 - - - - Name cannot be more than 20 characters long. - 频道用户名不能超过 20 个字符。 - - 1 - - - - Name should be only lowercase alphanumeric characters. - 频道用户名只能使用小写字母和数字。 - - 1 - - Support text must be at least 3 characters long. 支持信息应至少 3 个字符。 @@ -5549,13 +5365,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Subscribed - 已订阅 - - 1 - - Subscribed to 成功订阅 @@ -5563,9 +5372,9 @@ When you will upload a video in this channel, the video support field will be au 1 - - Unsubscribed - 已退订 + + Subscribed + 已订阅 1 @@ -5577,6 +5386,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Unsubscribed + 已退订 + + 1 + + Moderator 监察员 @@ -5633,13 +5449,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Info - 提示 - - 1 - - Upload cancelled 上传已取消 @@ -5647,13 +5456,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - We are sorry but PeerTube cannot handle videos > 8GB - 非常抱歉，PeerTube 不支持 8GB 以上的视频 - - 1 - -

Your video quota is exceeded with this video (video size: , used: , quota: ) 此视频已超出您的视频存储总空间（视频大小：，当前已使用：，总空间：） diff --git a/client/src/locale/target/angular_zh_Hant_TW.xml b/client/src/locale/target/angular_zh_Hant_TW.xml index 028520a6e..c1aefbb40 100644 --- a/client/src/locale/target/angular_zh_Hant_TW.xml +++ b/client/src/locale/target/angular_zh_Hant_TW.xml @@ -497,7 +497,7 @@ Password 密碼

- 12 + 13

@@ -511,7 +511,7 @@ Login 登入

- 38 + 36

@@ -539,7 +539,7 @@ Send me an email to reset my password 傳送電子郵件給我以重設我的密碼

- 75 + 80

@@ -606,7 +606,7 @@ Signup 註冊

- 88 + 78

@@ -674,7 +674,7 @@ Change the language 變更語言

- 88 + 86

@@ -685,7 +685,7 @@ 我的公開個人資料 - 18 + 16

@@ -696,7 +696,7 @@ 我的帳號 - 22 + 20

@@ -707,7 +707,7 @@ 我的影片 - 26 + 24

@@ -718,14 +718,14 @@ 登出 - 30 + 28

Create an account 建立帳號

- 39 + 37

@@ -739,49 +739,49 @@ Subscriptions 訂閱

- 47 + 45

Overview 概覽

- 52 + 50

Trending 趨勢

- 57 + 55

Recently added 最近新增

- 62 + 60

Local 本地

- 67 + 65

More 更多

- 72 + 70

Administration 管理

- 76 + 74

@@ -795,14 +795,14 @@ Show keyboard shortcuts 顯示鍵盤快捷鍵

- 91 + 89

Toggle dark interface 切換至暗色介面

- 94 + 92

@@ -907,14 +907,14 @@ Display unlisted and private videos 顯示未列出與私密影片

- 11 + 14

No results. 沒有結果

- 17 + 20

@@ -972,13 +972,22 @@ 7 - + - About instance - - 關於實體 + Cancel + + + 取消 + - 1 + 26 + + + + Submit + 遞交 + + 31

@@ -992,41 +1001,14 @@ Terms 條款

- 44 + 39

User registration is allowed and 允許使用者註冊與 - 25 - - - - - this instance provides a baseline quota of space for the videos of its users. - - 此實體提供了基本配額空間給它的使用者的影片。 - - 27 - - - - - this instance provides unlimited space for the videos of its users. - - 此實體提供了無限的影片空間給它的使用者。 - - 31 - - - - - User registration is currently not allowed. - - 目前不允許使用者註冊。 - - 36 + 29

@@ -1353,49 +1335,49 @@ Short description 短描述

- 22 + 21

Default client route 預設客戶端路由

- 55 + 48

Videos Overview 影片概覽

- 58 + 51

Videos Trending 影片趨勢

- 59 + 52

Videos Recently Added 最近新增的影片

- 60 + 53

Local videos 本地影片

- 61 + 54

Policy on videos containing sensitive content 包含敏感內容的影片政策

- 70 + 61

@@ -1430,23 +1412,44 @@ Signup enabled 已啟用註冊

- 93 + 84

Signup requires email verification 註冊需要電子郵件驗證

- 100 + 91

Signup limit 限制註冊 + + 96 + + + + Users + 使用者

105

+ + User default video quota + 使用者預設影片配額 + + 109 + + + + User default daily upload limit + 預設使用者每日上傳限制 + + 121 + +

Import 匯入 @@ -1458,49 +1461,28 @@ Video import with HTTP URL (i.e. YouTube) enabled 以 HTTP URL 匯入影片（如 YouTube）已啟用

- 120 + 141

Video import with a torrent file or a magnet URI enabled 已啟用種子檔案或磁力連結匯入影片

- 127 + 148

Administrator 管理員

- 131 + 155

Admin email 管理電子郵件 - 134 - - - - Users - 使用者 - - 144 - - - - User default video quota - 使用者預設影片配額 - - 147 - - - - User default daily upload limit - 預設使用者每日上傳限制 - - 161 + 158

@@ -1521,30 +1503,19 @@ Your Twitter username 您的 Twitter 使用者名稱

- 181 + 184

Indicates the Twitter account for the website or platform on which the content was published. 指示發佈影片的網頁或平臺的 Twitter 帳號

- 184 + 187

Instance whitelisted by Twitter 由 Twitter 列入白名單的實體 - - 198 - - - - If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> - If the instance is not whitelisted, we use an image link card that will redirect on 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 whitelisted. - 如果您的實體在 Twitter 的白名單裡面，PeerTube 的影片分享將會在 Twitter 的推文中嵌入影片播放器。<br /> - 如果實體不在白名單中，我們會使用一張圖片連結卡片並重新導向至您的 PeerTube 實體。<br /><br /> - 在此勾選框打勾，儲存設定並使用您實體的影片 URL (https://example.com/videos/watch/blabla)在 <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> 上測試以檢視您的實體是否在白名單內。 199 @@ -1560,35 +1531,35 @@ Transcoding 轉換編碼

- 210 + 215

Transcoding enabled 轉換編碼已啟用

- 215 + 221

If you disable transcoding, many videos from your users will not work! 若您停用轉換編碼，從您的使用者們而來的許多影片將會無法運作！

- 216 + 222

Transcoding threads 轉換編碼執行緒

- 223 + 237

Resolution enabled 解析度已啟用

- 239 + 252

@@ -1603,82 +1574,47 @@

- 244 + 260

Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them. 有一些檔案並未聯盟化（預覽、字幕）。我們會直接從原始實體擷取它們並快取。

- 249 + 265

Previews cache size 預覽快取大小

- 254 + 271

Video captions cache size 影片字幕快取大小

- 265 + 280

Customizations 自訂

- 275 + 289

JavaScript JavaScript

- 278 + 294

Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> 直接編寫 JavaScript 程式碼。<br />範例：<pre>console.log('my instance is amazing');</pre> - - 281 - - - - - Write directly CSS code. Example:<br /> - <pre> - body - background-color: red; - - </pre> - - Prepend with <em>#custom-css</em> to override styles. Example: - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - - - 直接撰寫 CSS 程式碼。範例：<br /> - <pre> - body - background-color: red; - - </pre> - - 附加 <em>#custom-css</em> 以覆寫樣式。範例： - <pre> - #custom-css .logged-in-email - color: red; - - </pre> - 297 @@ -1687,21 +1623,21 @@ Advanced configuration 進階設定

- 207 + 212

Update configuration 更新設定

- 325 + 340

It seems the configuration is invalid. Please search potential errors in the different tabs. 設定似乎無效。請在不同的分頁中搜尋潛在的錯誤。

- 326 + 341

@@ -1987,21 +1923,21 @@ User's email must be verified to login 使用者的電子郵件必須驗證過才能登入

- 70 + 72

User's email is verified / User can login without email verification 使用者的電子郵件已驗證／使用者可以不透過電子郵件驗證登入

- 74 + 76

Ban reason: 阻擋理由：

- 92 + 95

@@ -2068,7 +2004,7 @@ Actions 動作

- 33 + 35

@@ -2103,14 +2039,14 @@ Date 日期

- 10 + 11

Blacklist reason: 黑名單理由：

- 41 + 43

@@ -2169,69 +2105,6 @@ 23 - - My settings - 我的設定 - - 3 - - - - My library - 我的媒體庫 - - 7 - - - - My channels - 我的頻道 - - 12 - - - - My videos - 我的影片 - - 14 - - - - My subscriptions - 我的訂閱 - - 16 - - - - My imports - 我的匯入 - - 18 - - - - Misc - 雜項 - - 24 - - - - Muted instances - 已靜音的實體 - - 2 - - - - Ownership changes - 所有權變更 - - 33 - -

Video quota: 影片配額： @@ -2243,21 +2116,21 @@ Profile 簡介

- 8 + 7

Video settings 影片設定

- 15 + 16

Danger zone 危險區域

- 18 + 19

@@ -2285,13 +2158,6 @@ 35 - - Submit - 遞交 - - 24 - - - views - 次檢視 @@ -2450,6 +2316,13 @@ When you will upload a video in this channel, the video support field will be au 47 + + Muted instances + 已靜音的實體 + + 2 + +

Change password 變更密碼 @@ -2694,14 +2567,14 @@ When you will upload a video in this channel, the video support field will be au Publish will be available when upload is finished 上傳完成時將可發佈

- 53 + 58

Publish 發佈

- 60 + 65

@@ -2882,14 +2755,14 @@ When you will upload a video in this channel, the video support field will be au Wait transcoding before publishing the video 正等待發佈影片前的轉換編碼

- 130 + 131

If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends. 如果您決定不要等待在發佈影片前的轉換編碼，它可能會在轉換編碼結束前都無法播放。

- 131 + 132

@@ -2903,49 +2776,49 @@ When you will upload a video in this channel, the video support field will be au Add another caption 新增其他字幕

- 146 + 147

See the subtitle file 檢視字幕檔案

- 155 + 156

Already uploaded ✔ 已上傳 ✔

- 159 + 160

Will be created on update 將在更新時建立

- 167 + 168

Cancel create 取消建立

- 169 + 170

Will be deleted on update 將在更新時刪除

- 175 + 176

Cancel deletion 取消刪除

- 177 + 178

@@ -2956,28 +2829,28 @@ When you will upload a video in this channel, the video support field will be au 現在沒有字幕。 - 182 + 183

Captions 字幕

- 139 + 140

Upload thumbnail 上傳縮圖

- 195 + 196

Upload preview 上傳預覽

- 202 + 203

@@ -2991,14 +2864,14 @@ When you will upload a video in this channel, the video support field will be au Short text to tell people how they can support you (membership platform...). 告訴人們他們可以如何支援您（成員平臺等）的短文

- 209 + 210

Advanced settings 進階設定

- 190 + 191

@@ -3065,17 +2938,6 @@ When you will upload a video in this channel, the video support field will be au 3 - - - Cancel - - - 取消 - - - 19 - - Share 分享 @@ -3460,13 +3322,6 @@ When you will upload a video in this channel, the video support field will be au 14 - - Error getting about from server - 取得關於伺服器的錯誤 - - 1 - - No description 沒有描述 @@ -3488,13 +3343,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Error - 錯誤 - - 1 - - 240p 240p @@ -3537,13 +3385,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Success - 成功 - - 1 - - Configuration updated. 設定已更新。 @@ -3978,23 +3819,16 @@ When you will upload a video in this channel, the video support field will be au 1 - - Do you really want to delete ? It will delete all videos uploaded in this channel too. - 您真的想要刪除嗎？這也會刪除所有上傳到這個頻道的影片。 - - 1 - - - - Please type the name of the video channel to confirm - 請輸入影片頻道的名稱以確認 + + Video channel deleted. + 影片頻道已刪除。

- - Video channel deleted. - 影片頻道已刪除。 + + My videos + 我的影片 1 @@ -4069,16 +3903,44 @@ When you will upload a video in this channel, the video support field will be au 1 - - Channels - 頻道 + + My library + 我的媒體庫

- - Video imports - 影片匯入 + + My channels + 我的頻道 + + 1 + + + + My subscriptions + 我的訂閱 + + 1 + + + + Misc + 雜項 + + 1 + + + + Ownership changes + 所有權變更 + + 1 + + + + My settings + 我的設定 1 @@ -4204,6 +4066,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Error + 錯誤 + + 1 + + You need to reconnect. 您需要重新連線。 @@ -4225,6 +4094,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Info + 資訊 + + 1 + + + + Success + 成功 + + 1 + + Incorrect username or password. 不正確的使用者名稱或密碼。 @@ -4442,6 +4325,20 @@ When you will upload a video in this channel, the video support field will be au 1 + + Email is required. + 電子郵件必填。 + + 1 + + + + Email must be valid. + 電子郵件必須為有效電子郵件。 + + 1 + + Username is required. 使用者名稱必填。 @@ -4463,41 +4360,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Username must be at least 3 characters long. - 使用者名稱必須至少 3 個字元長。 - - 1 - - - - Username cannot be more than 20 characters long. - 使用者名稱不能多於 20 個字元。 - - 1 - - - - Username should be only lowercase alphanumeric characters. - 使用者名稱應該僅有小寫英數字元。 - - 1 - - - - Email is required. - 電子郵件必填。 - - 1 - - - - Email must be valid. - 電子郵件必須為有效電子郵件。 - - 1 - - Password must be at least 6 characters long. 密碼必須至少 6 個字元長。 @@ -4561,20 +4423,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Display name must be at least 3 characters long. - 顯示名稱必須至少 3 個字元長。 - - 1 - - - - Display name cannot be more than 120 characters long. - 顯示名稱不能多於 120 個字元。 - - 1 - - Description must be at least 3 characters long. 描述必須至少 3 個字元長。 @@ -4624,13 +4472,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Report reason cannot be more than 300 characters long. - 回報理由不能多於 300 個字元。 - - 1 - - Moderation comment is required. 管理評論必填。 @@ -4645,13 +4486,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Moderation comment cannot be more than 300 characters long. - 管理評論無法多於 300 個字元。 - - 1 - - The channel is required. 頻道必填。 @@ -4708,27 +4542,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Name must be at least 3 characters long. - 名稱必須至少 3 個字元。 - - 1 - - - - Name cannot be more than 20 characters long. - 名稱不能超過 20 個字元。 - - 1 - - - - Name should be only lowercase alphanumeric characters. - 名稱應該只有小寫英數字元。 - - 1 - - Support text must be at least 3 characters long. 支援文字必須至少 3 個字元長。 @@ -5541,13 +5354,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Subscribed - 已訂閱 - - 1 - - Subscribed to 訂閱 @@ -5555,9 +5361,9 @@ When you will upload a video in this channel, the video support field will be au 1 - - Unsubscribed - 已取消訂閱 + + Subscribed + 已訂閱 1 @@ -5569,6 +5375,13 @@ When you will upload a video in this channel, the video support field will be au 1 + + Unsubscribed + 已取消訂閱 + + 1 + + Moderator 主持人 @@ -5639,13 +5452,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - Info - 資訊 - - 1 - - Upload cancelled 已取消上傳 @@ -5653,13 +5459,6 @@ When you will upload a video in this channel, the video support field will be au 1 - - We are sorry but PeerTube cannot handle videos > 8GB - 我們很抱歉，但 PeerTube 無法處理大於 8GB 的影片 - - 1 - -

Your video quota is exceeded with this video (video size: , used: , quota: ) 您的影片配額已因此影片超過（影片大小：, used: ，配額：） diff --git a/client/src/locale/target/iso639_nl_NL.xml b/client/src/locale/target/iso639_nl_NL.xml index 9c0e2fd9e..b3a4ff541 100644 --- a/client/src/locale/target/iso639_nl_NL.xml +++ b/client/src/locale/target/iso639_nl_NL.xml @@ -5,7 +5,7 @@ Afar - Afar + Ver Abkhazian @@ -43,6 +43,10 @@ Avaric Avaars + + Kotava + Kotava + Aymara Aymara @@ -167,6 +171,10 @@ English Engels + + Esperanto + Esperanto + Estonian Ests @@ -311,6 +319,10 @@ Javanese Javaans + + Lojban + Lojban + Japanese Japans @@ -495,6 +507,10 @@ Nyanja Nyanja + + Occitan + Occitan + Ojibwa Ojibwe @@ -671,6 +687,10 @@ Tigrinya Tigrinya + + Klingon + Klingon + Tonga (Tonga Islands) Tongaans diff --git a/client/src/locale/target/player_nl_NL.xml b/client/src/locale/target/player_nl_NL.xml index 5b689f2a2..45bc76a55 100644 --- a/client/src/locale/target/player_nl_NL.xml +++ b/client/src/locale/target/player_nl_NL.xml @@ -347,6 +347,10 @@ Speed Snelheid + + Subtitles/CC + Ondertiteling/CC + peers peers diff --git a/client/src/locale/target/server_cs_CZ.json b/client/src/locale/target/server_cs_CZ.json index 060658c80..e013a910f 100644 --- a/client/src/locale/target/server_cs_CZ.json +++ b/client/src/locale/target/server_cs_CZ.json @@ -1 +1 @@ -{"Music":"Hudba","Films":"Filmy","Vehicles":"Auta","Art":"Umění","Sports":"Sport","Travels":"Cestování","Gaming":"Hry","People":"Lidé","Comedy":"Komedie","Entertainment":"Zábava","News & Politics":"Zprávy a politika","How To":"Jak na to","Education":"Výukové","Activism":"Aktivismus","Science & Technology":"Věda a technologie","Animals":"Zvířata","Kids":"Děti","Food":"Jídlo a vaření","Attribution":"Uveďte autora","Attribution - Share Alike":"Uveďte autora - Zachovejte licenci","Attribution - No Derivatives":"Uveďte autora - Nezpracovávejte","Attribution - Non Commercial":"Uveďte autora - Nešiřte dílo komerčně","Attribution - Non Commercial - Share Alike":"Uveďte autora - Nešiřte dílo komerčně - Zachovejte licenci","Attribution - Non Commercial - No Derivatives":"Uveďte autora - Nešiřte dílo komerčně - Nezpracovávejte","Public Domain Dedication":"Volné dílo","Public":"Veřejné","Unlisted":"Nezobrazeno","Private":"Soukromé","Published":"Publikované","Pending":"Čekající","Success":"Úspěch","Failed":"Neúspěch","Misc":"Různé","Unknown":"Neznámé","Afar":"Afarština","Abkhazian":"Abcházština","Afrikaans":"Afrikánština","Akan":"Akanština","Amharic":"Amharština","Arabic":"Arabština","Aragonese":"Aragonština","American Sign Language":"Americká znaková řeč","Assamese":"Ásámština","Avaric":"Avarština","Kotava":"Kotava","Aymara":"Ajmarština","Azerbaijani":"Ázerbájdžánština","Bashkir":"Baškirština","Bambara":"Bambarština","Belarusian":"Běloruština","Bengali":"Bengálština","British Sign Language":"Britská znaková řeč","Bislama":"Bislamština","Tibetan":"Tibetština","Bosnian":"Bosenština","Breton":"Bretonština","Bulgarian":"Bulharština","Brazilian Sign Language":"Brazilská znaková řeč","Catalan":"Katalánština","Czech":"Čeština","Chamorro":"Chamorro","Chechen":"Čečenština","Chuvash":"Čuvaština","Cornish":"Kornština","Corsican":"Korsičtina","Cree":"Kríjština","Czech Sign Language":"Česká znaková řeč","Chinese Sign Language":"Čínská znaková řeč","Welsh":"Velština","Danish":"Dánština","German":"Němčina","Dhivehi":"Maledivština","Danish Sign Language":"Dánská znaková řeč","Dzongkha":"Dzongkä","Modern Greek (1453-)":"Moderní řečtina","English":"Angličtina","Esperanto":"Esperanto","Estonian":"Estonština","Basque":"Baskičtina","Ewe":"Eveština","Faroese":"Faerština","Persian":"Perština","Fijian":"Fidžijština","Finnish":"Finština","French":"Francouzština","Western Frisian":"Západofríština","French Sign Language":"Francouzská znaková řeč","Fulah":"Fulbština","Scottish Gaelic":"Skotská gaelština","Irish":"Irština","Galician":"Galicijština","Manx":"Manština","Guarani":"Guaranština","German Sign Language":"Německá znaková řeč","Gujarati":"Gudžarátština","Haitian":"Haitská kreolština","Hausa":"Hauština","Serbo-Croatian":"Srcbochorvatšinta","Hebrew":"Hebrejština","Herero":"Herero","Hindi":"Hindština","Hiri Motu":"Hiri Motu","Croatian":"Chorvatština","Hungarian":"Maďarština","Armenian":"Arménština","Igbo":"Igboština","Sichuan Yi":"Nuosu","Inuktitut":"Inuktitutština","Indonesian":"Indonéština","Inupiaq":"Inupiaq","Icelandic":"Islandština","Italian":"Italština","Javanese":"Javánština","Lojban":"Lojban","Japanese":"Japonština","Japanese Sign Language":"Japonská znaková řeč","Kalaallisut":"Grónština","Kannada":"Kannadština","Kashmiri":"Kašmírština","Georgian":"Gruzínština","Kanuri":"Kanurijština","Kazakh":"Kazaština","Khmer":"Khmerština","Kikuyu":"Kikujština","Kinyarwanda":"Rwandština","Kirghiz":"Kyrgyzština","Komi":"Komi","Kongo":"Konžština","Korean":"Korejština","Kuanyama":"Kuanyama","Kurdish":"Kurdština","Lao":"Laoština","Latvian":"Lotyština","Limburgan":"Limburština","Lingala":"Ngalština","Lithuanian":"Litevština","Luxembourgish":"Lucemburština","Luba-Katanga":"Luba-Katanga","Ganda":"Gandština","Marshallese":"Maršálština","Malayalam":"Malajálamština","Marathi":"Maráthština","Macedonian":"Makedonština","Malagasy":"Malgaština","Maltese":"Maltština","Mongolian":"Mongolština","Maori":"Maorština","Malay (macrolanguage)":"Malajština","Burmese":"Barmština","Nauru":"Naurština","Navajo":"Navažština","South Ndebele":"Jižní ndebelština","North Ndebele":"Severní ndebelština","Ndonga":"Ndondština","Nepali (macrolanguage)":"Nepálština","Dutch":"Dánština","Norwegian Nynorsk":"Norština Nynorsk","Norwegian Bokmål":"Norština Bokmål","Norwegian":"Norština ","Nyanja":"Čičevština","Occitan":"Okcitánština","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Urijština","Oromo":"Oromština","Ossetian":"Osetština","Panjabi":"Paňdžábština","Pakistan Sign Language":"Pakistánská znaková řeč","Polish":"Polština","Portuguese":"Portugalština","Pushto":"Paštština","Quechua":"Kečuánština","Romansh":"Rétorománština","Romanian":"Rumunština","Russian Sign Language":"Ruská znaková řeč","Rundi":"Kirundi","Russian":"Ruština","Sango":"Sango","Saudi Arabian Sign Language":"Saudská arabská znaková řeč","South African Sign Language":"Jihoafrická znaková řeč","Sinhala":"Sinhálština","Slovak":"Slovenština","Slovenian":"Slovinština","Northern Sami":"Severní sámština","Samoan":"Samojština","Shona":"Shona","Sindhi":"Sindhština","Somali":"Somálština","Southern Sotho":"Jižní sotština","Spanish":"Španělština","Albanian":"Albánština","Sardinian":"Sardínština","Serbian":"Srbština","Swati":"Swati","Sundanese":"Sundština","Swahili (macrolanguage)":"Svahilština","Swedish":"Švédština","Swedish Sign Language":"Švédská znaková řeč","Tahitian":"Tahitština","Tamil":"Tamilština","Tatar":"Tatarština","Telugu":"Telugština","Tajik":"Tádžičtina","Tagalog":"Tagalog","Thai":"Thajština","Tigrinya":"Tigrinya","Klingon":"Klingonština","Tonga (Tonga Islands)":"Tongánština","Tswana":"Setswanština","Tsonga":"Tsongština","Turkmen":"Turkmenština","Turkish":"Turečtina","Twi":"Twi","Uighur":"Ujgurština","Ukrainian":"Ukrajinština","Urdu":"Urdština","Uzbek":"Uzbečtina","Venda":"Vendština","Vietnamese":"Vietnamština","Walloon":"Valonština","Wolof":"Wolof ","Xhosa":"Xhoština","Yiddish":"Jidiš","Yoruba":"Jorubština","Zhuang":"Čuangština","Chinese":"Čínština","Zulu":"Zuluština"} \ No newline at end of file +{"Music":"Hudba","Films":"Filmy","Vehicles":"Auta","Art":"Umění","Sports":"Sport","Travels":"Cestování","Gaming":"Hry","People":"Lidé","Comedy":"Komedie","Entertainment":"Zábava","News & Politics":"Zprávy a politika","How To":"Jak na to","Education":"Výukové","Activism":"Aktivismus","Science & Technology":"Věda a technologie","Animals":"Zvířata","Kids":"Děti","Food":"Jídlo a vaření","Attribution":"Uveďte autora","Attribution - Share Alike":"Uveďte autora - Zachovejte licenci","Attribution - No Derivatives":"Uveďte autora - Nezpracovávejte","Attribution - Non Commercial":"Uveďte autora - Nešiřte dílo komerčně","Attribution - Non Commercial - Share Alike":"Uveďte autora - Nešiřte dílo komerčně - Zachovejte licenci","Attribution - Non Commercial - No Derivatives":"Uveďte autora - Nešiřte dílo komerčně - Nezpracovávejte","Public Domain Dedication":"Volné dílo","Public":"Veřejné","Unlisted":"Nezobrazeno","Private":"Soukromé","Published":"Publikované","To transcode":"K transkódování","To import":"To import","Pending":"Čekající","Success":"Úspěch","Failed":"Neúspěch","Misc":"Různé","Unknown":"Neznámé","Afar":"Afarština","Abkhazian":"Abcházština","Afrikaans":"Afrikánština","Akan":"Akanština","Amharic":"Amharština","Arabic":"Arabština","Aragonese":"Aragonština","American Sign Language":"Americká znaková řeč","Assamese":"Ásámština","Avaric":"Avarština","Kotava":"Kotava","Aymara":"Ajmarština","Azerbaijani":"Ázerbájdžánština","Bashkir":"Baškirština","Bambara":"Bambarština","Belarusian":"Běloruština","Bengali":"Bengálština","British Sign Language":"Britská znaková řeč","Bislama":"Bislamština","Tibetan":"Tibetština","Bosnian":"Bosenština","Breton":"Bretonština","Bulgarian":"Bulharština","Brazilian Sign Language":"Brazilská znaková řeč","Catalan":"Katalánština","Czech":"Čeština","Chamorro":"Chamorro","Chechen":"Čečenština","Chuvash":"Čuvaština","Cornish":"Kornština","Corsican":"Korsičtina","Cree":"Kríjština","Czech Sign Language":"Česká znaková řeč","Chinese Sign Language":"Čínská znaková řeč","Welsh":"Velština","Danish":"Dánština","German":"Němčina","Dhivehi":"Maledivština","Danish Sign Language":"Dánská znaková řeč","Dzongkha":"Dzongkä","Modern Greek (1453-)":"Moderní řečtina","English":"Angličtina","Esperanto":"Esperanto","Estonian":"Estonština","Basque":"Baskičtina","Ewe":"Eveština","Faroese":"Faerština","Persian":"Perština","Fijian":"Fidžijština","Finnish":"Finština","French":"Francouzština","Western Frisian":"Západofríština","French Sign Language":"Francouzská znaková řeč","Fulah":"Fulbština","Scottish Gaelic":"Skotská gaelština","Irish":"Irština","Galician":"Galicijština","Manx":"Manština","Guarani":"Guaranština","German Sign Language":"Německá znaková řeč","Gujarati":"Gudžarátština","Haitian":"Haitská kreolština","Hausa":"Hauština","Serbo-Croatian":"Srcbochorvatšinta","Hebrew":"Hebrejština","Herero":"Herero","Hindi":"Hindština","Hiri Motu":"Hiri Motu","Croatian":"Chorvatština","Hungarian":"Maďarština","Armenian":"Arménština","Igbo":"Igboština","Sichuan Yi":"Nuosu","Inuktitut":"Inuktitutština","Indonesian":"Indonéština","Inupiaq":"Inupiaq","Icelandic":"Islandština","Italian":"Italština","Javanese":"Javánština","Lojban":"Lojban","Japanese":"Japonština","Japanese Sign Language":"Japonská znaková řeč","Kalaallisut":"Grónština","Kannada":"Kannadština","Kashmiri":"Kašmírština","Georgian":"Gruzínština","Kanuri":"Kanurijština","Kazakh":"Kazaština","Khmer":"Khmerština","Kikuyu":"Kikujština","Kinyarwanda":"Rwandština","Kirghiz":"Kyrgyzština","Komi":"Komi","Kongo":"Konžština","Korean":"Korejština","Kuanyama":"Kuanyama","Kurdish":"Kurdština","Lao":"Laoština","Latvian":"Lotyština","Limburgan":"Limburština","Lingala":"Ngalština","Lithuanian":"Litevština","Luxembourgish":"Lucemburština","Luba-Katanga":"Luba-Katanga","Ganda":"Gandština","Marshallese":"Maršálština","Malayalam":"Malajálamština","Marathi":"Maráthština","Macedonian":"Makedonština","Malagasy":"Malgaština","Maltese":"Maltština","Mongolian":"Mongolština","Maori":"Maorština","Malay (macrolanguage)":"Malajština","Burmese":"Barmština","Nauru":"Naurština","Navajo":"Navažština","South Ndebele":"Jižní ndebelština","North Ndebele":"Severní ndebelština","Ndonga":"Ndondština","Nepali (macrolanguage)":"Nepálština","Dutch":"Dánština","Norwegian Nynorsk":"Norština Nynorsk","Norwegian Bokmål":"Norština Bokmål","Norwegian":"Norština ","Nyanja":"Čičevština","Occitan":"Okcitánština","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Urijština","Oromo":"Oromština","Ossetian":"Osetština","Panjabi":"Paňdžábština","Pakistan Sign Language":"Pakistánská znaková řeč","Polish":"Polština","Portuguese":"Portugalština","Pushto":"Paštština","Quechua":"Kečuánština","Romansh":"Rétorománština","Romanian":"Rumunština","Russian Sign Language":"Ruská znaková řeč","Rundi":"Kirundi","Russian":"Ruština","Sango":"Sango","Saudi Arabian Sign Language":"Saudská arabská znaková řeč","South African Sign Language":"Jihoafrická znaková řeč","Sinhala":"Sinhálština","Slovak":"Slovenština","Slovenian":"Slovinština","Northern Sami":"Severní sámština","Samoan":"Samojština","Shona":"Shona","Sindhi":"Sindhština","Somali":"Somálština","Southern Sotho":"Jižní sotština","Spanish":"Španělština","Albanian":"Albánština","Sardinian":"Sardínština","Serbian":"Srbština","Swati":"Swati","Sundanese":"Sundština","Swahili (macrolanguage)":"Svahilština","Swedish":"Švédština","Swedish Sign Language":"Švédská znaková řeč","Tahitian":"Tahitština","Tamil":"Tamilština","Tatar":"Tatarština","Telugu":"Telugština","Tajik":"Tádžičtina","Tagalog":"Tagalog","Thai":"Thajština","Tigrinya":"Tigrinya","Klingon":"Klingonština","Tonga (Tonga Islands)":"Tongánština","Tswana":"Setswanština","Tsonga":"Tsongština","Turkmen":"Turkmenština","Turkish":"Turečtina","Twi":"Twi","Uighur":"Ujgurština","Ukrainian":"Ukrajinština","Urdu":"Urdština","Uzbek":"Uzbečtina","Venda":"Vendština","Vietnamese":"Vietnamština","Walloon":"Valonština","Wolof":"Wolof ","Xhosa":"Xhoština","Yiddish":"Jidiš","Yoruba":"Jorubština","Zhuang":"Čuangština","Chinese":"Čínština","Zulu":"Zuluština"} \ No newline at end of file diff --git a/client/src/locale/target/server_fr_FR.json b/client/src/locale/target/server_fr_FR.json index eebc2f96e..64762b575 100644 --- a/client/src/locale/target/server_fr_FR.json +++ b/client/src/locale/target/server_fr_FR.json @@ -1 +1 @@ -{"Music":"Musiques","Films":"Films","Vehicles":"Transport","Art":"Art","Sports":"Sports","Travels":"Voyages","Gaming":"Jeux vidéos","People":"Personnalités","Comedy":"Humour","Entertainment":"Divertissement","News & Politics":"Actualité & Politique","How To":"Tutoriels","Education":"Éducation","Activism":"Militantisme","Science & Technology":"Science & Technologie","Animals":"Animaux","Kids":"Enfants","Food":"Cuisine","Attribution":"Attribution","Attribution - Share Alike":"Attribution - Partage dans les mêmes conditions","Attribution - No Derivatives":"Attribution - Pas d’œuvre dérivée","Attribution - Non Commercial":"Attribution - Utilisation non commerciale","Attribution - Non Commercial - Share Alike":"Attribution - Utilisation non commerciale - Partage dans les mêmes conditions","Attribution - Non Commercial - No Derivatives":"Attribution - Utilisation non commerciale - Pas d’œuvre dérivée","Public Domain Dedication":"Domaine public","Public":"Publique","Unlisted":"Non listée","Private":"Privée","Published":"Publiée","To transcode":"À transcoder","To import":"À importer","Pending":"En cours","Success":"Succès","Failed":"Échoué","Misc":"Divers","Unknown":"Inconnu","Afar":"Afar","Abkhazian":"Abkhaze","Afrikaans":"Afrikaans","Akan":"Akan","Amharic":"Amharique","Arabic":"Arabe","Aragonese":"Aragonais","American Sign Language":"Langue des signes américaine","Assamese":"Assamais","Avaric":"Avar","Kotava":"Kotava","Aymara":"Aymara","Azerbaijani":"Azéri","Bashkir":"Bachkir","Bambara":"Bambara","Belarusian":"Biélorusse","Bengali":"Bengali","British Sign Language":"Langue des signes britannique","Bislama":"Bichlamar","Tibetan":"Tibétain","Bosnian":"Bosniaque","Breton":"Breton","Bulgarian":"Bulgare","Brazilian Sign Language":"Langue des signes brésilienne","Catalan":"Catalan","Czech":"Tchèque","Chamorro":"Chamorro","Chechen":"Tchétchène","Chuvash":"Tchouvache","Cornish":"Cornique","Corsican":"Corse","Cree":"Cree","Czech Sign Language":"Langue des signes tchèque","Chinese Sign Language":"Langue des signes chinoise","Welsh":"Gallois","Danish":"Danois","German":"Allemand","Dhivehi":"Maldivien","Danish Sign Language":"Langue des signes danoise","Dzongkha":"Dzongkha","Modern Greek (1453-)":"Grec moderne (après 1453)","English":"Anglais","Esperanto":"Espéranto","Estonian":"Estonien","Basque":"Basque","Ewe":"Éwé","Faroese":"Féroïen","Persian":"Persan","Fijian":"Fidjien","Finnish":"Finnois","French":"Français","Western Frisian":"Frison occidental","French Sign Language":"Langue des signes française","Fulah":"Peul","Scottish Gaelic":"Gaélique","Irish":"Irlandais","Galician":"Galicien","Manx":"Manx","Guarani":"Guarani","German Sign Language":"Langue des signes allemande","Gujarati":"Goudjrati","Haitian":"Haïtien","Hausa":"Haoussa","Serbo-Croatian":"Serbo-croate","Hebrew":"Hébreu","Herero":"Herero","Hindi":"Hindi","Hiri Motu":"Hiri motu","Croatian":"Croate","Hungarian":"Hongrois","Armenian":"Arménien","Igbo":"Igbo","Sichuan Yi":"Yi de Sichuan","Inuktitut":"Inuktitut","Indonesian":"Indonésien","Inupiaq":"Inupiaq","Icelandic":"Islandais","Italian":"Italien","Javanese":"Javanais","Lojban":"Lojban","Japanese":"Japonais","Japanese Sign Language":"Langue des signes japonaise","Kalaallisut":"Groenlandais","Kannada":"Kannada","Kashmiri":"Kashmiri","Georgian":"Géorgien","Kanuri":"Kanouri","Kazakh":"Kazakh","Khmer":"Khmer central","Kikuyu":"Kikuyu","Kinyarwanda":"Rwanda","Kirghiz":"Kirghiz","Komi":"Kom","Kongo":"Kongo","Korean":"Coréen","Kuanyama":"Kuanyama","Kurdish":"Kurde","Lao":"Lao","Latvian":"Letton","Limburgan":"Limbourgeois","Lingala":"Lingala","Lithuanian":"Lituanien","Luxembourgish":"Luxembourgeois","Luba-Katanga":"Luba-katanga","Ganda":"Ganda","Marshallese":"Marshall","Malayalam":"Malayalam","Marathi":"Marathe","Macedonian":"Macédonien","Malagasy":"Malgache","Maltese":"Maltais","Mongolian":"Mongol","Maori":"Maori","Malay (macrolanguage)":"Malais","Burmese":"Birman","Nauru":"Nauruan","Navajo":"Navaho","South Ndebele":"Ndébélé du Sud","North Ndebele":"Ndébélé du Nord","Ndonga":"Ndonga","Nepali (macrolanguage)":"Népalais","Dutch":"Néerlandais","Norwegian Nynorsk":"Norvégien nynorsk","Norwegian Bokmål":"Norvégien bokmål","Norwegian":"Norvégien","Nyanja":"Chichewa","Occitan":"Occitane","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Oriya","Oromo":"Galla","Ossetian":"Ossète","Panjabi":"Pendjabi","Pakistan Sign Language":"Langue des signes pakistanaise","Polish":"Polonais","Portuguese":"Portugais","Pushto":"Pachto","Quechua":"Quechua","Romansh":"Romanche","Romanian":"Roumain","Russian Sign Language":"Langue des signes russe","Rundi":"Rundi","Russian":"Russe","Sango":"Sango","Saudi Arabian Sign Language":"Langue des signes saoudienne","South African Sign Language":"Langue des signes sud-africaine","Sinhala":"Singhalais","Slovak":"Slovaque","Slovenian":"Slovène","Northern Sami":"Sami du Nord","Samoan":"Samoan","Shona":"Shona","Sindhi":"Sindhi","Somali":"Somali","Southern Sotho":"Sotho du Sud","Spanish":"Espagnol","Albanian":"Albanais","Sardinian":"Sarde","Serbian":"Serbe","Swati":"Swati","Sundanese":"Soundanais","Swahili (macrolanguage)":"Swahili","Swedish":"Suédois","Swedish Sign Language":"Langue des signes suédoise","Tahitian":"Tahitien","Tamil":"Tamoul","Tatar":"Tatar","Telugu":"Télougou","Tajik":"Tadjik","Tagalog":"Tagalog","Thai":"Thaï","Tigrinya":"Tigrigna","Klingon":"Klingon","Tonga (Tonga Islands)":"Tongan (Îles Tonga)","Tswana":"Tswana","Tsonga":"Tsonga","Turkmen":"Turkmène","Turkish":"Turc","Twi":"Twi","Uighur":"Ouïgour","Ukrainian":"Ukrainien","Urdu":"Ourdou","Uzbek":"Ouszbek","Venda":"Venda","Vietnamese":"Vietnamien","Walloon":"Wallon","Wolof":"Wolof","Xhosa":"Xhosa","Yiddish":"Yiddish","Yoruba":"Yoruba","Zhuang":"Zhuang","Chinese":"Chinois","Zulu":"Zoulou"} \ No newline at end of file +{"Music":"Musiques","Films":"Films","Vehicles":"Transport","Art":"Art","Sports":"Sports","Travels":"Voyages","Gaming":"Jeux vidéos","People":"Personnalités","Comedy":"Humour","Entertainment":"Divertissement","News & Politics":"Actualité & Politique","How To":"Tutoriels","Education":"Éducation","Activism":"Militantisme","Science & Technology":"Science & Technologie","Animals":"Animaux","Kids":"Enfants","Food":"Cuisine","Attribution":"Attribution","Attribution - Share Alike":"Attribution - Partage dans les mêmes conditions","Attribution - No Derivatives":"Attribution - Pas d’œuvre dérivée","Attribution - Non Commercial":"Attribution - Utilisation non commerciale","Attribution - Non Commercial - Share Alike":"Attribution - Utilisation non commerciale - Partage dans les mêmes conditions","Attribution - Non Commercial - No Derivatives":"Attribution - Utilisation non commerciale - Pas d’œuvre dérivée","Public Domain Dedication":"Domaine public","Public":"Publique","Unlisted":"Non listée","Private":"Privée","Published":"Publiée","To transcode":"À transcoder","To import":"À importer","Pending":"En cours","Success":"Succès","Failed":"Échoué","This video does not exist.":"Cette vidéo n'existe pas.","We cannot fetch the video. Please try again later.":"Nous ne pouvons pas récupérer la vidéo. Merci de réessayer plus tard.","Sorry":"Désolé","This video is not available because the remote instance is not responding.":"Cette vidéo n'est pas disponible car l'instance distante ne répond pas.","Misc":"Divers","Unknown":"Inconnu","Afar":"Afar","Abkhazian":"Abkhaze","Afrikaans":"Afrikaans","Akan":"Akan","Amharic":"Amharique","Arabic":"Arabe","Aragonese":"Aragonais","American Sign Language":"Langue des signes américaine","Assamese":"Assamais","Avaric":"Avar","Kotava":"Kotava","Aymara":"Aymara","Azerbaijani":"Azéri","Bashkir":"Bachkir","Bambara":"Bambara","Belarusian":"Biélorusse","Bengali":"Bengali","British Sign Language":"Langue des signes britannique","Bislama":"Bichlamar","Tibetan":"Tibétain","Bosnian":"Bosniaque","Breton":"Breton","Bulgarian":"Bulgare","Brazilian Sign Language":"Langue des signes brésilienne","Catalan":"Catalan","Czech":"Tchèque","Chamorro":"Chamorro","Chechen":"Tchétchène","Chuvash":"Tchouvache","Cornish":"Cornique","Corsican":"Corse","Cree":"Cree","Czech Sign Language":"Langue des signes tchèque","Chinese Sign Language":"Langue des signes chinoise","Welsh":"Gallois","Danish":"Danois","German":"Allemand","Dhivehi":"Maldivien","Danish Sign Language":"Langue des signes danoise","Dzongkha":"Dzongkha","Modern Greek (1453-)":"Grec moderne (après 1453)","English":"Anglais","Esperanto":"Espéranto","Estonian":"Estonien","Basque":"Basque","Ewe":"Éwé","Faroese":"Féroïen","Persian":"Persan","Fijian":"Fidjien","Finnish":"Finnois","French":"Français","Western Frisian":"Frison occidental","French Sign Language":"Langue des signes française","Fulah":"Peul","Scottish Gaelic":"Gaélique","Irish":"Irlandais","Galician":"Galicien","Manx":"Manx","Guarani":"Guarani","German Sign Language":"Langue des signes allemande","Gujarati":"Goudjrati","Haitian":"Haïtien","Hausa":"Haoussa","Serbo-Croatian":"Serbo-croate","Hebrew":"Hébreu","Herero":"Herero","Hindi":"Hindi","Hiri Motu":"Hiri motu","Croatian":"Croate","Hungarian":"Hongrois","Armenian":"Arménien","Igbo":"Igbo","Sichuan Yi":"Yi de Sichuan","Inuktitut":"Inuktitut","Indonesian":"Indonésien","Inupiaq":"Inupiaq","Icelandic":"Islandais","Italian":"Italien","Javanese":"Javanais","Lojban":"Lojban","Japanese":"Japonais","Japanese Sign Language":"Langue des signes japonaise","Kalaallisut":"Groenlandais","Kannada":"Kannada","Kashmiri":"Kashmiri","Georgian":"Géorgien","Kanuri":"Kanouri","Kazakh":"Kazakh","Khmer":"Khmer central","Kikuyu":"Kikuyu","Kinyarwanda":"Rwanda","Kirghiz":"Kirghiz","Komi":"Kom","Kongo":"Kongo","Korean":"Coréen","Kuanyama":"Kuanyama","Kurdish":"Kurde","Lao":"Lao","Latvian":"Letton","Limburgan":"Limbourgeois","Lingala":"Lingala","Lithuanian":"Lituanien","Luxembourgish":"Luxembourgeois","Luba-Katanga":"Luba-katanga","Ganda":"Ganda","Marshallese":"Marshall","Malayalam":"Malayalam","Marathi":"Marathe","Macedonian":"Macédonien","Malagasy":"Malgache","Maltese":"Maltais","Mongolian":"Mongol","Maori":"Maori","Malay (macrolanguage)":"Malais","Burmese":"Birman","Nauru":"Nauruan","Navajo":"Navaho","South Ndebele":"Ndébélé du Sud","North Ndebele":"Ndébélé du Nord","Ndonga":"Ndonga","Nepali (macrolanguage)":"Népalais","Dutch":"Néerlandais","Norwegian Nynorsk":"Norvégien nynorsk","Norwegian Bokmål":"Norvégien bokmål","Norwegian":"Norvégien","Nyanja":"Chichewa","Occitan":"Occitane","Ojibwa":"Ojibwa","Oriya (macrolanguage)":"Oriya","Oromo":"Galla","Ossetian":"Ossète","Panjabi":"Pendjabi","Pakistan Sign Language":"Langue des signes pakistanaise","Polish":"Polonais","Portuguese":"Portugais","Pushto":"Pachto","Quechua":"Quechua","Romansh":"Romanche","Romanian":"Roumain","Russian Sign Language":"Langue des signes russe","Rundi":"Rundi","Russian":"Russe","Sango":"Sango","Saudi Arabian Sign Language":"Langue des signes saoudienne","South African Sign Language":"Langue des signes sud-africaine","Sinhala":"Singhalais","Slovak":"Slovaque","Slovenian":"Slovène","Northern Sami":"Sami du Nord","Samoan":"Samoan","Shona":"Shona","Sindhi":"Sindhi","Somali":"Somali","Southern Sotho":"Sotho du Sud","Spanish":"Espagnol","Albanian":"Albanais","Sardinian":"Sarde","Serbian":"Serbe","Swati":"Swati","Sundanese":"Soundanais","Swahili (macrolanguage)":"Swahili","Swedish":"Suédois","Swedish Sign Language":"Langue des signes suédoise","Tahitian":"Tahitien","Tamil":"Tamoul","Tatar":"Tatar","Telugu":"Télougou","Tajik":"Tadjik","Tagalog":"Tagalog","Thai":"Thaï","Tigrinya":"Tigrigna","Klingon":"Klingon","Tonga (Tonga Islands)":"Tongan (Îles Tonga)","Tswana":"Tswana","Tsonga":"Tsonga","Turkmen":"Turkmène","Turkish":"Turc","Twi":"Twi","Uighur":"Ouïgour","Ukrainian":"Ukrainien","Urdu":"Ourdou","Uzbek":"Ouszbek","Venda":"Venda","Vietnamese":"Vietnamien","Walloon":"Wallon","Wolof":"Wolof","Xhosa":"Xhosa","Yiddish":"Yiddish","Yoruba":"Yoruba","Zhuang":"Zhuang","Chinese":"Chinois","Zulu":"Zoulou"} \ No newline at end of file diff --git a/client/src/locale/target/server_nl_NL.xml b/client/src/locale/target/server_nl_NL.xml index 797d022c5..a53a90588 100644 --- a/client/src/locale/target/server_nl_NL.xml +++ b/client/src/locale/target/server_nl_NL.xml @@ -43,6 +43,10 @@ Entertainment Entertainment + + News & Politics + Nieuws en Politiek +

How To Tutorials @@ -57,7 +61,7 @@

Science & Technology - Wetenschap & technologie + Wetenschap en technologie

Animals @@ -77,7 +81,7 @@

Attribution - No Derivatives @@ -111,9 +115,33 @@ Private Privé + + Published + Gepubliceerd + + + To transcode + Transcoden + + + To import + Importeren + + + Pending + In behandeling + + + Success + Success + + + Failed + Gefaald +

Misc - Diverse + Varia

Unknown diff --git a/client/src/standalone/videos/embed.html b/client/src/standalone/videos/embed.html index b7cf13ec2..f79cf68df 100644 --- a/client/src/standalone/videos/embed.html +++ b/client/src/standalone/videos/embed.html @@ -13,7 +13,7 @@

Sorry

diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts index 3a09f285e..54b8fb543 100644 --- a/client/src/standalone/videos/embed.ts +++ b/client/src/standalone/videos/embed.ts @@ -192,27 +192,33 @@ class PeerTubeEmbed { element.parentElement.removeChild(element) } - displayError (text: string) { + displayError (text: string, translations?: { [ id: string ]: string }) { // Remove video element if (this.videoElement) this.removeElement(this.videoElement) - document.title = 'Sorry - ' + text + const translatedText = peertubeTranslate(text, translations) + const translatedSorry = peertubeTranslate('Sorry', translations) + + document.title = translatedSorry + ' - ' + translatedText const errorBlock = document.getElementById('error-block') errorBlock.style.display = 'flex' + const errorTitle = document.getElementById('error-title') + errorTitle.innerHTML = peertubeTranslate('Sorry', translations) + const errorText = document.getElementById('error-content') - errorText.innerHTML = text + errorText.innerHTML = translatedText } - videoNotFound () { + videoNotFound (translations?: { [ id: string ]: string }) { const text = 'This video does not exist.' - this.displayError(text) + this.displayError(text, translations) } - videoFetchError () { + videoFetchError (translations?: { [ id: string ]: string }) { const text = 'We cannot fetch the video. Please try again later.' - this.displayError(text) + this.displayError(text, translations) } getParamToggle (params: URLSearchParams, name: string, defaultValue?: boolean) { @@ -268,9 +274,9 @@ class PeerTubeEmbed { ]) if (!videoResponse.ok) { - if (videoResponse.status === 404) return this.videoNotFound() + if (videoResponse.status === 404) return this.videoNotFound(serverTranslations) - return this.videoFetchError() + return this.videoFetchError(serverTranslations) } const videoInfo: VideoDetails = await videoResponse.json() @@ -308,7 +314,7 @@ class PeerTubeEmbed { this.playerOptions = videojsOptions this.player = vjs(this.videoContainerId, videojsOptions, () => { - this.player.on('customError', (event: any, data: any) => this.handleError(data.err)) + this.player.on('customError', (event: any, data: any) => this.handleError(data.err, serverTranslations)) window[ 'videojsPlayer' ] = this.player @@ -325,11 +331,11 @@ class PeerTubeEmbed { }) } - private handleError (err: Error) { + private handleError (err: Error, translations?: { [ id: string ]: string }) { if (err.message.indexOf('from xs param') !== -1) { this.player.dispose() this.videoElement = null - this.displayError('This video is not available because the remote instance is not responding.') + this.displayError('This video is not available because the remote instance is not responding.', translations) return } } -- cgit v1.2.3 From 3195cd1c118f5e020ab7e635d5a3dcdad2108b1a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 15 Jan 2019 09:25:26 +0100 Subject: Fix notification z-index on modals --- .../video-abuse-list/moderation-comment-modal.component.html | 4 ++-- client/src/sass/primeng-custom.scss | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'client') diff --git a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html index 3a8424f68..952235c55 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html @@ -14,7 +14,7 @@

This comment can only be seen by you or the other moderators.

@@ -29,4 +29,4 @@

- \ No newline at end of file + diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 58a6a0004..6057b1db0 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -301,6 +301,11 @@ p-inputswitch { } p-toast { + .ui-toast { + // Modal is 10005 + z-index: 10010 !important; + } + .ui-toast-message { font-family: $main-fonts; -- cgit v1.2.3 From 457bb213b273a9b206cc5654eb085cede4e916ad Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 16 Jan 2019 16:05:40 +0100 Subject: Refactor how we use icons Inject them in an angular component so we can easily change their color --- client/package.json | 1 - .../contact-admin-modal.component.html | 2 +- .../moderation-comment-modal.component.html | 5 +- .../moderation-comment-modal.component.ts | 4 +- .../users/user-list/user-list.component.html | 2 +- .../users/user-list/user-list.component.scss | 4 +- .../my-account-history.component.scss | 4 +- .../my-account-notifications.component.html | 10 +- .../my-account-notifications.component.scss | 4 +- .../my-account-accept-ownership.component.html | 3 +- .../my-account-video-channels.component.html | 2 +- .../my-account-video-channels.component.scss | 2 +- .../my-account-videos.component.html | 6 +- .../my-account-videos.component.scss | 11 +- .../video-change-ownership.component.html | 3 +- client/src/app/app.component.html | 2 + client/src/app/core/confirm/confirm.component.html | 25 --- client/src/app/core/confirm/confirm.component.scss | 17 -- client/src/app/core/confirm/confirm.component.ts | 68 -------- client/src/app/core/confirm/index.ts | 1 - client/src/app/core/core.module.ts | 4 +- client/src/app/header/header.component.html | 2 +- client/src/app/header/header.component.scss | 10 +- client/src/app/login/login.component.html | 3 +- .../app/menu/avatar-notification.component.scss | 2 +- .../src/app/menu/language-chooser.component.html | 2 +- client/src/app/search/search.component.scss | 4 +- client/src/app/shared/actor/actor.model.ts | 2 +- .../shared/buttons/action-dropdown.component.html | 2 +- .../shared/buttons/action-dropdown.component.scss | 9 +- .../src/app/shared/buttons/button.component.html | 2 +- .../src/app/shared/buttons/button.component.scss | 34 +--- client/src/app/shared/buttons/button.component.ts | 3 +- .../shared/buttons/delete-button.component.html | 2 +- .../app/shared/buttons/edit-button.component.html | 2 +- .../src/app/shared/confirm/confirm.component.html | 26 ++++ .../src/app/shared/confirm/confirm.component.scss | 17 ++ client/src/app/shared/confirm/confirm.component.ts | 68 ++++++++ .../app/shared/icons/global-icon.component.html | 0 .../app/shared/icons/global-icon.component.scss | 4 + .../src/app/shared/icons/global-icon.component.ts | 47 ++++++ client/src/app/shared/misc/help.component.html | 4 +- client/src/app/shared/misc/help.component.scss | 19 ++- .../moderation/user-ban-modal.component.html | 7 +- .../shared/moderation/user-ban-modal.component.ts | 4 +- client/src/app/shared/shared.module.ts | 8 +- .../app/shared/users/user-notification.model.ts | 37 ++--- .../app/shared/users/user-notification.service.ts | 2 - .../shared/users/user-notifications.component.html | 82 +++++++--- .../shared/users/user-notifications.component.scss | 46 ++++-- .../shared/users/user-notifications.component.ts | 14 +- client/src/app/shared/video/feed.component.html | 9 +- client/src/app/shared/video/feed.component.scss | 17 +- .../shared/video/video-miniature.component.scss | 4 +- client/src/app/shared/video/video.model.ts | 4 +- .../shared/video-caption-add-modal.component.html | 2 +- .../+video-edit/shared/video-edit.component.html | 2 +- .../+video-edit/shared/video-edit.component.scss | 17 +- .../video-import-torrent.component.html | 6 +- .../video-import-torrent.component.scss | 53 +------ .../video-import-torrent.component.ts | 3 +- .../video-import-url.component.html | 6 +- .../video-import-url.component.scss | 45 ------ .../video-import-url.component.ts | 2 +- .../video-add-components/video-send.scss | 54 +++++++ .../video-upload.component.html | 6 +- .../video-upload.component.scss | 44 +----- .../video-add-components/video-upload.component.ts | 3 +- .../videos/+video-edit/video-update.component.html | 2 +- .../comment/video-comment.component.scss | 6 +- .../modal/video-blacklist.component.html | 2 +- .../modal/video-download.component.html | 2 +- .../+video-watch/modal/video-report.component.html | 2 +- .../+video-watch/modal/video-share.component.html | 2 +- .../modal/video-support.component.html | 2 +- .../videos/+video-watch/video-watch.component.html | 24 +-- .../videos/+video-watch/video-watch.component.scss | 80 ++-------- client/src/assets/images/global/add.html | 11 ++ client/src/assets/images/global/add.svg | 13 -- client/src/assets/images/global/alert.html | 11 ++ client/src/assets/images/global/circle-tick.html | 12 ++ .../src/assets/images/global/cloud-download.html | 11 ++ client/src/assets/images/global/cloud-error.html | 11 ++ client/src/assets/images/global/cog.html | 9 ++ client/src/assets/images/global/cross.html | 10 ++ client/src/assets/images/global/cross.svg | 12 -- client/src/assets/images/global/delete-black.svg | 14 -- client/src/assets/images/global/delete-grey.svg | 14 -- client/src/assets/images/global/delete-white.svg | 14 -- client/src/assets/images/global/delete.html | 12 ++ client/src/assets/images/global/download.html | 11 ++ client/src/assets/images/global/edit-black.svg | 15 -- client/src/assets/images/global/edit-grey.svg | 15 -- client/src/assets/images/global/edit.html | 10 ++ client/src/assets/images/global/help.html | 10 ++ client/src/assets/images/global/help.svg | 12 -- client/src/assets/images/global/im-with-her.html | 10 ++ client/src/assets/images/global/im-with-her.svg | 15 -- client/src/assets/images/global/no.html | 10 ++ client/src/assets/images/global/sparkle.html | 11 ++ client/src/assets/images/global/syndication.html | 56 +++++++ client/src/assets/images/global/syndication.svg | 58 ------- client/src/assets/images/global/tick.html | 10 ++ client/src/assets/images/global/tick.svg | 12 -- client/src/assets/images/global/undo.html | 9 ++ client/src/assets/images/global/undo.svg | 11 -- client/src/assets/images/global/user-add.html | 11 ++ client/src/assets/images/global/validate.html | 12 ++ client/src/assets/images/global/validate.svg | 14 -- client/src/assets/images/header/upload-white.svg | 16 -- client/src/assets/images/video/alert.svg | 16 -- client/src/assets/images/video/blacklist.svg | 15 -- client/src/assets/images/video/dislike-grey.svg | 14 -- client/src/assets/images/video/dislike-white.svg | 14 -- client/src/assets/images/video/dislike.html | 12 ++ client/src/assets/images/video/download-black.svg | 16 -- client/src/assets/images/video/download-grey.svg | 16 -- client/src/assets/images/video/download-white.svg | 16 -- client/src/assets/images/video/heart.html | 11 ++ client/src/assets/images/video/heart.svg | 13 -- client/src/assets/images/video/like-grey.svg | 15 -- client/src/assets/images/video/like-white.svg | 15 -- client/src/assets/images/video/like.html | 10 ++ client/src/assets/images/video/more.html | 9 ++ client/src/assets/images/video/more.svg | 11 -- client/src/assets/images/video/share.html | 11 ++ client/src/assets/images/video/share.svg | 16 -- client/src/assets/images/video/upload.html | 11 ++ client/src/assets/images/video/upload.svg | 16 -- client/src/sass/application.scss | 9 +- client/src/sass/include/_mixins.scss | 49 ++++-- client/src/sass/include/_variables.scss | 9 +- client/yarn.lock | 173 --------------------- 133 files changed, 860 insertions(+), 1162 deletions(-) delete mode 100644 client/src/app/core/confirm/confirm.component.html delete mode 100644 client/src/app/core/confirm/confirm.component.scss delete mode 100644 client/src/app/core/confirm/confirm.component.ts create mode 100644 client/src/app/shared/confirm/confirm.component.html create mode 100644 client/src/app/shared/confirm/confirm.component.scss create mode 100644 client/src/app/shared/confirm/confirm.component.ts create mode 100644 client/src/app/shared/icons/global-icon.component.html create mode 100644 client/src/app/shared/icons/global-icon.component.scss create mode 100644 client/src/app/shared/icons/global-icon.component.ts delete mode 100644 client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss create mode 100644 client/src/app/videos/+video-edit/video-add-components/video-send.scss create mode 100644 client/src/assets/images/global/add.html delete mode 100644 client/src/assets/images/global/add.svg create mode 100644 client/src/assets/images/global/alert.html create mode 100644 client/src/assets/images/global/circle-tick.html create mode 100644 client/src/assets/images/global/cloud-download.html create mode 100644 client/src/assets/images/global/cloud-error.html create mode 100644 client/src/assets/images/global/cog.html create mode 100644 client/src/assets/images/global/cross.html delete mode 100644 client/src/assets/images/global/cross.svg delete mode 100644 client/src/assets/images/global/delete-black.svg delete mode 100644 client/src/assets/images/global/delete-grey.svg delete mode 100644 client/src/assets/images/global/delete-white.svg create mode 100644 client/src/assets/images/global/delete.html create mode 100644 client/src/assets/images/global/download.html delete mode 100644 client/src/assets/images/global/edit-black.svg delete mode 100644 client/src/assets/images/global/edit-grey.svg create mode 100644 client/src/assets/images/global/edit.html create mode 100644 client/src/assets/images/global/help.html delete mode 100644 client/src/assets/images/global/help.svg create mode 100644 client/src/assets/images/global/im-with-her.html delete mode 100644 client/src/assets/images/global/im-with-her.svg create mode 100644 client/src/assets/images/global/no.html create mode 100644 client/src/assets/images/global/sparkle.html create mode 100644 client/src/assets/images/global/syndication.html delete mode 100644 client/src/assets/images/global/syndication.svg create mode 100644 client/src/assets/images/global/tick.html delete mode 100644 client/src/assets/images/global/tick.svg create mode 100644 client/src/assets/images/global/undo.html delete mode 100644 client/src/assets/images/global/undo.svg create mode 100644 client/src/assets/images/global/user-add.html create mode 100644 client/src/assets/images/global/validate.html delete mode 100644 client/src/assets/images/global/validate.svg delete mode 100644 client/src/assets/images/header/upload-white.svg delete mode 100644 client/src/assets/images/video/alert.svg delete mode 100644 client/src/assets/images/video/blacklist.svg delete mode 100644 client/src/assets/images/video/dislike-grey.svg delete mode 100644 client/src/assets/images/video/dislike-white.svg create mode 100644 client/src/assets/images/video/dislike.html delete mode 100644 client/src/assets/images/video/download-black.svg delete mode 100644 client/src/assets/images/video/download-grey.svg delete mode 100644 client/src/assets/images/video/download-white.svg create mode 100644 client/src/assets/images/video/heart.html delete mode 100644 client/src/assets/images/video/heart.svg delete mode 100644 client/src/assets/images/video/like-grey.svg delete mode 100644 client/src/assets/images/video/like-white.svg create mode 100644 client/src/assets/images/video/like.html create mode 100644 client/src/assets/images/video/more.html delete mode 100644 client/src/assets/images/video/more.svg create mode 100644 client/src/assets/images/video/share.html delete mode 100644 client/src/assets/images/video/share.svg create mode 100644 client/src/assets/images/video/upload.html delete mode 100644 client/src/assets/images/video/upload.svg (limited to 'client') diff --git a/client/package.json b/client/package.json index 5fe1f3d5f..248c390fc 100644 --- a/client/package.json +++ b/client/package.json @@ -154,7 +154,6 @@ "videojs-contextmenu-ui": "^5.0.0", "videojs-dock": "^2.0.2", "videojs-hotkeys": "^0.2.21", - "webpack": "^4.17.1", "webpack-bundle-analyzer": "^3.0.2", "webpack-cli": "^3.0.8", "webtorrent": "https://github.com/webtorrent/webtorrent#e9b209c7970816fc29e0cc871157a4918d66001d", diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.html b/client/src/app/+about/about-instance/contact-admin-modal.component.html index 2b3fb32f3..b2cbd0873 100644 --- a/client/src/app/+about/about-instance/contact-admin-modal.component.html +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.html @@ -1,7 +1,7 @@

diff --git a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html index 952235c55..303a788d2 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html @@ -1,7 +1,8 @@

- Cancel + Cancel this.notifier.error(err.message) diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html index 8c03a924b..69a4616a3 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.html +++ b/client/src/app/+admin/users/user-list/user-list.component.html @@ -2,7 +2,7 @@

Users list

- +

Create user

diff --git a/client/src/app/+admin/users/user-list/user-list.component.scss b/client/src/app/+admin/users/user-list/user-list.component.scss index f235769f0..5274be01c 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.scss +++ b/client/src/app/+admin/users/user-list/user-list.component.scss @@ -2,7 +2,7 @@ @import '_mixins'; .add-button { - @include create-button('../../../../assets/images/global/add.svg'); + @include create-button; } tr.banned { @@ -23,4 +23,4 @@ tr.banned { input { @include peertube-input-text(250px); } -} \ No newline at end of file +} diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.scss b/client/src/app/+my-account/my-account-history/my-account-history.component.scss index 82150cbe3..e7c6863f1 100644 --- a/client/src/app/+my-account/my-account-history/my-account-history.component.scss +++ b/client/src/app/+my-account/my-account-history/my-account-history.component.scss @@ -65,10 +65,10 @@ text-overflow: ellipsis; white-space: nowrap; font-size: 14px; - color: #585858; + color: $grey-foreground-color; &:hover { - color: #303030; + color: $grey-foreground-hover-color; } } } diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html index b98a1087e..d518b22ec 100644 --- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html +++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html @@ -1,7 +1,13 @@ diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss index 86ac094c5..43d1f82ab 100644 --- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss +++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss @@ -5,16 +5,18 @@ display: flex; justify-content: space-between; font-size: 15px; - margin-bottom: 10px; + margin-bottom: 20px; a { @include peertube-button-link; @include grey-button; + @include button-with-icon(18px, 3px, -1px); } button { @include peertube-button; @include grey-button; + @include button-with-icon(20px, 3px, -1px); } } diff --git a/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html b/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html index fd7d7d23b..674a4e8a2 100644 --- a/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html +++ b/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html @@ -1,7 +1,8 @@ @@ -45,7 +45,7 @@

@@ -53,4 +53,4 @@

- \ No newline at end of file + diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss b/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss index a735562f8..39d0cf2f7 100644 --- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss +++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.scss @@ -23,14 +23,11 @@ .action-button-delete-selection { @include peertube-button; @include orange-button; - } - - .icon.icon-delete-white { - @include icon(21px); + @include button-with-icon(21px); - position: relative; - top: -2px; - background-image: url('../../../assets/images/global/delete-white.svg'); + my-global-icon { + @include apply-svg-color(#fff); + } } } } diff --git a/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html b/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html index 7c0df850d..22f127904 100644 --- a/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html +++ b/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html @@ -1,7 +1,8 @@ + +

diff --git a/client/src/app/core/confirm/confirm.component.html b/client/src/app/core/confirm/confirm.component.html deleted file mode 100644 index 43f0c6190..000000000 --- a/client/src/app/core/confirm/confirm.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - diff --git a/client/src/app/core/confirm/confirm.component.scss b/client/src/app/core/confirm/confirm.component.scss deleted file mode 100644 index 93dd7926b..000000000 --- a/client/src/app/core/confirm/confirm.component.scss +++ /dev/null @@ -1,17 +0,0 @@ -@import '_variables'; -@import '_mixins'; - -.button { - padding: 0 13px; -} - -input[type=text] { - @include peertube-input-text(100%); - display: block; -} - -.form-group { - margin: 20px 0; -} - - diff --git a/client/src/app/core/confirm/confirm.component.ts b/client/src/app/core/confirm/confirm.component.ts deleted file mode 100644 index 5138b7848..000000000 --- a/client/src/app/core/confirm/confirm.component.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { Component, ElementRef, HostListener, OnInit, ViewChild } from '@angular/core' -import { ConfirmService } from './confirm.service' -import { I18n } from '@ngx-translate/i18n-polyfill' -import { NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' - -@Component({ - selector: 'my-confirm', - templateUrl: './confirm.component.html', - styleUrls: [ './confirm.component.scss' ] -}) -export class ConfirmComponent implements OnInit { - @ViewChild('confirmModal') confirmModal: ElementRef - - title = '' - message = '' - expectedInputValue = '' - inputLabel = '' - - inputValue = '' - confirmButtonText = '' - - private openedModal: NgbModalRef - - constructor ( - private modalService: NgbModal, - private confirmService: ConfirmService, - private i18n: I18n - ) { } - - ngOnInit () { - this.confirmService.showConfirm.subscribe( - ({ title, message, expectedInputValue, inputLabel, confirmButtonText }) => { - this.title = title - this.message = message - - this.inputLabel = inputLabel - this.expectedInputValue = expectedInputValue - - this.confirmButtonText = confirmButtonText || this.i18n('Confirm') - - this.showModal() - } - ) - } - - @HostListener('document:keydown.enter') - confirm () { - if (this.openedModal) this.openedModal.close() - } - - isConfirmationDisabled () { - // No input validation - if (!this.inputLabel || !this.expectedInputValue) return false - - return this.expectedInputValue !== this.inputValue - } - - showModal () { - this.inputValue = '' - - this.openedModal = this.modalService.open(this.confirmModal) - - this.openedModal.result - .then(() => this.confirmService.confirmResponse.next(true)) - .catch(() => this.confirmService.confirmResponse.next(false)) - } -} diff --git a/client/src/app/core/confirm/index.ts b/client/src/app/core/confirm/index.ts index 44aabfc13..aca591e1a 100644 --- a/client/src/app/core/confirm/index.ts +++ b/client/src/app/core/confirm/index.ts @@ -1,2 +1 @@ -export * from './confirm.component' export * from './confirm.service' diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts index 3bc0e2885..4ef3b1e73 100644 --- a/client/src/app/core/core.module.ts +++ b/client/src/app/core/core.module.ts @@ -8,7 +8,7 @@ import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client' import { LoadingBarRouterModule } from '@ngx-loading-bar/router' import { AuthService } from './auth' -import { ConfirmComponent, ConfirmService } from './confirm' +import { ConfirmService } from './confirm' import { throwIfAlreadyLoaded } from './module-import-guard' import { LoginGuard, RedirectService, UserRightGuard } from './routing' import { ServerService } from './server' @@ -38,7 +38,6 @@ import { UserNotificationSocket } from '@app/core/notification/user-notification ], declarations: [ - ConfirmComponent, CheatSheetComponent ], @@ -48,7 +47,6 @@ import { UserNotificationSocket } from '@app/core/notification/user-notification ToastModule, - ConfirmComponent, CheatSheetComponent ], diff --git a/client/src/app/header/header.component.html b/client/src/app/header/header.component.html index c23e0c55d..46a87c79c 100644 --- a/client/src/app/header/header.component.html +++ b/client/src/app/header/header.component.html @@ -5,6 +5,6 @@ - + Upload diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss index 2f9820665..cdc457b96 100644 --- a/client/src/app/header/header.component.scss +++ b/client/src/app/header/header.component.scss @@ -40,6 +40,7 @@ .upload-button { @include peertube-button-link; @include orange-button; + @include button-with-icon(22px, 3px, -1px); margin-right: 25px; @@ -47,15 +48,6 @@ margin-right: 0; } - .icon.icon-upload { - @include icon(22px); - - background-image: url('../../assets/images/header/upload-white.svg'); - height: 24px; - vertical-align: middle; - margin-right: 6px; - } - @media screen and (max-width: 600px) { margin-right: 10px; padding: 0 10px; diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html index 9b8146624..4efe3fb22 100644 --- a/client/src/app/login/login.component.html +++ b/client/src/app/login/login.component.html @@ -55,7 +55,8 @@

diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss index 807385022..f6242eeae 100644 --- a/client/src/app/menu/avatar-notification.component.scss +++ b/client/src/app/menu/avatar-notification.component.scss @@ -42,7 +42,7 @@ justify-content: center; font-weight: $font-semibold; color: var(--mainForegroundColor); - height: 30px; + padding: 7px 0; } } } diff --git a/client/src/app/menu/language-chooser.component.html b/client/src/app/menu/language-chooser.component.html index c79609898..a62b33dda 100644 --- a/client/src/app/menu/language-chooser.component.html +++ b/client/src/app/menu/language-chooser.component.html @@ -1,7 +1,7 @@ diff --git a/client/src/app/search/search.component.scss b/client/src/app/search/search.component.scss index 3e074621b..6de13d276 100644 --- a/client/src/app/search/search.component.scss +++ b/client/src/app/search/search.component.scss @@ -87,10 +87,10 @@ text-overflow: ellipsis; white-space: nowrap; font-size: 14px; - color: #585858; + color: $grey-foreground-color; &:hover { - color: #303030; + color: $grey-foreground-hover-color; } } } diff --git a/client/src/app/shared/actor/actor.model.ts b/client/src/app/shared/actor/actor.model.ts index 811afb449..adecec1fc 100644 --- a/client/src/app/shared/actor/actor.model.ts +++ b/client/src/app/shared/actor/actor.model.ts @@ -16,7 +16,7 @@ export abstract class Actor implements ActorServer { avatarUrl: string - static GET_ACTOR_AVATAR_URL (actor: { avatar: Avatar }) { + static GET_ACTOR_AVATAR_URL (actor: { avatar?: { path: string } }) { const absoluteAPIUrl = getAbsoluteAPIUrl() if (actor && actor.avatar) return absoluteAPIUrl + actor.avatar.path diff --git a/client/src/app/shared/buttons/action-dropdown.component.html b/client/src/app/shared/buttons/action-dropdown.component.html index 90651f217..114b1d71f 100644 --- a/client/src/app/shared/buttons/action-dropdown.component.html +++ b/client/src/app/shared/buttons/action-dropdown.component.html @@ -3,7 +3,7 @@ class="action-button" [ngClass]="{ small: buttonSize === 'small', grey: theme === 'grey', orange: theme === 'orange' }" ngbDropdownToggle role="button" > - +

- Cancel + Cancel

You don't have notifications.

- {{ notification.video.channel.displayName }} published a

new video + + +

+ {{ notification.video.channel.displayName }} published a new video +

- Your video {{ notification.video.name }} has been unblacklisted + + +

+ Your video {{ notification.video.name }} has been unblacklisted +

- Your video {{ notification.videoBlacklist.video.name }} has been blacklisted + + +

+ Your video {{ notification.videoBlacklist.video.name }} has been blacklisted +

- A new video abuse has been created on video {{ notification.videoAbuse.video.name }} + + +

+ A new video abuse has been created on video {{ notification.videoAbuse.video.name }} +

- {{ notification.comment.account.displayName }} commented your video {{ notification.comment.video.name }} + + +

+ {{ notification.comment.account.displayName }} commented your video {{ notification.comment.video.name }} +

- Your video {{ notification.video.name }} has been published + + +

+ Your video {{ notification.video.name }} has been published +

- Your video import {{ notification.videoImportIdentifier }} succeeded + + +

+ Your video import {{ notification.videoImportIdentifier }} succeeded +

- Your video import {{ notification.videoImportIdentifier }} failed + + +

+ Your video import {{ notification.videoImportIdentifier }} failed +

- User {{ notification.account.name }} registered on your instance + + +

+ User {{ notification.account.name }} registered on your instance +

- {{ notification.actorFollow.follower.displayName }} is following + - - your channel {{ notification.actorFollow.following.displayName }} - - your account +

+ {{ notification.actorFollow.follower.displayName }} is following + + your channel {{ notification.actorFollow.following.displayName }} + your account +

- {{ notification.comment.account.displayName }} mentioned you on video {{ notification.comment.video.name }} + + +

+ {{ notification.comment.account.displayName }} mentioned you on video {{ notification.comment.video.name }} +

+ -

diff --git a/client/src/app/shared/users/user-notifications.component.scss b/client/src/app/shared/users/user-notifications.component.scss index 0ae26ea39..315d504c9 100644 --- a/client/src/app/shared/users/user-notifications.component.scss +++ b/client/src/app/shared/users/user-notifications.component.scss @@ -1,3 +1,6 @@ +@import '_variables'; +@import '_mixins'; + .no-notification { display: flex; justify-content: center; @@ -7,31 +10,42 @@ .notification { display: flex; - justify-content: space-between; align-items: center; font-size: inherit; - padding: 15px 10px; + padding: 15px 5px 15px 10px; border-bottom: 1px solid rgba(0, 0, 0, 0.10); - .mark-as-read { - min-width: 35px; + &.unread { + background-color: rgba(0, 0, 0, 0.05); + } + + my-global-icon { + width: 24px; + margin-right: 11px; + margin-left: 3px; - .glyphicon { - display: none; - cursor: pointer; - color: rgba(20, 20, 20, 0.5) - } + @include apply-svg-color(#333); } - &.unread { - background-color: rgba(0, 0, 0, 0.05); + .avatar { + @include avatar(30px); + + margin-right: 10px; + } - &:hover .mark-as-read .glyphicon { - display: block; + .message { + flex-grow: 1; - &:hover { - color: rgba(20, 20, 20, 0.8); - } + a { + font-weight: $font-semibold; } } + + .from-date { + font-size: 0.85em; + color: $grey-foreground-color; + padding-left: 5px; + min-width: 70px; + text-align: right; + } } diff --git a/client/src/app/shared/users/user-notifications.component.ts b/client/src/app/shared/users/user-notifications.component.ts index e3913ba56..b5f9fd399 100644 --- a/client/src/app/shared/users/user-notifications.component.ts +++ b/client/src/app/shared/users/user-notifications.component.ts @@ -20,11 +20,7 @@ export class UserNotificationsComponent implements OnInit { // So we can access it in the template UserNotificationType = UserNotificationType - componentPagination: ComponentPagination = { - currentPage: 1, - itemsPerPage: this.itemsPerPage, - totalItems: null - } + componentPagination: ComponentPagination constructor ( private userNotificationService: UserNotificationService, @@ -32,6 +28,12 @@ export class UserNotificationsComponent implements OnInit { ) { } ngOnInit () { + this.componentPagination = { + currentPage: 1, + itemsPerPage: this.itemsPerPage, // Reset items per page, because of the @Input() variable + totalItems: null + } + this.loadMoreNotifications() } @@ -58,6 +60,8 @@ export class UserNotificationsComponent implements OnInit { } markAsRead (notification: UserNotification) { + if (notification.read) return + this.userNotificationService.markAsRead(notification) .subscribe( () => { diff --git a/client/src/app/shared/video/feed.component.html b/client/src/app/shared/video/feed.component.html index 16116ba88..f7624ec01 100644 --- a/client/src/app/shared/video/feed.component.html +++ b/client/src/app/shared/video/feed.component.html @@ -1,10 +1,11 @@

- + class="icon-syndication" role="button" iconName="syndication" + > + {{ item.label }} -

\ No newline at end of file +

diff --git a/client/src/app/shared/video/feed.component.scss b/client/src/app/shared/video/feed.component.scss index 385764be0..ed1dc17d3 100644 --- a/client/src/app/shared/video/feed.component.scss +++ b/client/src/app/shared/video/feed.component.scss @@ -1,3 +1,4 @@ +@import '_variables'; @import '_mixins'; .video-feed { @@ -6,14 +7,12 @@ display: block; } - .icon { - @include icon(12px); + my-global-icon { + cursor: pointer; + width: 12px; + position: relative; + top: -2px; - &.icon-syndication { - position: relative; - top: -2px; - background-color: var(--mainForegroundColor); - mask-image: url('../../../assets/images/global/syndication.svg'); - } + @include apply-svg-color(var(--mainForegroundColor)) } -} \ No newline at end of file +} diff --git a/client/src/app/shared/video/video-miniature.component.scss b/client/src/app/shared/video/video-miniature.component.scss index 895879adc..f44bdf9a9 100644 --- a/client/src/app/shared/video/video-miniature.component.scss +++ b/client/src/app/shared/video/video-miniature.component.scss @@ -50,10 +50,10 @@ text-overflow: ellipsis; white-space: nowrap; font-size: 13px; - color: #585858; + color: $grey-foreground-color; &:hover { - color: #303030; + color: $grey-foreground-hover-color; } } } diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts index b92c96450..6ea83d13b 100644 --- a/client/src/app/shared/video/video.model.ts +++ b/client/src/app/shared/video/video.model.ts @@ -53,7 +53,7 @@ export class Video implements VideoServerModel { displayName: string url: string host: string - avatar: Avatar + avatar?: Avatar } channel: { @@ -63,7 +63,7 @@ export class Video implements VideoServerModel { displayName: string url: string host: string - avatar: Avatar + avatar?: Avatar } userHistory?: { diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html index 30aefdbfc..19043eee6 100644 --- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html +++ b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html @@ -3,7 +3,7 @@

diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/videos/+video-edit/shared/video-edit.component.html index bd52d686a..092c0e862 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html @@ -143,7 +143,7 @@

- +

Add another caption

diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss index 25db8e8ed..cc32fb254 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss @@ -42,7 +42,7 @@ my-peertube-checkbox { text-align: right; .create-caption { - @include create-button('../../../../assets/images/global/add.svg'); + @include create-button; } } @@ -100,13 +100,14 @@ my-peertube-checkbox { display: inline-block; margin-right: 25px; - color: #585858; + color: $grey-foreground-color; font-size: 15px; } .submit-button { @include peertube-button; @include orange-button; + @include button-with-icon(20px, 1px); display: inline-block; @@ -119,16 +120,6 @@ my-peertube-checkbox { color: inherit; font-weight: $font-semibold; } - - .icon.icon-validate { - @include icon(20px); - - cursor: inherit; - position: relative; - top: -1px; - margin-right: 4px; - background-image: url('../../../../assets/images/global/validate.svg'); - } } } @@ -202,7 +193,7 @@ p-calendar { top: -1px; height: auto !important; vertical-align: middle !important; - fill: #585858 !important; + fill: $grey-foreground-color !important; } &:hover { diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html index 11a81ad66..28eb143c9 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html @@ -1,6 +1,6 @@

Select the torrent to import @@ -66,7 +66,7 @@ (click)="updateSecondStep()" [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }" > - +

diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss index 00626cd7b..6d59ed834 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss @@ -1,45 +1,7 @@ @import 'variables'; @import 'mixins'; -$width-size: 190px; - -.peertube-select-container { - @include peertube-select-container($width-size); -} - -.alert.alert-danger { - text-align: center; - - & > div { - font-weight: $font-semibold; - } -} - -.import-video-torrent { - display: flex; - flex-direction: column; - align-items: center; - - .icon.icon-upload { - @include icon(90px); - margin-bottom: 25px; - cursor: default; - - background-image: url('../../../../assets/images/video/upload.svg'); - } - - .button-file { - @include peertube-button-file(auto); - - min-width: 190px; - } - - .button-file-extension { - display: block; - font-size: 12px; - margin-top: 5px; - } - +.first-step-block { .torrent-or-magnet { margin: 10px 0; } @@ -47,19 +9,6 @@ $width-size: 190px; .form-group-magnet-uri { margin-bottom: 40px; } - - input[type=text] { - @include peertube-input-text($width-size); - display: block; - } - - input[type=button] { - @include peertube-button; - @include orange-button; - - width: $width-size; - margin-top: 30px; - } } diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts index 63db06919..307806bb9 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts @@ -18,7 +18,8 @@ import { scrollToTop } from '@app/shared/misc/utils' templateUrl: './video-import-torrent.component.html', styleUrls: [ '../shared/video-edit.component.scss', - './video-import-torrent.component.scss' + './video-import-torrent.component.scss', + './video-send.scss' ] }) export class VideoImportTorrentComponent extends VideoSend implements OnInit, CanComponentDeactivate { diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html index 533446672..3550c3585 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html @@ -1,6 +1,6 @@

URL @@ -59,7 +59,7 @@ (click)="updateSecondStep()" [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }" > - +

diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss deleted file mode 100644 index e907edc70..000000000 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.scss +++ /dev/null @@ -1,45 +0,0 @@ -@import 'variables'; -@import 'mixins'; - -$width-size: 190px; - -.peertube-select-container { - @include peertube-select-container($width-size); -} - -.alert.alert-danger { - text-align: center; - - & > div { - font-weight: $font-semibold; - } -} - -.import-video-url { - display: flex; - flex-direction: column; - align-items: center; - - .icon.icon-upload { - @include icon(90px); - margin-bottom: 25px; - cursor: default; - - background-image: url('../../../../assets/images/video/upload.svg'); - } - - input[type=text] { - @include peertube-input-text($width-size); - display: block; - } - - input[type=button] { - @include peertube-button; - @include orange-button; - - width: $width-size; - margin-top: 30px; - } -} - - diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts index a1810b7a0..257c6e5db 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts @@ -18,7 +18,7 @@ import { scrollToTop } from '@app/shared/misc/utils' templateUrl: './video-import-url.component.html', styleUrls: [ '../shared/video-edit.component.scss', - './video-import-url.component.scss' + './video-send.scss' ] }) export class VideoImportUrlComponent extends VideoSend implements OnInit, CanComponentDeactivate { diff --git a/client/src/app/videos/+video-edit/video-add-components/video-send.scss b/client/src/app/videos/+video-edit/video-add-components/video-send.scss new file mode 100644 index 000000000..8769dd302 --- /dev/null +++ b/client/src/app/videos/+video-edit/video-add-components/video-send.scss @@ -0,0 +1,54 @@ +@import 'variables'; +@import 'mixins'; + +$width-size: 190px; + +.alert.alert-danger { + text-align: center; + + & > div { + font-weight: $font-semibold; + } +} + +.first-step-block { + display: flex; + flex-direction: column; + align-items: center; + + .upload-icon { + width: 90px; + margin-bottom: 25px; + + @include apply-svg-color(#C6C6C6); + } + + .peertube-select-container { + @include peertube-select-container($width-size); + } + + input[type=text] { + @include peertube-input-text($width-size); + display: block; + } + + input[type=button] { + @include peertube-button; + @include orange-button; + + width: $width-size; + margin-top: 30px; + } + + .button-file { + @include peertube-button-file(auto); + + min-width: 190px; + } + + .button-file-extension { + display: block; + font-size: 12px; + margin-top: 5px; + } +} diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html index 826e54d25..b252cd60a 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html +++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html @@ -1,6 +1,6 @@

Select the file to upload @@ -61,7 +61,7 @@ (click)="updateSecondStep()" [ngClass]="{ disabled: isPublishingButtonDisabled() }" > - +

diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss index 4b2c86ae9..8adf8f169 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss +++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss @@ -1,47 +1,9 @@ @import 'variables'; @import 'mixins'; -.peertube-select-container { - @include peertube-select-container(190px); -} - -.alert.alert-danger { - text-align: center; - - & > div { - font-weight: $font-semibold; - } -} - -.upload-video { - display: flex; - flex-direction: column; - align-items: center; - - .form-group-channel { - margin-bottom: 20px; - margin-top: 35px; - } - - .icon.icon-upload { - @include icon(90px); - margin-bottom: 25px; - cursor: default; - - background-image: url('../../../../assets/images/video/upload.svg'); - } - - .button-file { - @include peertube-button-file(auto); - - min-width: 190px; - } - - .button-file-extension { - display: block; - font-size: 12px; - margin-top: 5px; - } +.first-step-block .form-group-channel { + margin-bottom: 20px; + margin-top: 35px; } .upload-progress-cancel { diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts index aa40f8781..e4d54b654 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts +++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts @@ -20,7 +20,8 @@ import { scrollToTop } from '@app/shared/misc/utils' templateUrl: './video-upload.component.html', styleUrls: [ '../shared/video-edit.component.scss', - './video-upload.component.scss' + './video-upload.component.scss', + './video-send.scss' ] }) export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy, CanComponentDeactivate { diff --git a/client/src/app/videos/+video-edit/video-update.component.html b/client/src/app/videos/+video-edit/video-update.component.html index 0457778c0..4992bb369 100644 --- a/client/src/app/videos/+video-edit/video-update.component.html +++ b/client/src/app/videos/+video-edit/video-update.component.html @@ -13,7 +13,7 @@

- +

diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.scss b/client/src/app/videos/+video-watch/comment/video-comment.component.scss index 84da5727e..731ecbf8f 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment.component.scss +++ b/client/src/app/videos/+video-watch/comment/video-comment.component.scss @@ -41,7 +41,7 @@ } .comment-date { - color: #585858; + color: $grey-foreground-color; margin-left: 10px; } } @@ -69,7 +69,7 @@ .comment-action-reply, .comment-action-delete { - color: #585858; + color: $grey-foreground-color; cursor: pointer; margin-right: 10px; @@ -108,4 +108,4 @@ .root-comment { font-size: 14px; } -} \ No newline at end of file +} diff --git a/client/src/app/videos/+video-watch/modal/video-blacklist.component.html b/client/src/app/videos/+video-watch/modal/video-blacklist.component.html index 83600fa81..1a87bdcd4 100644 --- a/client/src/app/videos/+video-watch/modal/video-blacklist.component.html +++ b/client/src/app/videos/+video-watch/modal/video-blacklist.component.html @@ -1,7 +1,7 @@

diff --git a/client/src/app/videos/+video-watch/modal/video-download.component.html b/client/src/app/videos/+video-watch/modal/video-download.component.html index f46f92a17..2bb5d6d37 100644 --- a/client/src/app/videos/+video-watch/modal/video-download.component.html +++ b/client/src/app/videos/+video-watch/modal/video-download.component.html @@ -1,7 +1,7 @@

diff --git a/client/src/app/videos/+video-watch/modal/video-report.component.html b/client/src/app/videos/+video-watch/modal/video-report.component.html index 733c01be0..b9434da26 100644 --- a/client/src/app/videos/+video-watch/modal/video-report.component.html +++ b/client/src/app/videos/+video-watch/modal/video-report.component.html @@ -1,7 +1,7 @@

diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.html b/client/src/app/videos/+video-watch/modal/video-share.component.html index 301f67f2d..9f3c37fe8 100644 --- a/client/src/app/videos/+video-watch/modal/video-share.component.html +++ b/client/src/app/videos/+video-watch/modal/video-share.component.html @@ -1,7 +1,7 @@

diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.html b/client/src/app/videos/+video-watch/modal/video-support.component.html index 00c304709..2a05224a8 100644 --- a/client/src/app/videos/+video-watch/modal/video-support.component.html +++ b/client/src/app/videos/+video-watch/modal/video-support.component.html @@ -1,7 +1,7 @@ diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html index 770785d02..709eb91a8 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html @@ -53,55 +53,57 @@

- +

- + Support

- +

diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index 2586a2204..b03ed197d 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss @@ -183,6 +183,8 @@ $other-videos-width: 260px; .action-button { @include peertube-button; @include grey-button; + @include button-with-icon(21px, 0, -1px); + @include apply-svg-color($grey-foreground-color); font-size: 15px; font-weight: $font-semibold; @@ -194,53 +196,25 @@ $other-videos-width: 260px; display: none; } - .icon { - @include icon(21px); - - position: relative; - top: -2px; - - &.icon-like { - background-image: url('../../../assets/images/video/like-grey.svg'); - } - - &.icon-dislike { - background-image: url('../../../assets/images/video/dislike-grey.svg'); - } - - &.icon-support { - background-image: url('../../../assets/images/video/heart.svg'); - } - - &.icon-share { - background-image: url('../../../assets/images/video/share.svg'); - } - - &.icon-more { - background-image: url('../../../assets/images/video/more.svg'); - top: -1px; - } - } - - .icon-text { - margin-left: 3px; - } - &.action-button-like.activated { background-color: $green; - .icon-like { - background-image: url('../../../assets/images/video/like-white.svg'); + my-global-icon { + @include apply-svg-color(#fff); } } &.action-button-dislike.activated { background-color: $red; - .icon-dislike { - background-image: url('../../../assets/images/video/dislike-white.svg'); + my-global-icon { + @include apply-svg-color(#fff); } } + + .icon-text { + margin-left: 3px; + } } .action-more { @@ -249,36 +223,12 @@ $other-videos-width: 260px; .dropdown-menu .dropdown-item { padding: 6px 24px; - .icon { - @include icon(24px); + my-global-icon { + width: 24px; margin-right: 10px; position: relative; - top: -1px; - - &.icon-download { - background-image: url('../../../assets/images/video/download-black.svg'); - } - - &.icon-edit { - background-image: url('../../../assets/images/global/edit-black.svg'); - } - - &.icon-alert { - background-image: url('../../../assets/images/video/alert.svg'); - } - - &.icon-blacklist { - background-image: url('../../../assets/images/video/blacklist.svg'); - } - - &.icon-unblacklist { - background-image: url('../../../assets/images/global/undo.svg'); - } - - &.icon-delete { - background-image: url('../../../assets/images/global/delete-black.svg'); - } + top: -2px; } } } @@ -320,7 +270,7 @@ $other-videos-width: 260px; .video-info-description-more { cursor: pointer; font-weight: $font-semibold; - color: #585858; + color: $grey-foreground-color; font-size: 14px; .glyphicon { @@ -339,7 +289,7 @@ $other-videos-width: 260px; min-width: 91px; padding-right: 5px; display: inline-block; - color: #585858; + color: $grey-foreground-color; font-weight: $font-bold; } diff --git a/client/src/assets/images/global/add.html b/client/src/assets/images/global/add.html new file mode 100644 index 000000000..bfb0a52bc --- /dev/null +++ b/client/src/assets/images/global/add.html @@ -0,0 +1,11 @@ + diff --git a/client/src/assets/images/global/add.svg b/client/src/assets/images/global/add.svg deleted file mode 100644 index 42b269c43..000000000 --- a/client/src/assets/images/global/add.svg +++ /dev/null @@ -1,13 +0,0 @@ - - diff --git a/client/src/assets/images/global/alert.html b/client/src/assets/images/global/alert.html new file mode 100644 index 000000000..7c8c02074 --- /dev/null +++ b/client/src/assets/images/global/alert.html @@ -0,0 +1,11 @@ + diff --git a/client/src/assets/images/global/circle-tick.html b/client/src/assets/images/global/circle-tick.html new file mode 100644 index 000000000..2327de6be --- /dev/null +++ b/client/src/assets/images/global/circle-tick.html @@ -0,0 +1,12 @@ + diff --git a/client/src/assets/images/global/cloud-download.html b/client/src/assets/images/global/cloud-download.html new file mode 100644 index 000000000..b2634fd1f --- /dev/null +++ b/client/src/assets/images/global/cloud-download.html @@ -0,0 +1,11 @@ + diff --git a/client/src/assets/images/global/cloud-error.html b/client/src/assets/images/global/cloud-error.html new file mode 100644 index 000000000..1a3483805 --- /dev/null +++ b/client/src/assets/images/global/cloud-error.html @@ -0,0 +1,11 @@ + diff --git a/client/src/assets/images/global/cog.html b/client/src/assets/images/global/cog.html new file mode 100644 index 000000000..b74a180e7 --- /dev/null +++ b/client/src/assets/images/global/cog.html @@ -0,0 +1,9 @@ + diff --git a/client/src/assets/images/global/cross.html b/client/src/assets/images/global/cross.html new file mode 100644 index 000000000..962578487 --- /dev/null +++ b/client/src/assets/images/global/cross.html @@ -0,0 +1,10 @@ + diff --git a/client/src/assets/images/global/cross.svg b/client/src/assets/images/global/cross.svg deleted file mode 100644 index d47a75996..000000000 --- a/client/src/assets/images/global/cross.svg +++ /dev/null @@ -1,12 +0,0 @@ - - diff --git a/client/src/assets/images/global/delete-black.svg b/client/src/assets/images/global/delete-black.svg deleted file mode 100644 index 04ddc23aa..000000000 --- a/client/src/assets/images/global/delete-black.svg +++ /dev/null @@ -1,14 +0,0 @@ - - diff --git a/client/src/assets/images/global/delete-grey.svg b/client/src/assets/images/global/delete-grey.svg deleted file mode 100644 index 67e9e2ce7..000000000 --- a/client/src/assets/images/global/delete-grey.svg +++ /dev/null @@ -1,14 +0,0 @@ - - diff --git a/client/src/assets/images/global/delete-white.svg b/client/src/assets/images/global/delete-white.svg deleted file mode 100644 index 9c52de557..000000000 --- a/client/src/assets/images/global/delete-white.svg +++ /dev/null @@ -1,14 +0,0 @@ - - diff --git a/client/src/assets/images/global/delete.html b/client/src/assets/images/global/delete.html new file mode 100644 index 000000000..a0d9a0cac --- /dev/null +++ b/client/src/assets/images/global/delete.html @@ -0,0 +1,12 @@ + diff --git a/client/src/assets/images/global/download.html b/client/src/assets/images/global/download.html new file mode 100644 index 000000000..259506f31 --- /dev/null +++ b/client/src/assets/images/global/download.html @@ -0,0 +1,11 @@ + diff --git a/client/src/assets/images/global/edit-black.svg b/client/src/assets/images/global/edit-black.svg deleted file mode 100644 index 0176b0f37..000000000 --- a/client/src/assets/images/global/edit-black.svg +++ /dev/null @@ -1,15 +0,0 @@ - - diff --git a/client/src/assets/images/global/edit-grey.svg b/client/src/assets/images/global/edit-grey.svg deleted file mode 100644 index 23ece68f1..000000000 --- a/client/src/assets/images/global/edit-grey.svg +++ /dev/null @@ -1,15 +0,0 @@ - - diff --git a/client/src/assets/images/global/edit.html b/client/src/assets/images/global/edit.html new file mode 100644 index 000000000..f04183c2d --- /dev/null +++ b/client/src/assets/images/global/edit.html @@ -0,0 +1,10 @@ + diff --git a/client/src/assets/images/global/help.html b/client/src/assets/images/global/help.html new file mode 100644 index 000000000..27e9bee6f --- /dev/null +++ b/client/src/assets/images/global/help.html @@ -0,0 +1,10 @@ + diff --git a/client/src/assets/images/global/help.svg b/client/src/assets/images/global/help.svg deleted file mode 100644 index 48252febe..000000000 --- a/client/src/assets/images/global/help.svg +++ /dev/null @@ -1,12 +0,0 @@ - - \ No newline at end of file diff --git a/client/src/assets/images/global/im-with-her.html b/client/src/assets/images/global/im-with-her.html new file mode 100644 index 000000000..de2c62e96 --- /dev/null +++ b/client/src/assets/images/global/im-with-her.html @@ -0,0 +1,10 @@ + diff --git a/client/src/assets/images/global/im-with-her.svg b/client/src/assets/images/global/im-with-her.svg deleted file mode 100644 index 31d4754fd..000000000 --- a/client/src/assets/images/global/im-with-her.svg +++ /dev/null @@ -1,15 +0,0 @@ - - \ No newline at end of file diff --git a/client/src/assets/images/global/no.html b/client/src/assets/images/global/no.html new file mode 100644 index 000000000..bb7b28514 --- /dev/null +++ b/client/src/assets/images/global/no.html @@ -0,0 +1,10 @@ + diff --git a/client/src/assets/images/global/sparkle.html b/client/src/assets/images/global/sparkle.html new file mode 100644 index 000000000..3b29fefb9 --- /dev/null +++ b/client/src/assets/images/global/sparkle.html @@ -0,0 +1,11 @@ + diff --git a/client/src/assets/images/global/syndication.html b/client/src/assets/images/global/syndication.html new file mode 100644 index 000000000..e6c88a4db --- /dev/null +++ b/client/src/assets/images/global/syndication.html @@ -0,0 +1,56 @@ + diff --git a/client/src/assets/images/global/syndication.svg b/client/src/assets/images/global/syndication.svg deleted file mode 100644 index cb74cf81b..000000000 --- a/client/src/assets/images/global/syndication.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - diff --git a/client/src/assets/images/global/tick.html b/client/src/assets/images/global/tick.html new file mode 100644 index 000000000..4784b4807 --- /dev/null +++ b/client/src/assets/images/global/tick.html @@ -0,0 +1,10 @@ + diff --git a/client/src/assets/images/global/tick.svg b/client/src/assets/images/global/tick.svg deleted file mode 100644 index 230caa111..000000000 --- a/client/src/assets/images/global/tick.svg +++ /dev/null @@ -1,12 +0,0 @@ - - diff --git a/client/src/assets/images/global/undo.html b/client/src/assets/images/global/undo.html new file mode 100644 index 000000000..228245c86 --- /dev/null +++ b/client/src/assets/images/global/undo.html @@ -0,0 +1,9 @@ + diff --git a/client/src/assets/images/global/undo.svg b/client/src/assets/images/global/undo.svg deleted file mode 100644 index f1cca03f7..000000000 --- a/client/src/assets/images/global/undo.svg +++ /dev/null @@ -1,11 +0,0 @@ - - diff --git a/client/src/assets/images/global/user-add.html b/client/src/assets/images/global/user-add.html new file mode 100644 index 000000000..57df23c74 --- /dev/null +++ b/client/src/assets/images/global/user-add.html @@ -0,0 +1,11 @@ + diff --git a/client/src/assets/images/global/validate.html b/client/src/assets/images/global/validate.html new file mode 100644 index 000000000..520624ff6 --- /dev/null +++ b/client/src/assets/images/global/validate.html @@ -0,0 +1,12 @@ + diff --git a/client/src/assets/images/global/validate.svg b/client/src/assets/images/global/validate.svg deleted file mode 100644 index 5c7ee9d14..000000000 --- a/client/src/assets/images/global/validate.svg +++ /dev/null @@ -1,14 +0,0 @@ - - diff --git a/client/src/assets/images/header/upload-white.svg b/client/src/assets/images/header/upload-white.svg deleted file mode 100644 index 2b07caf76..000000000 --- a/client/src/assets/images/header/upload-white.svg +++ /dev/null @@ -1,16 +0,0 @@ - - diff --git a/client/src/assets/images/video/alert.svg b/client/src/assets/images/video/alert.svg deleted file mode 100644 index 5b43534ad..000000000 --- a/client/src/assets/images/video/alert.svg +++ /dev/null @@ -1,16 +0,0 @@ - - diff --git a/client/src/assets/images/video/blacklist.svg b/client/src/assets/images/video/blacklist.svg deleted file mode 100644 index 431c73816..000000000 --- a/client/src/assets/images/video/blacklist.svg +++ /dev/null @@ -1,15 +0,0 @@ - - diff --git a/client/src/assets/images/video/dislike-grey.svg b/client/src/assets/images/video/dislike-grey.svg deleted file mode 100644 index 56a7908fb..000000000 --- a/client/src/assets/images/video/dislike-grey.svg +++ /dev/null @@ -1,14 +0,0 @@ - - diff --git a/client/src/assets/images/video/dislike-white.svg b/client/src/assets/images/video/dislike-white.svg deleted file mode 100644 index cfc6eaa1f..000000000 --- a/client/src/assets/images/video/dislike-white.svg +++ /dev/null @@ -1,14 +0,0 @@ - - diff --git a/client/src/assets/images/video/dislike.html b/client/src/assets/images/video/dislike.html new file mode 100644 index 000000000..acde951e2 --- /dev/null +++ b/client/src/assets/images/video/dislike.html @@ -0,0 +1,12 @@ + diff --git a/client/src/assets/images/video/download-black.svg b/client/src/assets/images/video/download-black.svg deleted file mode 100644 index 501836746..000000000 --- a/client/src/assets/images/video/download-black.svg +++ /dev/null @@ -1,16 +0,0 @@ - - diff --git a/client/src/assets/images/video/download-grey.svg b/client/src/assets/images/video/download-grey.svg deleted file mode 100644 index 5b0cca5ef..000000000 --- a/client/src/assets/images/video/download-grey.svg +++ /dev/null @@ -1,16 +0,0 @@ - - diff --git a/client/src/assets/images/video/download-white.svg b/client/src/assets/images/video/download-white.svg deleted file mode 100644 index 0e66e06e8..000000000 --- a/client/src/assets/images/video/download-white.svg +++ /dev/null @@ -1,16 +0,0 @@ - - diff --git a/client/src/assets/images/video/heart.html b/client/src/assets/images/video/heart.html new file mode 100644 index 000000000..618f64f10 --- /dev/null +++ b/client/src/assets/images/video/heart.html @@ -0,0 +1,11 @@ + diff --git a/client/src/assets/images/video/heart.svg b/client/src/assets/images/video/heart.svg deleted file mode 100644 index 5d64aee0f..000000000 --- a/client/src/assets/images/video/heart.svg +++ /dev/null @@ -1,13 +0,0 @@ - - diff --git a/client/src/assets/images/video/like-grey.svg b/client/src/assets/images/video/like-grey.svg deleted file mode 100644 index 5ef6c7b31..000000000 --- a/client/src/assets/images/video/like-grey.svg +++ /dev/null @@ -1,15 +0,0 @@ - - diff --git a/client/src/assets/images/video/like-white.svg b/client/src/assets/images/video/like-white.svg deleted file mode 100644 index 88e5f6a9a..000000000 --- a/client/src/assets/images/video/like-white.svg +++ /dev/null @@ -1,15 +0,0 @@ - - diff --git a/client/src/assets/images/video/like.html b/client/src/assets/images/video/like.html new file mode 100644 index 000000000..d0e71763b --- /dev/null +++ b/client/src/assets/images/video/like.html @@ -0,0 +1,10 @@ + diff --git a/client/src/assets/images/video/more.html b/client/src/assets/images/video/more.html new file mode 100644 index 000000000..39dcad10e --- /dev/null +++ b/client/src/assets/images/video/more.html @@ -0,0 +1,9 @@ + diff --git a/client/src/assets/images/video/more.svg b/client/src/assets/images/video/more.svg deleted file mode 100644 index dea392136..000000000 --- a/client/src/assets/images/video/more.svg +++ /dev/null @@ -1,11 +0,0 @@ - - diff --git a/client/src/assets/images/video/share.html b/client/src/assets/images/video/share.html new file mode 100644 index 000000000..7759b37af --- /dev/null +++ b/client/src/assets/images/video/share.html @@ -0,0 +1,11 @@ + diff --git a/client/src/assets/images/video/share.svg b/client/src/assets/images/video/share.svg deleted file mode 100644 index da0f43e81..000000000 --- a/client/src/assets/images/video/share.svg +++ /dev/null @@ -1,16 +0,0 @@ - - diff --git a/client/src/assets/images/video/upload.html b/client/src/assets/images/video/upload.html new file mode 100644 index 000000000..3bc0d3a8a --- /dev/null +++ b/client/src/assets/images/video/upload.html @@ -0,0 +1,11 @@ + diff --git a/client/src/assets/images/video/upload.svg b/client/src/assets/images/video/upload.svg deleted file mode 100644 index c5b7cb443..000000000 --- a/client/src/assets/images/video/upload.svg +++ /dev/null @@ -1,16 +0,0 @@ - - diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 2356f9837..37837bfc0 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -23,7 +23,7 @@ body { // now beware node-sass requires interpolation // for css custom properties #{$var} --mainColor: #{$orange-color}; - --mainHoverColor: #{$orange-hoover-color}; + --mainHoverColor: #{$orange-hover-color}; --mainBackgroundColor: #{$bg-color}; --mainForegroundColor: #{$fg-color}; --menuBackgroundColor: #{$menu-background}; @@ -229,13 +229,12 @@ label { font-weight: $font-semibold; } - .close { + my-global-icon { @include icon(24px); position: relative; top: 3px; float: right; - background-image: url('../assets/images/global/cross.svg'); margin: 0; padding: 0; @@ -324,7 +323,7 @@ ngb-tabset.bootstrap { table { .action-button-edit, .action-button-delete { &:hover, &:active, &:focus, &[disabled], &.disabled { - background-color: $grey-color !important; + background-color: $grey-background-color !important; } } } @@ -389,4 +388,4 @@ table { } } } -} \ No newline at end of file +} diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index d6f391a45..1da240db8 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -55,6 +55,18 @@ hyphens: auto; } +@mixin apply-svg-color ($color) { + /deep/ svg { + path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"] { + fill: $color; + } + + path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"] { + stroke: $color; + } + } +} + @mixin peertube-input-text($width) { display: inline-block; height: $button-height; @@ -110,22 +122,30 @@ color: #fff; background-color: #C6C6C6; } + + my-global-icon { + @include apply-svg-color(#fff) + } } @mixin grey-button { &, &:active, &:focus { - background-color: $grey-color; - color: #585858; + background-color: $grey-background-color; + color: $grey-foreground-color; } &:hover, &:active, &:focus, &[disabled], &.disabled { - color: #585858; - background-color: $grey-hoover-color; + color: $grey-foreground-color; + background-color: $grey-background-hover-color; } &[disabled], &.disabled { cursor: default; } + + my-global-icon { + @include apply-svg-color($grey-foreground-color) + } } @mixin peertube-button { @@ -148,6 +168,15 @@ @include peertube-button; } +@mixin button-with-icon($width: 20px, $margin-right: 3px, $top: -1px) { + my-global-icon { + position: relative; + width: $width; + margin-right: $margin-right; + top: $top; + } +} + @mixin peertube-button-file ($width) { position: relative; overflow: hidden; @@ -455,18 +484,10 @@ } } -@mixin create-button ($imageUrl) { +@mixin create-button { @include peertube-button-link; @include orange-button; - - .icon.icon-add { - @include icon(20px); - - position: relative; - top: -1px; - margin-right: 5px; - background-image: url($imageUrl); - } + @include button-with-icon(20px, 5px, -1px); } @mixin row-blocks { diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index fdf33b12a..3780b7501 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss @@ -6,10 +6,13 @@ $font-regular: 400; $font-semibold: 600; $font-bold: 700; -$grey-color: #E5E5E5; -$grey-hoover-color: #EFEFEF;; +$grey-background-color: #E5E5E5; +$grey-background-hover-color: #EFEFEF; +$grey-foreground-color: #585858; +$grey-foreground-hover-color: #303030; + $orange-color: #F1680D; -$orange-hoover-color: #F97D46; +$orange-hover-color: #F97D46; $bg-color: #fff; $fg-color: #000; diff --git a/client/yarn.lock b/client/yarn.lock index 5ed43117a..dee67c414 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -552,45 +552,21 @@ "@webassemblyjs/helper-wasm-bytecode" "1.7.10" "@webassemblyjs/wast-parser" "1.7.10" -"@webassemblyjs/ast@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace" - integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA== - dependencies: - "@webassemblyjs/helper-module-context" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/wast-parser" "1.7.11" - "@webassemblyjs/floating-point-hex-parser@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.10.tgz#ee63d729c6311a85863e369a473f9983f984e4d9" integrity sha512-gMsGbI6I3p/P1xL2UxqhNh1ga2HCsx5VBB2i5VvJFAaqAjd2PBTRULc3BpTydabUQEGlaZCzEUQhLoLG7TvEYQ== -"@webassemblyjs/floating-point-hex-parser@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313" - integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg== - "@webassemblyjs/helper-api-error@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.10.tgz#bfcb3bbe59775357475790a2ad7b289f09b2f198" integrity sha512-DoYRlPWtuw3yd5BOr9XhtrmB6X1enYF0/54yNvQWGXZEPDF5PJVNI7zQ7gkcKfTESzp8bIBWailaFXEK/jjCsw== -"@webassemblyjs/helper-api-error@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a" - integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg== - "@webassemblyjs/helper-buffer@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.10.tgz#0a8c624c67ad0b214d2e003859921a1988cb151b" integrity sha512-+RMU3dt/dPh4EpVX4u5jxsOlw22tp3zjqE0m3ftU2tsYxnPULb4cyHlgaNd2KoWuwasCQqn8Mhr+TTdbtj3LlA== -"@webassemblyjs/helper-buffer@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b" - integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w== - "@webassemblyjs/helper-code-frame@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.10.tgz#0ab7e22fad0241a173178c73976fc0edf50832ce" @@ -598,43 +574,21 @@ dependencies: "@webassemblyjs/wast-printer" "1.7.10" -"@webassemblyjs/helper-code-frame@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b" - integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw== - dependencies: - "@webassemblyjs/wast-printer" "1.7.11" - "@webassemblyjs/helper-fsm@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.10.tgz#0915e7713fbbb735620a9d3e4fa3d7951f97ac64" integrity sha512-w2vDtUK9xeSRtt5+RnnlRCI7wHEvLjF0XdnxJpgx+LJOvklTZPqWkuy/NhwHSLP19sm9H8dWxKeReMR7sCkGZA== -"@webassemblyjs/helper-fsm@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181" - integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A== - "@webassemblyjs/helper-module-context@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.10.tgz#9beb83f72740f5ac8075313b5cac5e796510f755" integrity sha512-yE5x/LzZ3XdPdREmJijxzfrf+BDRewvO0zl8kvORgSWmxpRrkqY39KZSq6TSgIWBxkK4SrzlS3BsMCv2s1FpsQ== -"@webassemblyjs/helper-module-context@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209" - integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg== - "@webassemblyjs/helper-wasm-bytecode@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.10.tgz#797b1e734bbcfdea8399669cdc58308ef1c7ffc0" integrity sha512-u5qy4SJ/OrxKxZqJ9N3qH4ZQgHaAzsopsYwLvoWJY6Q33r8PhT3VPyNMaJ7ZFoqzBnZlCcS/0f4Sp8WBxylXfg== -"@webassemblyjs/helper-wasm-bytecode@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06" - integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ== - "@webassemblyjs/helper-wasm-section@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.10.tgz#c0ea3703c615d7bc3e3507c3b7991c8767b2f20e" @@ -645,16 +599,6 @@ "@webassemblyjs/helper-wasm-bytecode" "1.7.10" "@webassemblyjs/wasm-gen" "1.7.10" -"@webassemblyjs/helper-wasm-section@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a" - integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-buffer" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/wasm-gen" "1.7.11" - "@webassemblyjs/ieee754@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.10.tgz#62c1728b7ef0f66ef8221e2966a0afd75db430df" @@ -662,13 +606,6 @@ dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/ieee754@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b" - integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ== - dependencies: - "@xtuc/ieee754" "^1.2.0" - "@webassemblyjs/leb128@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.10.tgz#167e0bb4b06d7701585772a73fba9f4df85439f6" @@ -676,23 +613,11 @@ dependencies: "@xtuc/long" "4.2.1" -"@webassemblyjs/leb128@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63" - integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw== - dependencies: - "@xtuc/long" "4.2.1" - "@webassemblyjs/utf8@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.10.tgz#b6728f5b6f50364abc155be029f9670e6685605a" integrity sha512-Ng6Pxv6siyZp635xCSnH3mKmIFgqWPCcGdoo0GBYgyGdxu7cUj4agV7Uu1a8REP66UYUFXJLudeGgd4RvuJAnQ== -"@webassemblyjs/utf8@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82" - integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA== - "@webassemblyjs/wasm-edit@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.10.tgz#83fe3140f5a58f5a30b914702be9f0e59a399092" @@ -707,20 +632,6 @@ "@webassemblyjs/wasm-parser" "1.7.10" "@webassemblyjs/wast-printer" "1.7.10" -"@webassemblyjs/wasm-edit@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005" - integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-buffer" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/helper-wasm-section" "1.7.11" - "@webassemblyjs/wasm-gen" "1.7.11" - "@webassemblyjs/wasm-opt" "1.7.11" - "@webassemblyjs/wasm-parser" "1.7.11" - "@webassemblyjs/wast-printer" "1.7.11" - "@webassemblyjs/wasm-gen@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.10.tgz#4de003806ae29c97ab3707782469b53299570174" @@ -732,17 +643,6 @@ "@webassemblyjs/leb128" "1.7.10" "@webassemblyjs/utf8" "1.7.10" -"@webassemblyjs/wasm-gen@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8" - integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/ieee754" "1.7.11" - "@webassemblyjs/leb128" "1.7.11" - "@webassemblyjs/utf8" "1.7.11" - "@webassemblyjs/wasm-opt@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.10.tgz#d151e31611934a556c82789fdeec41a814993c2a" @@ -753,16 +653,6 @@ "@webassemblyjs/wasm-gen" "1.7.10" "@webassemblyjs/wasm-parser" "1.7.10" -"@webassemblyjs/wasm-opt@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7" - integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-buffer" "1.7.11" - "@webassemblyjs/wasm-gen" "1.7.11" - "@webassemblyjs/wasm-parser" "1.7.11" - "@webassemblyjs/wasm-parser@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.10.tgz#0367be7bf8f09e3e6abc95f8e483b9206487ec65" @@ -775,18 +665,6 @@ "@webassemblyjs/leb128" "1.7.10" "@webassemblyjs/utf8" "1.7.10" -"@webassemblyjs/wasm-parser@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a" - integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-api-error" "1.7.11" - "@webassemblyjs/helper-wasm-bytecode" "1.7.11" - "@webassemblyjs/ieee754" "1.7.11" - "@webassemblyjs/leb128" "1.7.11" - "@webassemblyjs/utf8" "1.7.11" - "@webassemblyjs/wast-parser@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.10.tgz#058f598b52f730b23fc874d4775b6286b6247264" @@ -799,18 +677,6 @@ "@webassemblyjs/helper-fsm" "1.7.10" "@xtuc/long" "4.2.1" -"@webassemblyjs/wast-parser@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c" - integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/floating-point-hex-parser" "1.7.11" - "@webassemblyjs/helper-api-error" "1.7.11" - "@webassemblyjs/helper-code-frame" "1.7.11" - "@webassemblyjs/helper-fsm" "1.7.11" - "@xtuc/long" "4.2.1" - "@webassemblyjs/wast-printer@1.7.10": version "1.7.10" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.10.tgz#d817909d2450ae96c66b7607624d98a33b84223b" @@ -820,15 +686,6 @@ "@webassemblyjs/wast-parser" "1.7.10" "@xtuc/long" "4.2.1" -"@webassemblyjs/wast-printer@1.7.11": - version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813" - integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/wast-parser" "1.7.11" - "@xtuc/long" "4.2.1" - "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -10524,36 +10381,6 @@ webpack@4.23.1: watchpack "^1.5.0" webpack-sources "^1.3.0" -webpack@^4.17.1: - version "4.26.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.26.1.tgz#ff3a9283d363c07b3494dfa702d08f4f2ef6cb39" - integrity sha512-i2oOvEvuvLLSuSCkdVrknaxAhtUZ9g+nLSoHCWV0gDzqGX2DXaCrMmMUpbRsTSSLrUqAI56PoEiyMUZIZ1msug== - dependencies: - "@webassemblyjs/ast" "1.7.11" - "@webassemblyjs/helper-module-context" "1.7.11" - "@webassemblyjs/wasm-edit" "1.7.11" - "@webassemblyjs/wasm-parser" "1.7.11" - acorn "^5.6.2" - acorn-dynamic-import "^3.0.0" - ajv "^6.1.0" - ajv-keywords "^3.1.0" - chrome-trace-event "^1.0.0" - enhanced-resolve "^4.1.0" - eslint-scope "^4.0.0" - json-parse-better-errors "^1.0.2" - loader-runner "^2.3.0" - loader-utils "^1.1.0" - memory-fs "~0.4.1" - micromatch "^3.1.8" - mkdirp "~0.5.0" - neo-async "^2.5.0" - node-libs-browser "^2.0.0" - schema-utils "^0.4.4" - tapable "^1.1.0" - terser-webpack-plugin "^1.1.0" - watchpack "^1.5.0" - webpack-sources "^1.3.0" - websocket-driver@>=0.5.1: version "0.7.0" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb" -- cgit v1.2.3 From 17bb716bc49b30cc8f22e32f73b9b53ab9ae560d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 11:16:08 +0100 Subject: Fix some styles Video edit tags, dropdown actions font ... --- client/src/app/header/header.component.scss | 1 + .../src/app/shared/buttons/button.component.scss | 1 - .../+video-edit/shared/video-edit.component.scss | 13 +++-- client/src/sass/include/_mixins.scss | 1 + client/src/sass/primeng-custom.scss | 55 +++++++++++++--------- 5 files changed, 41 insertions(+), 30 deletions(-) (limited to 'client') diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss index cdc457b96..cea415d9b 100644 --- a/client/src/app/header/header.component.scss +++ b/client/src/app/header/header.component.scss @@ -6,6 +6,7 @@ padding-left: 10px; margin-right: 15px; padding-right: 40px; // For the search icon + font-size: 14px; &::placeholder { color: var(--inputPlaceholderColor); diff --git a/client/src/app/shared/buttons/button.component.scss b/client/src/app/shared/buttons/button.component.scss index be41669cd..04199a2a9 100644 --- a/client/src/app/shared/buttons/button.component.scss +++ b/client/src/app/shared/buttons/button.component.scss @@ -5,7 +5,6 @@ @include peertube-button-link; @include button-with-icon(21px, 0, -2px); - font-size: 15px; font-weight: $font-semibold; color: $grey-foreground-color; background-color: $grey-background-color; diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss index cc32fb254..bb775cb0a 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss @@ -23,10 +23,6 @@ my-peertube-checkbox { display: block; } - input, select { - font-size: 15px - } - .label-tags + span { font-size: 15px; } @@ -167,10 +163,10 @@ p-calendar { } tag { - background-color: var(--inputColor) !important; + background-color: $grey-background-color !important; + color: #000 !important; border-radius: 3px !important; font-size: 15px !important; - color: var(--mainForegroundColor) !important; height: 30px !important; line-height: 30px !important; margin: 0 5px 0 0 !important; @@ -193,7 +189,10 @@ p-calendar { top: -1px; height: auto !important; vertical-align: middle !important; - fill: $grey-foreground-color !important; + + path { + fill: $grey-foreground-color !important; + } } &:hover { diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 1da240db8..8749649d3 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -76,6 +76,7 @@ border-radius: 3px; padding-left: 15px; padding-right: 15px; + font-size: 15px; &::placeholder { color: var(--inputPlaceholderColor); diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 6057b1db0..7ba011180 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -263,33 +263,40 @@ p-calendar .ui-datepicker { } } +.ui-chkbox { -.ui-chkbox-box { - &.ui-state-active { - border-color: var(--mainColor) !important; - background-color: var(--mainColor) !important; + &, .ui-chkbox-box { + width: 18px !important; + height: 18px !important; } - .ui-chkbox-icon { - position: relative; - overflow: visible !important; - - &:after { - content: ''; - position: absolute; - top: 1px; - left: 7px; - width: 5px; - height: 13px; - opacity: 0; - transform: rotate(45deg) scale(0); - border-right: 2px solid var(--mainBackgroundColor); - border-bottom: 2px solid var(--mainBackgroundColor); + .ui-chkbox-box { + &.ui-state-active { + border-color: var(--mainColor) !important; + background-color: var(--mainColor) !important; } - &.pi-check:after { - opacity: 1; - transform: rotate(45deg) scale(1); + .ui-chkbox-icon { + position: relative; + overflow: visible !important; + + &:after { + content: ''; + position: absolute; + top: 1px; + left: 6px; + width: 5px; + height: 12px; + opacity: 0; + transform: rotate(45deg) scale(0); + border-right: 2px solid var(--mainBackgroundColor); + border-bottom: 2px solid var(--mainBackgroundColor); + } + + &.pi-check:after { + opacity: 1; + transform: rotate(45deg) scale(1); + } } } } @@ -354,3 +361,7 @@ p-toast { } } } + +.ui-widget { + font-family: $main-fonts !important; +} -- cgit v1.2.3 From f2fab901df31a0e7081f4bb225f28e98798950b0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 11:30:47 +0100 Subject: Fix invisible things in dark mode --- client/src/app/shared/misc/help.component.scss | 10 ++++++---- client/src/assets/images/global/help.html | 4 ++-- client/src/sass/application.scss | 4 ++++ client/src/sass/include/_mixins.scss | 4 ++-- client/src/sass/primeng-custom.scss | 8 ++++++-- 5 files changed, 20 insertions(+), 10 deletions(-) (limited to 'client') diff --git a/client/src/app/shared/misc/help.component.scss b/client/src/app/shared/misc/help.component.scss index 4565d457a..3898f3cda 100644 --- a/client/src/app/shared/misc/help.component.scss +++ b/client/src/app/shared/misc/help.component.scss @@ -10,6 +10,8 @@ position: relative; top: -2px; margin: 5px; + + @include apply-svg-color(var(--mainForegroundColor)) } } @@ -18,15 +20,15 @@ max-width: 300px; .popover-body { + font-family: $main-fonts; text-align: left; padding: 10px; font-size: 13px; - font-family: $main-fonts; - background-color: #fff; - color: #000; + background-color: var(--mainBackgroundColor); + color: var(--mainForegroundColor); box-shadow: 0 0 6px rgba(0, 0, 0, 0.5); - p:last-child { + p { margin-bottom: 0; } diff --git a/client/src/assets/images/global/help.html b/client/src/assets/images/global/help.html index 27e9bee6f..80cd40321 100644 --- a/client/src/assets/images/global/help.html +++ b/client/src/assets/images/global/help.html @@ -2,8 +2,8 @@ - - + + diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 37837bfc0..783464f86 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -290,6 +290,10 @@ ngb-tabset.bootstrap { @include disable-default-a-behaviour; color: var(--mainForegroundColor) !important; + + &.active { + color: #000 !important; + } } } } diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 8749649d3..5b3346508 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -57,11 +57,11 @@ @mixin apply-svg-color ($color) { /deep/ svg { - path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"] { + path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"], circle[fill="#000000"] { fill: $color; } - path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"] { + path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"], circle[stroke="#000000"] { stroke: $color; } } diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 7ba011180..b3aac9d16 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -14,7 +14,7 @@ p-table { .ui-table-caption { border: none !important; - background-color: #fff !important; + background-color: var(--mainBackgroundColor) !important; .caption { height: 40px; @@ -24,7 +24,7 @@ p-table { } th { - background-color: #fff !important; + background-color: var(--mainBackgroundColor) !important; outline: 0; } @@ -122,10 +122,14 @@ p-table { &.pi-sort-up { @extend .glyphicon-triangle-top; + + color: var(--mainForegroundColor) !important; } &.pi-sort-down { @extend .glyphicon-triangle-bottom; + + color: var(--mainForegroundColor) !important; } } } -- cgit v1.2.3 From aa87909287c4f4d38696244e32828265b040c7d5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 11:51:08 +0100 Subject: Fix calendar in dark mode --- client/src/app/menu/avatar-notification.component.scss | 2 +- client/src/sass/application.scss | 8 ++++---- client/src/sass/include/_mixins.scss | 4 ++++ client/src/sass/primeng-custom.scss | 8 +++++++- 4 files changed, 16 insertions(+), 6 deletions(-) (limited to 'client') diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss index f6242eeae..a21e7beac 100644 --- a/client/src/app/menu/avatar-notification.component.scss +++ b/client/src/app/menu/avatar-notification.component.scss @@ -73,7 +73,7 @@ justify-content: center; background-color: var(--mainColor); - color: var(--mainBackgroundColor); + color: var(#fff); font-size: 10px; font-weight: $font-semibold; diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 783464f86..478737a43 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -290,12 +290,12 @@ ngb-tabset.bootstrap { @include disable-default-a-behaviour; color: var(--mainForegroundColor) !important; - - &.active { - color: #000 !important; - } } } + + .nav-pills .nav-link.active { + color: #000 !important; + } } .nav-tabs .nav-link.active { diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 5b3346508..e18e9ae9d 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -261,6 +261,10 @@ color: transparent; text-shadow: 0 0 0 #000; } + + option { + color: #000; + } } } diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index b3aac9d16..6e502b028 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -197,7 +197,7 @@ p-table { height: auto !important; a { - color: #000 !important; + color: var(--mainForegroundColor) !important; font-weight: $font-semibold !important; margin: 0 5px !important; outline: 0 !important; @@ -234,6 +234,7 @@ p-calendar .ui-datepicker { @extend .glyphicon-chevron-right; @include glyphicon-light; + color: #000 !important; text-align: right; .pi.pi-chevron-right { @@ -245,6 +246,7 @@ p-calendar .ui-datepicker { @extend .glyphicon-chevron-left; @include glyphicon-light; + color: #000 !important; text-align: left; .pi.pi-chevron-left { @@ -258,11 +260,15 @@ p-calendar .ui-datepicker { .pi.pi-chevron-up { @extend .glyphicon-chevron-up; @include glyphicon-light; + + color: #000 !important; } .pi.pi-chevron-down { @extend .glyphicon-chevron-down; @include glyphicon-light; + + color: #000 !important; } } } -- cgit v1.2.3 From cfeae291c00812bb99e88bdec785792ae5d5934e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 16:15:20 +0100 Subject: Bumped to version v1.2.0-rc.1 --- client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client') diff --git a/client/package.json b/client/package.json index 248c390fc..42deddd5f 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "peertube-client", - "version": "1.1.0", + "version": "1.2.0-rc.1", "private": true, "licence": "GPLv3", "author": { -- cgit v1.2.3 From 38967f7b73cec6f6198c72d62f8d64bb88e6951c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 21 Jan 2019 13:52:46 +0100 Subject: Add server host in notification account field --- client/src/app/app.component.html | 2 +- client/src/app/shared/users/user-notification.model.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'client') diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html index dfda556f5..d398d4f35 100644 --- a/client/src/app/app.component.html +++ b/client/src/app/app.component.html @@ -30,7 +30,7 @@

diff --git a/client/src/app/shared/users/user-notification.model.ts b/client/src/app/shared/users/user-notification.model.ts index c5996a8a1..3bb53ff45 100644 --- a/client/src/app/shared/users/user-notification.model.ts +++ b/client/src/app/shared/users/user-notification.model.ts @@ -136,8 +136,8 @@ export class UserNotification implements UserNotificationServer { return '/videos/watch/' + video.uuid } - private buildAccountUrl (account: { name: string }) { - return '/accounts/' + account.name + private buildAccountUrl (account: { name: string, host: string }) { + return '/accounts/' + Actor.CREATE_BY_STRING(account.name, account.host) } private buildVideoImportUrl () { -- cgit v1.2.3 From fdebd9a3bdcc3ea3881f2234a0f214c2588de3e4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 21 Jan 2019 14:03:04 +0100 Subject: Fix notification popover width --- client/src/app/menu/avatar-notification.component.scss | 13 ++++++++++--- client/src/app/menu/menu.component.scss | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'client') diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss index a21e7beac..e785db788 100644 --- a/client/src/app/menu/avatar-notification.component.scss +++ b/client/src/app/menu/avatar-notification.component.scss @@ -3,7 +3,7 @@ /deep/ { .popover-notifications.popover { - max-width: 400px; + max-width: none; .popover-body { padding: 0; @@ -11,9 +11,8 @@ font-family: $main-fonts; overflow-y: auto; max-height: 500px; - min-width: 200px; + width: 400px; box-shadow: 0 6px 14px rgba(0, 0, 0, 0.30); - overflow-y: auto; .notifications-header { display: flex; @@ -82,3 +81,11 @@ height: 15px; } } + +@media screen and (max-width: $mobile-view) { + /deep/ { + .popover-notifications.popover .popover-body { + width: 400px; + } + } +} diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index a4aaadc7f..24b1a4db3 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss @@ -243,7 +243,7 @@ menu { } } -@media screen and (max-width: 400px) { +@media screen and (max-width: $mobile-view) { .menu-wrapper { width: 100% !important; } -- cgit v1.2.3 From 0f80cb03c66f4eb429a296f7c722e91d78e29ade Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 21 Jan 2019 14:08:25 +0100 Subject: Add link to the profile who commented in notif --- client/src/app/shared/users/user-notification.model.ts | 1 + client/src/app/shared/users/user-notifications.component.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'client') diff --git a/client/src/app/shared/users/user-notification.model.ts b/client/src/app/shared/users/user-notification.model.ts index 3bb53ff45..125d2120c 100644 --- a/client/src/app/shared/users/user-notification.model.ts +++ b/client/src/app/shared/users/user-notification.model.ts @@ -95,6 +95,7 @@ export class UserNotification implements UserNotificationServer { case UserNotificationType.NEW_COMMENT_ON_MY_VIDEO: case UserNotificationType.COMMENT_MENTION: + this.accountUrl = this.buildAccountUrl(this.comment.account) this.commentUrl = [ this.buildVideoUrl(this.comment.video), { threadId: this.comment.threadId } ] break diff --git a/client/src/app/shared/users/user-notifications.component.html b/client/src/app/shared/users/user-notifications.component.html index caa518e7f..0d69e0feb 100644 --- a/client/src/app/shared/users/user-notifications.component.html +++ b/client/src/app/shared/users/user-notifications.component.html @@ -40,7 +40,7 @@

- {{ notification.comment.account.displayName }} commented your video {{ notification.comment.video.name }} + {{ notification.comment.account.displayName }} commented your video {{ notification.comment.video.name }}

@@ -91,7 +91,7 @@

- {{ notification.comment.account.displayName }} mentioned you on video {{ notification.comment.video.name }} + {{ notification.comment.account.displayName }} mentioned you on video {{ notification.comment.video.name }}

-- cgit v1.2.3 From 572b8e02e258bfa921032dee593d3c2f129852b6 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 21 Jan 2019 17:11:21 +0100 Subject: Fix trending days display on first load --- .../videos/video-list/video-trending.component.ts | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'client') diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/videos/video-list/video-trending.component.ts index 881ab2174..6fd74e67a 100644 --- a/client/src/app/videos/video-list/video-trending.component.ts +++ b/client/src/app/videos/video-list/video-trending.component.ts @@ -39,18 +39,21 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, this.generateSyndicationList() - const trendingDays = this.serverService.getConfig().trending.videos.intervalDays + this.serverService.configLoaded.subscribe( + () => { + const trendingDays = this.serverService.getConfig().trending.videos.intervalDays - if (trendingDays === 1) { - this.titlePage = this.i18n('Trending for the last 24 hours') - this.titleTooltip = this.i18n('Trending videos are those totalizing the greatest number of views during the last 24 hours.') - } else { - this.titlePage = this.i18n('Trending for the last {{days}} days', { days: trendingDays }) - this.titleTooltip = this.i18n( - 'Trending videos are those totalizing the greatest number of views during the last {{days}} days.', - { days: trendingDays } - ) - } + if (trendingDays === 1) { + this.titlePage = this.i18n('Trending for the last 24 hours') + this.titleTooltip = this.i18n('Trending videos are those totalizing the greatest number of views during the last 24 hours.') + } else { + this.titlePage = this.i18n('Trending for the last {{days}} days', { days: trendingDays }) + this.titleTooltip = this.i18n( + 'Trending videos are those totalizing the greatest number of views during the last {{days}} days.', + { days: trendingDays } + ) + } + }) } ngOnDestroy () { -- cgit v1.2.3 From 307902e2b3248073aeb677e420aafd8b5e041117 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 24 Jan 2019 15:23:06 +0100 Subject: Try to fix Mac video upload --- client/src/app/+accounts/accounts.component.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'client') diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts index 036264602..e8339b78b 100644 --- a/client/src/app/+accounts/accounts.component.ts +++ b/client/src/app/+accounts/accounts.component.ts @@ -26,8 +26,7 @@ export class AccountsComponent implements OnInit, OnDestroy { private notifier: Notifier, private restExtractor: RestExtractor, private redirectService: RedirectService, - private authService: AuthService, - private i18n: I18n + private authService: AuthService ) {} ngOnInit () { -- cgit v1.2.3 From 4afcdcfad88fbc75acd7f689cca3378421c681d1 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 28 Jan 2019 09:55:09 +0100 Subject: Fix menu overflow on mobile screens --- client/src/app/menu/menu.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client') diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 24b1a4db3..f30b89413 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss @@ -16,7 +16,7 @@ menu { height: 100%; white-space: nowrap; text-overflow: ellipsis; - overflow: hidden; + overflow: auto; color: var(--menuForegroundColor); display: flex; flex-direction: column; -- cgit v1.2.3 From 2c0070c8f31e6a28b1d52ee6e9965e21471abd5b Mon Sep 17 00:00:00 2001 From: Josh Morel Date: Mon, 28 Jan 2019 07:01:01 -0500 Subject: fix undefined change ownership icons --- .../my-account-ownership/my-account-ownership.component.html | 4 ++-- client/src/app/shared/icons/global-icon.component.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'client') diff --git a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html index 379fd8bb1..5709e9f54 100644 --- a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html +++ b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html @@ -40,10 +40,10 @@

Refuse

diff --git a/client/src/app/shared/icons/global-icon.component.ts b/client/src/app/shared/icons/global-icon.component.ts index 5b9377e3e..e8ada0324 100644 --- a/client/src/app/shared/icons/global-icon.component.ts +++ b/client/src/app/shared/icons/global-icon.component.ts @@ -19,6 +19,7 @@ const icons = { 'delete': require('../../../assets/images/global/delete.html'), 'cross': require('../../../assets/images/global/cross.html'), 'validate': require('../../../assets/images/global/validate.html'), + 'tick': require('../../../assets/images/global/tick.html'), 'dislike': require('../../../assets/images/video/dislike.html'), 'heart': require('../../../assets/images/video/heart.html'), 'like': require('../../../assets/images/video/like.html'), -- cgit v1.2.3 From f5305c04aae14467d6f957b713c5a902275cbb89 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 6 Feb 2019 11:57:57 +0100 Subject: Bumped to version v1.2.0 --- client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client') diff --git a/client/package.json b/client/package.json index 42deddd5f..31fc77887 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "peertube-client", - "version": "1.2.0-rc.1", + "version": "1.2.0", "private": true, "licence": "GPLv3", "author": { -- cgit v1.2.3

Contact {{ instanceName }} administrator

Sorry

Contact {{ instanceName }} administrator

Moderation comment

Accept ownership

Change ownership

{{ title }}

Forgot your password

Change the language

{{ title }}

Ban

Add caption

Blacklist video

Download video

Report video

Share

Support