diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-12-06 10:28:20 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-12-06 10:28:20 +0000 |
commit | 5f8e9d71182040473d4072241ce81fcadada497f (patch) | |
tree | 7701b9fed7aed50afd4dbf7fd34ec5ef08d40e5f /config | |
parent | e1781235696fe23851154ebbdc913e970d3c0f3a (diff) | |
download | redmine-5f8e9d71182040473d4072241ce81fcadada497f.tar.gz redmine-5f8e9d71182040473d4072241ce81fcadada497f.zip |
Version sharing (#465) + optional inclusion of subprojects in the roadmap view (#2666).
Each version of a project can be shared with:
* subprojects
* projects in the project hierarchy: ancestors + descendants (needs versions management permission on the root project)
* projects in the project tree: root project + all its descendants (same as above)
* all projects (can be set by admin users only)
Notes:
* when sharing a version of a private project with others projects, its name will be visible within the other projects
* a project with versions used by non descendant projects can not be archived
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3123 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
-rw-r--r-- | config/locales/en.yml | 7 | ||||
-rw-r--r-- | config/locales/fr.yml | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 85234cbeb..f3750a9a1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -156,6 +156,7 @@ en: error_no_tracker_in_project: 'No tracker is associated to this project. Please check the Project settings.' error_no_default_issue_status: 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").' error_can_not_reopen_issue_on_closed_version: 'An issue assigned to a closed version can not be reopened' + error_can_not_archive_project: This project can not be archived warning_attachments_not_saved: "{{count}} file(s) could not be saved." @@ -267,6 +268,7 @@ en: field_identity_url: OpenID URL field_content: Content field_group_by: Group results by + field_sharing: Sharing setting_app_title: Application title setting_app_subtitle: Application subtitle @@ -709,6 +711,11 @@ en: label_group_plural: Groups label_group_new: New group label_time_entry_plural: Spent time + label_version_sharing_none: Not shared + label_version_sharing_descendants: With subprojects + label_version_sharing_hierarchy: With project hierarchy + label_version_sharing_tree: With project tree + label_version_sharing_system: With all projects button_login: Login button_submit: Submit diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2e2a69be6..d1ea2608b 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -178,6 +178,7 @@ fr: error_scm_annotate: "L'entrée n'existe pas ou ne peut pas être annotée." error_issue_not_found_in_project: "La demande n'existe pas ou n'appartient pas à ce projet" error_can_not_reopen_issue_on_closed_version: 'Une demande assignée à une version fermée ne peut pas être réouverte' + error_can_not_archive_project: "Ce projet ne peut pas être archivé" warning_attachments_not_saved: "{{count}} fichier(s) n'ont pas pu être sauvegardés." @@ -289,6 +290,7 @@ fr: field_identity_url: URL OpenID field_content: Contenu field_group_by: Grouper par + field_sharing: Partage setting_app_title: Titre de l'application setting_app_subtitle: Sous-titre de l'application @@ -725,6 +727,11 @@ fr: label_group: Groupe label_group_new: Nouveau groupe label_time_entry_plural: Temps passé + label_version_sharing_none: Non partagé + label_version_sharing_descendants: Avec les sous-projets + label_version_sharing_hierarchy: Avec toute la hiérarchie + label_version_sharing_tree: Avec tout l'arbre + label_version_sharing_system: Avec tous les projets button_login: Connexion button_submit: Soumettre |