summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-12-31 15:04:05 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-12-31 15:04:05 +0000
commit987ca8cc2af0a3fd1f10e16deb6ca30336688d1b (patch)
tree4a0368088e2a6ba62c8ea537d40c9b619dfb4e7e /config
parentd42397e9a7cfe2b20768f06afea18b8d8c4ec418 (diff)
downloadredmine-987ca8cc2af0a3fd1f10e16deb6ca30336688d1b.tar.gz
redmine-987ca8cc2af0a3fd1f10e16deb6ca30336688d1b.zip
Handle time entries on subtasks and prevent from reassigning an issue that is going to be deleted (#24718, #24693).
git-svn-id: http://svn.redmine.org/redmine/trunk@16118 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/locales/fr.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b5f771d4b..deece3a17 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -218,6 +218,7 @@ en:
error_no_tracker_allowed_for_new_issue_in_project: "The project doesn't have any trackers for which you can create an issue"
error_no_projects_with_tracker_allowed_for_new_issue: "There are no projects with trackers for which you can create an issue"
error_move_of_child_not_possible: "Subtask %{child} could not be moved to the new project: %{errors}"
+ error_cannot_reassign_time_entries_to_an_issue_about_to_be_deleted: "Spent time cannot be reassigned to an issue that is about to be deleted"
mail_subject_lost_password: "Your %{value} password"
mail_body_lost_password: 'To change your password, click on the following link:'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e23ab86da..3996eccac 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -238,6 +238,7 @@ fr:
error_no_tracker_allowed_for_new_issue_in_project: "Le projet ne dispose d'aucun tracker sur lequel vous pouvez créer une demande"
error_no_projects_with_tracker_allowed_for_new_issue: "Aucun projet ne dispose d'un tracker sur lequel vous pouvez créer une demande"
error_move_of_child_not_possible: "La sous-tâche %{child} n'a pas pu être déplacée dans le nouveau projet : %{errors}"
+ error_cannot_reassign_time_entries_to_an_issue_about_to_be_deleted: "Le temps passé ne peut pas être réaffecté à une demande qui va être supprimée"
mail_subject_lost_password: "Votre mot de passe %{value}"
mail_body_lost_password: 'Pour changer votre mot de passe, cliquez sur le lien suivant :'