Fix merge conflict

controller/registercontroller.php

@@ -18,9 +18,9 @@ use \OCP\AppFramework\Controller;
 use \OCP\Util;
 use \OCA\Registration\Wrapper;
 use \OCP\IUserManager;
+use \OCP\IGroupManager;
 use \OCP\IL10N;
 use \OCP\IConfig;
-use \OCP\IUser;
 
 class RegisterController extends Controller {
 
@@ -84,7 +84,7 @@ class RegisterController extends Controller {
 			), 'error');
 		}
 
-		if ( !empty($this->config->getUsersForUserValue('settings', 'email', $email)) ) {
+		if ( $this->config->getUsersForUserValue('settings', 'email', $email) ) {
 			return new TemplateResponse('', 'error', array(
 				'errors' => array(array(
 					'error' => $this->l10n->t('There is an existing user with this email'),

controller/settingscontroller.php

@@ -16,7 +16,6 @@ use \OCP\AppFramework\Http\TemplateResponse;
 use \OCP\AppFramework\Http\DataResponse;
 use \OCP\AppFramework\Http;
 use \OCP\AppFramework\Controller;
-use \OCP\IUserManager;
 use \OCP\IGroupManager;
 use \OCP\IL10N;
 use \OCP\IConfig;

l10n/fr.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Registration" : "Inscription",
     "Default group that all registered users belong" : "Groupe par défaut auquel appartiennent tous les utilisateurs",
     "None" : "Aucun",
+    "To create a new account on ownCloud, just click the following link:<br/><br/>\n<a href=\"{link}\">{link}</a>" : "Pour créer un nouveau compte sur ownCloud, cliquez sur le lien suivant :<br/><br/>\n<a href=\"{link}\">{link}</a>",
     "Welcome, you can create your account below." : "Bienvenue, vous pouvez créer votre compte ci-dessous.",
     "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",

l10n/fr.json

@@ -14,6 +14,7 @@
     "Registration" : "Inscription",
     "Default group that all registered users belong" : "Groupe par défaut auquel appartiennent tous les utilisateurs",
     "None" : "Aucun",
+    "To create a new account on ownCloud, just click the following link:<br/><br/>\n<a href=\"{link}\">{link}</a>" : "Pour créer un nouveau compte sur ownCloud, cliquez sur le lien suivant :<br/><br/>\n<a href=\"{link}\">{link}</a>",
     "Welcome, you can create your account below." : "Bienvenue, vous pouvez créer votre compte ci-dessous.",
     "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",

l10n/fr.php

@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
 "Registration" => "Inscription",
 "Default group that all registered users belong" => "Groupe par défaut auquel appartiennent tous les utilisateurs",
 "None" => "Aucun",
+"To create a new account on ownCloud, just click the following link:<br/><br/>\n<a href=\"{link}\">{link}</a>" => "Pour créer un nouveau compte sur ownCloud, cliquez sur le lien suivant :<br/><br/>\n<a href=\"{link}\">{link}</a>",
 "Welcome, you can create your account below." => "Bienvenue, vous pouvez créer votre compte ci-dessous.",
 "Username" => "Nom d'utilisateur",
 "Password" => "Mot de passe",

l10n/ru.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Registration" : "Регистрация",
     "Default group that all registered users belong" : "Группа по умолчанию для всех новых пользователей",
     "None" : "Отсутствует",
+    "To create a new account on ownCloud, just click the following link:<br/><br/>\n<a href=\"{link}\">{link}</a>" : "Для создания новой учетной записи ownCloud просто нажмите на следующую ссылку:<br/><br/>\n<a href=\"{link}\">{link}</a>",
     "Welcome, you can create your account below." : "Добро пожаловать, Вы можете создать учетную запись ниже.",
     "Username" : "Имя пользователя",
     "Password" : "Пароль",

l10n/ru.json

@@ -14,6 +14,7 @@
     "Registration" : "Регистрация",
     "Default group that all registered users belong" : "Группа по умолчанию для всех новых пользователей",
     "None" : "Отсутствует",
+    "To create a new account on ownCloud, just click the following link:<br/><br/>\n<a href=\"{link}\">{link}</a>" : "Для создания новой учетной записи ownCloud просто нажмите на следующую ссылку:<br/><br/>\n<a href=\"{link}\">{link}</a>",
     "Welcome, you can create your account below." : "Добро пожаловать, Вы можете создать учетную запись ниже.",
     "Username" : "Имя пользователя",
     "Password" : "Пароль",

l10n/ru.php

@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
 "Registration" => "Регистрация",
 "Default group that all registered users belong" => "Группа по умолчанию для всех новых пользователей",
 "None" => "Отсутствует",
+"To create a new account on ownCloud, just click the following link:<br/><br/>\n<a href=\"{link}\">{link}</a>" => "Для создания новой учетной записи ownCloud просто нажмите на следующую ссылку:<br/><br/>\n<a href=\"{link}\">{link}</a>",
 "Welcome, you can create your account below." => "Добро пожаловать, Вы можете создать учетную запись ниже.",
 "Username" => "Имя пользователя",
 "Password" => "Пароль",

l10n/th_TH.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Registration" : "การลงทะเบียน",
     "Default group that all registered users belong" : "ค่าเริ่มต้นของกลุ่มผู้ใช้ที่ลงทะเบียนเป็นสมาชิก",
     "None" : "ไม่มี",
+    "To create a new account on ownCloud, just click the following link:<br/><br/>\n<a href=\"{link}\">{link}</a>" : "เพื่อที่จะสร้างบัญชี ownCloud ใหม่ โปรดคลิกที่ลิงค์ต่อไปนี้:<br/><br/>\n<a href=\"{link}\">{link}</a>",
     "Welcome, you can create your account below." : "ยินดีต้อนรับ, คุณสามารถสร้างบัญชีของคุณด้านล่าง",
     "Username" : "ชื่อผู้ใช้งาน",
     "Password" : "รหัสผ่าน",

l10n/th_TH.json

@@ -14,6 +14,7 @@
     "Registration" : "การลงทะเบียน",
     "Default group that all registered users belong" : "ค่าเริ่มต้นของกลุ่มผู้ใช้ที่ลงทะเบียนเป็นสมาชิก",
     "None" : "ไม่มี",
+    "To create a new account on ownCloud, just click the following link:<br/><br/>\n<a href=\"{link}\">{link}</a>" : "เพื่อที่จะสร้างบัญชี ownCloud ใหม่ โปรดคลิกที่ลิงค์ต่อไปนี้:<br/><br/>\n<a href=\"{link}\">{link}</a>",
     "Welcome, you can create your account below." : "ยินดีต้อนรับ, คุณสามารถสร้างบัญชีของคุณด้านล่าง",
     "Username" : "ชื่อผู้ใช้งาน",
     "Password" : "รหัสผ่าน",

l10n/th_TH.php

@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
 "Registration" => "การลงทะเบียน",
 "Default group that all registered users belong" => "ค่าเริ่มต้นของกลุ่มผู้ใช้ที่ลงทะเบียนเป็นสมาชิก",
 "None" => "ไม่มี",
+"To create a new account on ownCloud, just click the following link:<br/><br/>\n<a href=\"{link}\">{link}</a>" => "เพื่อที่จะสร้างบัญชี ownCloud ใหม่ โปรดคลิกที่ลิงค์ต่อไปนี้:<br/><br/>\n<a href=\"{link}\">{link}</a>",
 "Welcome, you can create your account below." => "ยินดีต้อนรับ, คุณสามารถสร้างบัญชีของคุณด้านล่าง",
 "Username" => "ชื่อผู้ใช้งาน",
 "Password" => "รหัสผ่าน",

l10n/tr.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Registration" : "Kayıt",
     "Default group that all registered users belong" : "Tüm kaydedilen kullanıcıların ait olduğu öntanımlı grup",
     "None" : "Hiçbiri",
+    "To create a new account on ownCloud, just click the following link:<br/><br/>\n<a href=\"{link}\">{link}</a>" : "ownCloud üzerinde yeni bir hesap oluşturmak için, sadece şu bağlantıya tıklamanız yeterli:<br/>{link}",
     "Welcome, you can create your account below." : "Hoş geldiniz, aşağıdan hesabınızı oluşturabilirsiniz.",
     "Username" : "Kullanıcı Adı",
     "Password" : "Parola",

l10n/tr.json

@@ -14,6 +14,7 @@
     "Registration" : "Kayıt",
     "Default group that all registered users belong" : "Tüm kaydedilen kullanıcıların ait olduğu öntanımlı grup",
     "None" : "Hiçbiri",
+    "To create a new account on ownCloud, just click the following link:<br/><br/>\n<a href=\"{link}\">{link}</a>" : "ownCloud üzerinde yeni bir hesap oluşturmak için, sadece şu bağlantıya tıklamanız yeterli:<br/>{link}",
     "Welcome, you can create your account below." : "Hoş geldiniz, aşağıdan hesabınızı oluşturabilirsiniz.",
     "Username" : "Kullanıcı Adı",
     "Password" : "Parola",

l10n/tr.php

@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
 "Registration" => "Kayıt",
 "Default group that all registered users belong" => "Tüm kaydedilen kullanıcıların ait olduğu öntanımlı grup",
 "None" => "Hiçbiri",
+"To create a new account on ownCloud, just click the following link:<br/><br/>\n<a href=\"{link}\">{link}</a>" => "ownCloud üzerinde yeni bir hesap oluşturmak için, sadece şu bağlantıya tıklamanız yeterli:<br/>{link}",
 "Welcome, you can create your account below." => "Hoş geldiniz, aşağıdan hesabınızı oluşturabilirsiniz.",
 "Username" => "Kullanıcı Adı",
 "Password" => "Parola",

templates/register.php

@@ -25,7 +25,7 @@ if ($_['entered']): ?>
 <?php else: ?>
 	<form action="<?php print_unescaped(OC_Helper::linkToRoute('registration.register.validateEmail')) ?>" method="post">
 		<fieldset>
-			<?php if (!empty($_['errormsg'])): ?>
+			<?php if ($_['errormsg']): ?>
 				<ul class="error">
 					<li><?php print_unescaped($_['errormsg']); ?></li>
 					<li><?php print_unescaped($l->t('Please re-enter a valid email address')); ?></li>