diff --git a/README.md b/README.md index 29286c716..c50d24255 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ npm start To configure it, run `PiGallery2` first to create `config.json` file, then edit it and restart. The app has a nice UI for settings, you may use that too. -Default user: `admin` pass: `admin`. (It is not possible to change the admin password, you need to create an other user and delete the default `admin` user, see #220) +Default user: `admin` pass: `admin`. (It is not possible to change the admin password, you need to create another user and delete the default `admin` user, see #220) **Note**: First run, you might have file access issues and port 80 issue, see [#115](https://github.com/bpatrik/pigallery2/issues/115). Running `npm start -- --Server-port=8080` will start the app on port 8080 that does not require `root` diff --git a/docs/index.html b/docs/index.html index 77b0ad179..aeab4d295 100644 --- a/docs/index.html +++ b/docs/index.html @@ -139,7 +139,7 @@

Advanced searching

keyword:"house"
caption:"caption"
- directory:"dir name/an other dir"
+ directory:"dir name/another dir"
file_name:"img.jpg",
person:"John",
position:"USA" # use city, state, country names
diff --git a/src/backend/model/jobs/JobManager.ts b/src/backend/model/jobs/JobManager.ts index 2ca98e37b..cc69757c2 100644 --- a/src/backend/model/jobs/JobManager.ts +++ b/src/backend/model/jobs/JobManager.ts @@ -59,7 +59,7 @@ export class JobManager implements IJobManager, IJobListener { (allowParallelRun === false && this.JobRunning === true) || this.JobNoParallelRunning === true ) { - throw new Error("Can't start this job while an other is running"); + throw new Error("Can't start this job while another is running"); } const t = this.findJob(jobName); 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 0d285dc95..f1407d1eb 100644 --- a/src/frontend/app/ui/settings/jobs/jobs.settings.component.html +++ b/src/frontend/app/ui/settings/jobs/jobs.settings.component.html @@ -141,7 +141,7 @@
[(ngModel)]="schedule.allowParallelRun"> Enables the job to start even if an other job is already running. + i18n>Enables the job to start even if another job is already running. diff --git a/src/frontend/translate/messages.cn.xlf b/src/frontend/translate/messages.cn.xlf index b59ae793b..450e0eeef 100644 --- a/src/frontend/translate/messages.cn.xlf +++ b/src/frontend/translate/messages.cn.xlf @@ -1961,7 +1961,7 @@ 允许并行运行 - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. src/frontend/app/ui/settings/jobs/jobs.settings.component.html 143,144 diff --git a/src/frontend/translate/messages.de.xlf b/src/frontend/translate/messages.de.xlf index bbc3b7f8b..590b5942d 100644 --- a/src/frontend/translate/messages.de.xlf +++ b/src/frontend/translate/messages.de.xlf @@ -1961,7 +1961,7 @@ parallelen Durchlauf zulassen - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. src/frontend/app/ui/settings/jobs/jobs.settings.component.html 143,144 diff --git a/src/frontend/translate/messages.en.xlf b/src/frontend/translate/messages.en.xlf index ba0074db4..71c5eb45a 100644 --- a/src/frontend/translate/messages.en.xlf +++ b/src/frontend/translate/messages.en.xlf @@ -1961,12 +1961,12 @@ Allow parallel run - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. src/frontend/app/ui/settings/jobs/jobs.settings.component.html 143,144 - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. ';' separated integers. diff --git a/src/frontend/translate/messages.es.xlf b/src/frontend/translate/messages.es.xlf index 2a60aa078..cde3e1f49 100644 --- a/src/frontend/translate/messages.es.xlf +++ b/src/frontend/translate/messages.es.xlf @@ -1961,7 +1961,7 @@ Permitir la ejecución en paralelo - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. src/frontend/app/ui/settings/jobs/jobs.settings.component.html 143,144 diff --git a/src/frontend/translate/messages.fr.xlf b/src/frontend/translate/messages.fr.xlf index 24ef6750e..5ddd47d36 100644 --- a/src/frontend/translate/messages.fr.xlf +++ b/src/frontend/translate/messages.fr.xlf @@ -1961,7 +1961,7 @@ Autoriser exécution parallèle - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. src/frontend/app/ui/settings/jobs/jobs.settings.component.html 143,144 diff --git a/src/frontend/translate/messages.hu.xlf b/src/frontend/translate/messages.hu.xlf index bee566325..bd6746697 100644 --- a/src/frontend/translate/messages.hu.xlf +++ b/src/frontend/translate/messages.hu.xlf @@ -1961,7 +1961,7 @@ Párhuzamos futtatás - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. src/frontend/app/ui/settings/jobs/jobs.settings.component.html 143,144 diff --git a/src/frontend/translate/messages.id.xlf b/src/frontend/translate/messages.id.xlf index e3371d3fe..4e4f10cec 100644 --- a/src/frontend/translate/messages.id.xlf +++ b/src/frontend/translate/messages.id.xlf @@ -1961,7 +1961,7 @@ Ijinkan menjalankan paralel - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. src/frontend/app/ui/settings/jobs/jobs.settings.component.html 143,144 diff --git a/src/frontend/translate/messages.it.xlf b/src/frontend/translate/messages.it.xlf index 4152fba89..f222e797c 100644 --- a/src/frontend/translate/messages.it.xlf +++ b/src/frontend/translate/messages.it.xlf @@ -1961,7 +1961,7 @@ Consentire il funzionamento in parallelo - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. src/frontend/app/ui/settings/jobs/jobs.settings.component.html 143,144 diff --git a/src/frontend/translate/messages.pl.xlf b/src/frontend/translate/messages.pl.xlf index dd5fd0def..2a36037b5 100644 --- a/src/frontend/translate/messages.pl.xlf +++ b/src/frontend/translate/messages.pl.xlf @@ -1961,7 +1961,7 @@ Równoczesne wykonanie zadań - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. src/frontend/app/ui/settings/jobs/jobs.settings.component.html 143,144 diff --git a/src/frontend/translate/messages.ro.xlf b/src/frontend/translate/messages.ro.xlf index 3e6921537..11d5f696d 100644 --- a/src/frontend/translate/messages.ro.xlf +++ b/src/frontend/translate/messages.ro.xlf @@ -1961,12 +1961,12 @@ Allow parallel run - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. src/frontend/app/ui/settings/jobs/jobs.settings.component.html 143,144 - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. ';' separated integers. diff --git a/src/frontend/translate/messages.ru.xlf b/src/frontend/translate/messages.ru.xlf index dad5265a6..8fde47650 100644 --- a/src/frontend/translate/messages.ru.xlf +++ b/src/frontend/translate/messages.ru.xlf @@ -1961,12 +1961,12 @@ Allow parallel run - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. src/frontend/app/ui/settings/jobs/jobs.settings.component.html 143,144 - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. ';' separated integers. diff --git a/src/frontend/translate/messages.sv.xlf b/src/frontend/translate/messages.sv.xlf index 90a269db0..1560f224c 100644 --- a/src/frontend/translate/messages.sv.xlf +++ b/src/frontend/translate/messages.sv.xlf @@ -1961,7 +1961,7 @@ Tillåt parallell körning - Enables the job to start even if an other job is already running. + Enables the job to start even if another job is already running. src/frontend/app/ui/settings/jobs/jobs.settings.component.html 143,144