diff options
Diffstat (limited to 'app')
35 files changed, 104 insertions, 22 deletions
diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php index 59ece6fd..15f2ddb5 100644 --- a/app/Locale/bs_BA/translations.php +++ b/app/Locale/bs_BA/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/ca_ES/translations.php b/app/Locale/ca_ES/translations.php index 38ff4aaf..11093d9e 100644 --- a/app/Locale/ca_ES/translations.php +++ b/app/Locale/ca_ES/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php index 50f1ad77..1932c6a0 100644 --- a/app/Locale/cs_CZ/translations.php +++ b/app/Locale/cs_CZ/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index e7b75a23..e3fffc63 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -594,7 +594,7 @@ return array( 'Factor to calculate new due date: ' => 'Faktor til beregning af ny forfaldsdato: ', 'Month(s)' => 'Måned(er)', 'Recurrence' => 'Gentagelse', - 'This task has been created by:' => 'Opgave oprettet af:', + 'This task has been created by: ' => 'Opgave oprettet af: ', 'Recurrent task has been generated:' => 'Gentagende opgave oprettet:', 'Timeframe to calculate new due date: ' => 'Tidsramme til beregning af ny forfaldsdato: ', 'Trigger to generate recurrent task: ' => 'Udløser for at generere gentagende opgave: ', @@ -1375,4 +1375,7 @@ return array( 'seconds' => 'sekunder', 'Assign automatically a color when preset start date is reached' => 'Tildele automatisk farve når forudindstillet startdato er nået', 'Move the task to another column once a predefined start date is reached' => 'Flytte opgave til anden kolonne når forudbestemt startdato er nået', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index dbc859a7..b8b60380 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -1375,4 +1375,7 @@ return array( 'seconds' => 'Sekunden', 'Assign automatically a color when preset start date is reached' => 'Automatisch eine Farbe zuweisen, wenn das Startdatum erreicht ist', 'Move the task to another column once a predefined start date is reached' => 'Verschieben des Tasks in eine andere Spalte, wenn das definierte Startdatum erreicht ist', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php index 86116258..e98f05f4 100644 --- a/app/Locale/el_GR/translations.php +++ b/app/Locale/el_GR/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index dae1f661..25c09bbc 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index e78ccc91..98a751c7 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index b6d7865d..73bb7b0b 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -1375,4 +1375,7 @@ return array( 'seconds' => 'secondes', 'Assign automatically a color when preset start date is reached' => 'Assigner automatiquement une couleur lorsque la date de début est passée', 'Move the task to another column once a predefined start date is reached' => 'Déplaçer la tâche vers une autre colonne lorsque la date de début est passée', + 'This task is now linked to the task %s with the relation "%s"' => 'Cette tâche est maintenant liée à la tâche %s avec la relation « %s »', + 'The link with the relation "%s" to the task %s has been removed' => 'Le lien avec la relation « %s » de la tâche %s a été supprimé', + 'Custom Filter:' => 'Filtre personalisé :', ); diff --git a/app/Locale/hr_HR/translations.php b/app/Locale/hr_HR/translations.php index bb085e88..255fe131 100644 --- a/app/Locale/hr_HR/translations.php +++ b/app/Locale/hr_HR/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index 13b4db05..f26eed90 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php index ef3f48a5..a8064bf4 100644 --- a/app/Locale/id_ID/translations.php +++ b/app/Locale/id_ID/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index 895c06b4..0d001dc3 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index b62e8722..c9935ceb 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/ko_KR/translations.php b/app/Locale/ko_KR/translations.php index 12f6d4a9..a04eb044 100644 --- a/app/Locale/ko_KR/translations.php +++ b/app/Locale/ko_KR/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php index 76aba90a..35111ae5 100644 --- a/app/Locale/my_MY/translations.php +++ b/app/Locale/my_MY/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php index 76eb5ff0..9494dcb0 100644 --- a/app/Locale/nb_NO/translations.php +++ b/app/Locale/nb_NO/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php index ddf01066..e6c3b1a4 100644 --- a/app/Locale/nl_NL/translations.php +++ b/app/Locale/nl_NL/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index 6d34613e..a3cd5a5d 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index f6a7b92f..674c5f64 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -1375,4 +1375,7 @@ return array( 'seconds' => 'segundos', 'Assign automatically a color when preset start date is reached' => 'Atribuir automaticamente uma cor quando a data de início for atingida', 'Move the task to another column once a predefined start date is reached' => 'Mover a tarefa para outra coluna quando a data de início for atingida', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php index fe5a8189..01d58d16 100644 --- a/app/Locale/pt_PT/translations.php +++ b/app/Locale/pt_PT/translations.php @@ -1375,4 +1375,7 @@ return array( 'seconds' => 'segundos', 'Assign automatically a color when preset start date is reached' => 'Atribuir automaticamente uma cor quando a data de início for atingida', 'Move the task to another column once a predefined start date is reached' => 'Mover a tarefa para outra coluna quando a data de início for atingida', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/ro_RO/translations.php b/app/Locale/ro_RO/translations.php index d132b458..56dcceeb 100644 --- a/app/Locale/ro_RO/translations.php +++ b/app/Locale/ro_RO/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index e4c9621f..3c64e957 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -1375,4 +1375,7 @@ return array( 'seconds' => 'секунд', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php index ebf14021..bc4c304a 100644 --- a/app/Locale/sr_Latn_RS/translations.php +++ b/app/Locale/sr_Latn_RS/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index 2495fc0f..e80feaed 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index 029d4863..c60dd782 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php index c306b597..bea79a64 100644 --- a/app/Locale/tr_TR/translations.php +++ b/app/Locale/tr_TR/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/vi_VN/translations.php b/app/Locale/vi_VN/translations.php index 3f6d2058..c13e3f8e 100644 --- a/app/Locale/vi_VN/translations.php +++ b/app/Locale/vi_VN/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index b4ff932b..8b463b12 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -1375,4 +1375,7 @@ return array( 'seconds' => '秒', 'Assign automatically a color when preset start date is reached' => '当到达预设起始日期时自动指派颜色', 'Move the task to another column once a predefined start date is reached' => '当到达预定起始日期时移动任务到另一栏目', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Locale/zh_TW/translations.php b/app/Locale/zh_TW/translations.php index b933689b..55b1425a 100644 --- a/app/Locale/zh_TW/translations.php +++ b/app/Locale/zh_TW/translations.php @@ -1375,4 +1375,7 @@ return array( // 'seconds' => '', // 'Assign automatically a color when preset start date is reached' => '', // 'Move the task to another column once a predefined start date is reached' => '', + // 'This task is now linked to the task %s with the relation "%s"' => '', + // 'The link with the relation "%s" to the task %s has been removed' => '', + // 'Custom Filter:' => '', ); diff --git a/app/Template/event/task_internal_link_create_update.php b/app/Template/event/task_internal_link_create_update.php index 4bc6ae9a..5a9144ac 100644 --- a/app/Template/event/task_internal_link_create_update.php +++ b/app/Template/event/task_internal_link_create_update.php @@ -7,10 +7,8 @@ </p> <div class="activity-description"> <p class="activity-task-title"> - <?= e( - 'This task is now linked to the task %s with the relation "%s"', - $this->url->link(t('#%d', $task_link['opposite_task_id']), 'TaskViewController', 'show', array('task_id' => $task_link['opposite_task_id'])), - $this->text->e($task_link['label']) - ) ?> + <?= e('This task is now linked to the task %s with the relation "%s"', + $this->url->link(t('#%d', $task_link['opposite_task_id']), 'TaskViewController', 'show', array('task_id' => $task_link['opposite_task_id'])), + $this->text->e($task_link['label'])) ?> </p> </div> diff --git a/app/Template/event/task_internal_link_delete.php b/app/Template/event/task_internal_link_delete.php index 3465fa57..c60d17e3 100644 --- a/app/Template/event/task_internal_link_delete.php +++ b/app/Template/event/task_internal_link_delete.php @@ -7,10 +7,8 @@ </p> <div class="activity-description"> <p class="activity-task-title"> - <?= e( - 'The link with the relation "%s" to the task %s have been removed', - $this->text->e($task_link['label']), - $this->url->link(t('#%d', $task_link['opposite_task_id']), 'TaskViewController', 'show', array('task_id' => $task_link['opposite_task_id'])) - ) ?> + <?= e('The link with the relation "%s" to the task %s has been removed', + $this->text->e($task_link['label']), + $this->url->link(t('#%d', $task_link['opposite_task_id']), 'TaskViewController', 'show', array('task_id' => $task_link['opposite_task_id']))) ?> </p> </div> diff --git a/app/Template/notification/task_internal_link_create_update.php b/app/Template/notification/task_internal_link_create_update.php index a2333703..eab96bfa 100644 --- a/app/Template/notification/task_internal_link_create_update.php +++ b/app/Template/notification/task_internal_link_create_update.php @@ -1,11 +1,9 @@ <h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2> <p> - <?= e( - 'This task is now linked to the task %s with the relation "%s"', - $this->url->absoluteLink(t('#%d', $task_link['opposite_task_id']), 'TaskViewController', 'show', array('task_id' => $task_link['opposite_task_id'])), - $this->text->e($task_link['label']) - ) ?> + <?= e('This task is now linked to the task %s with the relation "%s"', + $this->url->absoluteLink(t('#%d', $task_link['opposite_task_id']), 'TaskViewController', 'show', array('task_id' => $task_link['opposite_task_id'])), + $this->text->e($task_link['label'])) ?> </p> <?= $this->render('notification/footer', array('task' => $task)) ?> diff --git a/app/Template/notification/task_internal_link_delete.php b/app/Template/notification/task_internal_link_delete.php index c366001c..e4d57025 100644 --- a/app/Template/notification/task_internal_link_delete.php +++ b/app/Template/notification/task_internal_link_delete.php @@ -1,11 +1,9 @@ <h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2> <p> - <?= e( - 'The link with the relation "%s" to the task %s have been removed', - $this->text->e($task_link['label']), - $this->url->absoluteLink(t('#%d', $task_link['opposite_task_id']), 'TaskViewController', 'show', array('task_id' => $task_link['opposite_task_id'])) - ) ?> + <?= e('The link with the relation "%s" to the task %s has been removed', + $this->text->e($task_link['label']), + $this->url->absoluteLink(t('#%d', $task_link['opposite_task_id']), 'TaskViewController', 'show', array('task_id' => $task_link['opposite_task_id']))) ?> </p> <?= $this->render('notification/footer', array('task' => $task)) ?> diff --git a/app/Template/user_view/show.php b/app/Template/user_view/show.php index 39d10ab5..6172c561 100644 --- a/app/Template/user_view/show.php +++ b/app/Template/user_view/show.php @@ -33,7 +33,7 @@ <ul class="panel"> <li><?= t('Timezone:') ?> <strong><?= $this->text->in($user['timezone'], $timezones) ?></strong></li> <li><?= t('Language:') ?> <strong><?= $this->text->in($user['language'], $languages) ?></strong></li> - <li><?= t('Filter:') ?> <strong><?= $this->text->e($user['filter']) ?></strong></li> + <li><?= t('Custom Filter:') ?> <strong><?= $this->text->e($user['filter']) ?></strong></li> <li><?= t('Notifications:') ?> <strong><?= $user['notifications_enabled'] == 1 ? t('Enabled') : t('Disabled') ?></strong></li> </ul> |