diff --git a/client/src/app/modal/welcome-modal.component.ts b/client/src/app/modal/welcome-modal.component.ts
index 9097de984..19a147b85 100644
--- a/client/src/app/modal/welcome-modal.component.ts
+++ b/client/src/app/modal/welcome-modal.component.ts
@@ -25,7 +25,7 @@ export class WelcomeModalComponent {
})
}
- private doNotOpenAgain () {
+ doNotOpenAgain () {
this.userService.updateMyProfile({ noWelcomeModal: true })
.subscribe(
() => console.log('We will not open the welcome modal again.'),
diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml
index 497f1e10a..8d06ffe89 100644
--- a/client/src/locale/source/angular_en_US.xml
+++ b/client/src/locale/source/angular_en_US.xml
@@ -357,12 +357,12 @@
src/app/shared/users/user-notifications.component.html98
-
+
<x id="START_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="<my-global-icon>"/><x id="CLOSE_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="</my-global-icon>"/>
<x id="START_TAG_DIV" ctype="x-div" equiv-text="<div>"/>
- Your instance has <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>a new follower<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> (<x id="INTERPOLATION" equiv-text="{{ notification.actorFollow.follower.host }}"/>)
+ Your instance has <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>a new follower<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/> (<x id="INTERPOLATION" equiv-text="{{ notification.actorFollow?.follower.host }}"/>)
<x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="<ng-container>"/> awaiting your approval<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="</ng-container>"/>
<x id="CLOSE_TAG_DIV" ctype="x-div" equiv-text="</div>"/>
@@ -605,13 +605,13 @@
<x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> viewssrc/app/shared/video/video-miniature.component.html
- 22
+ 24Blacklistedsrc/app/shared/video/video-miniature.component.html
- 39
+ 42
@@ -619,7 +619,7 @@
src/app/shared/video/video-miniature.component.html
- 43
+ 46{VAR_PLURAL, plural, =0 {No videos} =1 {1 video} other {<x id="INTERPOLATION" equiv-text="{{ playlist.videosLength }}"/> videos} }
@@ -1332,60 +1332,59 @@
src/app/search/search.component.html44
-
- Welcome on PeerTube dear administrator!
+
+ Welcome to PeerTube, dear administrator!src/app/modal/welcome-modal.component.html3
-
- Documentation
-
- src/app/modal/welcome-modal.component.html
- 10
-
-
- It's time to configure your instance!
-
- src/app/modal/welcome-modal.component.html
- 34
-
-
-
- Choosing your <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>instance name<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/>, <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>setting up a description<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/>, specifying <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>who you are<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/>,
- why <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>you created your instance<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/> and <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>how long<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/> you plan to <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>maintain your it<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/>
- is very important for visitors to understand on what type of instance they are.
-
-
- src/app/modal/welcome-modal.component.html
- 36
-
-
-
- If you want to open registrations, please decide what are <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>your moderation rules<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/>, fill your <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>instance terms<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/>
- and specify the categories and languages you speak. This way, you will help users to register on <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>the appropriate<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/> PeerTube instance.
-
-
- src/app/modal/welcome-modal.component.html
- 42
-
-
- Configure your instance
-
- src/app/modal/welcome-modal.component.html
- 48
- Useful linkssrc/app/modal/welcome-modal.component.html
- 53
+ 41
-
- Understood!
+
+ It's time to configure your instance!src/app/modal/welcome-modal.component.html
- 64
+ 59
+
+
+
+ Choosing your <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>instance name<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/>, <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>setting up a description<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/>, specifying <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>who you are<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/>,
+ why <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>you created your instance<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/> and <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>how long<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/> you plan to <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>maintain your it<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/>
+ is very important for visitors to understand on what type of instance they are.
+
+
+ src/app/modal/welcome-modal.component.html
+ 61
+
+
+
+ If you want to open registrations, please decide what are <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>your moderation rules<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/>, fill your <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>instance
+ terms<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/>
+ and specify the categories and languages you speak. This way, you will help users to register on <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="<strong>"/>the
+ appropriate<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="</strong>"/>
+ PeerTube instance.
+
+
+ src/app/modal/welcome-modal.component.html
+ 67
+
+
+ Remind me later
+
+ src/app/modal/welcome-modal.component.html
+ 79
+
+
+
+ Configure my instance
+
+
+ src/app/modal/welcome-modal.component.html
+ 82Configuration warning!
@@ -1397,67 +1396,67 @@
Hello dear administrator. You enabled user registration on your instance but you did not configure the following fields:src/app/modal/instance-config-warning-modal.component.html
- 9
+ 10Instance namesrc/app/modal/instance-config-warning-modal.component.html
- 12
+ 13Instance short descriptionsrc/app/modal/instance-config-warning-modal.component.html
- 13
+ 14Who you aresrc/app/modal/instance-config-warning-modal.component.html
- 15
+ 16How long you plan to maintain your instancesrc/app/modal/instance-config-warning-modal.component.html
- 16
+ 17How you plan to pay your instancesrc/app/modal/instance-config-warning-modal.component.html
- 17
+ 18How you will moderate your instancesrc/app/modal/instance-config-warning-modal.component.html
- 19
+ 20Instance termssrc/app/modal/instance-config-warning-modal.component.html
- 20
+ 21Configure these fieldssrc/app/modal/instance-config-warning-modal.component.html
- 29
+ 30Don't show me this warning anymoresrc/app/modal/instance-config-warning-modal.component.html
- 37
+ 38Closesrc/app/modal/instance-config-warning-modal.component.html
- 42
+ 43src/app/videos/+video-watch/modal/video-share.component.html
@@ -2309,13 +2308,13 @@
src/app/videos/+video-edit/video-update.component.html2
-
+
- Other videos
+ Other videos
src/app/videos/recommendations/recommended-videos.component.html
- 2
+ 3Share
@@ -2445,17 +2444,17 @@
src/app/videos/+video-watch/video-watch.component.html32
-
+
- Published <x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> views
+ Published <x id="START_TAG_MY-DATE-TOGGLE" ctype="x-my-date-toggle" equiv-text="<my-date-toggle>"/><x id="CLOSE_TAG_MY-DATE-TOGGLE" ctype="x-my-date-toggle" equiv-text="</my-date-toggle>"/> <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span>"/> - <x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> views<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>
src/app/videos/+video-watch/video-watch.component.html44
-
+
- Published <x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> views
+ Published <x id="START_TAG_MY-DATE-TOGGLE" ctype="x-my-date-toggle" equiv-text="<my-date-toggle>"/><x id="CLOSE_TAG_MY-DATE-TOGGLE" ctype="x-my-date-toggle" equiv-text="</my-date-toggle>"/> <x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span>"/> - <x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> views<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/>
src/app/videos/+video-watch/video-watch.component.html
@@ -3641,8 +3640,8 @@
src/app/+admin/config/edit-custom-config/edit-custom-config.component.html156
-
- How will you pay the PeerTube instance server?
+
+ How will you finance the PeerTube server?src/app/+admin/config/edit-custom-config/edit-custom-config.component.html167
@@ -3653,8 +3652,8 @@
src/app/+admin/config/edit-custom-config/edit-custom-config.component.html177
-
- On what server/hardware the instance runs?
+
+ What server/hardware does the instance run on?src/app/+admin/config/edit-custom-config/edit-custom-config.component.html180
@@ -3689,26 +3688,26 @@
src/app/+admin/config/edit-custom-config/edit-custom-config.component.html216
-
- Videos Discover
+
+ Discover videossrc/app/+admin/config/edit-custom-config/edit-custom-config.component.html219
-
- Videos Trending
+
+ Trending videossrc/app/+admin/config/edit-custom-config/edit-custom-config.component.html220
-
- Most Liked Videos
+
+ Most liked videossrc/app/+admin/config/edit-custom-config/edit-custom-config.component.html221
-
- Videos Recently Added
+
+ Recently added videossrc/app/+admin/config/edit-custom-config/edit-custom-config.component.html222
@@ -3749,14 +3748,14 @@
src/app/+admin/config/edit-custom-config/edit-custom-config.component.html257
-
- User default video quota
+
+ Default video quota per usersrc/app/+admin/config/edit-custom-config/edit-custom-config.component.html261
-
- User default daily upload limit
+
+ Default daily upload limit per usersrc/app/+admin/config/edit-custom-config/edit-custom-config.component.html273
@@ -3911,8 +3910,8 @@
src/app/+admin/config/edit-custom-config/edit-custom-config.component.html465
-
- Allow your users to upload .mkv, .mov, .avi, .flv videos
+
+ Allow your users to upload .mkv, .mov, .avi and .flv videossrc/app/+admin/config/edit-custom-config/edit-custom-config.component.html478
@@ -3983,17 +3982,17 @@
src/app/+admin/config/edit-custom-config/edit-custom-config.component.html553
-
+
- Write directly JavaScript code.<x id="LINE_BREAK" ctype="lb" equiv-text="<br/>"/>Example: <x id="START_TAG_PRE" ctype="x-pre" equiv-text="<pre>"/>console.log('my instance is amazing');<x id="CLOSE_TAG_PRE" ctype="x-pre" equiv-text="</pre>"/>
+ Write JavaScript code directly.<x id="LINE_BREAK" ctype="lb" equiv-text="<br/>"/>Example: <x id="START_TAG_PRE" ctype="x-pre" equiv-text="<pre>"/>console.log('my instance is amazing');<x id="CLOSE_TAG_PRE" ctype="x-pre" equiv-text="</pre>"/>
src/app/+admin/config/edit-custom-config/edit-custom-config.component.html556
-
+
- Write directly CSS code. Example:<x id="LINE_BREAK" ctype="lb" equiv-text="<br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="<br/>"/>
+ Write CSS code directly. Example:<x id="LINE_BREAK" ctype="lb" equiv-text="<br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="<br/>"/>
<x id="START_TAG_PRE" ctype="x-pre" equiv-text="<pre>"/>#custom-css <x id="INTERPOLATION" equiv-text="{{ '{' }}"/>
color: red;
<x id="INTERPOLATION_1" equiv-text="{{ '}' }}"/>
@@ -4021,8 +4020,8 @@
src/app/+admin/config/edit-custom-config/edit-custom-config.component.html606
-
- It seems the configuration is invalid. Please search potential errors in the different tabs.
+
+ It seems like the configuration is invalid. Please search for potential errors in the different tabs.src/app/+admin/config/edit-custom-config/edit-custom-config.component.html607
@@ -4478,15 +4477,15 @@ When you will upload a video in this channel, the video support field will be au
src/app/+my-account/my-account-video-playlists/my-account-video-playlist-elements.component.html11
-
- Welcome on PeerTube!
+
+ Welcome to PeerTube!src/app/+signup/shared/signup-success.component.html8
-
+
- If you need help to use PeerTube, you can take a look to the <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>documentation<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/>.
+ If you need help to use PeerTube, you can have a look at the <x id="START_LINK" ctype="x-a" equiv-text="<a>"/>documentation<x id="CLOSE_LINK" ctype="x-a" equiv-text="</a>"/>.
src/app/+signup/shared/signup-success.component.html
@@ -4877,9 +4876,9 @@ When you will upload a video in this channel, the video support field will be au
src/app/+about/about-peertube/about-peertube.component.html50
-
+
- The IP address is a vague information : usually, it regularly changes and can represent many persons or entities
+ The IP address is a vague information: usually, it regularly changes and can represent many persons or entities
src/app/+about/about-peertube/about-peertube.component.html
@@ -5051,8 +5050,8 @@ When you will upload a video in this channel, the video support field will be au
src/app/+signup/+register/register.component.html65
-
- How will we pay this instance?
+
+ How will we finance this instance?src/app/+signup/+register/register.component.html70
@@ -5139,13 +5138,13 @@ When you will upload a video in this channel, the video support field will be au
src/app/+signup/+register/register-step-user.component.html65
-
+
- Sorry, but we couldn't find the page you were looking for.
-
+ Sorry, we couldn't find the page you were looking for.
+
src/app/+page-not-found/page-not-found.component.html
- 1
+ 4
@@ -8353,13 +8352,6 @@ When you will upload a video in this channel, the video support field will be au
1
-
- Most liked videos
-
- src/app/videos/video-list/video-most-liked.component.ts
- 1
-
- Videos that have the higher number of likes.