From d6cf8492358026ff5cb80d47a9504af8ad61e5ac Mon Sep 17 00:00:00 2001 From: Jose Riha Date: Wed, 28 Aug 2024 21:38:54 +0200 Subject: [PATCH 1/2] Fix a few typos. --- MANPAGE.md | 68 +++++++++---------- README.md | 2 +- src/common/SupportedFormats.ts | 2 +- src/common/config/private/PrivateConfig.ts | 10 +-- src/common/config/public/ClientConfig.ts | 14 ++-- .../button/job-button.settings.component.html | 2 +- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/MANPAGE.md b/MANPAGE.md index 354765b7..d64dbe22 100644 --- a/MANPAGE.md +++ b/MANPAGE.md @@ -27,10 +27,10 @@ Default values can be also overwritten by prefixing the options with 'default-', App CLI options: --Server-applicationTitle (default: 'PiGallery 2') - --Server-publicUrl If you access the page form local network its good to know the public url for creating sharing link. (default: '') + --Server-publicUrl If you access the page from local network it's good to know the public url for creating sharing link. (default: '') --Server-urlBase If you access the gallery under a sub url (like: http://mydomain.com/myGallery), set it here. If it is not working you might miss the '/' from the beginning of the url. (default: '') --Server-apiPath PiGallery api path. (default: '/pgapi') - --Server-customHTMLHead Injects the content of this between the HTML tags of the app. (You can use it add analytics or custom code to the app). (default: '') + --Server-customHTMLHead Injects the content of this between the HTML tags of the app. (You can use it to add analytics or custom code to the app). (default: '') --Server-svgIcon-viewBox SVG path viewBox. See: https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/viewBox (default: '0 0 512 512') --Server-svgIcon-items Content elements (paths, circles, rects) of the SVG icon. Icons used on the map: fontawesome.com/icons. (default: '') --Server-sessionSecret (default: []) @@ -41,7 +41,7 @@ App CLI options: --Server-Threading-thumbnailThreads Number of threads that are used to generate thumbnails. If 0, number of 'CPU cores -1' threads will be used. (default: 0) --Server-Log-level Logging level. (default: 'info') --Server-Log-sqlLevel Logging level for SQL queries. (default: 'error') - --Server-Log-logServerTiming If enabled, the app ads "Server-Timing" http header to the response. (default: false) + --Server-Log-logServerTiming If enabled, the app adds "Server-Timing" http header to the response. (default: false) --Users-authenticationRequired Enables user management with login to password protect the gallery. (default: true) --Users-unAuthenticatedUserRole Default user right when password protection is disabled. (default: 'Admin') --Users-enforcedUsers Creates these users in the DB during startup if they do not exist. If a user with this name exist, it won't be overwritten, even if the role is different. (default: []) @@ -50,7 +50,7 @@ App CLI options: --Gallery-enableDirectorySortingByDate If enabled, directories will be sorted by date, like photos, otherwise by name. Directory date is the last modification time of that directory not the creation date of the oldest photo. (default: false) --Gallery-enableOnScrollThumbnailPrioritising Those thumbnails will be rendered first that are in view. (default: true) --Gallery-NavBar-enableDownloadZip Enable download zip of a directory contents Directory flattening. (Does not work for searches.) (default: false) - --Gallery-NavBar-enableDirectoryFlattening 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.) (default: false) + --Gallery-NavBar-enableDirectoryFlattening 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.) (default: false) --Gallery-NavBar-defaultGidSize Default grid size that is used to render photos and videos. (default: 'medium') --Gallery-NavBar-showItemCount Shows the number photos and videos on the navigation bar. (default: true) --Gallery-NavBar-links Visible links in the top menu. (default: [{"type":1},{"type":3},{"type":2}]) @@ -74,8 +74,8 @@ App CLI options: --Gallery-Themes-defaultMode Sets the default theme mode that is used for the application. (default: 'auto') --Gallery-Themes-selectedTheme Selected theme to use on the site. (default: 'classic') --Gallery-Themes-availableThemes Adds these css settings as it is to the end of the body tag of the page. (default: [{"name":"classic","theme":":root nav.navbar {\n--bs-navbar-color: rgba(255, 255, 255, 0.55);\n--bs-navbar-hover-color: rgba(255, 255, 255, 0.75);\n--bs-navbar-disabled-color: rgba(255, 255, 255, 0.25);\n--bs-navbar-active-color: #fff;\n--bs-navbar-brand-color: #fff;\n--bs-navbar-brand-hover-color: #fff;\n--bs-bg-opacity: 1;\nbackground-color: rgba(var(--bs-dark-rgb), var(--bs-bg-opacity)) !important;\n}"}]) - --Gallery-InlineBlogStartsOpen Makes inline blog (*.md files content) to be auto open. (default: false) - --Gallery-TopBlogStartsOpen Makes inline blog (*.md files content) to be auto open. (default: false) + --Gallery-InlineBlogStartsOpen Makes inline blog (*.md files content) auto-open. (default: false) + --Gallery-TopBlogStartsOpen Makes inline blog (*.md files content) auto-open. (default: false) --Media-Thumbnail-iconSize Icon size (used on maps). (default: 45) --Media-Thumbnail-personThumbnailSize Person (face) thumbnail size. (default: 200) --Media-Thumbnail-thumbnailSizes Size of the thumbnails. The best matching size will be generated. More sizes give better quality, but use more storage and CPU to render. If size is 240, that shorter side of the thumbnail will have 160 pixels. (default: [240,480]) @@ -84,11 +84,11 @@ App CLI options: --Media-Thumbnail-smartSubsample Use high quality chroma subsampling in webp. See: https://sharp.pixelplumbing.com/api-output#webp. (default: true) --Media-Thumbnail-personFaceMargin This ratio of the face bounding box will be added to the face as a margin. Higher number add more margin. (default: 0.7) --Media-Video-enabled (default: true) - --Media-Video-supportedFormatsWithTranscoding Video formats that are supported after transcoding (with the build-in ffmpeg support). (default: ["avi","mkv","mov","wmv","flv","mts","m2ts","mpg","3gp","m4v","mpeg","vob","divx","xvid","ts"]) + --Media-Video-supportedFormatsWithTranscoding Video formats that are supported after transcoding (with the built-in ffmpeg support). (default: ["avi","mkv","mov","wmv","flv","mts","m2ts","mpg","3gp","m4v","mpeg","vob","divx","xvid","ts"]) --Media-Video-supportedFormats Video formats that are supported also without transcoding. Browser supported formats: https://www.w3schools.com/html/html5_video.asp (default: ["mp4","webm","ogv","ogg"]) - --Media-Video-transcoding-bitRate 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. (default: 5242880) + --Media-Video-transcoding-bitRate 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. (default: 5242880) --Media-Video-transcoding-resolution The height of the output video will be scaled down to this, while keeping the aspect ratio. (default: 720) - --Media-Video-transcoding-fps Target frame per second (fps) of the output video will be scaled down this this. (default: 25) + --Media-Video-transcoding-fps Target frame per second (fps) of the output video will be scaled down to this. (default: 25) --Media-Video-transcoding-format (default: 'mp4') --Media-Video-transcoding-mp4Codec (default: 'libx264') --Media-Video-transcoding-webmCodec (default: 'libvpx') @@ -117,7 +117,7 @@ App CLI options: --Search-enabled Enables searching. (default: true) --Search-searchCacheTimeout Search cache timeout. (default: 3600000) --Search-AutoComplete-enabled Show hints while typing search query. (default: true) - --Search-AutoComplete-ItemsPerCategory-maxItems Maximum number autocomplete items shown at once. If there is not enough items to reach this value, it takes upto double of the individual items. (default: 20) + --Search-AutoComplete-ItemsPerCategory-maxItems Maximum number autocomplete items shown at once. If there is not enough items to reach this value, it takes up to double of the individual items. (default: 20) --Search-AutoComplete-ItemsPerCategory-fileName Maximum number autocomplete items shown per photo category. (default: 2) --Search-AutoComplete-ItemsPerCategory-directory Maximum number autocomplete items shown per directory category. (default: 2) --Search-AutoComplete-ItemsPerCategory-caption Maximum number autocomplete items shown per caption category. (default: 3) @@ -168,15 +168,15 @@ App CLI options: --Messaging-Email-smtp-user User to connect to the SMTP server. (default: '') --Messaging-Email-smtp-password Password to connect to the SMTP server. (default: '') --Jobs-maxSavedProgress Job history size. (default: 20) - --Jobs-mediaProcessingBatchSize Jobs load this many photos or videos form the DB for processing at once. (default: 1000) + --Jobs-mediaProcessingBatchSize Jobs load this many photos or videos from the DB for processing at once. (default: 1000) --Jobs-scheduled (default: [{"name":"Indexing","jobName":"Indexing","config":{"indexChangesOnly":true},"allowParallelRun":false,"trigger":{"type":1}},{"name":"Album Cover Filling","jobName":"Album Cover Filling","config":{},"allowParallelRun":false,"trigger":{"type":4,"afterScheduleName":"Indexing"}},{"name":"Thumbnail Generation","jobName":"Thumbnail Generation","config":{"sizes":[240],"indexedOnly":true},"allowParallelRun":false,"trigger":{"type":4,"afterScheduleName":"Album Cover Filling"}},{"name":"Photo Converting","jobName":"Photo Converting","config":{"indexedOnly":true},"allowParallelRun":false,"trigger":{"type":4,"afterScheduleName":"Thumbnail Generation"}},{"name":"Video Converting","jobName":"Video Converting","config":{"indexedOnly":true},"allowParallelRun":false,"trigger":{"type":4,"afterScheduleName":"Photo Converting"}},{"name":"GPX Compression","jobName":"GPX Compression","config":{"indexedOnly":true},"allowParallelRun":false,"trigger":{"type":4,"afterScheduleName":"Video Converting"}},{"name":"Temp Folder Cleaning","jobName":"Temp Folder Cleaning","config":{"indexedOnly":true},"allowParallelRun":false,"trigger":{"type":4,"afterScheduleName":"GPX Compression"}}]) Environmental variables: Server-applicationTitle (default: 'PiGallery 2') - Server-publicUrl If you access the page form local network its good to know the public url for creating sharing link. (default: '') + Server-publicUrl If you access the page from local network it's good to know the public url for creating sharing link. (default: '') Server-urlBase If you access the gallery under a sub url (like: http://mydomain.com/myGallery), set it here. If it is not working you might miss the '/' from the beginning of the url. (default: '') Server-apiPath PiGallery api path. (default: '/pgapi') - Server-customHTMLHead Injects the content of this between the HTML tags of the app. (You can use it add analytics or custom code to the app). (default: '') + Server-customHTMLHead Injects the content of this between the HTML tags of the app. (You can use it to add analytics or custom code to the app). (default: '') Server-svgIcon-viewBox SVG path viewBox. See: https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/viewBox (default: '0 0 512 512') Server-svgIcon-items Content elements (paths, circles, rects) of the SVG icon. Icons used on the map: fontawesome.com/icons. (default: '') Server-sessionSecret (default: []) @@ -188,7 +188,7 @@ Environmental variables: Server-Threading-thumbnailThreads Number of threads that are used to generate thumbnails. If 0, number of 'CPU cores -1' threads will be used. (default: 0) Server-Log-level Logging level. (default: 'info') Server-Log-sqlLevel Logging level for SQL queries. (default: 'error') - Server-Log-logServerTiming If enabled, the app ads "Server-Timing" http header to the response. (default: false) + Server-Log-logServerTiming If enabled, the app adds "Server-Timing" http header to the response. (default: false) Users-authenticationRequired Enables user management with login to password protect the gallery. (default: true) Users-unAuthenticatedUserRole Default user right when password protection is disabled. (default: 'Admin') Users-enforcedUsers Creates these users in the DB during startup if they do not exist. If a user with this name exist, it won't be overwritten, even if the role is different. (default: []) @@ -197,7 +197,7 @@ Environmental variables: Gallery-enableDirectorySortingByDate If enabled, directories will be sorted by date, like photos, otherwise by name. Directory date is the last modification time of that directory not the creation date of the oldest photo. (default: false) Gallery-enableOnScrollThumbnailPrioritising Those thumbnails will be rendered first that are in view. (default: true) Gallery-NavBar-enableDownloadZip Enable download zip of a directory contents Directory flattening. (Does not work for searches.) (default: false) - Gallery-NavBar-enableDirectoryFlattening 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.) (default: false) + Gallery-NavBar-enableDirectoryFlattening 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.) (default: false) Gallery-NavBar-defaultGidSize Default grid size that is used to render photos and videos. (default: 'medium') Gallery-NavBar-showItemCount Shows the number photos and videos on the navigation bar. (default: true) Gallery-NavBar-links Visible links in the top menu. (default: [{"type":1},{"type":3},{"type":2}]) @@ -221,8 +221,8 @@ Environmental variables: Gallery-Themes-defaultMode Sets the default theme mode that is used for the application. (default: 'auto') Gallery-Themes-selectedTheme Selected theme to use on the site. (default: 'classic') Gallery-Themes-availableThemes Adds these css settings as it is to the end of the body tag of the page. (default: [{"name":"classic","theme":":root nav.navbar {\n--bs-navbar-color: rgba(255, 255, 255, 0.55);\n--bs-navbar-hover-color: rgba(255, 255, 255, 0.75);\n--bs-navbar-disabled-color: rgba(255, 255, 255, 0.25);\n--bs-navbar-active-color: #fff;\n--bs-navbar-brand-color: #fff;\n--bs-navbar-brand-hover-color: #fff;\n--bs-bg-opacity: 1;\nbackground-color: rgba(var(--bs-dark-rgb), var(--bs-bg-opacity)) !important;\n}"}]) - Gallery-InlineBlogStartsOpen Makes inline blog (*.md files content) to be auto open. (default: false) - Gallery-TopBlogStartsOpen Makes inline blog (*.md files content) to be auto open. (default: false) + Gallery-InlineBlogStartsOpen Makes inline blog (*.md files content) auto-open. (default: false) + Gallery-TopBlogStartsOpen Makes inline blog (*.md files content) auto-open. (default: false) Media-Thumbnail-iconSize Icon size (used on maps). (default: 45) Media-Thumbnail-personThumbnailSize Person (face) thumbnail size. (default: 200) Media-Thumbnail-thumbnailSizes Size of the thumbnails. The best matching size will be generated. More sizes give better quality, but use more storage and CPU to render. If size is 240, that shorter side of the thumbnail will have 160 pixels. (default: [240,480]) @@ -231,11 +231,11 @@ Environmental variables: Media-Thumbnail-smartSubsample Use high quality chroma subsampling in webp. See: https://sharp.pixelplumbing.com/api-output#webp. (default: true) Media-Thumbnail-personFaceMargin This ratio of the face bounding box will be added to the face as a margin. Higher number add more margin. (default: 0.7) Media-Video-enabled (default: true) - Media-Video-supportedFormatsWithTranscoding Video formats that are supported after transcoding (with the build-in ffmpeg support). (default: ["avi","mkv","mov","wmv","flv","mts","m2ts","mpg","3gp","m4v","mpeg","vob","divx","xvid","ts"]) + Media-Video-supportedFormatsWithTranscoding Video formats that are supported after transcoding (with the built-in ffmpeg support). (default: ["avi","mkv","mov","wmv","flv","mts","m2ts","mpg","3gp","m4v","mpeg","vob","divx","xvid","ts"]) Media-Video-supportedFormats Video formats that are supported also without transcoding. Browser supported formats: https://www.w3schools.com/html/html5_video.asp (default: ["mp4","webm","ogv","ogg"]) - Media-Video-transcoding-bitRate 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. (default: 5242880) + Media-Video-transcoding-bitRate 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. (default: 5242880) Media-Video-transcoding-resolution The height of the output video will be scaled down to this, while keeping the aspect ratio. (default: 720) - Media-Video-transcoding-fps Target frame per second (fps) of the output video will be scaled down this this. (default: 25) + Media-Video-transcoding-fps Target frame per second (fps) of the output video will be scaled down to this. (default: 25) Media-Video-transcoding-format (default: 'mp4') Media-Video-transcoding-mp4Codec (default: 'libx264') Media-Video-transcoding-webmCodec (default: 'libvpx') @@ -264,7 +264,7 @@ Environmental variables: Search-enabled Enables searching. (default: true) Search-searchCacheTimeout Search cache timeout. (default: 3600000) Search-AutoComplete-enabled Show hints while typing search query. (default: true) - Search-AutoComplete-ItemsPerCategory-maxItems Maximum number autocomplete items shown at once. If there is not enough items to reach this value, it takes upto double of the individual items. (default: 20) + Search-AutoComplete-ItemsPerCategory-maxItems Maximum number autocomplete items shown at once. If there is not enough items to reach this value, it takes up to double of the individual items. (default: 20) Search-AutoComplete-ItemsPerCategory-fileName Maximum number autocomplete items shown per photo category. (default: 2) Search-AutoComplete-ItemsPerCategory-directory Maximum number autocomplete items shown per directory category. (default: 2) Search-AutoComplete-ItemsPerCategory-caption Maximum number autocomplete items shown per caption category. (default: 3) @@ -320,7 +320,7 @@ Environmental variables: Messaging-Email-smtp-user User to connect to the SMTP server. (default: '') Messaging-Email-smtp-password Password to connect to the SMTP server. (default: '') Jobs-maxSavedProgress Job history size. (default: 20) - Jobs-mediaProcessingBatchSize Jobs load this many photos or videos form the DB for processing at once. (default: 1000) + Jobs-mediaProcessingBatchSize Jobs load this many photos or videos from the DB for processing at once. (default: 1000) Jobs-scheduled (default: [{"name":"Indexing","jobName":"Indexing","config":{"indexChangesOnly":true},"allowParallelRun":false,"trigger":{"type":1}},{"name":"Album Cover Filling","jobName":"Album Cover Filling","config":{},"allowParallelRun":false,"trigger":{"type":4,"afterScheduleName":"Indexing"}},{"name":"Thumbnail Generation","jobName":"Thumbnail Generation","config":{"sizes":[240],"indexedOnly":true},"allowParallelRun":false,"trigger":{"type":4,"afterScheduleName":"Album Cover Filling"}},{"name":"Photo Converting","jobName":"Photo Converting","config":{"indexedOnly":true},"allowParallelRun":false,"trigger":{"type":4,"afterScheduleName":"Thumbnail Generation"}},{"name":"Video Converting","jobName":"Video Converting","config":{"indexedOnly":true},"allowParallelRun":false,"trigger":{"type":4,"afterScheduleName":"Photo Converting"}},{"name":"GPX Compression","jobName":"GPX Compression","config":{"indexedOnly":true},"allowParallelRun":false,"trigger":{"type":4,"afterScheduleName":"Video Converting"}},{"name":"Temp Folder Cleaning","jobName":"Temp Folder Cleaning","config":{"indexedOnly":true},"allowParallelRun":false,"trigger":{"type":4,"afterScheduleName":"GPX Compression"}}]) ``` @@ -330,7 +330,7 @@ Environmental variables: "Server": { "applicationTitle": "PiGallery 2", "//[publicUrl]": [ - "If you access the page form local network its good to know the public url for creating sharing link." + "If you access the page from local network it's good to know the public url for creating sharing link." ], "publicUrl": "", "//[urlBase]": [ @@ -340,7 +340,7 @@ Environmental variables: "//[apiPath]": "PiGallery api path.", "apiPath": "/pgapi", "//[customHTMLHead]": [ - "Injects the content of this between the HTML tags of the app. (You can use it add analytics or custom code to the app)." + "Injects the content of this between the HTML tags of the app. (You can use it to add analytics or custom code to the app)." ], "customHTMLHead": "", "//[svgIcon]": [ @@ -431,7 +431,7 @@ Environmental variables: ], "enableDownloadZip": false, "//[enableDirectoryFlattening]": [ - "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.)" + "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": false, "//[defaultGidSize]": [ @@ -554,11 +554,11 @@ Environmental variables: ] }, "//[InlineBlogStartsOpen]": [ - "Makes inline blog (*.md files content) to be auto open." + "Makes inline blog (*.md files content) auto-open." ], "InlineBlogStartsOpen": false, "//[TopBlogStartsOpen]": [ - "Makes inline blog (*.md files content) to be auto open." + "Makes inline blog (*.md files content) auto-open." ], "TopBlogStartsOpen": false }, @@ -602,7 +602,7 @@ Environmental variables: "Video": { "enabled": true, "//[supportedFormatsWithTranscoding]": [ - "Video formats that are supported after transcoding (with the build-in ffmpeg support)." + "Video formats that are supported after transcoding (with the built-in ffmpeg support)." ], "supportedFormatsWithTranscoding": [ "avi", @@ -631,11 +631,11 @@ Environmental variables: "ogg" ], "//[transcoding]": [ - "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." + "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": { "//[bitRate]": [ - "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." + "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": 5242880, "//[resolution]": [ @@ -643,7 +643,7 @@ Environmental variables: ], "resolution": 720, "//[fps]": [ - "Target frame per second (fps) of the output video will be scaled down this this." + "Target frame per second (fps) of the output video will be scaled down to this." ], "fps": 25, "format": "mp4", @@ -778,7 +778,7 @@ Environmental variables: ], "ItemsPerCategory": { "//[maxItems]": [ - "Maximum number autocomplete items shown at once. If there is not enough items to reach this value, it takes upto double of the individual items." + "Maximum number autocomplete items shown at once. If there is not enough items to reach this value, it takes up to double of the individual items." ], "maxItems": 20, "//[fileName]": [ @@ -1381,7 +1381,7 @@ Environmental variables: ], "maxSavedProgress": 20, "//[mediaProcessingBatchSize]": [ - "Jobs load this many photos or videos form the DB for processing at once." + "Jobs load this many photos or videos from the DB for processing at once." ], "mediaProcessingBatchSize": 1000, "scheduled": [ @@ -1471,4 +1471,4 @@ Environmental variables: } ] } -}``` \ No newline at end of file +}``` diff --git a/README.md b/README.md index 57126f80..7ef00f3d 100644 --- a/README.md +++ b/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 `` tags 4. test if it works: diff --git a/src/common/SupportedFormats.ts b/src/common/SupportedFormats.ts index 95d960d2..c659a804 100644 --- a/src/common/SupportedFormats.ts +++ b/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[], diff --git a/src/common/config/private/PrivateConfig.ts b/src/common/config/private/PrivateConfig.ts index 721c02fc..3bb4ca6f 100644 --- a/src/common/config/private/PrivateConfig.ts +++ b/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(); } diff --git a/src/common/config/public/ClientConfig.ts b/src/common/config/public/ClientConfig.ts index d5da32b0..d2c85683 100644 --- a/src/common/config/public/ClientConfig.ts +++ b/src/common/config/public/ClientConfig.ts @@ -97,7 +97,7 @@ export class AutoCompleteItemsPerCategoryConfig { name: $localize`Maximum items`, priority: ConfigPriority.underTheHood }, - description: $localize`Maximum number autocomplete items shown at once. If there is not enough items to reach this value, it takes upto double of the individual items.` + description: $localize`Maximum number autocomplete items shown at once. If there is not enough items to reach this value, it takes up to double of the individual items.` }) maxItems: number = 20; @@ -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 inline 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 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 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, diff --git a/src/frontend/app/ui/settings/workflow/button/job-button.settings.component.html b/src/frontend/app/ui/settings/workflow/button/job-button.settings.component.html index 210c9f08..481a8801 100644 --- a/src/frontend/app/ui/settings/workflow/button/job-button.settings.component.html +++ b/src/frontend/app/ui/settings/workflow/button/job-button.settings.component.html @@ -27,7 +27,7 @@
- Are you sue you want to run this job? This will have the following effect: + Are you sure you want to run this job? This will have the following effect: From 679b1f7a27e5b0bbd8d3b1f2eac0be4e00ebc666 Mon Sep 17 00:00:00 2001 From: "Patrik J. Braun" Date: Sun, 15 Sep 2024 11:24:18 +0000 Subject: [PATCH 2/2] Config clarification for blog --- src/common/config/public/ClientConfig.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/config/public/ClientConfig.ts b/src/common/config/public/ClientConfig.ts index 93715c09..b75ee7ac 100644 --- a/src/common/config/public/ClientConfig.ts +++ b/src/common/config/public/ClientConfig.ts @@ -1155,7 +1155,7 @@ export class ClientGalleryConfig { priority: ConfigPriority.advanced, githubIssue: 711 }, - description: $localize`Makes inline blog (*.md files content) auto-open.` + description: $localize`Makes top blog (*.md files content) auto-open.` }) TopBlogStartsOpen: boolean = false; }