1 files changed, 14 insertions, 18 deletions
diff --git a/apps/user_ldap/l10n/en_GB.php b/apps/user_ldap/l10n/en_GB.php
index 731ddc58b8b..733a5744aab 100644
--- a/apps/user_ldap/l10n/en_GB.php
+++ b/apps/user_ldap/l10n/en_GB.php
@@ -12,40 +12,38 @@ $TRANSLATIONS = array(
 "mappings cleared" => "mappings cleared",
 "Success" => "Success",
 "Error" => "Error",
+"Select groups" => "Select groups",
 "Connection test succeeded" => "Connection test succeeded",
 "Connection test failed" => "Connection test failed",
 "Do you really want to delete the current Server Configuration?" => "Do you really want to delete the current Server Configuration?",
 "Confirm Deletion" => "Confirm Deletion",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.",
-"Server configuration" => "Server configuration",
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("",""),
+"Test Configuration" => "Test Configuration",
+"Help" => "Help",
 "Add Server Configuration" => "Add Server Configuration",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "You can omit the protocol, except you require SSL. Then start with ldaps://",
-"Base DN" => "Base DN",
-"One Base DN per line" => "One Base DN per line",
-"You can specify Base DN for users and groups in the Advanced tab" => "You can specify Base DN for users and groups in the Advanced tab",
+"Port" => "Port",
 "User DN" => "User DN",
 "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." => "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.",
 "Password" => "Password",
 "For anonymous access, leave DN and Password empty." => "For anonymous access, leave DN and Password empty.",
-"User Login Filter" => "User Login Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"",
-"User List Filter" => "User List Filter",
-"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"",
-"Group Filter" => "Group Filter",
-"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"",
+"One Base DN per line" => "One Base DN per line",
+"You can specify Base DN for users and groups in the Advanced tab" => "You can specify Base DN for users and groups in the Advanced tab",
+"Continue" => "Continue",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.",
 "Connection Settings" => "Connection Settings",
 "Configuration Active" => "Configuration Active",
 "When unchecked, this configuration will be skipped." => "When unchecked, this configuration will be skipped.",
-"Port" => "Port",
+"User Login Filter" => "User Login Filter",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"",
 "Backup (Replica) Host" => "Backup (Replica) Host",
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Give an optional backup host. It must be a replica of the main LDAP/AD server.",
 "Backup (Replica) Port" => "Backup (Replica) Port",
 "Disable Main Server" => "Disable Main Server",
 "Only connect to the replica server." => "Only connect to the replica server.",
-"Use TLS" => "Use TLS",
-"Do not use it additionally for LDAPS connections, it will fail." => "Do not use it additionally for LDAPS connections, it will fail.",
 "Case insensitve LDAP server (Windows)" => "Case insensitve LDAP server (Windows)",
 "Turn off SSL certificate validation." => "Turn off SSL certificate validation.",
 "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server.",
@@ -81,8 +79,6 @@ $TRANSLATIONS = array(
 "Username-LDAP User Mapping" => "Username-LDAP User Mapping",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Usernames are used to store and assign (meta) data. In order to precisely identify and recognise users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage.",
 "Clear Username-LDAP User Mapping" => "Clear Username-LDAP User Mapping",
-"Clear Groupname-LDAP Group Mapping" => "Clear Groupname-LDAP Group Mapping",
-"Test Configuration" => "Test Configuration",
-"Help" => "Help"
+"Clear Groupname-LDAP Group Mapping" => "Clear Groupname-LDAP Group Mapping"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";