From: Nik Okuntseff Date: Tue, 13 Feb 2018 15:24:15 +0000 (+0000) Subject: Work in progress making Allow overlap configurable. X-Git-Tag: timetracker_1.19-1~1130 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a94cf5b21ee9cc76ff7dda42563444011800f462;p=timetracker.git Work in progress making Allow overlap configurable. --- diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php index 0be2f1f4..df19a2cf 100644 --- a/WEB-INF/resources/ca.lang.php +++ b/WEB-INF/resources/ca.lang.php @@ -485,6 +485,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php index 802bf250..680b28e9 100644 --- a/WEB-INF/resources/cs.lang.php +++ b/WEB-INF/resources/cs.lang.php @@ -500,6 +500,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php index 12873ffe..9e56b50f 100644 --- a/WEB-INF/resources/da.lang.php +++ b/WEB-INF/resources/da.lang.php @@ -432,6 +432,8 @@ $i18n_key_words = array( 'form.profile.type_all' => 'Alle', 'form.profile.type_start_finish' => 'Start og slut', 'form.profile.type_duration' => 'Varighed', +// TODO: translate the following. +// 'form.profile.allow_overlap' => 'Allow overlap', 'form.profile.uncompleted_indicators' => 'Uafsluttede indikatore', 'form.profile.uncompleted_indicators_none' => 'Vis ikke', 'form.profile.uncompleted_indicators_show' => 'Vis', diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php index 52315361..d3f43242 100644 --- a/WEB-INF/resources/de.lang.php +++ b/WEB-INF/resources/de.lang.php @@ -431,6 +431,7 @@ $i18n_key_words = array( 'form.profile.type_start_finish' => 'Start und Ende', 'form.profile.type_duration' => 'Dauer', // TODO: translate the following. +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', //'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php index 78d32ecb..a417f62b 100644 --- a/WEB-INF/resources/en.lang.php +++ b/WEB-INF/resources/en.lang.php @@ -426,6 +426,7 @@ $i18n_key_words = array( 'form.profile.type_all' => 'all', 'form.profile.type_start_finish' => 'start and finish', 'form.profile.type_duration' => 'duration', +'form.profile.allow_overlap' => 'Allow overlap', 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', 'form.profile.uncompleted_indicators_none' => 'do not show', 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php index fa89d9c8..c15cac5f 100644 --- a/WEB-INF/resources/es.lang.php +++ b/WEB-INF/resources/es.lang.php @@ -498,6 +498,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php index 35806dd0..b774f74b 100644 --- a/WEB-INF/resources/et.lang.php +++ b/WEB-INF/resources/et.lang.php @@ -496,6 +496,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php index 1ef2f4bf..0a3a2778 100644 --- a/WEB-INF/resources/fa.lang.php +++ b/WEB-INF/resources/fa.lang.php @@ -462,6 +462,7 @@ $i18n_key_words = array( 'form.profile.type_start_finish' => 'شروع و اتمام', 'form.profile.type_duration' => 'مدت زمان', // TODO: translate the following. +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php index 479cbf6b..ef65a2f1 100644 --- a/WEB-INF/resources/fi.lang.php +++ b/WEB-INF/resources/fi.lang.php @@ -440,6 +440,7 @@ $i18n_key_words = array( 'form.profile.type_start_finish' => 'aloitus ja lopetus', 'form.profile.type_duration' => 'kesto', // TODO: translate the following. +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php index 05f4b259..7d2b924f 100644 --- a/WEB-INF/resources/fr.lang.php +++ b/WEB-INF/resources/fr.lang.php @@ -430,6 +430,7 @@ $i18n_key_words = array( 'form.profile.type_start_finish' => 'Début et fin', 'form.profile.type_duration' => 'Durée', // TODO: translate the following. +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php index 55d6e867..03669f76 100644 --- a/WEB-INF/resources/he.lang.php +++ b/WEB-INF/resources/he.lang.php @@ -467,6 +467,7 @@ $i18n_key_words = array( 'form.profile.type_start_finish' => 'התחלה וסיום', 'form.profile.type_duration' => 'משך זמן', // TODO: translate the following. +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php index 7c824b87..fca0e8d4 100644 --- a/WEB-INF/resources/hu.lang.php +++ b/WEB-INF/resources/hu.lang.php @@ -495,6 +495,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php index 04b63d88..e834fcad 100644 --- a/WEB-INF/resources/it.lang.php +++ b/WEB-INF/resources/it.lang.php @@ -432,6 +432,8 @@ $i18n_key_words = array( 'form.profile.type_all' => 'tutto', 'form.profile.type_start_finish' => 'inizio e fine', 'form.profile.type_duration' => 'durata', +// TODO: translate the following. +// 'form.profile.allow_overlap' => 'Allow overlap', 'form.profile.uncompleted_indicators' => 'Indicatori incompleti', 'form.profile.uncompleted_indicators_none' => 'non mostrare', 'form.profile.uncompleted_indicators_show' => 'mostra', diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php index fc420877..1458a9c1 100644 --- a/WEB-INF/resources/ja.lang.php +++ b/WEB-INF/resources/ja.lang.php @@ -485,6 +485,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php index 680b01c4..d1fdc85b 100644 --- a/WEB-INF/resources/ko.lang.php +++ b/WEB-INF/resources/ko.lang.php @@ -487,6 +487,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php index e96e808f..7f38d369 100644 --- a/WEB-INF/resources/nl.lang.php +++ b/WEB-INF/resources/nl.lang.php @@ -425,12 +425,14 @@ $i18n_key_words = array( 'form.profile.mode_projects' => 'projecten', 'form.profile.mode_projects_and_tasks' => 'projecten en taken', 'form.profile.record_type' => 'Registratie type', -'form.profile.uncompleted_indicators' => 'Onvolledige indicatoren', -'form.profile.uncompleted_indicators_none' => 'verberg', -'form.profile.uncompleted_indicators_show' => 'toon', 'form.profile.type_all' => 'begin, einde en duur', 'form.profile.type_start_finish' => 'begin en einde', 'form.profile.type_duration' => 'duur', +// TODO: translate the following. +// 'form.profile.allow_overlap' => 'Allow overlap', +'form.profile.uncompleted_indicators' => 'Onvolledige indicatoren', +'form.profile.uncompleted_indicators_none' => 'verberg', +'form.profile.uncompleted_indicators_show' => 'toon', 'form.profile.plugins' => 'Plugins', // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report. diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php index 8c23797c..150ecb7b 100644 --- a/WEB-INF/resources/no.lang.php +++ b/WEB-INF/resources/no.lang.php @@ -483,6 +483,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php index 5ef7b601..5e4f251e 100644 --- a/WEB-INF/resources/pl.lang.php +++ b/WEB-INF/resources/pl.lang.php @@ -443,6 +443,7 @@ $i18n_key_words = array( 'form.profile.type_start_finish' => 'początek i koniec', 'form.profile.type_duration' => 'czas trwania', // TODO: translate the following. +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php index 387abe05..714d2e79 100644 --- a/WEB-INF/resources/pt-br.lang.php +++ b/WEB-INF/resources/pt-br.lang.php @@ -438,6 +438,7 @@ $i18n_key_words = array( 'form.profile.type_start_finish' => 'início e fim', 'form.profile.type_duration' => 'duração', // TODO: translate the following. +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php index 2084757c..b8648fda 100644 --- a/WEB-INF/resources/pt.lang.php +++ b/WEB-INF/resources/pt.lang.php @@ -476,6 +476,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php index 129473eb..8a4b2b66 100644 --- a/WEB-INF/resources/ro.lang.php +++ b/WEB-INF/resources/ro.lang.php @@ -493,6 +493,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php index 2f22c81b..7ccbeda0 100644 --- a/WEB-INF/resources/ru.lang.php +++ b/WEB-INF/resources/ru.lang.php @@ -424,6 +424,7 @@ $i18n_key_words = array( 'form.profile.type_all' => 'все', 'form.profile.type_start_finish' => 'начало и конец', 'form.profile.type_duration' => 'длительность', +'form.profile.allow_overlap' => 'Возможное перекрывание', 'form.profile.uncompleted_indicators' => 'Индикаторы незавершения', 'form.profile.uncompleted_indicators_none' => 'не показывать', 'form.profile.uncompleted_indicators_show' => 'показывать', diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php index a2bd1b17..28f09a53 100644 --- a/WEB-INF/resources/sk.lang.php +++ b/WEB-INF/resources/sk.lang.php @@ -459,6 +459,7 @@ $i18n_key_words = array( 'form.profile.type_start_finish' => 'začiatok a koniec', 'form.profile.type_duration' => 'trvanie', // TODO: translate the following. +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php index 27fd0c3b..7bb52f75 100644 --- a/WEB-INF/resources/sl.lang.php +++ b/WEB-INF/resources/sl.lang.php @@ -472,6 +472,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php index c3353baa..ebb4751a 100644 --- a/WEB-INF/resources/sr.lang.php +++ b/WEB-INF/resources/sr.lang.php @@ -441,6 +441,7 @@ $i18n_key_words = array( 'form.profile.type_start_finish' => 'početak i kraj', 'form.profile.type_duration' => 'trajanje', // TODO: translate the following. +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php index 12d8c10c..96c8ee3f 100644 --- a/WEB-INF/resources/sv.lang.php +++ b/WEB-INF/resources/sv.lang.php @@ -437,6 +437,8 @@ $i18n_key_words = array( 'form.profile.type_all' => 'Alla', 'form.profile.type_start_finish' => 'Starttid och sluttid', 'form.profile.type_duration' => 'Varaktighet', +// TODO: translate the following. +// 'form.profile.allow_overlap' => 'Allow overlap', 'form.profile.uncompleted_indicators' => 'Indikatorer för oavslutad registrering', 'form.profile.uncompleted_indicators_none' => 'Visa inte', 'form.profile.uncompleted_indicators_show' => 'Visa', diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php index 25faa91b..44e2b88c 100644 --- a/WEB-INF/resources/tr.lang.php +++ b/WEB-INF/resources/tr.lang.php @@ -504,6 +504,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php index c2f7cd68..3ae2f5d0 100644 --- a/WEB-INF/resources/zh-cn.lang.php +++ b/WEB-INF/resources/zh-cn.lang.php @@ -472,6 +472,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php index a9c842c3..9b3de6ec 100644 --- a/WEB-INF/resources/zh-tw.lang.php +++ b/WEB-INF/resources/zh-tw.lang.php @@ -482,6 +482,7 @@ $i18n_key_words = array( // 'form.profile.type_all' => 'all', // 'form.profile.type_start_finish' => 'start and finish', // 'form.profile.type_duration' => 'duration', +// 'form.profile.allow_overlap' => 'Allow overlap', // 'form.profile.uncompleted_indicators' => 'Uncompleted indicators', // 'form.profile.uncompleted_indicators_none' => 'do not show', // 'form.profile.uncompleted_indicators_show' => 'show', diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 392fdd9a..f877ab05 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.17.16.3984 | Copyright © Anuko | +  Anuko Time Tracker 1.17.16.3985 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve}