From 6f77a4033f7feb2785e0e242d50b78e824c892cd Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 10 May 2015 16:33:23 -0400
Subject: Recurring tasks (#847): update translations

---
 app/Locale/da_DK/translations.php      | 36 ++++++++++++---------
 app/Locale/de_DE/translations.php      | 36 ++++++++++++---------
 app/Locale/es_ES/translations.php      | 36 ++++++++++++---------
 app/Locale/fi_FI/translations.php      | 36 ++++++++++++---------
 app/Locale/fr_FR/translations.php      | 54 +++++++++++++++++--------------
 app/Locale/hu_HU/translations.php      | 36 ++++++++++++---------
 app/Locale/it_IT/translations.php      | 36 ++++++++++++---------
 app/Locale/ja_JP/translations.php      | 36 ++++++++++++---------
 app/Locale/nl_NL/translations.php      | 36 ++++++++++++---------
 app/Locale/pl_PL/translations.php      | 36 ++++++++++++---------
 app/Locale/pt_BR/translations.php      | 59 ++++++++++++----------------------
 app/Locale/ru_RU/translations.php      | 36 ++++++++++++---------
 app/Locale/sr_Latn_RS/translations.php | 36 ++++++++++++---------
 app/Locale/sv_SE/translations.php      | 36 ++++++++++++---------
 app/Locale/th_TH/translations.php      | 36 ++++++++++++---------
 app/Locale/tr_TR/translations.php      | 36 ++++++++++++---------
 app/Locale/zh_CN/translations.php      | 36 ++++++++++++---------
 app/Template/task/recurring_info.php   |  6 ++--
 app/Template/tasklink/edit.php         |  2 +-
 19 files changed, 353 insertions(+), 308 deletions(-)

diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index 3d166f5d..20994881 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -868,30 +868,34 @@ return array(
     // 'Help on Sendgrid integration' => '',
     // 'Disable two factor authentication' => '',
     // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index 0aab9fde..6b89433c 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -868,30 +868,34 @@ return array(
     'Help on Sendgrid integration' => 'Hilfe bei Sendgrid-Integration',
     'Disable two factor authentication' => 'Deaktiviere Zwei-Faktor-Authentifizierung',
     'Do you really want to disable the two factor authentication for this user: "%s"?' => 'Willst du wirklich für folgenden Nutzer die Zwei-Faktor-Authentifizierung deaktivieren: "%s"?',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index d89f7b1d..8eff2428 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -868,30 +868,34 @@ return array(
     'Help on Sendgrid integration' => 'Ayuda sobre la integración con Sendgrid',
     'Disable two factor authentication' => 'Desactivar la autenticación de dos factores',
     'Do you really want to disable the two factor authentication for this user: "%s"?' => '¿Realmentes quieres desactuvar la autenticación de dos factores para este usuario: "%s?"',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index ba01e7be..9ce8b2b6 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -868,30 +868,34 @@ return array(
     // 'Help on Sendgrid integration' => '',
     // 'Disable two factor authentication' => '',
     // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index 934762d0..b7436323 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -870,32 +870,36 @@ return array(
     'Help on Sendgrid integration' => 'Aide sur l\'intégration avec Sendgrid',
     'Disable two factor authentication' => 'Désactiver l\'authentification à deux facteurs',
     'Do you really want to disable the two factor authentication for this user: "%s"?' => 'Voulez-vous vraiment désactiver l\'authentification à deux facteurs pour cet utilisateur : « %s » ?',
-    'Edit a link' => 'Modifier un lien',
+    'Edit link' => 'Modifier un lien',
     'Start to type task title...' => 'Tappez le titre de la tâche...',
     'A task cannot be linked to itself' => 'Une tâche ne peut être liée à elle-même',
     'The exact same link already exists' => 'Un lien identique existe déjà',
-    // 'Action date' => '',
-    // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
-    // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
-    // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
-    // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
-    // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
-    // 'When task is closed' => '',
-    // 'When task is moved from first column' => '',
-    // 'When task is moved to last column' => '',
-    // 'Year(s)' => '',
+    'Recurrent task is scheduled to be generated' => 'La tâche récurrente est programmée pour être créée',
+    'Recurring information' => 'Information sur la récurrence',
+    'Score' => 'Complexity',
+    'The identifier must be unique' => 'L\'identifiant doit être unique',
+    'This linked task id doesn\'t exists' => 'L\'identifiant de la task liée n\'existe pas',
+    'This value must be alphanumeric' => 'Cette valeur doit être alpha-numérique',
+    'Edit recurrence' => 'Modifier la récurrence',
+    'Generate recurrent task' => 'Générer une tâche récurrente',
+    'Trigger to generate recurrent task' => 'Déclencheur pour générer la tâche récurrente',
+    'Factor to calculate new due date' => 'Facteur pour calculer la nouvelle date d\'échéance',
+    'Timeframe to calculate new due date' => 'Échelle de temps pour calculer la nouvelle date d\'échéance',
+    'Base date to calculate new due date' => 'Date à utiliser pour calculer la nouvelle date d\'échéance',
+    'Action date' => 'Date de l\'action',
+    'Base date to calculate new due date: ' => 'Date utilisée pour calculer la nouvelle date d\'échéance : ',
+    'This task has created this child task: ' => 'Cette tâche a créée la tâche enfant : ',
+    'Day(s)' => 'Jour(s)',
+    'Existing due date' => 'Date d\'échéance existante',
+    'Factor to calculate new due date: ' => 'Facteur pour calculer la nouvelle date d\'échéance : ',
+    'Month(s)' => 'Mois',
+    'Recurrence' => 'Récurrence',
+    'This task has been created by: ' => 'Cette tâche a été créée par :',
+    'Recurrent task has been generated:' => 'Une tâche récurrente a été générée :',
+    'Timeframe to calculate new due date: ' => 'Échelle de temps pour calculer la nouvelle date d\'échéance : ',
+    'Trigger to generate recurrent task: ' => 'Déclencheur pour générer la tâche récurrente : ',
+    'When task is closed' => 'Lorsque la tâche est fermée',
+    'When task is moved from first column' => 'Lorsque la tâche est déplacée en dehors de la première colonne',
+    'When task is moved to last column' => 'Lorsque la tâche est déplacée dans la dernière colonne',
+    'Year(s)' => 'Année(s)',
 );
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index 3614f4cd..b0a10f89 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -868,30 +868,34 @@ return array(
     // 'Help on Sendgrid integration' => '',
     // 'Disable two factor authentication' => '',
     // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index 11f4f47d..fb5293eb 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -868,30 +868,34 @@ return array(
     // 'Help on Sendgrid integration' => '',
     // 'Disable two factor authentication' => '',
     // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index 3d54b0c2..89ed3f7d 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -868,30 +868,34 @@ return array(
     // 'Help on Sendgrid integration' => '',
     // 'Disable two factor authentication' => '',
     // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index 2fb1637b..24bf8f91 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -868,30 +868,34 @@ return array(
     // 'Help on Sendgrid integration' => '',
     // 'Disable two factor authentication' => '',
     // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index 5065ddbf..6370830a 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -868,30 +868,34 @@ return array(
     // 'Help on Sendgrid integration' => '',
     // 'Disable two factor authentication' => '',
     // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index 576e1a8f..bc579c04 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -846,7 +846,6 @@ return array(
     'Secret key: ' => 'Chave secreta:',
     'Test your device' => 'Teste o seu dispositivo',
     'Assign a color when the task is moved to a specific column' => 'Atribuir uma cor quando a tarefa é movida em uma coluna específica',
-<<<<<<< HEAD
     '%s via Kanboard' => '%s via Kanboard',
     'uploaded by: %s' => 'carregado por: %s',
     'uploaded on: %s' => 'carregado em: %s',
@@ -869,52 +868,34 @@ return array(
     'Help on Sendgrid integration' => 'Ajuda na integração do Sendgrid',
     'Disable two factor authentication' => 'Desativar autenticação à dois fatores',
     'Do you really want to disable the two factor authentication for this user: "%s"?' => 'Você deseja realmente desativar a autenticação à dois fatores para esse usuário: "%s"?',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // '%s via Kanboard' => '',
-    // 'uploaded by: %s' => '',
-    // 'uploaded on: %s' => '',
-    // 'size: %s' => '',
-    // 'Burndown chart for "%s"' => '',
-    // 'Burndown chart' => '',
-    // 'This chart show the task complexity over the time (Work Remaining).' => '',
-    // 'Screenshot taken %s' => '',
-    // 'Add a screenshot' => '',
-    // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '',
-    // 'Screenshot uploaded successfully.' => '',
-    // 'SEK - Swedish Krona' => '',
-    // 'The project identifier is an optional alphanumeric code used to identify your project.' => '',
-    // 'Identifier' => '',
-    // 'Postmark (incoming emails)' => '',
-    // 'Help on Postmark integration' => '',
-    // 'Mailgun (incoming emails)' => '',
-    // 'Help on Mailgun integration' => '',
-    // 'Sendgrid (incoming emails)' => '',
-    // 'Help on Sendgrid integration' => '',
-    // 'Disable two factor authentication' => '',
-    // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index 14019773..6e688406 100644
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -868,30 +868,34 @@ return array(
     // 'Help on Sendgrid integration' => '',
     'Disable two factor authentication' => 'Выключить двухфакторную авторизацию',
     'Do you really want to disable the two factor authentication for this user: "%s"?' => 'Вы действительно хотите выключить двухфакторную авторизацию для пользователя "%s"?',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 521721b8..e7e624f9 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -868,30 +868,34 @@ return array(
     // 'Help on Sendgrid integration' => '',
     // 'Disable two factor authentication' => '',
     // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index 3303cede..d756c75d 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -868,30 +868,34 @@ return array(
     // 'Help on Sendgrid integration' => '',
     // 'Disable two factor authentication' => '',
     // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index 045b1f66..88007e84 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -868,30 +868,34 @@ return array(
     // 'Help on Sendgrid integration' => '',
     // 'Disable two factor authentication' => '',
     // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index 96e3e034..e7edd856 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -868,30 +868,34 @@ return array(
     // 'Help on Sendgrid integration' => '',
     // 'Disable two factor authentication' => '',
     // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index 5daa713a..4cac3c48 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -868,30 +868,34 @@ return array(
     // 'Help on Sendgrid integration' => '',
     // 'Disable two factor authentication' => '',
     // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
-    // 'Edit a link' => '',
+    // 'Edit link' => '',
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
-    // 'Action date' => '',
+    // 'Recurrent task is scheduled to be generated' => '',
+    // 'Recurring information' => '',
+    // 'Score' => '',
+    // 'The identifier must be unique' => '',
+    // 'This linked task id doesn\'t exists' => '',
+    // 'This value must be alphanumeric' => '',
+    // 'Edit recurrence' => '',
+    // 'Generate recurrent task' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Timeframe to calculate new due date' => '',
     // 'Base date to calculate new due date' => '',
-    // 'Base date to calculate new due date: %s' => '',
-    // 'Created recurrent task: %s' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date: ' => '',
+    // 'This task has created this child task: ' => '',
     // 'Day(s)' => '',
-    // 'Edit recurrence' => '',
     // 'Existing due date' => '',
-    // 'Factor to calculate new due date' => '',
-    // 'Factor to calculate new due date: %s' => '',
-    // 'Generate recurrent task' => '',
+    // 'Factor to calculate new due date: ' => '',
     // 'Month(s)' => '',
-    // 'No recurrent task is scheduled to generate' => '',
     // 'Recurrence' => '',
-    // 'Recurrent task created by: %s' => '',
-    // 'Recurrent task has been generated' => '',
-    // 'Recurrent task is scheduled to generate' => '',
-    // 'Timeframe to calculate new due date' => '',
-    // 'Timeframe to calculate new due date: %s' => '',
-    // 'Trigger to generate recurrent task' => '',
-    // 'Trigger to generate recurrent task: %s' => '',
+    // 'This task has been created by: ' => '',
+    // 'Recurrent task has been generated:' => '',
+    // 'Timeframe to calculate new due date: ' => '',
+    // 'Trigger to generate recurrent task: ' => '',
     // 'When task is closed' => '',
     // 'When task is moved from first column' => '',
     // 'When task is moved to last column' => '',
diff --git a/app/Template/task/recurring_info.php b/app/Template/task/recurring_info.php
index 2a283337..897f6207 100644
--- a/app/Template/task/recurring_info.php
+++ b/app/Template/task/recurring_info.php
@@ -2,7 +2,7 @@
     <?php if ($task['recurrence_status'] == \Model\Task::RECURRING_STATUS_PENDING): ?>
         <li><?= t('Recurrent task is scheduled to be generated') ?></li>
     <?php elseif ($task['recurrence_status'] == \Model\Task::RECURRING_STATUS_PROCESSED): ?>
-        <li><?= t('Recurrent task has been generated') ?>
+        <li><?= t('Recurrent task has been generated:') ?>
             <ul>
                 <li>
                     <?= t('Trigger to generate recurrent task: ') ?><strong><?= $this->e($recurrence_trigger_list[$task['recurrence_trigger']]) ?></strong>
@@ -23,13 +23,13 @@
     <?php if ($task['recurrence_parent'] || $task['recurrence_child']): ?>
         <?php if ($task['recurrence_parent']): ?>
         <li>
-            <?= t('Recurrent task created by: ') ?>
+            <?= t('This task has been created by: ') ?>
             <?= $this->a('#'.$task['recurrence_parent'], 'task', 'show', array('task_id' => $task['recurrence_parent'], 'project_id' => $task['project_id'])) ?>
         </li>
         <?php endif ?>
         <?php if ($task['recurrence_child']): ?>
         <li>
-            <?= t('Created recurrent task: ') ?>
+            <?= t('This task has created this child task: ') ?>
             <?= $this->a('#'.$task['recurrence_child'], 'task', 'show', array('task_id' => $task['recurrence_child'], 'project_id' => $task['project_id'])) ?>
         </li>
         <?php endif ?>
diff --git a/app/Template/tasklink/edit.php b/app/Template/tasklink/edit.php
index 267bd627..37c3cb14 100644
--- a/app/Template/tasklink/edit.php
+++ b/app/Template/tasklink/edit.php
@@ -1,5 +1,5 @@
 <div class="page-header">
-    <h2><?= t('Edit a link') ?></h2>
+    <h2><?= t('Edit link') ?></h2>
 </div>
 
 <form action="<?= $this->u('tasklink', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'link_id' => $task_link['id'])) ?>" method="post" autocomplete="off">
-- 
cgit v1.2.3