OLD 8.0 2015 11 30

Conflict:

diff --cc addons/auth_signup/res_users.py
index b290dcf,39ef46f..0000000
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@@ -274,7 -274,7 +274,11 @@@ class res_users(osv.Model)
          partner_ids = [user.partner_id.id for user in self.browse(cr, uid, ids, context)]
          res_partner.signup_prepare(cr, uid, partner_ids, signup_type="reset", expiration=now(days=+1), context=context)
  
++<<<<<<< HEAD
 +        context = dict(context) if context else {}
++=======
+         context = dict(context or {})
++>>>>>>> 52d2b7f... [FIX] auth_signup: translate password reset email
  
          # send email to users with their signup url
          template = False
@@@ -291,7 -291,7 +295,11 @@@
          for user in self.browse(cr, uid, ids, context):
              if not user.email:
                  raise osv.except_osv(_("Cannot send email: user has no email address."), user.name)
++<<<<<<< HEAD
 +            context['lang'] = user.lang
++=======
+             context['lang'] = user.lang  # translate in targeted user language
++>>>>>>> 52d2b7f... [FIX] auth_signup: translate password reset email
              self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, force_send=True, raise_exception=True, context=context)
  
      def create(self, cr, uid, values, context=None):

This reflects changes by @mart-e in @invitu's patch https://github.com/odoo/odoo/pull/9195 as merged into odoo/8.0 as https://github.com/odoo/odoo/commit/52d2b7fbcf7d1d9091281ab8f63bde6f842f6da4.

Resolved by taking the upstream version, committed into ocb/8.0 as https://github.com/OCA/OCB/commit/2a02d8ab3720c8accd4a9e5eca05a3c9b69c7b18 by @StefanRijnhart.