diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-11-12 21:09:17 +0100 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2020-11-12 21:09:28 +0100 |
commit | dc5bb5cea5bf7e906caa6d9c5468e6de36e605de (patch) | |
tree | 9176c9f6d2f508a11ea444cef8105840486960c6 | |
parent | 501af82d999a79e277f87794f6296d0e3495775c (diff) | |
download | PeerTube-dc5bb5cea5bf7e906caa6d9c5468e6de36e605de.tar.gz PeerTube-dc5bb5cea5bf7e906caa6d9c5468e6de36e605de.tar.zst PeerTube-dc5bb5cea5bf7e906caa6d9c5468e6de36e605de.zip |
reword unclear sentences, check for grammar
fixes #3222
13 files changed, 24 insertions, 28 deletions
diff --git a/client/src/app/+about/about-follows/about-follows.component.html b/client/src/app/+about/about-follows/about-follows.component.html index dd50cda74..6d38e2109 100644 --- a/client/src/app/+about/about-follows/about-follows.component.html +++ b/client/src/app/+about/about-follows/about-follows.component.html | |||
@@ -13,7 +13,7 @@ | |||
13 | <div class="col-xl-6 col-md-12"> | 13 | <div class="col-xl-6 col-md-12"> |
14 | <h2 i18n class="subtitle">Followings instances</h2> | 14 | <h2 i18n class="subtitle">Followings instances</h2> |
15 | 15 | ||
16 | <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance does not have instances followings.</div> | 16 | <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance is not following any other.</div> |
17 | 17 | ||
18 | <a *ngFor="let following of followings" [href]="buildLink(following)" target="_blank" rel="noopener noreferrer"> | 18 | <a *ngFor="let following of followings" [href]="buildLink(following)" target="_blank" rel="noopener noreferrer"> |
19 | {{ following }} | 19 | {{ following }} |
diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html index 93670fe4e..65e06b3a1 100644 --- a/client/src/app/+about/about-peertube/about-peertube.component.html +++ b/client/src/app/+about/about-peertube/about-peertube.component.html | |||
@@ -11,7 +11,7 @@ | |||
11 | </p> | 11 | </p> |
12 | 12 | ||
13 | <p i18n> | 13 | <p i18n> |
14 | It is a free and open-source software, under the <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE">AGPLv3 | 14 | It is free and open-source software, under <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE">AGPLv3 |
15 | licence</a>. | 15 | licence</a>. |
16 | </p> | 16 | </p> |
17 | 17 | ||
@@ -156,7 +156,6 @@ | |||
156 | <li i18n>We set a limit to the number of peers sent by the tracker</li> | 156 | <li i18n>We set a limit to the number of peers sent by the tracker</li> |
157 | <li i18n>We set a limit on the request frequency received by the tracker</li> | 157 | <li i18n>We set a limit on the request frequency received by the tracker</li> |
158 | <li i18n>Allow instance admins to disable P2P from the administration interface</li> | 158 | <li i18n>Allow instance admins to disable P2P from the administration interface</li> |
159 | <li i18n>Automatic video redundancy from some instances: one doesn't know if the IP downloaded the video on purpose or if it a server</li> | ||
160 | </ul> | 159 | </ul> |
161 | 160 | ||
162 | <p i18n> | 161 | <p i18n> |
diff --git a/client/src/app/+about/about-routing.module.ts b/client/src/app/+about/about-routing.module.ts index 828b2884c..96a737555 100644 --- a/client/src/app/+about/about-routing.module.ts +++ b/client/src/app/+about/about-routing.module.ts | |||
@@ -44,7 +44,7 @@ const aboutRoutes: Routes = [ | |||
44 | component: AboutFollowsComponent, | 44 | component: AboutFollowsComponent, |
45 | data: { | 45 | data: { |
46 | meta: { | 46 | meta: { |
47 | title: $localize`About follows` | 47 | title: $localize`About this instance's network` |
48 | } | 48 | } |
49 | } | 49 | } |
50 | } | 50 | } |
diff --git a/client/src/app/+about/about.component.html b/client/src/app/+about/about.component.html index b89e6aeeb..1ab00c5df 100644 --- a/client/src/app/+about/about.component.html +++ b/client/src/app/+about/about.component.html | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | <a i18n routerLink="peertube" routerLinkActive="active" class="title-page title-page-about">PeerTube</a> | 7 | <a i18n routerLink="peertube" routerLinkActive="active" class="title-page title-page-about">PeerTube</a> |
8 | 8 | ||
9 | <a i18n routerLink="follows" routerLinkActive="active" class="title-page title-page-about">Follows</a> | 9 | <a i18n routerLink="follows" routerLinkActive="active" class="title-page title-page-about">Network</a> |
10 | </div> | 10 | </div> |
11 | </div> | 11 | </div> |
12 | 12 | ||
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index 686f3601b..f8f379d47 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | |||
@@ -466,7 +466,7 @@ | |||
466 | i18n-labelText labelText="Allow users to do remote URI/handle search" | 466 | i18n-labelText labelText="Allow users to do remote URI/handle search" |
467 | > | 467 | > |
468 | <ng-container ngProjectAs="description"> | 468 | <ng-container ngProjectAs="description"> |
469 | <span i18n>Allow <strong>your users</strong> to look up remote videos/actors by their URI, that may not be federated with your instance</span> | 469 | <span i18n>Allow <strong>your users</strong> to look up remote videos/actors that may not be federated with your instance</span> |
470 | </ng-container> | 470 | </ng-container> |
471 | </my-peertube-checkbox> | 471 | </my-peertube-checkbox> |
472 | </div> | 472 | </div> |
@@ -477,7 +477,7 @@ | |||
477 | i18n-labelText labelText="Allow anonymous to do remote URI/handle search" | 477 | i18n-labelText labelText="Allow anonymous to do remote URI/handle search" |
478 | > | 478 | > |
479 | <ng-container ngProjectAs="description"> | 479 | <ng-container ngProjectAs="description"> |
480 | <span i18n>Allow <strong>anonymous users</strong> to look up remote videos/actors by their URI, that may not be federated with your instance</span> | 480 | <span i18n>Allow <strong>anonymous users</strong> to look up remote videos/actors that may not be federated with your instance</span> |
481 | </ng-container> | 481 | </ng-container> |
482 | </my-peertube-checkbox> | 482 | </my-peertube-checkbox> |
483 | </div> | 483 | </div> |
@@ -682,7 +682,7 @@ | |||
682 | <ng-template ptTemplate="help"> | 682 | <ng-template ptTemplate="help"> |
683 | <ng-container i18n> | 683 | <ng-container i18n> |
684 | If your instance is explicitly allowed by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> | 684 | If your instance is explicitly allowed by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> |
685 | If the instance is not, we use an image link card that will redirect on your PeerTube instance.<br /><br /> | 685 | If the instance is not, we use an image link card that will redirect to your PeerTube instance.<br /><br /> |
686 | Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on | 686 | Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on |
687 | <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> | 687 | <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a> |
688 | to see if you instance is allowed. | 688 | to see if you instance is allowed. |
@@ -708,7 +708,7 @@ | |||
708 | <div class="form-group col-12 col-lg-4 col-xl-3"> | 708 | <div class="form-group col-12 col-lg-4 col-xl-3"> |
709 | <div i18n class="inner-form-title">LIVE</div> | 709 | <div i18n class="inner-form-title">LIVE</div> |
710 | <div i18n class="inner-form-description"> | 710 | <div i18n class="inner-form-description"> |
711 | Add ability for your users to do live streaming on your instance. | 711 | Enable users of your instance to stream live. |
712 | </div> | 712 | </div> |
713 | </div> | 713 | </div> |
714 | 714 | ||
diff --git a/client/src/app/+signup/+register/register-step-channel.component.html b/client/src/app/+signup/+register/register-step-channel.component.html index 170c2964e..67f332409 100644 --- a/client/src/app/+signup/+register/register-step-channel.component.html +++ b/client/src/app/+signup/+register/register-step-channel.component.html | |||
@@ -48,7 +48,7 @@ | |||
48 | </div> | 48 | </div> |
49 | 49 | ||
50 | <div *ngIf="isSameThanUsername()" class="form-error" i18n> | 50 | <div *ngIf="isSameThanUsername()" class="form-error" i18n> |
51 | Channel name cannot be the same than your account name. You can click on the first step to update your account name. | 51 | Channel name cannot be the same as your account name. You can click on the first step to update your account name. |
52 | </div> | 52 | </div> |
53 | </div> | 53 | </div> |
54 | </form> | 54 | </form> |
diff --git a/client/src/app/+signup/+verify-account/verify-account-routing.module.ts b/client/src/app/+signup/+verify-account/verify-account-routing.module.ts index c9ac67e4c..67c80ae93 100644 --- a/client/src/app/+signup/+verify-account/verify-account-routing.module.ts +++ b/client/src/app/+signup/+verify-account/verify-account-routing.module.ts | |||
@@ -14,7 +14,7 @@ const verifyAccountRoutes: Routes = [ | |||
14 | component: VerifyAccountEmailComponent, | 14 | component: VerifyAccountEmailComponent, |
15 | data: { | 15 | data: { |
16 | meta: { | 16 | meta: { |
17 | title: $localize`Verify account email` | 17 | title: $localize`Verify account via email` |
18 | } | 18 | } |
19 | } | 19 | } |
20 | }, | 20 | }, |
@@ -23,7 +23,7 @@ const verifyAccountRoutes: Routes = [ | |||
23 | component: VerifyAccountAskSendEmailComponent, | 23 | component: VerifyAccountAskSendEmailComponent, |
24 | data: { | 24 | data: { |
25 | meta: { | 25 | meta: { |
26 | title: $localize`Verify account ask send email` | 26 | title: $localize`Ask to send an email to verify you account` |
27 | } | 27 | } |
28 | } | 28 | } |
29 | } | 29 | } |
diff --git a/client/src/app/+videos/video-list/video-most-liked.component.ts b/client/src/app/+videos/video-list/video-most-liked.component.ts index e5f7bd152..93408d76b 100644 --- a/client/src/app/+videos/video-list/video-most-liked.component.ts +++ b/client/src/app/+videos/video-list/video-most-liked.component.ts | |||
@@ -39,7 +39,7 @@ export class VideoMostLikedComponent extends AbstractVideoList implements OnInit | |||
39 | this.generateSyndicationList() | 39 | this.generateSyndicationList() |
40 | 40 | ||
41 | this.titlePage = $localize`Most liked videos` | 41 | this.titlePage = $localize`Most liked videos` |
42 | this.titleTooltip = $localize`Videos that have the higher number of likes.` | 42 | this.titleTooltip = $localize`Videos that have the most likes.` |
43 | } | 43 | } |
44 | 44 | ||
45 | getVideosObservable (page: number) { | 45 | getVideosObservable (page: number) { |
diff --git a/client/src/app/core/rest/rest-extractor.service.ts b/client/src/app/core/rest/rest-extractor.service.ts index 36702b371..4b8c1e155 100644 --- a/client/src/app/core/rest/rest-extractor.service.ts +++ b/client/src/app/core/rest/rest-extractor.service.ts | |||
@@ -58,8 +58,7 @@ export class RestExtractor { | |||
58 | } else if (err.error && err.error.error) { | 58 | } else if (err.error && err.error.error) { |
59 | errorMessage = err.error.error | 59 | errorMessage = err.error.error |
60 | } else if (err.status === 413) { | 60 | } else if (err.status === 413) { |
61 | errorMessage = $localize`Request is too large for the server. | 61 | errorMessage = $localize`Media is too large for the server. Please contact you administrator if you want to increase the limit size.` |
62 | Please contact you administrator if you want to increase the limit size.` | ||
63 | } else if (err.status === 429) { | 62 | } else if (err.status === 429) { |
64 | const secondsLeft = err.headers.get('retry-after') | 63 | const secondsLeft = err.headers.get('retry-after') |
65 | if (secondsLeft) { | 64 | if (secondsLeft) { |
diff --git a/client/src/app/modal/welcome-modal.component.html b/client/src/app/modal/welcome-modal.component.html index 81c12d4c0..66b144656 100644 --- a/client/src/app/modal/welcome-modal.component.html +++ b/client/src/app/modal/welcome-modal.component.html | |||
@@ -61,11 +61,9 @@ | |||
61 | </p> | 61 | </p> |
62 | 62 | ||
63 | <p i18n> | 63 | <p i18n> |
64 | If you want to open registrations, please decide what are <strong>your moderation rules</strong>, fill your <strong>instance | 64 | If you want to open registrations, please decide what <strong>your moderation rules</strong> and <strong>instance |
65 | terms</strong> | 65 | terms of service</strong> are, as well as specify the categories and languages and your moderators speak. |
66 | and specify the categories and languages you speak. This way, you will help users to register on <strong>the | 66 | This way, you will help users to register on <strong>the appropriate</strong> PeerTube instance. |
67 | appropriate</strong> | ||
68 | PeerTube instance. | ||
69 | </p> | 67 | </p> |
70 | </div> | 68 | </div> |
71 | </div> | 69 | </div> |
diff --git a/client/src/app/shared/form-validators/user-validators.ts b/client/src/app/shared/form-validators/user-validators.ts index 18199505c..9efc5180d 100644 --- a/client/src/app/shared/form-validators/user-validators.ts +++ b/client/src/app/shared/form-validators/user-validators.ts | |||
@@ -27,7 +27,7 @@ export const USER_CHANNEL_NAME_VALIDATOR: BuildFormValidator = { | |||
27 | 'required': $localize`Channel name is required.`, | 27 | 'required': $localize`Channel name is required.`, |
28 | 'minlength': $localize`Channel name must be at least 1 character long.`, | 28 | 'minlength': $localize`Channel name must be at least 1 character long.`, |
29 | 'maxlength': $localize`Channel name cannot be more than 50 characters long.`, | 29 | 'maxlength': $localize`Channel name cannot be more than 50 characters long.`, |
30 | 'pattern': $localize`Channel name should be lowercase alphanumeric; dots and underscores are allowed.` | 30 | 'pattern': $localize`Channel name should be lowercase, and can contain only alphanumeric characters, dots and underscores.` |
31 | } | 31 | } |
32 | } | 32 | } |
33 | 33 | ||
diff --git a/client/src/app/shared/shared-main/users/user-notifications.component.html b/client/src/app/shared/shared-main/users/user-notifications.component.html index a56a0859b..91a4c8dc3 100644 --- a/client/src/app/shared/shared-main/users/user-notifications.component.html +++ b/client/src/app/shared/shared-main/users/user-notifications.component.html | |||
@@ -187,7 +187,7 @@ | |||
187 | <my-global-icon iconName="alert" aria-hidden="true"></my-global-icon> | 187 | <my-global-icon iconName="alert" aria-hidden="true"></my-global-icon> |
188 | 188 | ||
189 | <div class="message" i18n> | 189 | <div class="message" i18n> |
190 | The notification points to a content now unavailable | 190 | The notification points to content now unavailable |
191 | </div> | 191 | </div> |
192 | </ng-container> | 192 | </ng-container> |
193 | </ng-container> | 193 | </ng-container> |
diff --git a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts index 44aefa853..f59910d1c 100644 --- a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts +++ b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts | |||
@@ -295,7 +295,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges { | |||
295 | this.userActions.push([ | 295 | this.userActions.push([ |
296 | { | 296 | { |
297 | label: $localize`Mute this account`, | 297 | label: $localize`Mute this account`, |
298 | description: $localize`Hide any content from that user for you.`, | 298 | description: $localize`Hide any content from that user from you.`, |
299 | isDisplayed: ({ account }) => account.mutedByUser === false, | 299 | isDisplayed: ({ account }) => account.mutedByUser === false, |
300 | handler: ({ account }) => this.blockAccountByUser(account) | 300 | handler: ({ account }) => this.blockAccountByUser(account) |
301 | }, | 301 | }, |
@@ -319,7 +319,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges { | |||
319 | }, | 319 | }, |
320 | { | 320 | { |
321 | label: $localize`Remove comments from your videos`, | 321 | label: $localize`Remove comments from your videos`, |
322 | description: $localize`Remove comments of this account from your videos.`, | 322 | description: $localize`Remove comments made by this account on your videos.`, |
323 | handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'my-videos' }) | 323 | handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'my-videos' }) |
324 | } | 324 | } |
325 | ]) | 325 | ]) |
@@ -331,13 +331,13 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges { | |||
331 | instanceActions = instanceActions.concat([ | 331 | instanceActions = instanceActions.concat([ |
332 | { | 332 | { |
333 | label: $localize`Mute this account by your instance`, | 333 | label: $localize`Mute this account by your instance`, |
334 | description: $localize`Hide any content from that user for you, your instance and its users.`, | 334 | description: $localize`Hide any content from that user from you, your instance and its users.`, |
335 | isDisplayed: ({ account }) => account.mutedByInstance === false, | 335 | isDisplayed: ({ account }) => account.mutedByInstance === false, |
336 | handler: ({ account }) => this.blockAccountByInstance(account) | 336 | handler: ({ account }) => this.blockAccountByInstance(account) |
337 | }, | 337 | }, |
338 | { | 338 | { |
339 | label: $localize`Unmute this account by your instance`, | 339 | label: $localize`Unmute this account by your instance`, |
340 | description: $localize`Show back content from that user for you, your instance and its users.`, | 340 | description: $localize`Show this user's content to the users of this instance again.`, |
341 | isDisplayed: ({ account }) => account.mutedByInstance === true, | 341 | isDisplayed: ({ account }) => account.mutedByInstance === true, |
342 | handler: ({ account }) => this.unblockAccountByInstance(account) | 342 | handler: ({ account }) => this.unblockAccountByInstance(account) |
343 | } | 343 | } |
@@ -349,7 +349,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges { | |||
349 | instanceActions = instanceActions.concat([ | 349 | instanceActions = instanceActions.concat([ |
350 | { | 350 | { |
351 | label: $localize`Mute the instance by your instance`, | 351 | label: $localize`Mute the instance by your instance`, |
352 | description: $localize`Hide any content from that instance for you, your instance and its users.`, | 352 | description: $localize`Hide any content from that instance from you, your instance and its users.`, |
353 | isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false, | 353 | isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false, |
354 | handler: ({ account }) => this.blockServerByInstance(account.host) | 354 | handler: ({ account }) => this.blockServerByInstance(account.host) |
355 | }, | 355 | }, |
@@ -366,7 +366,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges { | |||
366 | instanceActions = instanceActions.concat([ | 366 | instanceActions = instanceActions.concat([ |
367 | { | 367 | { |
368 | label: $localize`Remove comments from your instance`, | 368 | label: $localize`Remove comments from your instance`, |
369 | description: $localize`Remove comments of this account from your instance.`, | 369 | description: $localize`Remove comments made by this account from your instance.`, |
370 | handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'instance' }) | 370 | handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'instance' }) |
371 | } | 371 | } |
372 | ]) | 372 | ]) |