fixes failing email specs

Conflicts:
	app/models/user.rb

fixes missing i18n entry

fixes badly done merge

fixes i18n issues

force build to start

app/models/user.rb

@@ -183,8 +183,8 @@ class User < ActiveRecord::Base
     self[:locale] ||= I18n.default_locale.to_s
   end
 
-  def pending_finish_signup?
-    email.blank? && unconfirmed_email.blank?
+  def confirmation_required?
+    super && !registering_with_oauth
   end
 
   private