diff --git a/package.json b/package.json index f985baac..a56725c3 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "pretest": "tsc", "test": "ng test && mocha --recursive test/backend/unit && mocha --recursive test/backend/integration && mocha --recursive test/common/unit ", "start": "node ./src/backend/index", - "run-dev": "ng build --aot --watch --output-path=./dist --i18n-locale en --i18n-file src/frontend/translate/messages.en.xlf --i18n-missing-translation warning", + "run-dev": "ng build --aot --watch --output-path=./dist --i18n-locale hu --i18n-file src/frontend/translate/messages.hu.xlf --i18n-missing-translation warning", "build-stats": "ng build --aot --prod --stats-json --output-path=./dist --i18n-locale en --i18n-file src/frontend/translate/messages.en.xlf --i18n-missing-translation warning", "merge-new-translation": "gulp merge-new-translation", "add-translation": "gulp add-translation" diff --git a/src/backend/model/jobs/JobProgressManager.ts b/src/backend/model/jobs/JobProgressManager.ts index 3e558cc7..7c205551 100644 --- a/src/backend/model/jobs/JobProgressManager.ts +++ b/src/backend/model/jobs/JobProgressManager.ts @@ -5,7 +5,7 @@ import {Config} from '../../../common/config/private/Config'; import {JobProgressDTO, JobProgressStates} from '../../../common/entities/job/JobProgressDTO'; export class JobProgressManager { - private static readonly VERSION = 2; + private static readonly VERSION = 3; private db: { version: number, progresses: { [key: string]: { progress: JobProgressDTO, timestamp: number } } diff --git a/src/backend/model/jobs/jobs/Job.ts b/src/backend/model/jobs/jobs/Job.ts index 081d7af1..30a7b3ca 100644 --- a/src/backend/model/jobs/jobs/Job.ts +++ b/src/backend/model/jobs/jobs/Job.ts @@ -43,7 +43,7 @@ export abstract class Job implements IJob { Logger.info(LOG_TAG, 'Running job ' + (soloRun === true ? 'solo' : '') + ': ' + this.Name); this.soloRun = soloRun; this.config = config; - this.progress = new JobProgress(JobDTO.getHashName(this.Name, this.config)); + this.progress = new JobProgress(this.Name, JobDTO.getHashName(this.Name, this.config)); this.progress.OnChange = this.jobListener.onProgressUpdate; const pr = new Promise((resolve) => { this.prResolve = resolve; diff --git a/src/backend/model/jobs/jobs/JobProgress.ts b/src/backend/model/jobs/jobs/JobProgress.ts index f521208c..66118d3e 100644 --- a/src/backend/model/jobs/jobs/JobProgress.ts +++ b/src/backend/model/jobs/jobs/JobProgress.ts @@ -16,7 +16,7 @@ export class JobProgress { private logs: { id: number, timestamp: string, comment: string }[] = []; - constructor(public readonly HashName: string) { + constructor(public readonly jobName: string, public readonly HashName: string) { } set OnChange(val: (progress: JobProgress) => void) { @@ -90,6 +90,7 @@ export class JobProgress { toDTO(): JobProgressDTO { return { + jobName: this.jobName, HashName: this.HashName, state: this.state, time: { diff --git a/src/common/entities/job/JobProgressDTO.ts b/src/common/entities/job/JobProgressDTO.ts index d889f1e5..7079e417 100644 --- a/src/common/entities/job/JobProgressDTO.ts +++ b/src/common/entities/job/JobProgressDTO.ts @@ -10,6 +10,7 @@ export interface JobProgressLogDTO { } export interface JobProgressDTO { + jobName: string; HashName: string; steps: { all: number, diff --git a/src/frontend/app/model/backendtext.service.ts b/src/frontend/app/model/backendtext.service.ts index 6d4b8827..510979be 100644 --- a/src/frontend/app/model/backendtext.service.ts +++ b/src/frontend/app/model/backendtext.service.ts @@ -1,6 +1,7 @@ import {Injectable} from '@angular/core'; import {I18n} from '@ngx-translate/i18n-polyfill'; import {backendText, backendTexts} from '../../../common/BackendTexts'; +import {DefaultsJobs} from '../../../common/entities/job/JobDTO'; @Injectable() export class BackendtextService { @@ -23,4 +24,26 @@ export class BackendtextService { return null; } } + + public getJobName(job: DefaultsJobs | string): string { + if (typeof job === 'string') { + job = DefaultsJobs[job]; + } + switch (job as DefaultsJobs) { + case DefaultsJobs.Indexing: + return this.i18n('Indexing'); + case DefaultsJobs['Database Reset']: + return this.i18n('Database Reset'); + case DefaultsJobs['Thumbnail Generation']: + return this.i18n('Thumbnail Generation'); + case DefaultsJobs['Photo Converting']: + return this.i18n('Photo Converting'); + case DefaultsJobs['Video Converting']: + return this.i18n('Video Converting'); + case DefaultsJobs['Temp Folder Cleaning']: + return this.i18n('Temp Folder Cleaning'); + default: + return DefaultsJobs[job as DefaultsJobs]; + } + } } diff --git a/src/frontend/app/ui/settings/database/database.settings.component.html b/src/frontend/app/ui/settings/database/database.settings.component.html index fb956f06..ee63a2be 100644 --- a/src/frontend/app/ui/settings/database/database.settings.component.html +++ b/src/frontend/app/ui/settings/database/database.settings.component.html @@ -26,10 +26,11 @@
+ + All file-based data will be stored here (sqlite database, user database in case of memory db, job history + data) +
- - All file-based data will be stored here (sqlite database, user database in case of memory db, job history data) - diff --git a/src/frontend/app/ui/settings/indexing/indexing.settings.component.html b/src/frontend/app/ui/settings/indexing/indexing.settings.component.html index d412f5aa..d14402e8 100644 --- a/src/frontend/app/ui/settings/indexing/indexing.settings.component.html +++ b/src/frontend/app/ui/settings/indexing/indexing.settings.component.html @@ -117,7 +117,7 @@ [jobName]="indexingJobName"> - - Run {{jobName}} now + Run now: {{backendTextService.getJobName(jobName)}} diff --git a/src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts b/src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts index d4902457..d9db5acd 100644 --- a/src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts +++ b/src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts @@ -5,6 +5,7 @@ import {ScheduledJobsService} from '../../scheduled-jobs.service'; import {NotificationService} from '../../../../model/notification.service'; import {I18n} from '@ngx-translate/i18n-polyfill'; import {JobDTO} from '../../../../../../common/entities/job/JobDTO'; +import {BackendtextService} from '../../../../model/backendtext.service'; @Component({ selector: 'app-settings-job-button', @@ -23,6 +24,7 @@ export class JobButtonComponent { constructor(private notification: NotificationService, public jobsService: ScheduledJobsService, + public backendTextService: BackendtextService, private i18n: I18n) { } @@ -39,7 +41,7 @@ export class JobButtonComponent { this.error.emit(''); try { await this.jobsService.start(this.jobName, this.config, this.soloRun); - this.notification.info(this.i18n('Job') + ' ' + this.jobName + ' ' + this.i18n('started')); + this.notification.info(this.i18n('Job started') + ': ' + this.jobName); return true; } catch (err) { console.log(err); @@ -55,7 +57,7 @@ export class JobButtonComponent { this.error.emit(''); try { await this.jobsService.stop(this.jobName); - this.notification.info(this.i18n('Job') + ' ' + this.jobName + ' ' + this.i18n('stopped')); + this.notification.info(this.i18n('Job stopped') + ': ' + this.jobName); return true; } catch (err) { console.log(err); diff --git a/src/frontend/app/ui/settings/jobs/jobs.settings.component.html b/src/frontend/app/ui/settings/jobs/jobs.settings.component.html index 7315852a..f33b245c 100644 --- a/src/frontend/app/ui/settings/jobs/jobs.settings.component.html +++ b/src/frontend/app/ui/settings/jobs/jobs.settings.component.html @@ -24,15 +24,15 @@ *ngSwitchCase="JobTriggerType.scheduled">{{schedule.trigger.time | date:"medium"}} never - after + after: {{schedule.trigger.afterScheduleName}}
- - @@ -44,11 +44,18 @@
-
+
-
- {{schedule.jobName}} +
+ {{backendTextService.getJobName(schedule.jobName)}} +
+
+ +
@@ -116,12 +123,7 @@
-
- -
+
@@ -130,7 +132,7 @@
+ [for]="configEntry.id+'_'+i">{{backendTextService.get(configEntry.name)}}:
@@ -172,7 +174,7 @@ ';' separated integers. - {{backendtextService.get(configEntry.description)}} + {{backendTextService.get(configEntry.description)}}
@@ -223,7 +225,7 @@ s.Server.Jobs); this.hasAvailableSettings = !this.simplifiedMode; - this.JobTriggerTypeMap = Utils.enumToArray(JobTriggerType); + this.JobTriggerTypeMap = [ + {key: JobTriggerType.after, value: this.i18n('after')}, + {key: JobTriggerType.never, value: this.i18n('never')}, + {key: JobTriggerType.periodic, value: this.i18n('periodic')}, + {key: JobTriggerType.scheduled, value: this.i18n('scheduled')}, + ]; this.periods = [this.i18n('Monday'), // 0 this.i18n('Tuesday'), // 1 this.i18n('Wednesday'), // 2 @@ -166,7 +170,7 @@ export class JobsSettingsComponent extends SettingsComponent s.jobName === jobName).length; - this.newSchedule.name = count === 0 ? jobName : jobName + ' ' + (count + 1); + this.newSchedule.name = count === 0 ? jobName : this.backendTextService.getJobName(jobName) + ' ' + (count + 1); this.settings.scheduled.push(this.newSchedule); this.jobModal.hide(); } diff --git a/src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.html b/src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.html index 503f241d..e1e54998 100644 --- a/src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.html +++ b/src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.html @@ -7,13 +7,13 @@ {{progress.time.start | date:'medium'}} - {{progress.time.end | date:'mediumTime'}}
+ [title]="ProgressTitle"> {{progress.steps.processed + progress.steps.skipped}}/{{progress.steps.all}}
- {{JobProgressStates[progress.state]}} + {{State}}
- diff --git a/src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.html b/src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.html index cb442b1e..fde9cd8c 100644 --- a/src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.html +++ b/src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.html @@ -28,7 +28,7 @@
- +
- @@ -56,7 +56,7 @@ storage and CPU to render.)
- ';' separated integers. If size is 160, that shorter side of the thumbnail will have 160 + ';' separated integers. If size is 240, that shorter side of the thumbnail will have 160 pixels.
@@ -74,7 +74,7 @@ - Reset - diff --git a/src/frontend/translate/messages.en.xlf b/src/frontend/translate/messages.en.xlf index 1e18d283..af29f867 100644 --- a/src/frontend/translate/messages.en.xlf +++ b/src/frontend/translate/messages.en.xlf @@ -32,7 +32,7 @@ app/ui/settings/database/database.settings.component.html - 42 + 53 Username @@ -60,7 +60,7 @@ app/ui/settings/database/database.settings.component.html - 49 + 60 Password @@ -419,6 +419,14 @@ Mode + + Up time + + app/ui/admin/admin.component.html + 115 + + Up time + Info @@ -533,7 +541,7 @@ app/ui/settings/map/map.settings.component.html - 61 + 62 Name @@ -580,7 +588,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 244 + 237 Close @@ -597,7 +605,7 @@ Type app/ui/settings/database/database.settings.component.html - 12 + 11 Type @@ -606,15 +614,34 @@ app/ui/settings/database/database.settings.component.html - 20 + 19 Install manually mysql node module to use mysql (npm install mysql) + + Database folder + + app/ui/settings/database/database.settings.component.html + 25 + + Database folder + + + + All file-based data will be stored here (sqlite database, user database in case of memory db, job history + data) + + + app/ui/settings/database/database.settings.component.html + 29 + + All file-based data will be stored here (sqlite database, user database in case of memory db, job history data) + Host app/ui/settings/database/database.settings.component.html - 28 + 39 app/ui/settings/basic/basic.settings.component.html @@ -626,48 +653,32 @@ Database app/ui/settings/database/database.settings.component.html - 35 + 46 Database - - Storage file - - app/ui/settings/database/database.settings.component.html - 58 - - Storage file - - - User's file - - app/ui/settings/database/database.settings.component.html - 67 - - User's file - Save app/ui/settings/database/database.settings.component.html - 77 + 71 app/ui/settings/map/map.settings.component.html - 113 + 114 app/ui/settings/thumbnail/thumbnail.settings.component.html - 70 + 69 app/ui/settings/video/video.settings.component.html - 120 + 123 app/ui/settings/photo/photo.settings.component.html - 94 + 95 app/ui/settings/metafiles/metafile.settings.component.html @@ -683,7 +694,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 39 + 38 app/ui/settings/basic/basic.settings.component.html @@ -699,7 +710,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 203 + 196 Save @@ -708,23 +719,23 @@ app/ui/settings/database/database.settings.component.html - 81 + 75 app/ui/settings/map/map.settings.component.html - 117 + 118 app/ui/settings/thumbnail/thumbnail.settings.component.html - 74 + 73 app/ui/settings/video/video.settings.component.html - 124 + 127 app/ui/settings/photo/photo.settings.component.html - 98 + 99 app/ui/settings/metafiles/metafile.settings.component.html @@ -740,7 +751,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 43 + 42 app/ui/settings/basic/basic.settings.component.html @@ -756,7 +767,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 207 + 200 Reset @@ -764,7 +775,7 @@ Use image markers app/ui/settings/map/map.settings.component.html - 24 + 25 Use image markers @@ -774,7 +785,7 @@ app/ui/settings/map/map.settings.component.html - 38 + 39 Map will use thumbnail images as markers instead of the default pin. @@ -782,7 +793,7 @@ Map provider app/ui/settings/map/map.settings.component.html - 46 + 47 Map provider @@ -790,7 +801,7 @@ Tile Url* app/ui/settings/map/map.settings.component.html - 62 + 63 Tile Url* @@ -798,7 +809,7 @@ *The map module will use these urls to fetch the map tiles. app/ui/settings/map/map.settings.component.html - 87 + 88 *The map module will use these urls to fetch the map tiles. @@ -807,7 +818,7 @@ app/ui/settings/map/map.settings.component.html - 92 + 93 + Add Layer @@ -815,7 +826,7 @@ Mapbox access token app/ui/settings/map/map.settings.component.html - 98 + 99 Mapbox access token @@ -823,7 +834,7 @@ MapBox needs an access token to work, create one at app/ui/settings/map/map.settings.component.html - 104 + 105 MapBox needs an access token to work, create one at @@ -831,7 +842,7 @@ Thumbnail Quality app/ui/settings/thumbnail/thumbnail.settings.component.html - 12 + 11 Thumbnail Quality @@ -839,15 +850,23 @@ High quality may be slow. Especially with Jimp. app/ui/settings/thumbnail/thumbnail.settings.component.html - 26 + 25 High quality may be slow. Especially with Jimp. + + Icon size + + app/ui/settings/thumbnail/thumbnail.settings.component.html + 31 + + Icon size + Icon size (used on maps) app/ui/settings/thumbnail/thumbnail.settings.component.html - 41 + 40 Icon size (used on maps) @@ -855,7 +874,7 @@ Thumbnail sizes app/ui/settings/thumbnail/thumbnail.settings.component.html - 47 + 46 Thumbnail sizes @@ -863,7 +882,7 @@ Size of the thumbnails. app/ui/settings/thumbnail/thumbnail.settings.component.html - 54 + 53 Size of the thumbnails. @@ -873,44 +892,21 @@ app/ui/settings/thumbnail/thumbnail.settings.component.html - 56 + 55 The best matching size will be generated. (More sizes give better quality, but use more storage and CPU to render.) - - ';' separated integers. If size is 160, that shorter side of the thumbnail will have 160 + + ';' separated integers. If size is 240, that shorter side of the thumbnail will have 160 pixels. app/ui/settings/thumbnail/thumbnail.settings.component.html - 60 + 59 - ';' separated integers. If size is 160, that shorter side of the thumbnail will have 160 pixels. - - - Generate thumbnails now - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 84 - - Generate thumbnails now - - - Generates all thumbnails now - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 81 - - Generates all thumbnails now - - - Cancel thumbnail generation - - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 90 - - Cancel thumbnail generation + ';' separated integers. If size is 240, that shorter side of the thumbnail will have 160 + pixels. + Video support uses ffmpeg. ffmpeg and ffprobe binaries need to be available in the PATH or @@ -985,7 +981,7 @@ app/ui/settings/photo/photo.settings.component.html - 78 + 79 Resolution @@ -1033,46 +1029,13 @@ 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. - - Transcode videos now - - app/ui/settings/video/video.settings.component.html - 134 - - Transcode videos now - - - Indexes the folders - - app/ui/settings/video/video.settings.component.html - 131 - - - app/ui/settings/photo/photo.settings.component.html - 105 - - - app/ui/settings/indexing/indexing.settings.component.html - 118 - - Indexes the folders - - - Cancel transcoding - - - app/ui/settings/video/video.settings.component.html - 140 - - Cancel transcoding - It is highly recommended to use hardware accelerated (sharp or gm) lib for thumbnail generation app/ui/settings/photo/photo.settings.component.html - 8 + 9 It is highly recommended to use hardware accelerated (sharp or gm) lib for thumbnail generation @@ -1080,7 +1043,7 @@ Thumbnail generation library app/ui/settings/photo/photo.settings.component.html - 14 + 15 Thumbnail generation library @@ -1089,7 +1052,7 @@ app/ui/settings/photo/photo.settings.component.html - 22 + 23 Make sure that sharp node module is installed (npm install sharp). @@ -1097,7 +1060,7 @@ Make sure that gm node module and app/ui/settings/photo/photo.settings.component.html - 26 + 27 Make sure that gm node module and @@ -1105,7 +1068,7 @@ are installed (npm install sharp). app/ui/settings/photo/photo.settings.component.html - 28 + 29 are installed (npm install sharp). @@ -1113,7 +1076,7 @@ Photo converting: app/ui/settings/photo/photo.settings.component.html - 36 + 37 Photo converting: @@ -1121,7 +1084,7 @@ Converting app/ui/settings/photo/photo.settings.component.html - 39 + 40 Converting @@ -1130,7 +1093,7 @@ loads the original) app/ui/settings/photo/photo.settings.component.html - 53 + 54 Downsizes photos for faster preview loading. (Zooming in to the photo loads the original) @@ -1138,7 +1101,7 @@ On the fly converting app/ui/settings/photo/photo.settings.component.html - 59 + 60 On the fly converting @@ -1146,7 +1109,7 @@ Converts photos on the fly, when they are requested. app/ui/settings/photo/photo.settings.component.html - 73 + 74 Converts photos on the fly, when they are requested. @@ -1156,27 +1119,10 @@ keeping the aspect ratio. app/ui/settings/photo/photo.settings.component.html - 85 + 86 The shorter edge of the converted photo will be scaled down to this, while keeping the aspect ratio. - - Convert photos now - - app/ui/settings/photo/photo.settings.component.html - 108 - - Convert photos now - - - Cancel converting - - - app/ui/settings/photo/photo.settings.component.html - 114 - - Cancel converting - Reads and show *.gpx files on the map @@ -1261,7 +1207,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 27 + 26 This feature enables you to generate 'random photo' urls. That URL returns a photo random selected from your gallery. You can use the url with 3rd party application like random changing desktop background. @@ -1271,7 +1217,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 34 + 33 Random Photo is not supported with these settings @@ -1731,43 +1677,17 @@ Note: search only works among the indexed directories app/ui/settings/indexing/indexing.settings.component.html - 106 + 107 Note: search only works among the indexed directories - - Index folders now - - app/ui/settings/indexing/indexing.settings.component.html - 121 - - Index folders now - - - Cancel converting - - - app/ui/settings/indexing/indexing.settings.component.html - 127 - - Cancel converting - - - Reset Indexes - - - app/ui/settings/indexing/indexing.settings.component.html - 131 - - Reset Indexes - Statistic: app/ui/settings/indexing/indexing.settings.component.html - 137 + 130 Statistic: @@ -1775,7 +1695,7 @@ Folders app/ui/settings/indexing/indexing.settings.component.html - 141 + 134 Folders @@ -1783,7 +1703,7 @@ Photos app/ui/settings/indexing/indexing.settings.component.html - 145 + 138 Photos @@ -1791,7 +1711,7 @@ Videos app/ui/settings/indexing/indexing.settings.component.html - 149 + 142 Videos @@ -1799,7 +1719,7 @@ Size app/ui/settings/indexing/indexing.settings.component.html - 154 + 147 Size @@ -1811,26 +1731,16 @@ app/ui/settings/jobs/progress/job-progress.settings.component.html 2 - - Last run: - + Last run: Run between app/ui/settings/jobs/progress/job-progress.settings.component.html - 6 + 5 Run between - - done/all - - app/ui/settings/jobs/progress/job-progress.settings.component.html - 10 - - done/all - Status @@ -1839,19 +1749,19 @@ Status - - Stopping + + Cancelling... app/ui/settings/jobs/progress/job-progress.settings.component.html - 24 + 32 - Stopping + Cancelling... time elapsed app/ui/settings/jobs/progress/job-progress.settings.component.html - 31 + 43 time elapsed @@ -1859,19 +1769,61 @@ time left app/ui/settings/jobs/progress/job-progress.settings.component.html - 51 + 45 time left + + Processed + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 82 + + Processed + + + Skipped + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 83 + + Skipped + + + Left + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 84 + + Left + + + All + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 85 + + All + + + + Logs + + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 110 + + Logs + every app/ui/settings/jobs/jobs.settings.component.html - 18 + 20 app/ui/settings/jobs/jobs.settings.component.html - 97 + 114 every @@ -1879,7 +1831,7 @@ never app/ui/settings/jobs/jobs.settings.component.html - 23 + 25 never @@ -1887,7 +1839,7 @@ after app/ui/settings/jobs/jobs.settings.component.html - 25 + 27 after @@ -1895,7 +1847,7 @@ Job: app/ui/settings/jobs/jobs.settings.component.html - 39 + 49 Job: @@ -1903,7 +1855,7 @@ Periodicity: app/ui/settings/jobs/jobs.settings.component.html - 45 + 62 Periodicity: @@ -1912,7 +1864,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 55 + 72 Set the time to run the job. @@ -1920,7 +1872,7 @@ After: app/ui/settings/jobs/jobs.settings.component.html - 61 + 78 After: @@ -1929,54 +1881,28 @@ app/ui/settings/jobs/jobs.settings.component.html - 72 + 89 - The job will run after that job finishes. - + The job will run after that job finishes. At: app/ui/settings/jobs/jobs.settings.component.html - 79 + 96 app/ui/settings/jobs/jobs.settings.component.html - 89 + 106 At: - - Start now - + + ';' separated integers. + app/ui/settings/jobs/jobs.settings.component.html - 115 - - Start now - - - Trigger job run manually - - app/ui/settings/jobs/jobs.settings.component.html - 113 - - Trigger job run manually - - - Stop - - - app/ui/settings/jobs/jobs.settings.component.html - 120 - - Stop - - - ';' separated integers. - - app/ui/settings/jobs/jobs.settings.component.html - 183 + 175 ';' separated integers. @@ -1985,7 +1911,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 210 + 203 + Add Job @@ -1993,7 +1919,7 @@ Add new job app/ui/settings/jobs/jobs.settings.component.html - 225 + 218 Add new job @@ -2002,7 +1928,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 239 + 232 Select a job to schedule. @@ -2011,10 +1937,113 @@ app/ui/settings/jobs/jobs.settings.component.html - 247 + 240 - Add Job - + Add Job + + + Run now + + app/ui/settings/jobs/button/job-button.settings.component.html + 7 + + Run now + + + Trigger job run manually + + app/ui/settings/jobs/button/job-button.settings.component.html + 2 + + Trigger job run manually + + + Cancel + + app/ui/settings/jobs/button/job-button.settings.component.html + 15 + + Cancel + + + Size to generate + + src/frontend/app/model/backendtext.service.ts + 1 + + Size to generate + + + These thumbnails will be generated. The list should be a subset of the enabled thumbnail sizes + + src/frontend/app/model/backendtext.service.ts + 1 + + These thumbnails will be generated. The list should be a subset of the enabled thumbnail sizes + + + Indexed only + + src/frontend/app/model/backendtext.service.ts + 1 + + Indexed only + + + Only checks indexed files. + + src/frontend/app/model/backendtext.service.ts + 1 + + Only checks indexed files. + + + Indexing + + src/frontend/app/model/backendtext.service.ts + 1 + + Indexing + + + Database Reset + + src/frontend/app/model/backendtext.service.ts + 1 + + Database Reset + + + Thumbnail Generation + + src/frontend/app/model/backendtext.service.ts + 1 + + Thumbnail Generation + + + Photo Converting + + src/frontend/app/model/backendtext.service.ts + 1 + + Photo Converting + + + Video Converting + + src/frontend/app/model/backendtext.service.ts + 1 + + Video Converting + + + Temp Folder Cleaning + + src/frontend/app/model/backendtext.service.ts + 1 + + Temp Folder Cleaning Server error @@ -2339,6 +2368,22 @@ Resetting database + + Job started + + src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts + 1 + + Job started + + + Job stopped + + src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts + 1 + + Job stopped + Jobs @@ -2347,6 +2392,22 @@ Jobs + + periodic + + src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + 1 + + periodic + + + scheduled + + src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + 1 + + scheduled + Monday @@ -2411,33 +2472,69 @@ day - - Job + + processed - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts - 1 - - Job + processed - - started + + skipped - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - started + skipped - - stopped + + all - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - stopped + all + + + running + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + running + + + cancelling + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + cancelling + + + canceled + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + canceled + + + interrupted + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + interrupted + + + finished + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + finished Map @@ -2487,22 +2584,6 @@ Photo - - Photo converting started - - src/frontend/app/ui/settings/photo/photo.settings.component.ts - 1 - - Photo converting started - - - Photo converting interrupted - - src/frontend/app/ui/settings/photo/photo.settings.component.ts - 1 - - Photo converting interrupted - Random Photo @@ -2519,22 +2600,6 @@ Thumbnail - - Thumbnail generation started - - src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts - 1 - - Thumbnail generation started - - - Thumbnail generation interrupted - - src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts - 1 - - Thumbnail generation interrupted - Password protection @@ -2575,22 +2640,6 @@ Video - - Video transcoding started - - src/frontend/app/ui/settings/video/video.settings.component.ts - 1 - - Video transcoding started - - - Video transcoding interrupted - - src/frontend/app/ui/settings/video/video.settings.component.ts - 1 - - Video transcoding interrupted - \ No newline at end of file diff --git a/src/frontend/translate/messages.fr.xlf b/src/frontend/translate/messages.fr.xlf index fd7507cb..86bfc1ca 100644 --- a/src/frontend/translate/messages.fr.xlf +++ b/src/frontend/translate/messages.fr.xlf @@ -32,7 +32,7 @@ app/ui/settings/database/database.settings.component.html - 42 + 53 Nom d'utilisateur @@ -60,7 +60,7 @@ app/ui/settings/database/database.settings.component.html - 49 + 60 Mot de passe @@ -419,6 +419,14 @@ Mode + + Up time + + app/ui/admin/admin.component.html + 115 + + Up time + Info @@ -533,7 +541,7 @@ app/ui/settings/map/map.settings.component.html - 61 + 62 Nom @@ -580,7 +588,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 244 + 237 Fermer @@ -597,7 +605,7 @@ Type app/ui/settings/database/database.settings.component.html - 12 + 11 Type @@ -606,15 +614,34 @@ app/ui/settings/database/database.settings.component.html - 20 + 19 Installer manuellement le module de noeud mysql pour utiliser mysql (npm install mysql) + + Database folder + + app/ui/settings/database/database.settings.component.html + 25 + + Database folder + + + + All file-based data will be stored here (sqlite database, user database in case of memory db, job history + data) + + + app/ui/settings/database/database.settings.component.html + 29 + + All file-based data will be stored here (sqlite database, user database in case of memory db, job history data) + Host app/ui/settings/database/database.settings.component.html - 28 + 39 app/ui/settings/basic/basic.settings.component.html @@ -626,48 +653,32 @@ Database app/ui/settings/database/database.settings.component.html - 35 + 46 Base de données - - Storage file - - app/ui/settings/database/database.settings.component.html - 58 - - Storage file - - - User's file - - app/ui/settings/database/database.settings.component.html - 67 - - User's file - Save app/ui/settings/database/database.settings.component.html - 77 + 71 app/ui/settings/map/map.settings.component.html - 113 + 114 app/ui/settings/thumbnail/thumbnail.settings.component.html - 70 + 69 app/ui/settings/video/video.settings.component.html - 120 + 123 app/ui/settings/photo/photo.settings.component.html - 94 + 95 app/ui/settings/metafiles/metafile.settings.component.html @@ -683,7 +694,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 39 + 38 app/ui/settings/basic/basic.settings.component.html @@ -699,7 +710,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 203 + 196 Enregistrer @@ -708,23 +719,23 @@ app/ui/settings/database/database.settings.component.html - 81 + 75 app/ui/settings/map/map.settings.component.html - 117 + 118 app/ui/settings/thumbnail/thumbnail.settings.component.html - 74 + 73 app/ui/settings/video/video.settings.component.html - 124 + 127 app/ui/settings/photo/photo.settings.component.html - 98 + 99 app/ui/settings/metafiles/metafile.settings.component.html @@ -740,7 +751,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 43 + 42 app/ui/settings/basic/basic.settings.component.html @@ -756,7 +767,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 207 + 200 Réinitialiser @@ -764,7 +775,7 @@ Use image markers app/ui/settings/map/map.settings.component.html - 24 + 25 Use image markers @@ -774,7 +785,7 @@ app/ui/settings/map/map.settings.component.html - 38 + 39 Map will use thumbnail images as markers instead of the default pin. @@ -782,7 +793,7 @@ Map provider app/ui/settings/map/map.settings.component.html - 46 + 47 Fournisseur de carte @@ -790,7 +801,7 @@ Tile Url* app/ui/settings/map/map.settings.component.html - 62 + 63 Tile Url* @@ -798,7 +809,7 @@ *The map module will use these urls to fetch the map tiles. app/ui/settings/map/map.settings.component.html - 87 + 88 *The map module will use these urls to fetch the map tiles. @@ -807,7 +818,7 @@ app/ui/settings/map/map.settings.component.html - 92 + 93 + Add Layer @@ -815,7 +826,7 @@ Mapbox access token app/ui/settings/map/map.settings.component.html - 98 + 99 Jeton d'accès Mapbox @@ -823,7 +834,7 @@ MapBox needs an access token to work, create one at app/ui/settings/map/map.settings.component.html - 104 + 105 MapBox a besoin d’un jeton d’accès pour pouvoir fonctionner, créez-en un à @@ -831,7 +842,7 @@ Thumbnail Quality app/ui/settings/thumbnail/thumbnail.settings.component.html - 12 + 11 Qualité des vignettes @@ -839,15 +850,23 @@ High quality may be slow. Especially with Jimp. app/ui/settings/thumbnail/thumbnail.settings.component.html - 26 + 25 Une haute qualité peut être lente à obtenir. Surtout avec Jimp. + + Icon size + + app/ui/settings/thumbnail/thumbnail.settings.component.html + 31 + + Icon size + Icon size (used on maps) app/ui/settings/thumbnail/thumbnail.settings.component.html - 41 + 40 Taille des icônes (utilisées sur les cartes) @@ -855,7 +874,7 @@ Thumbnail sizes app/ui/settings/thumbnail/thumbnail.settings.component.html - 47 + 46 Taille des vignettes @@ -863,7 +882,7 @@ Size of the thumbnails. app/ui/settings/thumbnail/thumbnail.settings.component.html - 54 + 53 Taille des vignettes. @@ -873,44 +892,21 @@ app/ui/settings/thumbnail/thumbnail.settings.component.html - 56 + 55 The best matching size will be generated. (More sizes give better quality, but use more storage and CPU to render.) - - ';' separated integers. If size is 160, that shorter side of the thumbnail will have 160 + + ';' separated integers. If size is 240, that shorter side of the thumbnail will have 160 pixels. app/ui/settings/thumbnail/thumbnail.settings.component.html - 60 + 59 - ';' separated integers. If size is 160, that shorter side of the thumbnail will have 160 pixels. - - - Generate thumbnails now - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 84 - - Generate thumbnails now - - - Generates all thumbnails now - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 81 - - Generates all thumbnails now - - - Cancel thumbnail generation - - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 90 - - Cancel thumbnail generation + ';' separated integers. If size is 240, that shorter side of the thumbnail will have 160 + pixels. + Video support uses ffmpeg. ffmpeg and ffprobe binaries need to be available in the PATH or @@ -985,7 +981,7 @@ app/ui/settings/photo/photo.settings.component.html - 78 + 79 Resolution @@ -1033,46 +1029,13 @@ 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. - - Transcode videos now - - app/ui/settings/video/video.settings.component.html - 134 - - Transcode videos now - - - Indexes the folders - - app/ui/settings/video/video.settings.component.html - 131 - - - app/ui/settings/photo/photo.settings.component.html - 105 - - - app/ui/settings/indexing/indexing.settings.component.html - 118 - - Index des dossiers - - - Cancel transcoding - - - app/ui/settings/video/video.settings.component.html - 140 - - Cancel transcoding - It is highly recommended to use hardware accelerated (sharp or gm) lib for thumbnail generation app/ui/settings/photo/photo.settings.component.html - 8 + 9 Il est fortement recommandé d'utiliser une librairie avec accélération matérielle (sharp ou gm) pour la génération des vignettes. @@ -1080,7 +1043,7 @@ Thumbnail generation library app/ui/settings/photo/photo.settings.component.html - 14 + 15 Bibliothèque de génération de vignettes @@ -1089,7 +1052,7 @@ app/ui/settings/photo/photo.settings.component.html - 22 + 23 Assurez-vous que le module de nœud sharp est installé. @@ -1097,7 +1060,7 @@ Make sure that gm node module and app/ui/settings/photo/photo.settings.component.html - 26 + 27 Assurez-vous que le module de noeud gm et @@ -1105,7 +1068,7 @@ are installed (npm install sharp). app/ui/settings/photo/photo.settings.component.html - 28 + 29 sont installés (npm install sharp). @@ -1113,7 +1076,7 @@ Photo converting: app/ui/settings/photo/photo.settings.component.html - 36 + 37 Photo converting: @@ -1121,7 +1084,7 @@ Converting app/ui/settings/photo/photo.settings.component.html - 39 + 40 Converting @@ -1130,7 +1093,7 @@ loads the original) app/ui/settings/photo/photo.settings.component.html - 53 + 54 Downsizes photos for faster preview loading. (Zooming in to the photo loads the original) @@ -1138,7 +1101,7 @@ On the fly converting app/ui/settings/photo/photo.settings.component.html - 59 + 60 On the fly converting @@ -1146,7 +1109,7 @@ Converts photos on the fly, when they are requested. app/ui/settings/photo/photo.settings.component.html - 73 + 74 Converts photos on the fly, when they are requested. @@ -1156,27 +1119,10 @@ keeping the aspect ratio. app/ui/settings/photo/photo.settings.component.html - 85 + 86 The shorter edge of the converted photo will be scaled down to this, while keeping the aspect ratio. - - Convert photos now - - app/ui/settings/photo/photo.settings.component.html - 108 - - Convert photos now - - - Cancel converting - - - app/ui/settings/photo/photo.settings.component.html - 114 - - Cancel converting - Reads and show *.gpx files on the map @@ -1261,7 +1207,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 27 + 26 This feature enables you to generate 'random photo' urls. That URL returns a photo random selected from your gallery. You can use the url with 3rd party application like random changing desktop background. @@ -1271,7 +1217,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 34 + 33 Photo aléatoire n'est pas supporté avec ces paramètres @@ -1731,43 +1677,17 @@ Note: search only works among the indexed directories app/ui/settings/indexing/indexing.settings.component.html - 106 + 107 Remarque: la recherche ne fonctionne que parmi les répertoires indexés - - Index folders now - - app/ui/settings/indexing/indexing.settings.component.html - 121 - - Index folders now - - - Cancel converting - - - app/ui/settings/indexing/indexing.settings.component.html - 127 - - Cancel converting - - - Reset Indexes - - - app/ui/settings/indexing/indexing.settings.component.html - 131 - - Réinitialiser les Index - Statistic: app/ui/settings/indexing/indexing.settings.component.html - 137 + 130 Statistique : @@ -1775,7 +1695,7 @@ Folders app/ui/settings/indexing/indexing.settings.component.html - 141 + 134 Dossiers @@ -1783,7 +1703,7 @@ Photos app/ui/settings/indexing/indexing.settings.component.html - 145 + 138 Photos @@ -1791,7 +1711,7 @@ Videos app/ui/settings/indexing/indexing.settings.component.html - 149 + 142 Vidéos @@ -1799,7 +1719,7 @@ Size app/ui/settings/indexing/indexing.settings.component.html - 154 + 147 Taille @@ -1811,26 +1731,16 @@ app/ui/settings/jobs/progress/job-progress.settings.component.html 2 - - Last run: - + Last run: Run between app/ui/settings/jobs/progress/job-progress.settings.component.html - 6 + 5 Run between - - done/all - - app/ui/settings/jobs/progress/job-progress.settings.component.html - 10 - - done/all - Status @@ -1839,19 +1749,19 @@ Status - - Stopping + + Cancelling... app/ui/settings/jobs/progress/job-progress.settings.component.html - 24 + 32 - Stopping + Cancelling... time elapsed app/ui/settings/jobs/progress/job-progress.settings.component.html - 31 + 43 time elapsed @@ -1859,19 +1769,61 @@ time left app/ui/settings/jobs/progress/job-progress.settings.component.html - 51 + 45 time left + + Processed + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 82 + + Processed + + + Skipped + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 83 + + Skipped + + + Left + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 84 + + Left + + + All + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 85 + + All + + + + Logs + + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 110 + + Logs + every app/ui/settings/jobs/jobs.settings.component.html - 18 + 20 app/ui/settings/jobs/jobs.settings.component.html - 97 + 114 every @@ -1879,7 +1831,7 @@ never app/ui/settings/jobs/jobs.settings.component.html - 23 + 25 never @@ -1887,7 +1839,7 @@ after app/ui/settings/jobs/jobs.settings.component.html - 25 + 27 after @@ -1895,7 +1847,7 @@ Job: app/ui/settings/jobs/jobs.settings.component.html - 39 + 49 Job: @@ -1903,7 +1855,7 @@ Periodicity: app/ui/settings/jobs/jobs.settings.component.html - 45 + 62 Periodicity: @@ -1912,7 +1864,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 55 + 72 Set the time to run the job. @@ -1920,7 +1872,7 @@ After: app/ui/settings/jobs/jobs.settings.component.html - 61 + 78 After: @@ -1929,54 +1881,28 @@ app/ui/settings/jobs/jobs.settings.component.html - 72 + 89 - The job will run after that job finishes. - + The job will run after that job finishes. At: app/ui/settings/jobs/jobs.settings.component.html - 79 + 96 app/ui/settings/jobs/jobs.settings.component.html - 89 + 106 At: - - Start now - + + ';' separated integers. + app/ui/settings/jobs/jobs.settings.component.html - 115 - - Start now - - - Trigger job run manually - - app/ui/settings/jobs/jobs.settings.component.html - 113 - - Trigger job run manually - - - Stop - - - app/ui/settings/jobs/jobs.settings.component.html - 120 - - Stop - - - ';' separated integers. - - app/ui/settings/jobs/jobs.settings.component.html - 183 + 175 ';' separated integers. @@ -1985,7 +1911,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 210 + 203 + Add Job @@ -1993,7 +1919,7 @@ Add new job app/ui/settings/jobs/jobs.settings.component.html - 225 + 218 Add new job @@ -2002,7 +1928,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 239 + 232 Select a job to schedule. @@ -2011,10 +1937,113 @@ app/ui/settings/jobs/jobs.settings.component.html - 247 + 240 - Add Job - + Add Job + + + Run now + + app/ui/settings/jobs/button/job-button.settings.component.html + 7 + + Run now + + + Trigger job run manually + + app/ui/settings/jobs/button/job-button.settings.component.html + 2 + + Trigger job run manually + + + Cancel + + app/ui/settings/jobs/button/job-button.settings.component.html + 15 + + Cancel + + + Size to generate + + src/frontend/app/model/backendtext.service.ts + 1 + + Size to generate + + + These thumbnails will be generated. The list should be a subset of the enabled thumbnail sizes + + src/frontend/app/model/backendtext.service.ts + 1 + + These thumbnails will be generated. The list should be a subset of the enabled thumbnail sizes + + + Indexed only + + src/frontend/app/model/backendtext.service.ts + 1 + + Indexed only + + + Only checks indexed files. + + src/frontend/app/model/backendtext.service.ts + 1 + + Only checks indexed files. + + + Indexing + + src/frontend/app/model/backendtext.service.ts + 1 + + Indexing + + + Database Reset + + src/frontend/app/model/backendtext.service.ts + 1 + + Database Reset + + + Thumbnail Generation + + src/frontend/app/model/backendtext.service.ts + 1 + + Thumbnail Generation + + + Photo Converting + + src/frontend/app/model/backendtext.service.ts + 1 + + Photo Converting + + + Video Converting + + src/frontend/app/model/backendtext.service.ts + 1 + + Video Converting + + + Temp Folder Cleaning + + src/frontend/app/model/backendtext.service.ts + 1 + + Temp Folder Cleaning Server error @@ -2339,6 +2368,22 @@ Resetting database + + Job started + + src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts + 1 + + Job started + + + Job stopped + + src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts + 1 + + Job stopped + Jobs @@ -2347,6 +2392,22 @@ Jobs + + periodic + + src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + 1 + + periodic + + + scheduled + + src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + 1 + + scheduled + Monday @@ -2411,33 +2472,69 @@ day - - Job + + processed - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts - 1 - - Job + processed - - started + + skipped - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - started + skipped - - stopped + + all - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - stopped + all + + + running + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + running + + + cancelling + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + cancelling + + + canceled + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + canceled + + + interrupted + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + interrupted + + + finished + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + finished Map @@ -2487,22 +2584,6 @@ Photo - - Photo converting started - - src/frontend/app/ui/settings/photo/photo.settings.component.ts - 1 - - Photo converting started - - - Photo converting interrupted - - src/frontend/app/ui/settings/photo/photo.settings.component.ts - 1 - - Photo converting interrupted - Random Photo @@ -2519,22 +2600,6 @@ Vignette - - Thumbnail generation started - - src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts - 1 - - Thumbnail generation started - - - Thumbnail generation interrupted - - src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts - 1 - - Thumbnail generation interrupted - Password protection @@ -2575,22 +2640,6 @@ Vidéo - - Video transcoding started - - src/frontend/app/ui/settings/video/video.settings.component.ts - 1 - - Video transcoding started - - - Video transcoding interrupted - - src/frontend/app/ui/settings/video/video.settings.component.ts - 1 - - Video transcoding interrupted - \ No newline at end of file diff --git a/src/frontend/translate/messages.hu.xlf b/src/frontend/translate/messages.hu.xlf index da229cbb..018b5e79 100644 --- a/src/frontend/translate/messages.hu.xlf +++ b/src/frontend/translate/messages.hu.xlf @@ -32,7 +32,7 @@ app/ui/settings/database/database.settings.component.html - 42 + 53 Felhasználónév @@ -60,7 +60,7 @@ app/ui/settings/database/database.settings.component.html - 49 + 60 Jelszó @@ -419,6 +419,14 @@ Mód + + Up time + + app/ui/admin/admin.component.html + 115 + + Szerver futás kezdete + Info @@ -533,7 +541,7 @@ app/ui/settings/map/map.settings.component.html - 61 + 62 Név @@ -580,7 +588,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 244 + 237 Bezárás @@ -597,7 +605,7 @@ Type app/ui/settings/database/database.settings.component.html - 12 + 11 Típus @@ -606,15 +614,34 @@ app/ui/settings/database/database.settings.component.html - 20 + 19 Telepítsd kézzel mysql csomópont-modulot a mysql (npm install mysql) használatához + + Database folder + + app/ui/settings/database/database.settings.component.html + 25 + + Database folder + + + + All file-based data will be stored here (sqlite database, user database in case of memory db, job history + data) + + + app/ui/settings/database/database.settings.component.html + 29 + + Minden adat ebbe a mappába kerül mentésre (sqlite adatbázis, felhasználók memoria adatbázis esetén, üzemezett feladatok) + Host app/ui/settings/database/database.settings.component.html - 28 + 39 app/ui/settings/basic/basic.settings.component.html @@ -626,48 +653,32 @@ Database app/ui/settings/database/database.settings.component.html - 35 + 46 Adatbázis - - Storage file - - app/ui/settings/database/database.settings.component.html - 58 - - Adatbázis fájl - - - User's file - - app/ui/settings/database/database.settings.component.html - 67 - - User's file - Save app/ui/settings/database/database.settings.component.html - 77 + 71 app/ui/settings/map/map.settings.component.html - 113 + 114 app/ui/settings/thumbnail/thumbnail.settings.component.html - 70 + 69 app/ui/settings/video/video.settings.component.html - 120 + 123 app/ui/settings/photo/photo.settings.component.html - 94 + 95 app/ui/settings/metafiles/metafile.settings.component.html @@ -683,7 +694,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 39 + 38 app/ui/settings/basic/basic.settings.component.html @@ -699,7 +710,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 203 + 196 Mentés @@ -708,23 +719,23 @@ app/ui/settings/database/database.settings.component.html - 81 + 75 app/ui/settings/map/map.settings.component.html - 117 + 118 app/ui/settings/thumbnail/thumbnail.settings.component.html - 74 + 73 app/ui/settings/video/video.settings.component.html - 124 + 127 app/ui/settings/photo/photo.settings.component.html - 98 + 99 app/ui/settings/metafiles/metafile.settings.component.html @@ -740,7 +751,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 43 + 42 app/ui/settings/basic/basic.settings.component.html @@ -756,7 +767,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 207 + 200 Visszaállítás @@ -764,7 +775,7 @@ Use image markers app/ui/settings/map/map.settings.component.html - 24 + 25 Use image markers @@ -774,7 +785,7 @@ app/ui/settings/map/map.settings.component.html - 38 + 39 A térkép ikonokat fog használni az alap jelölő pin helyett @@ -782,7 +793,7 @@ Map provider app/ui/settings/map/map.settings.component.html - 46 + 47 Térképszolgáltató @@ -790,7 +801,7 @@ Tile Url* app/ui/settings/map/map.settings.component.html - 62 + 63 Tile Url* @@ -798,7 +809,7 @@ *The map module will use these urls to fetch the map tiles. app/ui/settings/map/map.settings.component.html - 87 + 88 *A térkép ezeket a url-eket fogja használni a térkép csempék betöltéséhez. @@ -807,7 +818,7 @@ app/ui/settings/map/map.settings.component.html - 92 + 93 + Új Térkép @@ -815,7 +826,7 @@ Mapbox access token app/ui/settings/map/map.settings.component.html - 98 + 99 Mapbox access token @@ -823,7 +834,7 @@ MapBox needs an access token to work, create one at app/ui/settings/map/map.settings.component.html - 104 + 105 A MapBox-hoz access token szükséges, amit itt lehet létrehozni: @@ -831,23 +842,31 @@ Thumbnail Quality app/ui/settings/thumbnail/thumbnail.settings.component.html - 12 + 11 - Thumbnail Quality + Thumbnail minőség High quality may be slow. Especially with Jimp. app/ui/settings/thumbnail/thumbnail.settings.component.html - 26 + 25 A jó minőség lassú lehet. Különösen a Jimp estén. + + Icon size + + app/ui/settings/thumbnail/thumbnail.settings.component.html + 31 + + Icon size + Icon size (used on maps) app/ui/settings/thumbnail/thumbnail.settings.component.html - 41 + 40 Ikonméret (térképeken lesz használva) @@ -855,7 +874,7 @@ Thumbnail sizes app/ui/settings/thumbnail/thumbnail.settings.component.html - 47 + 46 Thumbnail méretek @@ -863,7 +882,7 @@ Size of the thumbnails. app/ui/settings/thumbnail/thumbnail.settings.component.html - 54 + 53 A thumbnail-ok mérete. @@ -873,44 +892,19 @@ app/ui/settings/thumbnail/thumbnail.settings.component.html - 56 + 55 - The best matching size will be generated. (More sizes give better quality, but use more storage and CPU to render.) + A legjobban illeszkedő méret lesz generálva az adott képhez. (Több méretter könyebb kiválasztani a legjobbat, de több tárhely és CPU szükséges a tároláshoz és generáláshoz) - - ';' separated integers. If size is 160, that shorter side of the thumbnail will have 160 + + ';' separated integers. If size is 240, that shorter side of the thumbnail will have 160 pixels. app/ui/settings/thumbnail/thumbnail.settings.component.html - 60 + 59 - ';' separated integers. If size is 160, that shorter side of the thumbnail will have 160 pixels. - - - Generate thumbnails now - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 84 - - Thumbnail generálás most - - - Generates all thumbnails now - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 81 - - Legenerál minden thumbnailt - - - Cancel thumbnail generation - - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 90 - - Thumbnail generálás megszakítása + ';'-al elválasztott számok. Ha a méret 240, akkor a thubmnail rövidebb oldala 240 pixel lesz. Video support uses ffmpeg. ffmpeg and ffprobe binaries need to be available in the PATH or @@ -985,7 +979,7 @@ app/ui/settings/photo/photo.settings.component.html - 78 + 79 Felbontás @@ -1033,46 +1027,13 @@ A konvertált videó bit rátája ennyi lesz. (Felfelé nem lesz skálázva) - - Transcode videos now - - app/ui/settings/video/video.settings.component.html - 134 - - Videók konvertálása most - - - Indexes the folders - - app/ui/settings/video/video.settings.component.html - 131 - - - app/ui/settings/photo/photo.settings.component.html - 105 - - - app/ui/settings/indexing/indexing.settings.component.html - 118 - - Indexeli a mappákat - - - Cancel transcoding - - - app/ui/settings/video/video.settings.component.html - 140 - - Konvertálás megszakítása - It is highly recommended to use hardware accelerated (sharp or gm) lib for thumbnail generation app/ui/settings/photo/photo.settings.component.html - 8 + 9 Nagyon ajánlott hardveres gyorsított (sharp vagy gm) modul használata a thumbnail-ek generálásához @@ -1080,7 +1041,7 @@ Thumbnail generation library app/ui/settings/photo/photo.settings.component.html - 14 + 15 Thumbnail generáló könyvtár @@ -1089,7 +1050,7 @@ app/ui/settings/photo/photo.settings.component.html - 22 + 23 Győződjön meg arról, hogy a sharp node modul telepítve van (npm telepítés éles). @@ -1097,7 +1058,7 @@ Make sure that gm node module and app/ui/settings/photo/photo.settings.component.html - 26 + 27 Győződj meg róla, hogy a gm node modul és @@ -1105,7 +1066,7 @@ are installed (npm install sharp). app/ui/settings/photo/photo.settings.component.html - 28 + 29 telepítve van (npm install sharp). @@ -1113,7 +1074,7 @@ Photo converting: app/ui/settings/photo/photo.settings.component.html - 36 + 37 Photo konvertálás: @@ -1121,7 +1082,7 @@ Converting app/ui/settings/photo/photo.settings.component.html - 39 + 40 Konvertálás @@ -1130,7 +1091,7 @@ loads the original) app/ui/settings/photo/photo.settings.component.html - 53 + 54 Fotók leméretezése, hogy gyorsabban töltődjön be az előnézet. (Zoom-olás esetén betöltődik az eredeti kép) @@ -1138,7 +1099,7 @@ On the fly converting app/ui/settings/photo/photo.settings.component.html - 59 + 60 Menet közbeni konvetálás @@ -1146,7 +1107,7 @@ Converts photos on the fly, when they are requested. app/ui/settings/photo/photo.settings.component.html - 73 + 74 Photókat menet közvben konvertálja, amikor kérésre megy rájuk. @@ -1156,27 +1117,10 @@ keeping the aspect ratio. app/ui/settings/photo/photo.settings.component.html - 85 + 86 A konvertált fotó rövidebb oldala lesz ekkora. - - Convert photos now - - app/ui/settings/photo/photo.settings.component.html - 108 - - Fotó konvertálása most - - - Cancel converting - - - app/ui/settings/photo/photo.settings.component.html - 114 - - Cancel converting - Reads and show *.gpx files on the map @@ -1261,7 +1205,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 27 + 26 Ez a modul a 'véletlenszerű fotó' utl generálását engedelyezi. Az url egy véletlen fotót ad vissza a galériából. Harmadik fél által készített alkalmazásokhoz használhatód. Pl véletlenszerűen változó háttérkép. @@ -1271,7 +1215,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 34 + 33 Ezeket a beállításokat nem támogatja a véletlenszerű fénykép @@ -1638,7 +1582,7 @@ app/ui/settings/indexing/indexing.settings.component.html 47 - Set the reindexing sensitivity. High value check the folders for change more often. + Az újraindexálás érzékenységét állítja. Magasabb érték esetén gyakrabban indexel újra. Exclude Folder List @@ -1646,7 +1590,7 @@ app/ui/settings/indexing/indexing.settings.component.html 53 - Exclude Folder List + Kihagyható mappák Folders to exclude from indexing @@ -1654,7 +1598,7 @@ app/ui/settings/indexing/indexing.settings.component.html 60 - Folders to exclude from indexing + Ezek a mappák lesznek kihagyva indexeléskor ';' separated strings. If an entry starts with '/' it is treated as an absolute path. If it doesn't @@ -1665,7 +1609,7 @@ app/ui/settings/indexing/indexing.settings.component.html 63 - ';' separated strings. If an entry starts with '/' it is treated as an absolute path. If it doesn't start with '/' but contains a '/', the path is relative to the image directory. If it doesn't contain a '/', any folder with this name will be excluded. + ';' elválasztott szövegek. Ha a bejegyzés '/'-el kezdődik, akkor abszolút útvonalként lesz kezelve. Ha nem '/'-el kezdédik, de tartalmazza, akkor a képek mappához képest relatív útvonalként lesz kezelve. Egyébként az ilyen nevű mappákat lesznek kihagyva. Exclude File List @@ -1673,7 +1617,7 @@ app/ui/settings/indexing/indexing.settings.component.html 72 - Exclude File List + Mappa kihagyó fájlok Files that mark a folder to be excluded from indexing @@ -1681,7 +1625,7 @@ app/ui/settings/indexing/indexing.settings.component.html 79 - Files that mark a folder to be excluded from indexing + Fájlok amik a mappa kihagyást jelölik ';' separated strings. Any folder that contains a file with this name will be excluded from @@ -1691,7 +1635,7 @@ app/ui/settings/indexing/indexing.settings.component.html 82 - ';' separated strings. Any folder that contains a file with this name will be excluded from indexing. + ';'-al elválsztott szövegek. Az a mappa ami az itt felsorolt fájlok bármelyikét tartlamazza, kihagyásra kerül. Save @@ -1731,43 +1675,17 @@ Note: search only works among the indexed directories app/ui/settings/indexing/indexing.settings.component.html - 106 + 107 Megjegyzés: csak az indexelt könyvtárak között működik a keresés - - Index folders now - - app/ui/settings/indexing/indexing.settings.component.html - 121 - - Index folders now - - - Cancel converting - - - app/ui/settings/indexing/indexing.settings.component.html - 127 - - Cancel converting - - - Reset Indexes - - - app/ui/settings/indexing/indexing.settings.component.html - 131 - - Indexek visszaállítása - Statistic: app/ui/settings/indexing/indexing.settings.component.html - 137 + 130 Statisztika: @@ -1775,7 +1693,7 @@ Folders app/ui/settings/indexing/indexing.settings.component.html - 141 + 134 Mappák @@ -1783,7 +1701,7 @@ Photos app/ui/settings/indexing/indexing.settings.component.html - 145 + 138 Fotók @@ -1791,7 +1709,7 @@ Videos app/ui/settings/indexing/indexing.settings.component.html - 149 + 142 Videók @@ -1799,7 +1717,7 @@ Size app/ui/settings/indexing/indexing.settings.component.html - 154 + 147 Méret @@ -1811,26 +1729,16 @@ app/ui/settings/jobs/progress/job-progress.settings.component.html 2 - - Last run: - + Last run: Run between app/ui/settings/jobs/progress/job-progress.settings.component.html - 6 + 5 Run between - - done/all - - app/ui/settings/jobs/progress/job-progress.settings.component.html - 10 - - done/all - Status @@ -1839,19 +1747,19 @@ Status - - Stopping + + Cancelling... app/ui/settings/jobs/progress/job-progress.settings.component.html - 24 + 32 - Leállás alatt + Leállítás... time elapsed app/ui/settings/jobs/progress/job-progress.settings.component.html - 31 + 43 eltelt idő @@ -1859,19 +1767,61 @@ time left app/ui/settings/jobs/progress/job-progress.settings.component.html - 51 + 45 hátramaradt idő + + Processed + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 82 + + Feldolgozott + + + Skipped + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 83 + + Kihagyott + + + Left + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 84 + + Hátra + + + All + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 85 + + Összes + + + + Logs + + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 110 + + Napló + every app/ui/settings/jobs/jobs.settings.component.html - 18 + 20 app/ui/settings/jobs/jobs.settings.component.html - 97 + 114 minden @@ -1879,7 +1829,7 @@ never app/ui/settings/jobs/jobs.settings.component.html - 23 + 25 soha @@ -1887,23 +1837,23 @@ after app/ui/settings/jobs/jobs.settings.component.html - 25 + 27 - after + ez után Job: app/ui/settings/jobs/jobs.settings.component.html - 39 + 49 - Job: + Feladat: Periodicity: app/ui/settings/jobs/jobs.settings.component.html - 45 + 62 Gyakoriság: @@ -1912,7 +1862,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 55 + 72 Állítsd be, hogy mikos fusson a feladat. @@ -1920,63 +1870,37 @@ After: app/ui/settings/jobs/jobs.settings.component.html - 61 + 78 - After: + Ez után: The job will run after that job finishes. app/ui/settings/jobs/jobs.settings.component.html - 72 + 89 - The job will run after that job finishes. - + Ez a feladat a beállított feladat után fog futni. At: app/ui/settings/jobs/jobs.settings.component.html - 79 + 96 app/ui/settings/jobs/jobs.settings.component.html - 89 + 106 Ekkor: - - Start now - + + ';' separated integers. + app/ui/settings/jobs/jobs.settings.component.html - 115 - - Futtatás most - - - Trigger job run manually - - app/ui/settings/jobs/jobs.settings.component.html - 113 - - Manuálisan elnidítja a feladatot - - - Stop - - - app/ui/settings/jobs/jobs.settings.component.html - 120 - - Leállítás - - - ';' separated integers. - - app/ui/settings/jobs/jobs.settings.component.html - 183 + 175 ';'-vel elválaszott egész számok. @@ -1985,7 +1909,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 210 + 203 + Új feladat @@ -1993,7 +1917,7 @@ Add new job app/ui/settings/jobs/jobs.settings.component.html - 225 + 218 Új feladat @@ -2002,7 +1926,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 239 + 232 Válaszd ki az ütemezendő feladatot. @@ -2011,10 +1935,113 @@ app/ui/settings/jobs/jobs.settings.component.html - 247 + 240 - Feladat hozzáadása - + Feladat hozzáadása + + + Run now + + app/ui/settings/jobs/button/job-button.settings.component.html + 7 + + Futtatás most + + + Trigger job run manually + + app/ui/settings/jobs/button/job-button.settings.component.html + 2 + + Manuálisan elnidítja a feladatot + + + Cancel + + app/ui/settings/jobs/button/job-button.settings.component.html + 15 + + Megszakítás + + + Size to generate + + src/frontend/app/model/backendtext.service.ts + 1 + + Generálandó méret + + + These thumbnails will be generated. The list should be a subset of the enabled thumbnail sizes + + src/frontend/app/model/backendtext.service.ts + 1 + + Ezek a thumnail-ek lesznek létrehozva. A lista az engedélyezett thumbnail méretek alhalmaza kell, hogy legyen + + + Indexed only + + src/frontend/app/model/backendtext.service.ts + 1 + + Csak indexelt + + + Only checks indexed files. + + src/frontend/app/model/backendtext.service.ts + 1 + + Csak az indexelt fájlokat nézi. + + + Indexing + + src/frontend/app/model/backendtext.service.ts + 1 + + Indexelés + + + Database Reset + + src/frontend/app/model/backendtext.service.ts + 1 + + Adatbázis visszaállítás + + + Thumbnail Generation + + src/frontend/app/model/backendtext.service.ts + 1 + + Thumbnail Generálás + + + Photo Converting + + src/frontend/app/model/backendtext.service.ts + 1 + + Fotó Konvertálás + + + Video Converting + + src/frontend/app/model/backendtext.service.ts + 1 + + Videó Konvertálás + + + Temp Folder Cleaning + + src/frontend/app/model/backendtext.service.ts + 1 + + Temp Mappa Tisztítása Server error @@ -2339,13 +2366,45 @@ Adatbázis visszaállítása + + Job started + + src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts + 1 + + Feladat elindult + + + Job stopped + + src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts + 1 + + Feladat leállt + Jobs src/frontend/app/ui/settings/jobs/jobs.settings.component.ts 1 - Jobs + Feladatok + + + periodic + + src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + 1 + + periodic + + + scheduled + + src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + 1 + + scheduled Monday @@ -2411,33 +2470,69 @@ nap - - Job + + processed - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts - 1 - - Job + feldolgozott - - started + + skipped - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - elindult + kihagyott - - stopped + + all - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - leállt + összes + + + running + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + fut + + + cancelling + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + leállítás alatt + + + canceled + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + leállítva + + + interrupted + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + megszakítva + + + finished + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + végzett Map @@ -2487,22 +2582,6 @@ Fotó - - Photo converting started - - src/frontend/app/ui/settings/photo/photo.settings.component.ts - 1 - - Fotó konvertálás elkezdődött - - - Photo converting interrupted - - src/frontend/app/ui/settings/photo/photo.settings.component.ts - 1 - - Fotó konvertálás megszakadt - Random Photo @@ -2519,22 +2598,6 @@ Thumbnail - - Thumbnail generation started - - src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts - 1 - - Thumbnail generation started - - - Thumbnail generation interrupted - - src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts - 1 - - Thumbnail generation interrupted - Password protection @@ -2575,22 +2638,6 @@ Videó - - Video transcoding started - - src/frontend/app/ui/settings/video/video.settings.component.ts - 1 - - Video transcoding started - - - Video transcoding interrupted - - src/frontend/app/ui/settings/video/video.settings.component.ts - 1 - - Video transcoding interrupted - diff --git a/src/frontend/translate/messages.ro.xlf b/src/frontend/translate/messages.ro.xlf index 5e9cb363..e5ff8ebe 100644 --- a/src/frontend/translate/messages.ro.xlf +++ b/src/frontend/translate/messages.ro.xlf @@ -32,7 +32,7 @@ app/ui/settings/database/database.settings.component.html - 42 + 53 Nume utilizator @@ -60,7 +60,7 @@ app/ui/settings/database/database.settings.component.html - 49 + 60 Parolă @@ -419,6 +419,14 @@ Mod + + Up time + + app/ui/admin/admin.component.html + 115 + + Up time + Info @@ -533,7 +541,7 @@ app/ui/settings/map/map.settings.component.html - 61 + 62 Nume @@ -580,7 +588,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 244 + 237 Închide @@ -597,7 +605,7 @@ Type app/ui/settings/database/database.settings.component.html - 12 + 11 Type @@ -606,15 +614,34 @@ app/ui/settings/database/database.settings.component.html - 20 + 19 Instalați manual modulul node MuSQL pentru a utiliza MySQL (npm install mysql) + + Database folder + + app/ui/settings/database/database.settings.component.html + 25 + + Database folder + + + + All file-based data will be stored here (sqlite database, user database in case of memory db, job history + data) + + + app/ui/settings/database/database.settings.component.html + 29 + + All file-based data will be stored here (sqlite database, user database in case of memory db, job history data) + Host app/ui/settings/database/database.settings.component.html - 28 + 39 app/ui/settings/basic/basic.settings.component.html @@ -626,48 +653,32 @@ Database app/ui/settings/database/database.settings.component.html - 35 + 46 Bază de date - - Storage file - - app/ui/settings/database/database.settings.component.html - 58 - - Storage file - - - User's file - - app/ui/settings/database/database.settings.component.html - 67 - - User's file - Save app/ui/settings/database/database.settings.component.html - 77 + 71 app/ui/settings/map/map.settings.component.html - 113 + 114 app/ui/settings/thumbnail/thumbnail.settings.component.html - 70 + 69 app/ui/settings/video/video.settings.component.html - 120 + 123 app/ui/settings/photo/photo.settings.component.html - 94 + 95 app/ui/settings/metafiles/metafile.settings.component.html @@ -683,7 +694,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 39 + 38 app/ui/settings/basic/basic.settings.component.html @@ -699,7 +710,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 203 + 196 Salvare @@ -708,23 +719,23 @@ app/ui/settings/database/database.settings.component.html - 81 + 75 app/ui/settings/map/map.settings.component.html - 117 + 118 app/ui/settings/thumbnail/thumbnail.settings.component.html - 74 + 73 app/ui/settings/video/video.settings.component.html - 124 + 127 app/ui/settings/photo/photo.settings.component.html - 98 + 99 app/ui/settings/metafiles/metafile.settings.component.html @@ -740,7 +751,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 43 + 42 app/ui/settings/basic/basic.settings.component.html @@ -756,7 +767,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 207 + 200 Restabilire @@ -764,7 +775,7 @@ Use image markers app/ui/settings/map/map.settings.component.html - 24 + 25 Utilizare marcatori de imagine @@ -774,7 +785,7 @@ app/ui/settings/map/map.settings.component.html - 38 + 39 Harta va folosi miniaturi ca marcatori în loc de pinul implicit. @@ -782,7 +793,7 @@ Map provider app/ui/settings/map/map.settings.component.html - 46 + 47 Furnizor de hartă @@ -790,7 +801,7 @@ Tile Url* app/ui/settings/map/map.settings.component.html - 62 + 63 URL plăci* @@ -798,7 +809,7 @@ *The map module will use these urls to fetch the map tiles. app/ui/settings/map/map.settings.component.html - 87 + 88 *Modulul de hartă va utiliza aceste URL-uri pentru a prelua plăcile hărții. @@ -807,7 +818,7 @@ app/ui/settings/map/map.settings.component.html - 92 + 93 + Adaugă strat @@ -815,7 +826,7 @@ Mapbox access token app/ui/settings/map/map.settings.component.html - 98 + 99 Token de acces Mapbox @@ -823,7 +834,7 @@ MapBox needs an access token to work, create one at app/ui/settings/map/map.settings.component.html - 104 + 105 Mapbox are nevoie de un token de acces pentru a funcționa, creați unul la @@ -831,7 +842,7 @@ Thumbnail Quality app/ui/settings/thumbnail/thumbnail.settings.component.html - 12 + 11 Calitatea miniaturii @@ -839,15 +850,23 @@ High quality may be slow. Especially with Jimp. app/ui/settings/thumbnail/thumbnail.settings.component.html - 26 + 25 Calitatea înaltă poate fi lentă. În special cu Jimp. + + Icon size + + app/ui/settings/thumbnail/thumbnail.settings.component.html + 31 + + Icon size + Icon size (used on maps) app/ui/settings/thumbnail/thumbnail.settings.component.html - 41 + 40 Mărimea pictogramei (folosită pe hărți) @@ -855,7 +874,7 @@ Thumbnail sizes app/ui/settings/thumbnail/thumbnail.settings.component.html - 47 + 46 Dimensiunile miniaturii @@ -863,7 +882,7 @@ Size of the thumbnails. app/ui/settings/thumbnail/thumbnail.settings.component.html - 54 + 53 Dimensiunea miniaturilor. @@ -873,44 +892,21 @@ app/ui/settings/thumbnail/thumbnail.settings.component.html - 56 + 55 The best matching size will be generated. (More sizes give better quality, but use more storage and CPU to render.) - - ';' separated integers. If size is 160, that shorter side of the thumbnail will have 160 + + ';' separated integers. If size is 240, that shorter side of the thumbnail will have 160 pixels. app/ui/settings/thumbnail/thumbnail.settings.component.html - 60 + 59 - ';' separated integers. If size is 160, that shorter side of the thumbnail will have 160 pixels. - - - Generate thumbnails now - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 84 - - Generate thumbnails now - - - Generates all thumbnails now - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 81 - - Generates all thumbnails now - - - Cancel thumbnail generation - - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 90 - - Cancel thumbnail generation + ';' separated integers. If size is 240, that shorter side of the thumbnail will have 160 + pixels. + Video support uses ffmpeg. ffmpeg and ffprobe binaries need to be available in the PATH or @@ -985,7 +981,7 @@ app/ui/settings/photo/photo.settings.component.html - 78 + 79 Resolution @@ -1033,46 +1029,13 @@ 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. - - Transcode videos now - - app/ui/settings/video/video.settings.component.html - 134 - - Transcode videos now - - - Indexes the folders - - app/ui/settings/video/video.settings.component.html - 131 - - - app/ui/settings/photo/photo.settings.component.html - 105 - - - app/ui/settings/indexing/indexing.settings.component.html - 118 - - Indexează dosarele - - - Cancel transcoding - - - app/ui/settings/video/video.settings.component.html - 140 - - Cancel transcoding - It is highly recommended to use hardware accelerated (sharp or gm) lib for thumbnail generation app/ui/settings/photo/photo.settings.component.html - 8 + 9 Este recomandat să utilizați o bibliotecă accelerată hardware (Sharp sau GraphicsMagick) pentru generarea de miniaturi @@ -1080,7 +1043,7 @@ Thumbnail generation library app/ui/settings/photo/photo.settings.component.html - 14 + 15 Biblioteca de generare a miniaturilor @@ -1089,7 +1052,7 @@ app/ui/settings/photo/photo.settings.component.html - 22 + 23 Asigurați-vă că modulul node sharp este instalat (npm install sharp). @@ -1097,7 +1060,7 @@ Make sure that gm node module and app/ui/settings/photo/photo.settings.component.html - 26 + 27 Asigurați-vă că modulul node gm și @@ -1105,7 +1068,7 @@ are installed (npm install sharp). app/ui/settings/photo/photo.settings.component.html - 28 + 29 sunt instalate (npm install sharp). @@ -1113,7 +1076,7 @@ Photo converting: app/ui/settings/photo/photo.settings.component.html - 36 + 37 Photo converting: @@ -1121,7 +1084,7 @@ Converting app/ui/settings/photo/photo.settings.component.html - 39 + 40 Converting @@ -1130,7 +1093,7 @@ loads the original) app/ui/settings/photo/photo.settings.component.html - 53 + 54 Downsizes photos for faster preview loading. (Zooming in to the photo loads the original) @@ -1138,7 +1101,7 @@ On the fly converting app/ui/settings/photo/photo.settings.component.html - 59 + 60 On the fly converting @@ -1146,7 +1109,7 @@ Converts photos on the fly, when they are requested. app/ui/settings/photo/photo.settings.component.html - 73 + 74 Converts photos on the fly, when they are requested. @@ -1156,27 +1119,10 @@ keeping the aspect ratio. app/ui/settings/photo/photo.settings.component.html - 85 + 86 The shorter edge of the converted photo will be scaled down to this, while keeping the aspect ratio. - - Convert photos now - - app/ui/settings/photo/photo.settings.component.html - 108 - - Convert photos now - - - Cancel converting - - - app/ui/settings/photo/photo.settings.component.html - 114 - - Cancel converting - Reads and show *.gpx files on the map @@ -1261,7 +1207,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 27 + 26 This feature enables you to generate 'random photo' urls. That URL returns a photo random selected from your gallery. You can use the url with 3rd party application like random changing desktop background. @@ -1271,7 +1217,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 34 + 33 Fotografia aleatorie nu este suportată cu aceste setări @@ -1731,43 +1677,17 @@ Note: search only works among the indexed directories app/ui/settings/indexing/indexing.settings.component.html - 106 + 107 Notă: căutarea funcționează numai printre directoarele indexate - - Index folders now - - app/ui/settings/indexing/indexing.settings.component.html - 121 - - Index folders now - - - Cancel converting - - - app/ui/settings/indexing/indexing.settings.component.html - 127 - - Cancel converting - - - Reset Indexes - - - app/ui/settings/indexing/indexing.settings.component.html - 131 - - Resetare indecși - Statistic: app/ui/settings/indexing/indexing.settings.component.html - 137 + 130 Statistici: @@ -1775,7 +1695,7 @@ Folders app/ui/settings/indexing/indexing.settings.component.html - 141 + 134 Dosare @@ -1783,7 +1703,7 @@ Photos app/ui/settings/indexing/indexing.settings.component.html - 145 + 138 Fotografii @@ -1791,7 +1711,7 @@ Videos app/ui/settings/indexing/indexing.settings.component.html - 149 + 142 Videoclipuri @@ -1799,7 +1719,7 @@ Size app/ui/settings/indexing/indexing.settings.component.html - 154 + 147 Dimensiuni @@ -1811,26 +1731,16 @@ app/ui/settings/jobs/progress/job-progress.settings.component.html 2 - - Last run: - + Last run: Run between app/ui/settings/jobs/progress/job-progress.settings.component.html - 6 + 5 Run between - - done/all - - app/ui/settings/jobs/progress/job-progress.settings.component.html - 10 - - done/all - Status @@ -1839,19 +1749,19 @@ Status - - Stopping + + Cancelling... app/ui/settings/jobs/progress/job-progress.settings.component.html - 24 + 32 - Stopping + Cancelling... time elapsed app/ui/settings/jobs/progress/job-progress.settings.component.html - 31 + 43 time elapsed @@ -1859,19 +1769,61 @@ time left app/ui/settings/jobs/progress/job-progress.settings.component.html - 51 + 45 time left + + Processed + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 82 + + Processed + + + Skipped + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 83 + + Skipped + + + Left + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 84 + + Left + + + All + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 85 + + All + + + + Logs + + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 110 + + Logs + every app/ui/settings/jobs/jobs.settings.component.html - 18 + 20 app/ui/settings/jobs/jobs.settings.component.html - 97 + 114 every @@ -1879,7 +1831,7 @@ never app/ui/settings/jobs/jobs.settings.component.html - 23 + 25 never @@ -1887,7 +1839,7 @@ after app/ui/settings/jobs/jobs.settings.component.html - 25 + 27 after @@ -1895,7 +1847,7 @@ Job: app/ui/settings/jobs/jobs.settings.component.html - 39 + 49 Job: @@ -1903,7 +1855,7 @@ Periodicity: app/ui/settings/jobs/jobs.settings.component.html - 45 + 62 Periodicity: @@ -1912,7 +1864,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 55 + 72 Set the time to run the job. @@ -1920,7 +1872,7 @@ After: app/ui/settings/jobs/jobs.settings.component.html - 61 + 78 After: @@ -1929,54 +1881,28 @@ app/ui/settings/jobs/jobs.settings.component.html - 72 + 89 - The job will run after that job finishes. - + The job will run after that job finishes. At: app/ui/settings/jobs/jobs.settings.component.html - 79 + 96 app/ui/settings/jobs/jobs.settings.component.html - 89 + 106 At: - - Start now - + + ';' separated integers. + app/ui/settings/jobs/jobs.settings.component.html - 115 - - Start now - - - Trigger job run manually - - app/ui/settings/jobs/jobs.settings.component.html - 113 - - Trigger job run manually - - - Stop - - - app/ui/settings/jobs/jobs.settings.component.html - 120 - - Stop - - - ';' separated integers. - - app/ui/settings/jobs/jobs.settings.component.html - 183 + 175 ';' separated integers. @@ -1985,7 +1911,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 210 + 203 + Add Job @@ -1993,7 +1919,7 @@ Add new job app/ui/settings/jobs/jobs.settings.component.html - 225 + 218 Add new job @@ -2002,7 +1928,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 239 + 232 Select a job to schedule. @@ -2011,10 +1937,113 @@ app/ui/settings/jobs/jobs.settings.component.html - 247 + 240 - Add Job - + Add Job + + + Run now + + app/ui/settings/jobs/button/job-button.settings.component.html + 7 + + Run now + + + Trigger job run manually + + app/ui/settings/jobs/button/job-button.settings.component.html + 2 + + Trigger job run manually + + + Cancel + + app/ui/settings/jobs/button/job-button.settings.component.html + 15 + + Cancel + + + Size to generate + + src/frontend/app/model/backendtext.service.ts + 1 + + Size to generate + + + These thumbnails will be generated. The list should be a subset of the enabled thumbnail sizes + + src/frontend/app/model/backendtext.service.ts + 1 + + These thumbnails will be generated. The list should be a subset of the enabled thumbnail sizes + + + Indexed only + + src/frontend/app/model/backendtext.service.ts + 1 + + Indexed only + + + Only checks indexed files. + + src/frontend/app/model/backendtext.service.ts + 1 + + Only checks indexed files. + + + Indexing + + src/frontend/app/model/backendtext.service.ts + 1 + + Indexing + + + Database Reset + + src/frontend/app/model/backendtext.service.ts + 1 + + Database Reset + + + Thumbnail Generation + + src/frontend/app/model/backendtext.service.ts + 1 + + Thumbnail Generation + + + Photo Converting + + src/frontend/app/model/backendtext.service.ts + 1 + + Photo Converting + + + Video Converting + + src/frontend/app/model/backendtext.service.ts + 1 + + Video Converting + + + Temp Folder Cleaning + + src/frontend/app/model/backendtext.service.ts + 1 + + Temp Folder Cleaning Server error @@ -2339,6 +2368,22 @@ Resetting database + + Job started + + src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts + 1 + + Job started + + + Job stopped + + src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts + 1 + + Job stopped + Jobs @@ -2347,6 +2392,22 @@ Jobs + + periodic + + src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + 1 + + periodic + + + scheduled + + src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + 1 + + scheduled + Monday @@ -2411,33 +2472,69 @@ day - - Job + + processed - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts - 1 - - Job + processed - - started + + skipped - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - started + skipped - - stopped + + all - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - stopped + all + + + running + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + running + + + cancelling + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + cancelling + + + canceled + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + canceled + + + interrupted + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + interrupted + + + finished + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + finished Map @@ -2487,22 +2584,6 @@ Photo - - Photo converting started - - src/frontend/app/ui/settings/photo/photo.settings.component.ts - 1 - - Photo converting started - - - Photo converting interrupted - - src/frontend/app/ui/settings/photo/photo.settings.component.ts - 1 - - Photo converting interrupted - Random Photo @@ -2519,22 +2600,6 @@ Miniatură - - Thumbnail generation started - - src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts - 1 - - Thumbnail generation started - - - Thumbnail generation interrupted - - src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts - 1 - - Thumbnail generation interrupted - Password protection @@ -2575,22 +2640,6 @@ Video - - Video transcoding started - - src/frontend/app/ui/settings/video/video.settings.component.ts - 1 - - Video transcoding started - - - Video transcoding interrupted - - src/frontend/app/ui/settings/video/video.settings.component.ts - 1 - - Video transcoding interrupted - \ No newline at end of file diff --git a/src/frontend/translate/messages.ru.xlf b/src/frontend/translate/messages.ru.xlf index b77058bb..5f33f402 100644 --- a/src/frontend/translate/messages.ru.xlf +++ b/src/frontend/translate/messages.ru.xlf @@ -32,7 +32,7 @@ app/ui/settings/database/database.settings.component.html - 42 + 53 Имя пользователя @@ -60,7 +60,7 @@ app/ui/settings/database/database.settings.component.html - 49 + 60 Пароль @@ -419,6 +419,14 @@ Режим + + Up time + + app/ui/admin/admin.component.html + 115 + + Up time + Info @@ -533,7 +541,7 @@ app/ui/settings/map/map.settings.component.html - 61 + 62 Имя @@ -580,7 +588,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 244 + 237 Закрыть @@ -597,7 +605,7 @@ Type app/ui/settings/database/database.settings.component.html - 12 + 11 Type @@ -606,15 +614,34 @@ app/ui/settings/database/database.settings.component.html - 20 + 19 Установите вручную модуль node.js для использования mysql (npm install mysql) + + Database folder + + app/ui/settings/database/database.settings.component.html + 25 + + Database folder + + + + All file-based data will be stored here (sqlite database, user database in case of memory db, job history + data) + + + app/ui/settings/database/database.settings.component.html + 29 + + All file-based data will be stored here (sqlite database, user database in case of memory db, job history data) + Host app/ui/settings/database/database.settings.component.html - 28 + 39 app/ui/settings/basic/basic.settings.component.html @@ -626,48 +653,32 @@ Database app/ui/settings/database/database.settings.component.html - 35 + 46 База данных - - Storage file - - app/ui/settings/database/database.settings.component.html - 58 - - Storage file - - - User's file - - app/ui/settings/database/database.settings.component.html - 67 - - User's file - Save app/ui/settings/database/database.settings.component.html - 77 + 71 app/ui/settings/map/map.settings.component.html - 113 + 114 app/ui/settings/thumbnail/thumbnail.settings.component.html - 70 + 69 app/ui/settings/video/video.settings.component.html - 120 + 123 app/ui/settings/photo/photo.settings.component.html - 94 + 95 app/ui/settings/metafiles/metafile.settings.component.html @@ -683,7 +694,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 39 + 38 app/ui/settings/basic/basic.settings.component.html @@ -699,7 +710,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 203 + 196 Сохранить @@ -708,23 +719,23 @@ app/ui/settings/database/database.settings.component.html - 81 + 75 app/ui/settings/map/map.settings.component.html - 117 + 118 app/ui/settings/thumbnail/thumbnail.settings.component.html - 74 + 73 app/ui/settings/video/video.settings.component.html - 124 + 127 app/ui/settings/photo/photo.settings.component.html - 98 + 99 app/ui/settings/metafiles/metafile.settings.component.html @@ -740,7 +751,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 43 + 42 app/ui/settings/basic/basic.settings.component.html @@ -756,7 +767,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 207 + 200 Сбросить @@ -764,7 +775,7 @@ Use image markers app/ui/settings/map/map.settings.component.html - 24 + 25 Use image markers @@ -774,7 +785,7 @@ app/ui/settings/map/map.settings.component.html - 38 + 39 Map will use thumbnail images as markers instead of the default pin. @@ -782,7 +793,7 @@ Map provider app/ui/settings/map/map.settings.component.html - 46 + 47 Провайдер онлайн карт @@ -790,7 +801,7 @@ Tile Url* app/ui/settings/map/map.settings.component.html - 62 + 63 Tile Url* @@ -798,7 +809,7 @@ *The map module will use these urls to fetch the map tiles. app/ui/settings/map/map.settings.component.html - 87 + 88 *The map module will use these urls to fetch the map tiles. @@ -807,7 +818,7 @@ app/ui/settings/map/map.settings.component.html - 92 + 93 + Add Layer @@ -815,7 +826,7 @@ Mapbox access token app/ui/settings/map/map.settings.component.html - 98 + 99 Токен доступа Mapbox @@ -823,7 +834,7 @@ MapBox needs an access token to work, create one at app/ui/settings/map/map.settings.component.html - 104 + 105 Для работы MapBox нужен токен, создайте его на @@ -831,7 +842,7 @@ Thumbnail Quality app/ui/settings/thumbnail/thumbnail.settings.component.html - 12 + 11 Качество миниатюр @@ -839,15 +850,23 @@ High quality may be slow. Especially with Jimp. app/ui/settings/thumbnail/thumbnail.settings.component.html - 26 + 25 Высокое качество может потребовать больше времени на создание. Особенно с Jimp. + + Icon size + + app/ui/settings/thumbnail/thumbnail.settings.component.html + 31 + + Icon size + Icon size (used on maps) app/ui/settings/thumbnail/thumbnail.settings.component.html - 41 + 40 Размер иконки (используется на картах) @@ -855,7 +874,7 @@ Thumbnail sizes app/ui/settings/thumbnail/thumbnail.settings.component.html - 47 + 46 Размеры миниатюр @@ -863,7 +882,7 @@ Size of the thumbnails. app/ui/settings/thumbnail/thumbnail.settings.component.html - 54 + 53 Размер миниатюр. @@ -873,44 +892,21 @@ app/ui/settings/thumbnail/thumbnail.settings.component.html - 56 + 55 The best matching size will be generated. (More sizes give better quality, but use more storage and CPU to render.) - - ';' separated integers. If size is 160, that shorter side of the thumbnail will have 160 + + ';' separated integers. If size is 240, that shorter side of the thumbnail will have 160 pixels. app/ui/settings/thumbnail/thumbnail.settings.component.html - 60 + 59 - ';' separated integers. If size is 160, that shorter side of the thumbnail will have 160 pixels. - - - Generate thumbnails now - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 84 - - Generate thumbnails now - - - Generates all thumbnails now - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 81 - - Generates all thumbnails now - - - Cancel thumbnail generation - - - app/ui/settings/thumbnail/thumbnail.settings.component.html - 90 - - Cancel thumbnail generation + ';' separated integers. If size is 240, that shorter side of the thumbnail will have 160 + pixels. + Video support uses ffmpeg. ffmpeg and ffprobe binaries need to be available in the PATH or @@ -985,7 +981,7 @@ app/ui/settings/photo/photo.settings.component.html - 78 + 79 Resolution @@ -1033,46 +1029,13 @@ 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. - - Transcode videos now - - app/ui/settings/video/video.settings.component.html - 134 - - Transcode videos now - - - Indexes the folders - - app/ui/settings/video/video.settings.component.html - 131 - - - app/ui/settings/photo/photo.settings.component.html - 105 - - - app/ui/settings/indexing/indexing.settings.component.html - 118 - - Индексирует папки - - - Cancel transcoding - - - app/ui/settings/video/video.settings.component.html - 140 - - Cancel transcoding - It is highly recommended to use hardware accelerated (sharp or gm) lib for thumbnail generation app/ui/settings/photo/photo.settings.component.html - 8 + 9 Для создания миниатюр рекомендуется использовать библиотеку с аппаратным ускорением (sharp или gm) @@ -1080,7 +1043,7 @@ Thumbnail generation library app/ui/settings/photo/photo.settings.component.html - 14 + 15 Библиотека для создания миниатюр @@ -1089,7 +1052,7 @@ app/ui/settings/photo/photo.settings.component.html - 22 + 23 Убедитесь, что модуль node.js sharp установлен. @@ -1097,7 +1060,7 @@ Make sure that gm node module and app/ui/settings/photo/photo.settings.component.html - 26 + 27 Убедитесь, что модуль node.js gm и @@ -1105,7 +1068,7 @@ are installed (npm install sharp). app/ui/settings/photo/photo.settings.component.html - 28 + 29 установлен (npm install sharp). @@ -1113,7 +1076,7 @@ Photo converting: app/ui/settings/photo/photo.settings.component.html - 36 + 37 Photo converting: @@ -1121,7 +1084,7 @@ Converting app/ui/settings/photo/photo.settings.component.html - 39 + 40 Converting @@ -1130,7 +1093,7 @@ loads the original) app/ui/settings/photo/photo.settings.component.html - 53 + 54 Downsizes photos for faster preview loading. (Zooming in to the photo loads the original) @@ -1138,7 +1101,7 @@ On the fly converting app/ui/settings/photo/photo.settings.component.html - 59 + 60 On the fly converting @@ -1146,7 +1109,7 @@ Converts photos on the fly, when they are requested. app/ui/settings/photo/photo.settings.component.html - 73 + 74 Converts photos on the fly, when they are requested. @@ -1156,27 +1119,10 @@ keeping the aspect ratio. app/ui/settings/photo/photo.settings.component.html - 85 + 86 The shorter edge of the converted photo will be scaled down to this, while keeping the aspect ratio. - - Convert photos now - - app/ui/settings/photo/photo.settings.component.html - 108 - - Convert photos now - - - Cancel converting - - - app/ui/settings/photo/photo.settings.component.html - 114 - - Cancel converting - Reads and show *.gpx files on the map @@ -1261,7 +1207,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 27 + 26 This feature enables you to generate 'random photo' urls. That URL returns a photo random selected from your gallery. You can use the url with 3rd party application like random changing desktop background. @@ -1271,7 +1217,7 @@ app/ui/settings/random-photo/random-photo.settings.component.html - 34 + 33 "Случайные Фото" не поддерживают указанные настройки @@ -1731,43 +1677,17 @@ Note: search only works among the indexed directories app/ui/settings/indexing/indexing.settings.component.html - 106 + 107 Примечание: поиск работает только с проиндексированными каталогами - - Index folders now - - app/ui/settings/indexing/indexing.settings.component.html - 121 - - Index folders now - - - Cancel converting - - - app/ui/settings/indexing/indexing.settings.component.html - 127 - - Cancel converting - - - Reset Indexes - - - app/ui/settings/indexing/indexing.settings.component.html - 131 - - Удалить индекс - Statistic: app/ui/settings/indexing/indexing.settings.component.html - 137 + 130 Статистика: @@ -1775,7 +1695,7 @@ Folders app/ui/settings/indexing/indexing.settings.component.html - 141 + 134 Папки @@ -1783,7 +1703,7 @@ Photos app/ui/settings/indexing/indexing.settings.component.html - 145 + 138 Фото @@ -1791,7 +1711,7 @@ Videos app/ui/settings/indexing/indexing.settings.component.html - 149 + 142 Видео @@ -1799,7 +1719,7 @@ Size app/ui/settings/indexing/indexing.settings.component.html - 154 + 147 Размер @@ -1811,26 +1731,16 @@ app/ui/settings/jobs/progress/job-progress.settings.component.html 2 - - Last run: - + Last run: Run between app/ui/settings/jobs/progress/job-progress.settings.component.html - 6 + 5 Run between - - done/all - - app/ui/settings/jobs/progress/job-progress.settings.component.html - 10 - - done/all - Status @@ -1839,19 +1749,19 @@ Status - - Stopping + + Cancelling... app/ui/settings/jobs/progress/job-progress.settings.component.html - 24 + 32 - Stopping + Cancelling... time elapsed app/ui/settings/jobs/progress/job-progress.settings.component.html - 31 + 43 time elapsed @@ -1859,19 +1769,61 @@ time left app/ui/settings/jobs/progress/job-progress.settings.component.html - 51 + 45 time left + + Processed + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 82 + + Processed + + + Skipped + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 83 + + Skipped + + + Left + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 84 + + Left + + + All + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 85 + + All + + + + Logs + + + app/ui/settings/jobs/progress/job-progress.settings.component.html + 110 + + Logs + every app/ui/settings/jobs/jobs.settings.component.html - 18 + 20 app/ui/settings/jobs/jobs.settings.component.html - 97 + 114 every @@ -1879,7 +1831,7 @@ never app/ui/settings/jobs/jobs.settings.component.html - 23 + 25 never @@ -1887,7 +1839,7 @@ after app/ui/settings/jobs/jobs.settings.component.html - 25 + 27 after @@ -1895,7 +1847,7 @@ Job: app/ui/settings/jobs/jobs.settings.component.html - 39 + 49 Job: @@ -1903,7 +1855,7 @@ Periodicity: app/ui/settings/jobs/jobs.settings.component.html - 45 + 62 Periodicity: @@ -1912,7 +1864,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 55 + 72 Set the time to run the job. @@ -1920,7 +1872,7 @@ After: app/ui/settings/jobs/jobs.settings.component.html - 61 + 78 After: @@ -1929,54 +1881,28 @@ app/ui/settings/jobs/jobs.settings.component.html - 72 + 89 - The job will run after that job finishes. - + The job will run after that job finishes. At: app/ui/settings/jobs/jobs.settings.component.html - 79 + 96 app/ui/settings/jobs/jobs.settings.component.html - 89 + 106 At: - - Start now - + + ';' separated integers. + app/ui/settings/jobs/jobs.settings.component.html - 115 - - Start now - - - Trigger job run manually - - app/ui/settings/jobs/jobs.settings.component.html - 113 - - Trigger job run manually - - - Stop - - - app/ui/settings/jobs/jobs.settings.component.html - 120 - - Stop - - - ';' separated integers. - - app/ui/settings/jobs/jobs.settings.component.html - 183 + 175 ';' separated integers. @@ -1985,7 +1911,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 210 + 203 + Add Job @@ -1993,7 +1919,7 @@ Add new job app/ui/settings/jobs/jobs.settings.component.html - 225 + 218 Add new job @@ -2002,7 +1928,7 @@ app/ui/settings/jobs/jobs.settings.component.html - 239 + 232 Select a job to schedule. @@ -2011,10 +1937,113 @@ app/ui/settings/jobs/jobs.settings.component.html - 247 + 240 - Add Job - + Add Job + + + Run now + + app/ui/settings/jobs/button/job-button.settings.component.html + 7 + + Run now + + + Trigger job run manually + + app/ui/settings/jobs/button/job-button.settings.component.html + 2 + + Trigger job run manually + + + Cancel + + app/ui/settings/jobs/button/job-button.settings.component.html + 15 + + Cancel + + + Size to generate + + src/frontend/app/model/backendtext.service.ts + 1 + + Size to generate + + + These thumbnails will be generated. The list should be a subset of the enabled thumbnail sizes + + src/frontend/app/model/backendtext.service.ts + 1 + + These thumbnails will be generated. The list should be a subset of the enabled thumbnail sizes + + + Indexed only + + src/frontend/app/model/backendtext.service.ts + 1 + + Indexed only + + + Only checks indexed files. + + src/frontend/app/model/backendtext.service.ts + 1 + + Only checks indexed files. + + + Indexing + + src/frontend/app/model/backendtext.service.ts + 1 + + Indexing + + + Database Reset + + src/frontend/app/model/backendtext.service.ts + 1 + + Database Reset + + + Thumbnail Generation + + src/frontend/app/model/backendtext.service.ts + 1 + + Thumbnail Generation + + + Photo Converting + + src/frontend/app/model/backendtext.service.ts + 1 + + Photo Converting + + + Video Converting + + src/frontend/app/model/backendtext.service.ts + 1 + + Video Converting + + + Temp Folder Cleaning + + src/frontend/app/model/backendtext.service.ts + 1 + + Temp Folder Cleaning Server error @@ -2339,6 +2368,22 @@ Resetting database + + Job started + + src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts + 1 + + Job started + + + Job stopped + + src/frontend/app/ui/settings/jobs/button/job-button.settings.component.ts + 1 + + Job stopped + Jobs @@ -2347,6 +2392,22 @@ Jobs + + periodic + + src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + 1 + + periodic + + + scheduled + + src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + 1 + + scheduled + Monday @@ -2411,33 +2472,69 @@ day - - Job + + processed - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts - 1 - - Job + processed - - started + + skipped - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - started + skipped - - stopped + + all - src/frontend/app/ui/settings/jobs/jobs.settings.component.ts + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts 1 - stopped + all + + + running + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + running + + + cancelling + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + cancelling + + + canceled + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + canceled + + + interrupted + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + interrupted + + + finished + + src/frontend/app/ui/settings/jobs/progress/job-progress.settings.component.ts + 1 + + finished Map @@ -2487,22 +2584,6 @@ Photo - - Photo converting started - - src/frontend/app/ui/settings/photo/photo.settings.component.ts - 1 - - Photo converting started - - - Photo converting interrupted - - src/frontend/app/ui/settings/photo/photo.settings.component.ts - 1 - - Photo converting interrupted - Random Photo @@ -2519,22 +2600,6 @@ Миниатюра - - Thumbnail generation started - - src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts - 1 - - Thumbnail generation started - - - Thumbnail generation interrupted - - src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.ts - 1 - - Thumbnail generation interrupted - Password protection @@ -2575,22 +2640,6 @@ Видео - - Video transcoding started - - src/frontend/app/ui/settings/video/video.settings.component.ts - 1 - - Video transcoding started - - - Video transcoding interrupted - - src/frontend/app/ui/settings/video/video.settings.component.ts - 1 - - Video transcoding interrupted - \ No newline at end of file