Merge branch 'bpatrik:master' into master

README.md

@@ -135,7 +135,7 @@ apt-get install build-essential  libkrb5-dev gcc g++
 ## 2. Translate the page to your own language
 1. [Install Pigallery2](#121-b-install-from-source) from source (with the release it won't work) 
 2. add your language e.g: fr
-   * copy `src/frontend/translate/messages.en.xls` to `src/frontend/translate/messages.fr.xls`
+   * copy `src/frontend/translate/messages.en.xlf` to `src/frontend/translate/messages.fr.xlf`
    * add the new translation to the `angular.json` `projects->pigallery2->i18n->locales` section 
 3. translate the file by updating the `<target>` tags
 4. test if it works:

src/common/SupportedFormats.ts

@@ -16,7 +16,7 @@ export class SupportedFormats {
   // Read more:  https://www.w3schools.com/html/html5_video.asp
   static Videos = Config.Media.Video.supportedFormats;
   static MetaFiles = Config.MetaFile.supportedFormats;
-  // These formats need to be transcoded (with the build-in ffmpeg support)
+  // These formats need to be transcoded (with the built-in ffmpeg support)
   static TranscodeNeed = {
     // based on libvips, all supported formats for sharp: https://github.com/libvips/libvips
     Photos: [] as string[],

src/common/config/private/PrivateConfig.ts

@@ -525,7 +525,7 @@ export class ServerLogConfig {
       name: $localize`Server timing`,
       priority: ConfigPriority.underTheHood,
     },
-    description: $localize`If enabled, the app ads "Server-Timing" http header to the response.`
+    description: $localize`If enabled, the app adds "Server-Timing" http header to the response.`
   })
   logServerTiming: boolean = false;
 }
@@ -638,7 +638,7 @@ export class ServerJobConfig {
         name: $localize`Processing batch size`,
         priority: ConfigPriority.underTheHood
       },
-    description: $localize`Jobs load this many photos or videos form the DB for processing at once.`
+    description: $localize`Jobs load this many photos or videos from the DB for processing at once.`
   })
   mediaProcessingBatchSize: number = 1000;
   @ConfigProperty({
@@ -698,7 +698,7 @@ export class VideoTranscodingConfig {
         priority: ConfigPriority.advanced,
         unit: 'bps'
       },
-    description: $localize`Target bit rate of the output video will be scaled down this this. This should be less than the upload rate of your home server.`
+    description: $localize`Target bit rate of the output video will be scaled down to this. This should be less than the upload rate of your home server.`
   })
   bitRate: number = 5 * 1024 * 1024;
   @ConfigProperty({
@@ -721,7 +721,7 @@ export class VideoTranscodingConfig {
         priority: ConfigPriority.underTheHood,
         uiOptions: [24, 25, 30, 48, 50, 60]
       },
-    description: $localize`Target frame per second (fps) of the output video will be scaled down this this.`
+    description: $localize`Target frame per second (fps) of the output video will be scaled down to this.`
   })
   fps: number = 25;
   @ConfigProperty({
@@ -810,7 +810,7 @@ export class ServerVideoConfig extends ClientVideoConfig {
       priority: ConfigPriority.advanced,
       uiDisabled: (sb: ClientVideoConfig) => !sb.enabled
     },
-    description: $localize`To ensure smooth video playback, video transcoding is recommended to a lower bit rate than the server's upload rate.   The transcoded videos will be save to the thumbnail folder.  You can trigger the transcoding manually, but you can also create an automatic encoding job in advanced settings mode.`
+    description: $localize`To ensure smooth video playback, video transcoding is recommended to a lower bit rate than the server's upload rate.   The transcoded videos will be saved to the thumbnail folder.  You can trigger the transcoding manually, but you can also create an automatic encoding job in advanced settings mode.`
   })
   transcoding: VideoTranscodingConfig = new VideoTranscodingConfig();
 }

src/common/config/public/ClientConfig.ts

@@ -789,7 +789,7 @@ export class NavBarConfig {
       experimental: true,
       githubIssue: 174
     },
-    description: $localize`Adds a button to flattens the file structure, by listing the content of all subdirectories. (Won't work if the gallery has multiple folders with the same path.)`
+    description: $localize`Adds a button to flatten the file structure, by listing the content of all subdirectories. (Won't work if the gallery has multiple folders with the same path.)`
   })
   enableDirectoryFlattening: boolean = false;
 
@@ -1145,7 +1145,7 @@ export class ClientGalleryConfig {
       priority: ConfigPriority.advanced,
       githubIssue: 711
     },
-    description: $localize`Makes inline blog (*.md files content) to be auto open.`
+    description: $localize`Makes inline blog (*.md files content) auto-open.`
   })
   InlineBlogStartsOpen: boolean = false;
 
@@ -1155,7 +1155,7 @@ export class ClientGalleryConfig {
       priority: ConfigPriority.advanced,
       githubIssue: 711
     },
-    description: $localize`Makes inline blog (*.md files content) to be auto open.`
+    description: $localize`Makes top blog (*.md files content) auto-open.`
   })
   TopBlogStartsOpen: boolean = false;
 }
@@ -1178,7 +1178,7 @@ export class ClientVideoConfig {
       uiDisabled: (sb: ClientVideoConfig) => !sb.enabled,
       uiResetNeeded: {db: true}
     } as TAGS,
-    description: $localize`Video formats that are supported after transcoding (with the build-in ffmpeg support).`
+    description: $localize`Video formats that are supported after transcoding (with the built-in ffmpeg support).`
   })
   supportedFormatsWithTranscoding: string[] = ['avi', 'mkv', 'mov', 'wmv', 'flv', 'mts', 'm2ts', 'mpg', '3gp', 'm4v', 'mpeg', 'vob', 'divx', 'xvid', 'ts'];
   // Browser supported video formats
@@ -1402,7 +1402,7 @@ export class ClientServiceConfig {
   applicationTitle: string = 'PiGallery 2';
 
   @ConfigProperty({
-    description: $localize`If you access the page from local network its good to know the public url for creating sharing link.`,
+    description: $localize`If you access the page from local network it's good to know the public url for creating sharing link.`,
     tags: {
       name: $localize`Page public url`,
       hint: typeof window !== 'undefined' ? window?.origin : '',
@@ -1438,7 +1438,7 @@ export class ClientServiceConfig {
   languages: string[] | undefined;
 
   @ConfigProperty({
-    description: $localize`Injects the content of this between the <head></head> HTML tags of the app. (You can use it add analytics or custom code to the app).`,
+    description: $localize`Injects the content of this between the <head></head> HTML tags of the app. (You can use it to add analytics or custom code to the app).`,
     tags: {
       name: $localize`Custom HTML Head`,
       priority: ConfigPriority.advanced,

src/frontend/app/ui/settings/workflow/button/job-button.settings.component.html

@@ -27,7 +27,7 @@
     </button>
   </div>
   <div class="modal-body">
-    <span i18n>Are you sue you want to run this job? This will have the following effect:</span>
+    <span i18n>Are you sure you want to run this job? This will have the following effect:</span>
     <div class="alert alert-secondary" role="alert">
       {{ backendTextService.getJobDescription(jobName) }}
     </div>