summaryrefslogtreecommitdiff
path: root/addons/mail/res_users.py
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2012-06-28 15:12:10 +0200
committerRaphael Collet <rco@openerp.com>2012-06-28 15:12:10 +0200
commit1debe0efcd00a294fa436a8a13416ccb1de0e919 (patch)
treea9a7209823affdaedb129f6f1cd1c0173fa11a6e /addons/mail/res_users.py
parent083deae5a4845cb9578b318ec08bd2d62b79a755 (diff)
parenta6e3d4bf0029d879e008414090d54499ffe358f4 (diff)
[MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
Diffstat (limited to 'addons/mail/res_users.py')
-rw-r--r--addons/mail/res_users.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 2223d9e162a..f62e29fb44d 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -36,7 +36,7 @@ class res_users(osv.osv):
('comments', 'Only comments'),
('to_me', 'Only when sent directly to me'),
('none', 'Never')
- ], 'Receive Feeds by E-mail', required=True,
+ ], 'Receive Feeds by Email', required=True,
help="Choose in which case you want to receive an email when you receive new feeds."),
}