diff options
5 files changed, 18 insertions, 18 deletions
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 @@ | |||
52 | </li> | 52 | </li> |
53 | 53 | ||
54 | <li i18n> | 54 | <li i18n> |
55 | The IP address is a vague information : usually, it regularly changes and can represent many persons or entities | 55 | The IP address is a vague information: usually, it regularly changes and can represent many persons or entities |
56 | </li> | 56 | </li> |
57 | 57 | ||
58 | <li i18n> | 58 | <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 @@ | |||
131 | 131 | ||
132 | <div class="form-group"> | 132 | <div class="form-group"> |
133 | <label i18n for="instanceAdministrator">Who is behind the instance?</label> | 133 | <label i18n for="instanceAdministrator">Who is behind the instance?</label> |
134 | <div class="label-small-info">A single person? A non profit? A company?</div> | 134 | <div class="label-small-info">A single person? A non-profit? A company?</div> |
135 | 135 | ||
136 | <my-markdown-textarea | 136 | <my-markdown-textarea |
137 | id="instanceAdministrator" formControlName="administrator" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true" | 137 | id="instanceAdministrator" formControlName="administrator" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true" |
@@ -164,7 +164,7 @@ | |||
164 | </div> | 164 | </div> |
165 | 165 | ||
166 | <div class="form-group"> | 166 | <div class="form-group"> |
167 | <label i18n for="instanceBusinessModel">How will you pay the PeerTube instance server?</label> | 167 | <label i18n for="instanceBusinessModel">How will you finance the PeerTube server?</label> |
168 | <div class="label-small-info">With you own funds? With users donations? Advertising?</div> | 168 | <div class="label-small-info">With you own funds? With users donations? Advertising?</div> |
169 | 169 | ||
170 | <textarea | 170 | <textarea |
@@ -177,7 +177,7 @@ | |||
177 | <div i18n class="inner-form-title">Other information</div> | 177 | <div i18n class="inner-form-title">Other information</div> |
178 | 178 | ||
179 | <div class="form-group"> | 179 | <div class="form-group"> |
180 | <label i18n for="instanceHardwareInformation">On what server/hardware the instance runs?</label> | 180 | <label i18n for="instanceHardwareInformation">What server/hardware does the instance run on?</label> |
181 | <div class="label-small-info">2vCore 2GB RAM/or directly the link to the server you rent etc</div> | 181 | <div class="label-small-info">2vCore 2GB RAM/or directly the link to the server you rent etc</div> |
182 | 182 | ||
183 | <my-markdown-textarea | 183 | <my-markdown-textarea |
@@ -216,10 +216,10 @@ | |||
216 | <label i18n for="instanceDefaultClientRoute">Default client route</label> | 216 | <label i18n for="instanceDefaultClientRoute">Default client route</label> |
217 | <div class="peertube-select-container"> | 217 | <div class="peertube-select-container"> |
218 | <select id="instanceDefaultClientRoute" formControlName="defaultClientRoute"> | 218 | <select id="instanceDefaultClientRoute" formControlName="defaultClientRoute"> |
219 | <option i18n value="/videos/overview">Videos Discover</option> | 219 | <option i18n value="/videos/overview">Discover videos</option> |
220 | <option i18n value="/videos/trending">Videos Trending</option> | 220 | <option i18n value="/videos/trending">Trending videos</option> |
221 | <option i18n value="/videos/most-liked">Most Liked Videos</option> | 221 | <option i18n value="/videos/most-liked">Most liked videos</option> |
222 | <option i18n value="/videos/recently-added">Videos Recently Added</option> | 222 | <option i18n value="/videos/recently-added">Recently added videos</option> |
223 | <option i18n value="/videos/local">Local videos</option> | 223 | <option i18n value="/videos/local">Local videos</option> |
224 | </select> | 224 | </select> |
225 | </div> | 225 | </div> |
@@ -258,7 +258,7 @@ | |||
258 | 258 | ||
259 | <ng-container formGroupName="user"> | 259 | <ng-container formGroupName="user"> |
260 | <div class="form-group"> | 260 | <div class="form-group"> |
261 | <label i18n for="userVideoQuota">User default video quota</label> | 261 | <label i18n for="userVideoQuota">Default video quota per user</label> |
262 | <div class="peertube-select-container"> | 262 | <div class="peertube-select-container"> |
263 | <select id="userVideoQuota" formControlName="videoQuota"> | 263 | <select id="userVideoQuota" formControlName="videoQuota"> |
264 | <option *ngFor="let videoQuotaOption of videoQuotaOptions" [value]="videoQuotaOption.value"> | 264 | <option *ngFor="let videoQuotaOption of videoQuotaOptions" [value]="videoQuotaOption.value"> |
@@ -270,7 +270,7 @@ | |||
270 | </div> | 270 | </div> |
271 | 271 | ||
272 | <div class="form-group"> | 272 | <div class="form-group"> |
273 | <label i18n for="userVideoQuotaDaily">User default daily upload limit</label> | 273 | <label i18n for="userVideoQuotaDaily">Default daily upload limit per user</label> |
274 | <div class="peertube-select-container"> | 274 | <div class="peertube-select-container"> |
275 | <select id="userVideoQuotaDaily" formControlName="videoQuotaDaily"> | 275 | <select id="userVideoQuotaDaily" formControlName="videoQuotaDaily"> |
276 | <option *ngFor="let videoQuotaDailyOption of videoQuotaDailyOptions" [value]="videoQuotaDailyOption.value"> | 276 | <option *ngFor="let videoQuotaDailyOption of videoQuotaDailyOptions" [value]="videoQuotaDailyOption.value"> |
@@ -475,7 +475,7 @@ | |||
475 | i18n-labelText labelText="Allow additional extensions" | 475 | i18n-labelText labelText="Allow additional extensions" |
476 | > | 476 | > |
477 | <ng-template ptTemplate="help"> | 477 | <ng-template ptTemplate="help"> |
478 | <ng-container i18n>Allow your users to upload .mkv, .mov, .avi, .flv videos</ng-container> | 478 | <ng-container i18n>Allow your users to upload .mkv, .mov, .avi and .flv videos</ng-container> |
479 | </ng-template> | 479 | </ng-template> |
480 | </my-peertube-checkbox> | 480 | </my-peertube-checkbox> |
481 | </div> | 481 | </div> |
@@ -554,7 +554,7 @@ | |||
554 | <my-help> | 554 | <my-help> |
555 | <ng-template ptTemplate="customHtml"> | 555 | <ng-template ptTemplate="customHtml"> |
556 | <ng-container i18n> | 556 | <ng-container i18n> |
557 | Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre> | 557 | Write JavaScript code directly.<br />Example: <pre>console.log('my instance is amazing');</pre> |
558 | </ng-container> | 558 | </ng-container> |
559 | </ng-template> | 559 | </ng-template> |
560 | </my-help> | 560 | </my-help> |
@@ -573,7 +573,7 @@ | |||
573 | <my-help> | 573 | <my-help> |
574 | <ng-template ptTemplate="customHtml"> | 574 | <ng-template ptTemplate="customHtml"> |
575 | <ng-container i18n> | 575 | <ng-container i18n> |
576 | Write directly CSS code. Example:<br /><br /> | 576 | Write CSS code directly. Example:<br /><br /> |
577 | <pre> | 577 | <pre> |
578 | #custom-css {{ '{' }} | 578 | #custom-css {{ '{' }} |
579 | color: red; | 579 | color: red; |
@@ -604,5 +604,5 @@ | |||
604 | </ngb-tabset> | 604 | </ngb-tabset> |
605 | 605 | ||
606 | <input (click)="formValidated()" type="submit" i18n-value value="Update configuration" [disabled]="!form.valid"> | 606 | <input (click)="formValidated()" type="submit" i18n-value value="Update configuration" [disabled]="!form.valid"> |
607 | <span class="form-error" i18n *ngIf="!form.valid">It seems the configuration is invalid. Please search potential errors in the different tabs.</span> | 607 | <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> |
608 | </form> | 608 | </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 @@ | |||
67 | </div> | 67 | </div> |
68 | 68 | ||
69 | <div class="block"> | 69 | <div class="block"> |
70 | <strong i18n>How will we pay this instance?</strong> | 70 | <strong i18n>How will we finance this instance?</strong> |
71 | <div [innerHTML]="about.instance.businessModel"></div> | 71 | <div [innerHTML]="about.instance.businessModel"></div> |
72 | </div> | 72 | </div> |
73 | </ng-template> | 73 | </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 @@ | |||
5 | <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 "/> | 5 | <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 "/> |
6 | </svg> | 6 | </svg> |
7 | 7 | ||
8 | <p i18n class="bottom-message">Welcome on PeerTube!</p> | 8 | <p i18n class="bottom-message">Welcome to PeerTube!</p> |
9 | 9 | ||
10 | <div *ngIf="message" class="alert alert-success"> | 10 | <div *ngIf="message" class="alert alert-success"> |
11 | <p>{{ message }}</p> | 11 | <p>{{ message }}</p> |
12 | 12 | ||
13 | <p i18n> | 13 | <p i18n> |
14 | 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>. | 14 | 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>. |
15 | </p> | 15 | </p> |
16 | </div> | 16 | </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 @@ | |||
1 | <ng-template #modal let-hide="close"> | 1 | <ng-template #modal let-hide="close"> |
2 | <div class="modal-header"> | 2 | <div class="modal-header"> |
3 | <h4 i18n class="modal-title">Welcome on PeerTube dear administrator!</h4> | 3 | <h4 i18n class="modal-title">Welcome to PeerTube, dear administrator!</h4> |
4 | <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hide()"></my-global-icon> | 4 | <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hide()"></my-global-icon> |
5 | </div> | 5 | </div> |
6 | 6 | ||