More flexible mail notifications settings at user level. A user has now 3 options:

* notification on any event on all his projects
* notification on any event on selected projects only (if the user belongs to more than 1 project)
* notification only for things that he watches or he is involded in (eg. issues that he watches or he is author or assignee)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@855 e93f8b46-1217-0410-a6f0-8f06a7374b81

16 files changed, 83 insertions, 3 deletions

diff --git a/lang/bg.yml b/lang/bg.yml
index 15bbb5239..d4ef3511e 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -526,3 +526,8 @@ label_theme: Тема
 label_default: По подразбиране
 label_search_titles_only: Само в заглавията
 label_nobody: nobody
+button_change_password: Change password
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_none: "Only for things I watch or I'm involved in"
diff --git a/lang/cs.yml b/lang/cs.yml
index 8e5f91b41..b7b88884d 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -526,3 +526,8 @@ label_theme: Theme
 label_default: Default
 label_search_titles_only: Search titles only
 label_nobody: nobody
+button_change_password: Change password
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_none: "Only for things I watch or I'm involved in"
diff --git a/lang/de.yml b/lang/de.yml
index dae960579..793876fc3 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -526,3 +526,8 @@ label_theme: Theme
 label_default: Default
 label_search_titles_only: Search titles only
 label_nobody: nobody
+button_change_password: Change password
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_none: "Only for things I watch or I'm involved in"
diff --git a/lang/en.yml b/lang/en.yml
index 7d23e4fbe..d0dc64666 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -127,7 +127,7 @@ field_parent: Subproject of
 field_is_in_chlog: Issues displayed in changelog
 field_is_in_roadmap: Issues displayed in roadmap
 field_login: Login
-field_mail_notification: Mail notifications
+field_mail_notification: Email notifications
 field_admin: Administrator
 field_last_login_on: Last connection
 field_language: Language
@@ -174,7 +174,7 @@ setting_login_required: Authent. required
 setting_self_registration: Self-registration enabled
 setting_attachment_max_size: Attachment max. size
 setting_issues_export_limit: Issues export limit
-setting_mail_from: Emission mail address
+setting_mail_from: Emission email address
 setting_host_name: Host name
 setting_text_formatting: Text formatting
 setting_wiki_compression: Wiki history compression
@@ -437,6 +437,9 @@ label_bulk_edit_selected_issues: Bulk edit selected issues
 label_theme: Theme
 label_default: Default
 label_search_titles_only: Search titles only
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_none: "Only for things I watch or I'm involved in"
 
 button_login: Login
 button_submit: Submit
@@ -470,12 +473,13 @@ button_archive: Archive
 button_unarchive: Unarchive
 button_reset: Reset
 button_rename: Rename
+button_change_password: Change password
 
 status_active: active
 status_registered: registered
 status_locked: locked
 
-text_select_mail_notifications: Select actions for which mail notifications should be sent.
+text_select_mail_notifications: Select actions for which email notifications should be sent.
 text_regexp_info: eg. ^[A-Z0-9]+$
 text_min_max_length_info: 0 means no restriction
 text_project_destroy_confirmation: Are you sure you want to delete this project and all related data ?
@@ -500,6 +504,7 @@ text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and al
 text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
 text_issue_category_destroy_assignments: Remove category assignments
 text_issue_category_reassign_to: Reassign issues to this category
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
 
 default_role_manager: Manager
 default_role_developper: Developer
diff --git a/lang/es.yml b/lang/es.yml
index c3392b2d4..d66220e05 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -529,3 +529,8 @@ label_theme: Theme
 label_default: Default
 label_search_titles_only: Search titles only
 label_nobody: nobody
+button_change_password: Change password
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_none: "Only for things I watch or I'm involved in"
diff --git a/lang/fr.yml b/lang/fr.yml
index 4b46189f5..ce543b686 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -437,6 +437,9 @@ label_bulk_edit_selected_issues: Modifier les demandes sélectionnées
 label_theme: Thème
 label_default: Défaut
 label_search_titles_only: Uniquement dans les titres
+label_user_mail_option_all: "Pour tous les événements de tous mes projets"
+label_user_mail_option_selected: "Pour tous les événements des projets sélectionnés..."
+label_user_mail_option_none: "Seulement pour ce que je surveille ou à quoi je participe"
 
 button_login: Connexion
 button_submit: Soumettre
@@ -470,6 +473,7 @@ button_archive: Archiver
 button_unarchive: Désarchiver
 button_reset: Réinitialiser
 button_rename: Renommer
+button_change_password: Changer de mot de passe
 
 status_active: actif
 status_registered: enregistré
@@ -500,6 +504,7 @@ text_wiki_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce wiki et t
 text_issue_category_destroy_question: Des demandes (%d) sont affectées à cette catégories. Que voulez-vous faire ?
 text_issue_category_destroy_assignments: N'affecter les demandes à aucune autre catégorie
 text_issue_category_reassign_to: Réaffecter les demandes à cette catégorie
+text_user_mail_option: "Pour les projets non sélectionnés, vous recevrez seulement des notifications pour ce que vous surveillez ou à quoi vous participez (exemple: demandes dont vous êtes l'auteur ou la personne assignée)."
 
 default_role_manager: Manager
 default_role_developper: Développeur
diff --git a/lang/he.yml b/lang/he.yml
index 106bc0096..0a310924a 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -526,3 +526,8 @@ enumeration_doc_categories: קטגוריות מסמכים
 enumeration_activities: פעילויות (מעקב אחר זמנים)
 label_search_titles_only: Search titles only
 label_nobody: nobody
+button_change_password: Change password
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_none: "Only for things I watch or I'm involved in"
diff --git a/lang/it.yml b/lang/it.yml
index 8dad1566a..b4888808f 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -526,3 +526,8 @@ label_theme: Theme
 label_default: Default
 label_search_titles_only: Search titles only
 label_nobody: nobody
+button_change_password: Change password
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_none: "Only for things I watch or I'm involved in"
diff --git a/lang/ja.yml b/lang/ja.yml
index ce70a4c32..3016d385b 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -527,3 +527,8 @@ label_theme: テーマ
 label_default: 既定
 label_search_titles_only: Search titles only
 label_nobody: nobody
+button_change_password: Change password
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_none: "Only for things I watch or I'm involved in"
diff --git a/lang/nl.yml b/lang/nl.yml
index c5928c23c..9b7d73a9d 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -527,3 +527,8 @@ label_theme: Theme
 label_default: Default
 label_search_titles_only: Search titles only
 label_nobody: nobody
+button_change_password: Change password
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_none: "Only for things I watch or I'm involved in"
diff --git a/lang/pl.yml b/lang/pl.yml
index 23b028ba6..1b8602abb 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -526,3 +526,8 @@ label_theme: Temat
 label_default: Domyślne
 label_search_titles_only: Przeszukuj tylko tytuły
 label_nobody: nobody
+button_change_password: Change password
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_none: "Only for things I watch or I'm involved in"
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index bb335b082..da25974ad 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -526,3 +526,8 @@ label_theme: Theme
 label_default: Default

 label_search_titles_only: Search titles only

 label_nobody: nobody

+button_change_password: Change password

+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."

+label_user_mail_option_selected: "For any event on the selected projects only..."

+label_user_mail_option_all: "For any event on all my projects"

+label_user_mail_option_none: "Only for things I watch or I'm involved in"

diff --git a/lang/pt.yml b/lang/pt.yml
index 2fcfbd334..94dace1d9 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -526,3 +526,8 @@ label_theme: Theme
 label_default: Default
 label_search_titles_only: Search titles only
 label_nobody: nobody
+button_change_password: Change password
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_none: "Only for things I watch or I'm involved in"
diff --git a/lang/ro.yml b/lang/ro.yml
index 08eb75b0b..93352c8c9 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -526,3 +526,8 @@ label_theme: Theme
 label_default: Default
 label_search_titles_only: Search titles only
 label_nobody: nobody
+button_change_password: Change password
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_none: "Only for things I watch or I'm involved in"
diff --git a/lang/sv.yml b/lang/sv.yml
index 17b57b5dc..139105ed4 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -527,3 +527,8 @@ label_theme: Theme
 label_default: Default
 label_search_titles_only: Search titles only
 label_nobody: nobody
+button_change_password: Change password
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_none: "Only for things I watch or I'm involved in"
diff --git a/lang/zh.yml b/lang/zh.yml
index 3826be6d4..9fda045b8 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -529,3 +529,8 @@ label_theme: Theme
 label_default: Default
 label_search_titles_only: Search titles only
 label_nobody: nobody
+button_change_password: Change password
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+label_user_mail_option_selected: "For any event on the selected projects only..."
+label_user_mail_option_all: "For any event on all my projects"
+label_user_mail_option_none: "Only for things I watch or I'm involved in"