From dc5bb5cea5bf7e906caa6d9c5468e6de36e605de Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Thu, 12 Nov 2020 21:09:17 +0100 Subject: [PATCH] reword unclear sentences, check for grammar fixes #3222 --- .../about-follows/about-follows.component.html | 2 +- .../about-peertube/about-peertube.component.html | 3 +-- client/src/app/+about/about-routing.module.ts | 2 +- client/src/app/+about/about.component.html | 2 +- .../edit-custom-config.component.html | 8 ++++---- .../+register/register-step-channel.component.html | 2 +- .../+verify-account/verify-account-routing.module.ts | 4 ++-- .../+videos/video-list/video-most-liked.component.ts | 2 +- client/src/app/core/rest/rest-extractor.service.ts | 3 +-- client/src/app/modal/welcome-modal.component.html | 8 +++----- .../app/shared/form-validators/user-validators.ts | 2 +- .../users/user-notifications.component.html | 2 +- .../user-moderation-dropdown.component.ts | 12 ++++++------ 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 @@

Followings instances

-
This instance does not have instances followings.
+
This instance is not following any other.
{{ 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 @@

- It is a free and open-source software, under the AGPLv3 + It is free and open-source software, under AGPLv3 licence.

@@ -156,7 +156,6 @@
  • We set a limit to the number of peers sent by the tracker
  • We set a limit on the request frequency received by the tracker
  • Allow instance admins to disable P2P from the administration interface
    • -
  • Automatic video redundancy from some instances: one doesn't know if the IP downloaded the video on purpose or if it a server

    • diff --git a/client/src/app/+about/about-routing.module.ts b/client/src/app/+about/about-routing.module.ts index 828b2884c..96a737555 100644 --- a/client/src/app/+about/about-routing.module.ts +++ b/client/src/app/+about/about-routing.module.ts @@ -44,7 +44,7 @@ const aboutRoutes: Routes = [ component: AboutFollowsComponent, data: { meta: { - title: $localize`About follows` + title: $localize`About this instance's network` } } } diff --git a/client/src/app/+about/about.component.html b/client/src/app/+about/about.component.html index b89e6aeeb..1ab00c5df 100644 --- a/client/src/app/+about/about.component.html +++ b/client/src/app/+about/about.component.html @@ -6,7 +6,7 @@ PeerTube - Follows + Network

    diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index 686f3601b..f8f379d47 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html @@ -466,7 +466,7 @@ i18n-labelText labelText="Allow users to do remote URI/handle search" > - Allow your users to look up remote videos/actors by their URI, that may not be federated with your instance + Allow your users to look up remote videos/actors that may not be federated with your instance @@ -477,7 +477,7 @@ i18n-labelText labelText="Allow anonymous to do remote URI/handle search" > - Allow anonymous users to look up remote videos/actors by their URI, that may not be federated with your instance + Allow anonymous users to look up remote videos/actors that may not be federated with your instance @@ -682,7 +682,7 @@ If your instance is explicitly allowed by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.
    - If the instance is not, we use an image link card that will redirect on your PeerTube instance.

    + If the instance is not, we use an image link card that will redirect to your PeerTube instance.

    Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on https://cards-dev.twitter.com/validator to see if you instance is allowed. @@ -708,7 +708,7 @@
    LIVE
    - Add ability for your users to do live streaming on your instance. + Enable users of your instance to stream live.
    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 @@
    - Channel name cannot be the same than your account name. You can click on the first step to update your account name. + Channel name cannot be the same as your account name. You can click on the first step to update your account name.
    diff --git a/client/src/app/+signup/+verify-account/verify-account-routing.module.ts b/client/src/app/+signup/+verify-account/verify-account-routing.module.ts index c9ac67e4c..67c80ae93 100644 --- a/client/src/app/+signup/+verify-account/verify-account-routing.module.ts +++ b/client/src/app/+signup/+verify-account/verify-account-routing.module.ts @@ -14,7 +14,7 @@ const verifyAccountRoutes: Routes = [ component: VerifyAccountEmailComponent, data: { meta: { - title: $localize`Verify account email` + title: $localize`Verify account via email` } } }, @@ -23,7 +23,7 @@ const verifyAccountRoutes: Routes = [ component: VerifyAccountAskSendEmailComponent, data: { meta: { - title: $localize`Verify account ask send email` + title: $localize`Ask to send an email to verify you account` } } } diff --git a/client/src/app/+videos/video-list/video-most-liked.component.ts b/client/src/app/+videos/video-list/video-most-liked.component.ts index e5f7bd152..93408d76b 100644 --- a/client/src/app/+videos/video-list/video-most-liked.component.ts +++ b/client/src/app/+videos/video-list/video-most-liked.component.ts @@ -39,7 +39,7 @@ export class VideoMostLikedComponent extends AbstractVideoList implements OnInit this.generateSyndicationList() this.titlePage = $localize`Most liked videos` - this.titleTooltip = $localize`Videos that have the higher number of likes.` + this.titleTooltip = $localize`Videos that have the most likes.` } getVideosObservable (page: number) { diff --git a/client/src/app/core/rest/rest-extractor.service.ts b/client/src/app/core/rest/rest-extractor.service.ts index 36702b371..4b8c1e155 100644 --- a/client/src/app/core/rest/rest-extractor.service.ts +++ b/client/src/app/core/rest/rest-extractor.service.ts @@ -58,8 +58,7 @@ export class RestExtractor { } else if (err.error && err.error.error) { errorMessage = err.error.error } else if (err.status === 413) { - errorMessage = $localize`Request is too large for the server. - Please contact you administrator if you want to increase the limit size.` + errorMessage = $localize`Media is too large for the server. Please contact you administrator if you want to increase the limit size.` } else if (err.status === 429) { const secondsLeft = err.headers.get('retry-after') if (secondsLeft) { diff --git a/client/src/app/modal/welcome-modal.component.html b/client/src/app/modal/welcome-modal.component.html index 81c12d4c0..66b144656 100644 --- a/client/src/app/modal/welcome-modal.component.html +++ b/client/src/app/modal/welcome-modal.component.html @@ -61,11 +61,9 @@

    - If you want to open registrations, please decide what are your moderation rules, fill your instance - terms - and specify the categories and languages you speak. This way, you will help users to register on the - appropriate - PeerTube instance. + If you want to open registrations, please decide what your moderation rules and instance + terms of service are, as well as specify the categories and languages and your moderators speak. + This way, you will help users to register on the appropriate PeerTube instance.

    diff --git a/client/src/app/shared/form-validators/user-validators.ts b/client/src/app/shared/form-validators/user-validators.ts index 18199505c..9efc5180d 100644 --- a/client/src/app/shared/form-validators/user-validators.ts +++ b/client/src/app/shared/form-validators/user-validators.ts @@ -27,7 +27,7 @@ export const USER_CHANNEL_NAME_VALIDATOR: BuildFormValidator = { 'required': $localize`Channel name is required.`, 'minlength': $localize`Channel name must be at least 1 character long.`, 'maxlength': $localize`Channel name cannot be more than 50 characters long.`, - 'pattern': $localize`Channel name should be lowercase alphanumeric; dots and underscores are allowed.` + 'pattern': $localize`Channel name should be lowercase, and can contain only alphanumeric characters, dots and underscores.` } } diff --git a/client/src/app/shared/shared-main/users/user-notifications.component.html b/client/src/app/shared/shared-main/users/user-notifications.component.html index a56a0859b..91a4c8dc3 100644 --- a/client/src/app/shared/shared-main/users/user-notifications.component.html +++ b/client/src/app/shared/shared-main/users/user-notifications.component.html @@ -187,7 +187,7 @@
    - The notification points to a content now unavailable + The notification points to content now unavailable
    diff --git a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts index 44aefa853..f59910d1c 100644 --- a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts +++ b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts @@ -295,7 +295,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges { this.userActions.push([ { label: $localize`Mute this account`, - description: $localize`Hide any content from that user for you.`, + description: $localize`Hide any content from that user from you.`, isDisplayed: ({ account }) => account.mutedByUser === false, handler: ({ account }) => this.blockAccountByUser(account) }, @@ -319,7 +319,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges { }, { label: $localize`Remove comments from your videos`, - description: $localize`Remove comments of this account from your videos.`, + description: $localize`Remove comments made by this account on your videos.`, handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'my-videos' }) } ]) @@ -331,13 +331,13 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges { instanceActions = instanceActions.concat([ { label: $localize`Mute this account by your instance`, - description: $localize`Hide any content from that user for you, your instance and its users.`, + description: $localize`Hide any content from that user from you, your instance and its users.`, isDisplayed: ({ account }) => account.mutedByInstance === false, handler: ({ account }) => this.blockAccountByInstance(account) }, { label: $localize`Unmute this account by your instance`, - description: $localize`Show back content from that user for you, your instance and its users.`, + description: $localize`Show this user's content to the users of this instance again.`, isDisplayed: ({ account }) => account.mutedByInstance === true, handler: ({ account }) => this.unblockAccountByInstance(account) } @@ -349,7 +349,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges { instanceActions = instanceActions.concat([ { label: $localize`Mute the instance by your instance`, - description: $localize`Hide any content from that instance for you, your instance and its users.`, + description: $localize`Hide any content from that instance from you, your instance and its users.`, isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false, handler: ({ account }) => this.blockServerByInstance(account.host) }, @@ -366,7 +366,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges { instanceActions = instanceActions.concat([ { label: $localize`Remove comments from your instance`, - description: $localize`Remove comments of this account from your instance.`, + description: $localize`Remove comments made by this account from your instance.`, handler: ({ account }) => this.bulkRemoveCommentsOf({ accountName: account.nameWithHost, scope: 'instance' }) } ])