From 925de78cec848b293266450f9b5dde85f3a9af8f Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 15 Feb 2013 15:51:55 +0100
Subject: Join split translated strings

---
 apps/user_ldap/ajax/testConfiguration.php |  3 +--
 apps/user_ldap/templates/settings.php     | 16 +++++-----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php
index cfc07ff263e..7ce1258a796 100644
--- a/apps/user_ldap/ajax/testConfiguration.php
+++ b/apps/user_ldap/ajax/testConfiguration.php
@@ -36,8 +36,7 @@ if($connection->setConfiguration($_POST)) {
 			=> $l->t('The configuration is valid and the connection could be established!')));
 	} else {
 		OCP\JSON::error(array('message'
-			=> $l->t('The configuration is valid, but the Bind failed.'
-				.' Please check the server settings and credentials.')));
+			=> $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.')));
 	}
 } else {
 	OCP\JSON::error(array('message'
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 43f87c076d7..a882e5b7548 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -5,13 +5,10 @@
 		<li><a href="#ldapSettings-2">Advanced</a></li>
 	</ul>
 		<?php if(OCP\App::isEnabled('user_webdavauth')) {
-			echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible.'
-				.' You may experience unexpected behaviour.'
-				.' Please ask your system administrator to disable one of them.').'</p>';
+			echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them.').'</p>';
 		}
 		if(!function_exists('ldap_connect')) {
-			echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed,'
-				.' the backend will not work. Please ask your system administrator to install it.').'</p>';
+			echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>';
 		}
 		?>
 	<fieldset id="ldapSettings-1">
@@ -25,16 +22,14 @@
 		</p>
 		<p><label for="ldap_host"><?php echo $l->t('Host');?></label>
 		<input type="text" id="ldap_host" name="ldap_host" data-default="<?php echo $_['ldap_host_default']; ?>"
-			title="<?php echo $l->t('You can omit the protocol, except you require SSL.'
-				.' Then start with ldaps://');?>"></p>
+			title="<?php echo $l->t('You can omit the protocol, except you require SSL. Then start with ldaps://');?>"></p>
 		<p><label for="ldap_base"><?php echo $l->t('Base DN');?></label>
 		<textarea id="ldap_base" name="ldap_base" placeholder="<?php echo $l->t('One Base DN per line');?>"
 			title="<?php echo $l->t('You can specify Base DN for users and groups in the Advanced tab');?>"
 			data-default="<?php echo $_['ldap_base_default']; ?>" ></textarea></p>
 		<p><label for="ldap_dn"><?php echo $l->t('User DN');?></label>
 		<input type="text" id="ldap_dn" name="ldap_dn" data-default="<?php echo $_['ldap_dn_default']; ?>"
-			title="<?php echo $l->t('The DN of the client user with which the bind shall be done,'
-				.' e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.');?>" /></p>
+			title="<?php echo $l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.');?>" /></p>
 		<p><label for="ldap_agent_password"><?php echo $l->t('Password');?></label>
 		<input type="password" id="ldap_agent_password" name="ldap_agent_password"
 			data-default="<?php echo $_['ldap_agent_password_default']; ?>"
@@ -42,8 +37,7 @@
 		<p><label for="ldap_login_filter"><?php echo $l->t('User Login Filter');?></label>
 		<input type="text" id="ldap_login_filter" name="ldap_login_filter"
 			data-default="<?php echo $_['ldap_login_filter_default']; ?>"
-			title="<?php echo $l->t('Defines the filter to apply, when login is attempted.'
-				.' %%uid replaces the username in the login action.');?>" />
+			title="<?php echo $l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action.');?>" />
 				<br /><small><?php echo $l->t('use %%uid placeholder, e.g. "uid=%%uid"');?></small></p>
 		<p><label for="ldap_userlist_filter"><?php echo $l->t('User List Filter');?></label>
 		<input type="text" id="ldap_userlist_filter" name="ldap_userlist_filter"
-- 
cgit v1.2.3