From 34398be4297852b6aecebe65dd33bded9187a0c9 Mon Sep 17 00:00:00 2001 From: Filip Bengtsson <40275136+AutomCoding@users.noreply.github.com> Date: Wed, 23 Oct 2019 14:39:09 +0200 Subject: Some language fixes (#2198) * Fix preposition * Fix French colon spacing * Some grammar fixes * Preposition fix * Update signup-success.component.html After suggestion from @frankstrater. --- .../about-peertube/about-peertube.component.html | 2 +- .../edit-custom-config.component.html | 26 +++++++++++----------- .../app/+signup/+register/register.component.html | 2 +- .../+signup/shared/signup-success.component.html | 4 ++-- client/src/app/modal/welcome-modal.component.html | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'client/src') 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 423f7bce7..d1e3e1b3c 100644 --- a/client/src/app/+about/about-peertube/about-peertube.component.html +++ b/client/src/app/+about/about-peertube/about-peertube.component.html @@ -52,7 +52,7 @@ </li> <li i18n> - 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 </li> <li i18n> 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 47e3e5a52..5e7ab03cd 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 @@ -131,7 +131,7 @@ <div class="form-group"> <label i18n for="instanceAdministrator">Who is behind the instance?</label> - <div class="label-small-info">A single person? A non profit? A company?</div> + <div class="label-small-info">A single person? A non-profit? A company?</div> <my-markdown-textarea id="instanceAdministrator" formControlName="administrator" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true" @@ -164,7 +164,7 @@ </div> <div class="form-group"> - <label i18n for="instanceBusinessModel">How will you pay the PeerTube instance server?</label> + <label i18n for="instanceBusinessModel">How will you finance the PeerTube server?</label> <div class="label-small-info">With you own funds? With users donations? Advertising?</div> <textarea @@ -177,7 +177,7 @@ <div i18n class="inner-form-title">Other information</div> <div class="form-group"> - <label i18n for="instanceHardwareInformation">On what server/hardware the instance runs?</label> + <label i18n for="instanceHardwareInformation">What server/hardware does the instance run on?</label> <div class="label-small-info">2vCore 2GB RAM/or directly the link to the server you rent etc</div> <my-markdown-textarea @@ -216,10 +216,10 @@ <label i18n for="instanceDefaultClientRoute">Default client route</label> <div class="peertube-select-container"> <select id="instanceDefaultClientRoute" formControlName="defaultClientRoute"> - <option i18n value="/videos/overview">Videos Discover</option> - <option i18n value="/videos/trending">Videos Trending</option> - <option i18n value="/videos/most-liked">Most Liked Videos</option> - <option i18n value="/videos/recently-added">Videos Recently Added</option> + <option i18n value="/videos/overview">Discover videos</option> + <option i18n value="/videos/trending">Trending videos</option> + <option i18n value="/videos/most-liked">Most liked videos</option> + <option i18n value="/videos/recently-added">Recently added videos</option> <option i18n value="/videos/local">Local videos</option> </select> </div> @@ -258,7 +258,7 @@ <ng-container formGroupName="user"> <div class="form-group"> - <label i18n for="userVideoQuota">User default video quota</label> + <label i18n for="userVideoQuota">Default video quota per user</label> <div class="peertube-select-container"> <select id="userVideoQuota" formControlName="videoQuota"> <option *ngFor="let videoQuotaOption of videoQuotaOptions" [value]="videoQuotaOption.value"> @@ -270,7 +270,7 @@ </div> <div class="form-group"> - <label i18n for="userVideoQuotaDaily">User default daily upload limit</label> + <label i18n for="userVideoQuotaDaily">Default daily upload limit per user</label> <div class="peertube-select-container"> <select id="userVideoQuotaDaily" formControlName="videoQuotaDaily"> <option *ngFor="let videoQuotaDailyOption of videoQuotaDailyOptions" [value]="videoQuotaDailyOption.value"> @@ -475,7 +475,7 @@ i18n-labelText labelText="Allow additional extensions" > <ng-template ptTemplate="help"> - <ng-container i18n>Allow your users to upload .mkv, .mov, .avi, .flv videos</ng-container> + <ng-container i18n>Allow your users to upload .mkv, .mov, .avi and .flv videos</ng-container> </ng-template> </my-peertube-checkbox> </div> @@ -554,7 +554,7 @@ <my-help> <ng-template ptTemplate="customHtml"> <ng-container i18n> - Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> + Write JavaScript code directly.<br />Example: <pre>console.log('my instance is amazing');</pre> </ng-container> </ng-template> </my-help> @@ -573,7 +573,7 @@ <my-help> <ng-template ptTemplate="customHtml"> <ng-container i18n> - Write directly CSS code. Example:<br /><br /> + Write CSS code directly. Example:<br /><br /> <pre> #custom-css {{ '{' }} color: red; @@ -604,5 +604,5 @@ </ngb-tabset> <input (click)="formValidated()" type="submit" i18n-value value="Update configuration" [disabled]="!form.valid"> - <span class="form-error" i18n *ngIf="!form.valid">It seems the configuration is invalid. Please search potential errors in the different tabs.</span> + <span class="form-error" i18n *ngIf="!form.valid">It seems like the configuration is invalid. Please search for potential errors in the different tabs.</span> </form> diff --git a/client/src/app/+signup/+register/register.component.html b/client/src/app/+signup/+register/register.component.html index 906e29aed..fa9838ba6 100644 --- a/client/src/app/+signup/+register/register.component.html +++ b/client/src/app/+signup/+register/register.component.html @@ -67,7 +67,7 @@ </div> <div class="block"> - <strong i18n>How will we pay this instance?</strong> + <strong i18n>How will we finance this instance?</strong> <div [innerHTML]="about.instance.businessModel"></div> </div> </ng-template> diff --git a/client/src/app/+signup/shared/signup-success.component.html b/client/src/app/+signup/shared/signup-success.component.html index 9bd381b78..71f01897d 100644 --- a/client/src/app/+signup/shared/signup-success.component.html +++ b/client/src/app/+signup/shared/signup-success.component.html @@ -5,12 +5,12 @@ <polyline class="path check" fill="none" stroke="#73AF55" stroke-width="6" stroke-linecap="round" stroke-miterlimit="10" points="100.2,40.2 51.5,88.8 29.8,67.5 "/> </svg> -<p i18n class="bottom-message">Welcome on PeerTube!</p> +<p i18n class="bottom-message">Welcome to PeerTube!</p> <div *ngIf="message" class="alert alert-success"> <p>{{ message }}</p> <p i18n> - If you need help to use PeerTube, you can take a look to the <a href="https://docs.joinpeertube.org/#/use-setup-account" target="_blank" rel="noopener noreferrer">documentation</a>. + If you need help to use PeerTube, you can have a look at the <a href="https://docs.joinpeertube.org/#/use-setup-account" target="_blank" rel="noopener noreferrer">documentation</a>. </p> </div> diff --git a/client/src/app/modal/welcome-modal.component.html b/client/src/app/modal/welcome-modal.component.html index 09ff2163b..d28bbf699 100644 --- a/client/src/app/modal/welcome-modal.component.html +++ b/client/src/app/modal/welcome-modal.component.html @@ -1,6 +1,6 @@ <ng-template #modal let-hide="close"> <div class="modal-header"> - <h4 i18n class="modal-title">Welcome on PeerTube dear administrator!</h4> + <h4 i18n class="modal-title">Welcome to PeerTube, dear administrator!</h4> <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hide()"></my-global-icon> </div> -- cgit v1.2.3