summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/l10n/en_GB.json
diff options
context:
space:
mode:
Diffstat (limited to 'apps/user_ldap/l10n/en_GB.json')
-rw-r--r--apps/user_ldap/l10n/en_GB.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json
index bee955fed3b..6bea154a08d 100644
--- a/apps/user_ldap/l10n/en_GB.json
+++ b/apps/user_ldap/l10n/en_GB.json
@@ -126,7 +126,6 @@
"Groups" : "Groups",
"Expert" : "Expert",
"Advanced" : "Advanced",
- "<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",
@@ -191,6 +190,7 @@
"Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected.",
"Add a new and blank configuration" : "Add a new and blank configuration",
"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://",
+ "<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.",
"in bytes" : "in bytes"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file