summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml3
-rw-r--r--config/locales/fr.yml1
-rw-r--r--config/settings.yml4
3 files changed, 8 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1f205b0ff..92b2ffdeb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -941,6 +941,9 @@ en:
label_enable_notifications: Enable notifications
label_disable_notifications: Disable notifications
label_blank_value: blank
+ label_parent_task_attributes: Parent tasks attributes
+ label_parent_task_attributes_derived: Calculated from subtasks
+ label_parent_task_attributes_independent: Independent of subtasks
button_login: Login
button_submit: Submit
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 54dc13a61..539375277 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -961,6 +961,7 @@ fr:
label_enable_notifications: Activer les notifications
label_disable_notifications: Désactiver les notifications
label_blank_value: non renseigné
+ label_parent_task_attributes: Attributs des tâches parentes
button_login: Connexion
button_submit: Soumettre
diff --git a/config/settings.yml b/config/settings.yml
index e5093dd58..6a163c72f 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -146,6 +146,10 @@ cross_project_issue_relations:
# Enables subtasks to be in other projects
cross_project_subtasks:
default: 'tree'
+parent_issue_dates:
+ default: 'derived'
+parent_issue_priority:
+ default: 'derived'
link_copied_issue:
default: 'ask'
issue_group_assignment: