diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2019-03-15 10:09:28 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2019-03-15 10:09:28 +0000 |
| commit | b4c23f066e71978f36d8bd4aeae02be11385fcca (patch) | |
| tree | 3555bb21efc0778859ea316c0a567f89c474502d /config | |
| parent | 5da9cc59ee48b8e86b2836909ddff970cce76545 (diff) | |
| download | redmine-b4c23f066e71978f36d8bd4aeae02be11385fcca.tar.gz redmine-b4c23f066e71978f36d8bd4aeae02be11385fcca.zip | |
Display details about inheritance when editing a member roles (#31032).
git-svn-id: http://svn.redmine.org/redmine/trunk@17968 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/locales/fr.yml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index effc62f2d..63e33cfab 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1041,6 +1041,8 @@ en: label_font_proportional: Proportional font label_last_notes: Last notes label_nothing_to_preview: Nothing to preview + label_inherited_from_parent_project: "Inherited from parent project" + label_inherited_from_group: "Inherited from group %{name}" button_login: Login button_submit: Submit diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 9a6423a1e..e53486793 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1252,7 +1252,8 @@ fr: label_delete_link_to_subtask: "Supprimer la relation avec la sous-tâche" error_not_allowed_to_log_time_for_other_users: "Vous n'êtes pas autorisé à saisir le temps passé pour d'autres utilisateurs" permission_log_time_for_other_users: "Saisir le temps passé pour d'autres utilisateurs" - label_tomorrow: tomorrow + label_inherited_from_parent_project: "Hérité du projet parent" + label_inherited_from_group: "Hérité du groupe %{name}" label_tomorrow: tomorrow label_next_week: next week label_next_month: next month text_role_no_workflow: No workflow defined for this role |