[tx-robot] updated from transifex

20 files changed, 514 insertions, 198 deletions

diff --git a/apps/user_ldap/l10n/bg.js b/apps/user_ldap/l10n/bg.js
new file mode 100644
index 00000000000..d620d6e9b28
--- /dev/null
+++ b/apps/user_ldap/l10n/bg.js
@@ -0,0 +1,102 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Неуспешно изчистване на mapping-ите.",
+    "Failed to delete the server configuration" : "Неуспешен опит за изтриване на сървърната конфигурация.",
+    "No action specified" : "Не е посочено действие",
+    "No configuration specified" : "Не е посочена конфигурация",
+    "No data specified" : "Не са посочени данни",
+    " Could not set configuration %s" : "Неуспешно задаване на конфигруацията %s",
+    "Action does not exist" : "Действието не съществува",
+    "Testing configuration…" : "Изпробване на конфигурацията...",
+    "Configuration incorrect" : "Конфигурацията е грешна",
+    "Configuration incomplete" : "Конфигурацията не е завършена",
+    "Configuration OK" : "Конфигурацията е ОК",
+    "Select groups" : "Избери Групи",
+    "Select object classes" : "Избери типове обекти",
+    "Please check the credentials, they seem to be wrong." : "Моля, проверете идентификационните данни, изглежда че са неправилни.",
+    "Please specify the port, it could not be auto-detected." : "Моля, посочете порт, той не може да бъде автоматично определен.",
+    "{nthServer}. Server" : "{nthServer}. Сървър",
+    "Do you really want to delete the current Server Configuration?" : "Наистина ли искаш да изтриеш текущата Сървърна Конфигурация?",
+    "Confirm Deletion" : "Потвърди Изтриването",
+    "Select attributes" : "Избери атрибути",
+    "LDAP / AD integration" : "LDAP / AD интеграция",
+    "_%s group found_::_%s groups found_" : ["%s открита група","%s открити групи"],
+    "_%s user found_::_%s users found_" : ["%s октрит потребител","%s октрити потребители"],
+    "Could not find the desired feature" : "Не е открита желанта функция",
+    "Invalid Host" : "Невалиден сървър",
+    "Test Configuration" : "Изпробване на конфигурацията",
+    "Help" : "Помощ",
+    "Groups meeting these criteria are available in %s:" : "Групи спазващи тези критерии са разположени в %s:",
+    "Available groups" : "Налични групи",
+    "Selected groups" : "Избрани групи",
+    "LDAP Filter:" : "LDAP филтър:",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтърът посочва кои LDAP групи ще имат достъп до %s инсталацията.",
+    "LDAP / AD Username:" : "LDAP / AD потребител:",
+    "LDAP / AD Email Address:" : "LDAP / AD имейл адрес:",
+    "Other Attributes:" : "Други атрибути:",
+    "Test Loginname" : "Проверка на Потребителско име",
+    "Verify settings" : "Потвърди настройките",
+    "1. Server" : "1. Сървър",
+    "%s. Server:" : "%s. Сървър:",
+    "Delete the current configuration" : "Изтриване на текущата конфигурация",
+    "Host" : "Сървър",
+    "Port" : "Порт",
+    "Detect 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." : "DN на потребителят, с който ще стане свързването, пр. uid=agent,dc=example,dc=com. За анонимен достъп, остави DN и Парола празни.",
+    "Password" : "Парола",
+    "For anonymous access, leave DN and Password empty." : "За анонимен достъп, остави DN и Парола празни.",
+    "One Base DN per line" : "По един Base DN на ред",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Можеш да настроиш Base DN за отделни потребители и групи в разделителя Допълнителни.",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избягва автоматични LDAP заявки. По-добра опция за големи инсталации, но изисква LDAP познания.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ръчно въвеждана на LDAP филтри(препоръчано за по-големи папки)",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Филтърът посочва кои LDAP потребители ще имат достъп до %s инсталацията.",
+    "Saving" : "Записване",
+    "Back" : "Назад",
+    "Continue" : "Продължи",
+    "Server" : "Сървър",
+    "Users" : "Потребители",
+    "Groups" : "Групи",
+    "Expert" : "Експерт",
+    "Advanced" : "Допълнителни",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Предупреждение:</b> PHP LDAP модулът не е инсталиран, сървърът няма да работи. Моля, поискай системният админстратор да го инсталира.",
+    "Connection Settings" : "Настройки на Връзката",
+    "Configuration Active" : "Конфигурацията е Активна",
+    "When unchecked, this configuration will be skipped." : "Когато не е отметнато, тази конфигурация ще бъде прескочена.",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Задай незадължителен резервен сървър. Трябва да бъде реплика на главния LDAP/AD сървър.",
+    "Disable Main Server" : "Изключи Главиния Сървър",
+    "Only connect to the replica server." : "Свържи се само с репликирания сървър.",
+    "Turn off SSL certificate validation." : "Изключи валидацията на SSL сертификата.",
+    "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." : "Не е препоръчително! Ползвайте само за тестване. Ако връзката работи само с тази опция, внесете SSL сертификата на LDAP сървъра във вашия %s сървър.",
+    "Cache Time-To-Live" : "Кеширай Time-To-Live",
+    "in seconds. A change empties the cache." : "в секунди. Всяка промяна изтрива кеша.",
+    "Directory Settings" : "Настройки на Директорията",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP атрибутът, който да бъде използван за генериране на видимото име на потребителя.",
+    "Base User Tree" : "Base User Tree",
+    "One User Base DN per line" : "По един User Base DN на ред",
+    "User Search Attributes" : "Атрибути на Потребителско Търсене",
+    "Optional; one attribute per line" : "По желание; един атрибут на ред",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP атрибутът, който да бъде използван за генерирането на видмото име на групата.",
+    "Base Group Tree" : "Base Group Tree",
+    "One Group Base DN per line" : "По един Group Base DN на ред",
+    "Group Search Attributes" : "Атрибути на Групово Търсене",
+    "Group-Member association" : "Group-Member асоциация",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Когато е включени, се подържат групи в групи. (Работи единствено ако членът на групата притежава атрибута DNs).",
+    "Paging chunksize" : "Размер на paging-а",
+    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Размерът използван за връщането на големи резултати от LDAP търсения като изброяване на потребители или групи. (Стойност 0 изключва paged LDAP търсения в тези ситуации).",
+    "Special Attributes" : "Специални атрибути",
+    "Quota Field" : "Поле за Квота",
+    "Quota Default" : "Детайли на квотата",
+    "Email Field" : "Поле за имейл",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Оставете празно за потребителско име (стандартно). Или посочете LDAP/AD атрибут.",
+    "Internal Username" : "Вътрешно потребителско име",
+    "Internal Username Attribute:" : "Атрибут на вътрешното потребителско име:",
+    "Override UUID detection" : "Промени UUID откриването",
+    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Обикновено UUID атрибутът ще бъде намерен автоматично. UUID атрибута се използва, за да се идентифицират еднозначно LDAP потребители и групи. Освен това ще бъде генерирано вътрешното име базирано на UUID-то, ако такова не е посочено по-горе. Можете да промените настройката и да използвате атрибут по свой избор. Наложително е атрибутът да бъде уникален както за потребителите така и за групите. Промените ще се отразят само за новодобавени (map-нати) LDAP потребители.",
+    "UUID Attribute for Users:" : "UUID атрибут за потребителите:",
+    "UUID Attribute for Groups:" : "UUID атрибут за групите:",
+    "LDAP" : "LDAP",
+    "<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>Предупреждение:</b> Приложенията user_ldap и user_webdavauth са несъвместими. Моля, помолете системния администратор да изключи едно от приложенията."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/bg.json b/apps/user_ldap/l10n/bg.json
new file mode 100644
index 00000000000..b9e94e8b1be
--- /dev/null
+++ b/apps/user_ldap/l10n/bg.json
@@ -0,0 +1,100 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Неуспешно изчистване на mapping-ите.",
+    "Failed to delete the server configuration" : "Неуспешен опит за изтриване на сървърната конфигурация.",
+    "No action specified" : "Не е посочено действие",
+    "No configuration specified" : "Не е посочена конфигурация",
+    "No data specified" : "Не са посочени данни",
+    " Could not set configuration %s" : "Неуспешно задаване на конфигруацията %s",
+    "Action does not exist" : "Действието не съществува",
+    "Testing configuration…" : "Изпробване на конфигурацията...",
+    "Configuration incorrect" : "Конфигурацията е грешна",
+    "Configuration incomplete" : "Конфигурацията не е завършена",
+    "Configuration OK" : "Конфигурацията е ОК",
+    "Select groups" : "Избери Групи",
+    "Select object classes" : "Избери типове обекти",
+    "Please check the credentials, they seem to be wrong." : "Моля, проверете идентификационните данни, изглежда че са неправилни.",
+    "Please specify the port, it could not be auto-detected." : "Моля, посочете порт, той не може да бъде автоматично определен.",
+    "{nthServer}. Server" : "{nthServer}. Сървър",
+    "Do you really want to delete the current Server Configuration?" : "Наистина ли искаш да изтриеш текущата Сървърна Конфигурация?",
+    "Confirm Deletion" : "Потвърди Изтриването",
+    "Select attributes" : "Избери атрибути",
+    "LDAP / AD integration" : "LDAP / AD интеграция",
+    "_%s group found_::_%s groups found_" : ["%s открита група","%s открити групи"],
+    "_%s user found_::_%s users found_" : ["%s октрит потребител","%s октрити потребители"],
+    "Could not find the desired feature" : "Не е открита желанта функция",
+    "Invalid Host" : "Невалиден сървър",
+    "Test Configuration" : "Изпробване на конфигурацията",
+    "Help" : "Помощ",
+    "Groups meeting these criteria are available in %s:" : "Групи спазващи тези критерии са разположени в %s:",
+    "Available groups" : "Налични групи",
+    "Selected groups" : "Избрани групи",
+    "LDAP Filter:" : "LDAP филтър:",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтърът посочва кои LDAP групи ще имат достъп до %s инсталацията.",
+    "LDAP / AD Username:" : "LDAP / AD потребител:",
+    "LDAP / AD Email Address:" : "LDAP / AD имейл адрес:",
+    "Other Attributes:" : "Други атрибути:",
+    "Test Loginname" : "Проверка на Потребителско име",
+    "Verify settings" : "Потвърди настройките",
+    "1. Server" : "1. Сървър",
+    "%s. Server:" : "%s. Сървър:",
+    "Delete the current configuration" : "Изтриване на текущата конфигурация",
+    "Host" : "Сървър",
+    "Port" : "Порт",
+    "Detect 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." : "DN на потребителят, с който ще стане свързването, пр. uid=agent,dc=example,dc=com. За анонимен достъп, остави DN и Парола празни.",
+    "Password" : "Парола",
+    "For anonymous access, leave DN and Password empty." : "За анонимен достъп, остави DN и Парола празни.",
+    "One Base DN per line" : "По един Base DN на ред",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Можеш да настроиш Base DN за отделни потребители и групи в разделителя Допълнителни.",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избягва автоматични LDAP заявки. По-добра опция за големи инсталации, но изисква LDAP познания.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ръчно въвеждана на LDAP филтри(препоръчано за по-големи папки)",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Филтърът посочва кои LDAP потребители ще имат достъп до %s инсталацията.",
+    "Saving" : "Записване",
+    "Back" : "Назад",
+    "Continue" : "Продължи",
+    "Server" : "Сървър",
+    "Users" : "Потребители",
+    "Groups" : "Групи",
+    "Expert" : "Експерт",
+    "Advanced" : "Допълнителни",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Предупреждение:</b> PHP LDAP модулът не е инсталиран, сървърът няма да работи. Моля, поискай системният админстратор да го инсталира.",
+    "Connection Settings" : "Настройки на Връзката",
+    "Configuration Active" : "Конфигурацията е Активна",
+    "When unchecked, this configuration will be skipped." : "Когато не е отметнато, тази конфигурация ще бъде прескочена.",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Задай незадължителен резервен сървър. Трябва да бъде реплика на главния LDAP/AD сървър.",
+    "Disable Main Server" : "Изключи Главиния Сървър",
+    "Only connect to the replica server." : "Свържи се само с репликирания сървър.",
+    "Turn off SSL certificate validation." : "Изключи валидацията на SSL сертификата.",
+    "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." : "Не е препоръчително! Ползвайте само за тестване. Ако връзката работи само с тази опция, внесете SSL сертификата на LDAP сървъра във вашия %s сървър.",
+    "Cache Time-To-Live" : "Кеширай Time-To-Live",
+    "in seconds. A change empties the cache." : "в секунди. Всяка промяна изтрива кеша.",
+    "Directory Settings" : "Настройки на Директорията",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP атрибутът, който да бъде използван за генериране на видимото име на потребителя.",
+    "Base User Tree" : "Base User Tree",
+    "One User Base DN per line" : "По един User Base DN на ред",
+    "User Search Attributes" : "Атрибути на Потребителско Търсене",
+    "Optional; one attribute per line" : "По желание; един атрибут на ред",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP атрибутът, който да бъде използван за генерирането на видмото име на групата.",
+    "Base Group Tree" : "Base Group Tree",
+    "One Group Base DN per line" : "По един Group Base DN на ред",
+    "Group Search Attributes" : "Атрибути на Групово Търсене",
+    "Group-Member association" : "Group-Member асоциация",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Когато е включени, се подържат групи в групи. (Работи единствено ако членът на групата притежава атрибута DNs).",
+    "Paging chunksize" : "Размер на paging-а",
+    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Размерът използван за връщането на големи резултати от LDAP търсения като изброяване на потребители или групи. (Стойност 0 изключва paged LDAP търсения в тези ситуации).",
+    "Special Attributes" : "Специални атрибути",
+    "Quota Field" : "Поле за Квота",
+    "Quota Default" : "Детайли на квотата",
+    "Email Field" : "Поле за имейл",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Оставете празно за потребителско име (стандартно). Или посочете LDAP/AD атрибут.",
+    "Internal Username" : "Вътрешно потребителско име",
+    "Internal Username Attribute:" : "Атрибут на вътрешното потребителско име:",
+    "Override UUID detection" : "Промени UUID откриването",
+    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Обикновено UUID атрибутът ще бъде намерен автоматично. UUID атрибута се използва, за да се идентифицират еднозначно LDAP потребители и групи. Освен това ще бъде генерирано вътрешното име базирано на UUID-то, ако такова не е посочено по-горе. Можете да промените настройката и да използвате атрибут по свой избор. Наложително е атрибутът да бъде уникален както за потребителите така и за групите. Промените ще се отразят само за новодобавени (map-нати) LDAP потребители.",
+    "UUID Attribute for Users:" : "UUID атрибут за потребителите:",
+    "UUID Attribute for Groups:" : "UUID атрибут за групите:",
+    "LDAP" : "LDAP",
+    "<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>Предупреждение:</b> Приложенията user_ldap и user_webdavauth са несъвместими. Моля, помолете системния администратор да изключи едно от приложенията."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/eu.js b/apps/user_ldap/l10n/eu.js
index ff7fad6017c..230df36f183 100644
--- a/apps/user_ldap/l10n/eu.js
+++ b/apps/user_ldap/l10n/eu.js
@@ -3,9 +3,10 @@ OC.L10N.register(
     {
     "Failed to clear the mappings." : "Mapeatzeen garbiketak huts egin du.",
     "Failed to delete the server configuration" : "Zerbitzariaren konfigurazioa ezabatzeak huts egin du",
-    "The configuration is valid and the connection could be established!" : "Konfigurazioa egokia da eta konexioa ezarri daiteke!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurazioa ongi dago, baina Bind-ek huts egin du. Mesedez egiaztatu zerbitzariaren ezarpenak eta kredentzialak.",
-    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurazioa ez dago ongi. Mesedez ikusi egunerokoak (log) informazio gehiago eskuratzeko.",
+    "Invalid configuration: Anonymous binding is not allowed." : "Baliogabeko konfigurazioa. Lotura anonimoak ez dira onartzen.",
+    "Valid configuration, connection established!" : "Baleko konfigurazioa, konexioa ezarri da!",
+    "Valid configuration, but binding failed. Please check the server settings and credentials." : "Baleko konfigurazioa, baina lotura ez da ezarri. Egiaztatu zerbitzariaren ezarpenak eta kredentzialak.",
+    "Invalid configuration. Please have a look at the logs for further details." : "Baliogabeko konfigurazioa. Eman begirada bat egunkari-fitxategiei zehaztasun gehiagorako.",
     "No action specified" : "Ez da ekintzarik zehaztu",
     "No configuration specified" : "Ez da konfiguraziorik zehaztu",
     "No data specified" : "Ez da daturik zehaztu",
@@ -28,7 +29,6 @@ OC.L10N.register(
     "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Taldeen sarrera desgaitu da, LDAP / AD zerbitzariak ez duelako memberOf onartzen.",
     "_%s group found_::_%s groups found_" : ["Talde %s aurkitu da","%s talde aurkitu dira"],
     "_%s user found_::_%s users found_" : ["Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"],
-    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ezin izan da erabiltzailearen bistaratze izenaren atributua antzeman. Mesedez zehaztu ldap ezarpen aurreratuetan.",
     "Could not find the desired feature" : "Ezin izan da nahi zen ezaugarria aurkitu",
     "Invalid Host" : "Baliogabeko hostalaria",
     "Test Configuration" : "Egiaztatu Konfigurazioa",
@@ -42,20 +42,16 @@ OC.L10N.register(
     "Edit LDAP Query" : "Editatu LDAP kontsulta",
     "LDAP Filter:" : "LDAP Iragazkia:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP taldek izango duten sarrera %s instantziara:",
-    "Verify settings and count groups" : "Egiaztatu ezarpetak eta zenbatu taldeak",
     "LDAP / AD Username:" : "LDAP / AD Erabiltzaile izena:",
     "LDAP / AD Email Address:" : "LDAP / AD E-posta Helbidea:",
     "Other Attributes:" : "Bestelako atributuak:",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definitu aplikatu beharreko iragazkia sartzen saiatzean. %%uid erabiltzailearen izena ordezten du sartzeko ekintzan. Adibidez: \"uid=%%uid\"",
     "Test Loginname" : "Egiaztatu Saioa hasteko izena",
     "Verify settings" : "Egiaztatu ezarpenak",
     "1. Server" : "1. Zerbitzaria",
     "%s. Server:" : "%s. Zerbitzaria:",
-    "Add a new and blank configuration" : "Gehitu konfigurazio berri eta huts bat",
     "Copy current configuration into new directory binding" : "Kopiatu uneko konfigurazioa direktorio lotura berrian",
     "Delete the current configuration" : "Ezabatu uneko konfigurazioa",
     "Host" : "Hostalaria",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
     "Port" : "Portua",
     "Detect Port" : "Antzeman Ataka",
     "User DN" : "Erabiltzaile DN",
@@ -72,14 +68,12 @@ OC.L10N.register(
     "Saving" : "Gordetzen",
     "Back" : "Atzera",
     "Continue" : "Jarraitu",
-    "LDAP" : "LDAP",
     "Server" : "Zerbitzaria",
     "Users" : "Erabiltzaileak",
     "Login Attributes" : "Saioa hasteko atributuak",
     "Groups" : "Taldeak",
     "Expert" : "Aditua",
     "Advanced" : "Aurreratua",
-    "<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>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.",
     "Connection Settings" : "Konexio Ezarpenak",
     "Configuration Active" : "Konfigurazio Aktiboa",
@@ -111,7 +105,6 @@ OC.L10N.register(
     "Special Attributes" : "Atributu Bereziak",
     "Quota Field" : "Kuota Eremua",
     "Quota Default" : "Kuota Lehenetsia",
-    "in bytes" : "bytetan",
     "Email Field" : "Eposta eremua",
     "User Home Folder Naming Rule" : "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia",
     "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua.",
@@ -123,6 +116,8 @@ OC.L10N.register(
     "UUID Attribute for Groups:" : "Taldeentzako UUID atributuak:",
     "Username-LDAP User Mapping" : "LDAP-erabiltzaile-izena erabiltzailearen mapeatzea",
     "Clear Username-LDAP User Mapping" : "Garbitu LDAP-erabiltzaile-izenaren erabiltzaile mapaketa",
-    "Clear Groupname-LDAP Group Mapping" : "Garbitu LDAP-talde-izenaren talde mapaketa"
+    "Clear Groupname-LDAP Group Mapping" : "Garbitu LDAP-talde-izenaren talde mapaketa",
+    "LDAP" : "LDAP",
+    "<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>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/eu.json b/apps/user_ldap/l10n/eu.json
index e4ac633236c..82cde273a00 100644
--- a/apps/user_ldap/l10n/eu.json
+++ b/apps/user_ldap/l10n/eu.json
@@ -1,9 +1,10 @@
 { "translations": {
     "Failed to clear the mappings." : "Mapeatzeen garbiketak huts egin du.",
     "Failed to delete the server configuration" : "Zerbitzariaren konfigurazioa ezabatzeak huts egin du",
-    "The configuration is valid and the connection could be established!" : "Konfigurazioa egokia da eta konexioa ezarri daiteke!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurazioa ongi dago, baina Bind-ek huts egin du. Mesedez egiaztatu zerbitzariaren ezarpenak eta kredentzialak.",
-    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurazioa ez dago ongi. Mesedez ikusi egunerokoak (log) informazio gehiago eskuratzeko.",
+    "Invalid configuration: Anonymous binding is not allowed." : "Baliogabeko konfigurazioa. Lotura anonimoak ez dira onartzen.",
+    "Valid configuration, connection established!" : "Baleko konfigurazioa, konexioa ezarri da!",
+    "Valid configuration, but binding failed. Please check the server settings and credentials." : "Baleko konfigurazioa, baina lotura ez da ezarri. Egiaztatu zerbitzariaren ezarpenak eta kredentzialak.",
+    "Invalid configuration. Please have a look at the logs for further details." : "Baliogabeko konfigurazioa. Eman begirada bat egunkari-fitxategiei zehaztasun gehiagorako.",
     "No action specified" : "Ez da ekintzarik zehaztu",
     "No configuration specified" : "Ez da konfiguraziorik zehaztu",
     "No data specified" : "Ez da daturik zehaztu",
@@ -26,7 +27,6 @@
     "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Taldeen sarrera desgaitu da, LDAP / AD zerbitzariak ez duelako memberOf onartzen.",
     "_%s group found_::_%s groups found_" : ["Talde %s aurkitu da","%s talde aurkitu dira"],
     "_%s user found_::_%s users found_" : ["Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"],
-    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ezin izan da erabiltzailearen bistaratze izenaren atributua antzeman. Mesedez zehaztu ldap ezarpen aurreratuetan.",
     "Could not find the desired feature" : "Ezin izan da nahi zen ezaugarria aurkitu",
     "Invalid Host" : "Baliogabeko hostalaria",
     "Test Configuration" : "Egiaztatu Konfigurazioa",
@@ -40,20 +40,16 @@
     "Edit LDAP Query" : "Editatu LDAP kontsulta",
     "LDAP Filter:" : "LDAP Iragazkia:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP taldek izango duten sarrera %s instantziara:",
-    "Verify settings and count groups" : "Egiaztatu ezarpetak eta zenbatu taldeak",
     "LDAP / AD Username:" : "LDAP / AD Erabiltzaile izena:",
     "LDAP / AD Email Address:" : "LDAP / AD E-posta Helbidea:",
     "Other Attributes:" : "Bestelako atributuak:",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definitu aplikatu beharreko iragazkia sartzen saiatzean. %%uid erabiltzailearen izena ordezten du sartzeko ekintzan. Adibidez: \"uid=%%uid\"",
     "Test Loginname" : "Egiaztatu Saioa hasteko izena",
     "Verify settings" : "Egiaztatu ezarpenak",
     "1. Server" : "1. Zerbitzaria",
     "%s. Server:" : "%s. Zerbitzaria:",
-    "Add a new and blank configuration" : "Gehitu konfigurazio berri eta huts bat",
     "Copy current configuration into new directory binding" : "Kopiatu uneko konfigurazioa direktorio lotura berrian",
     "Delete the current configuration" : "Ezabatu uneko konfigurazioa",
     "Host" : "Hostalaria",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
     "Port" : "Portua",
     "Detect Port" : "Antzeman Ataka",
     "User DN" : "Erabiltzaile DN",
@@ -70,14 +66,12 @@
     "Saving" : "Gordetzen",
     "Back" : "Atzera",
     "Continue" : "Jarraitu",
-    "LDAP" : "LDAP",
     "Server" : "Zerbitzaria",
     "Users" : "Erabiltzaileak",
     "Login Attributes" : "Saioa hasteko atributuak",
     "Groups" : "Taldeak",
     "Expert" : "Aditua",
     "Advanced" : "Aurreratua",
-    "<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>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.",
     "Connection Settings" : "Konexio Ezarpenak",
     "Configuration Active" : "Konfigurazio Aktiboa",
@@ -109,7 +103,6 @@
     "Special Attributes" : "Atributu Bereziak",
     "Quota Field" : "Kuota Eremua",
     "Quota Default" : "Kuota Lehenetsia",
-    "in bytes" : "bytetan",
     "Email Field" : "Eposta eremua",
     "User Home Folder Naming Rule" : "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia",
     "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua.",
@@ -121,6 +114,8 @@
     "UUID Attribute for Groups:" : "Taldeentzako UUID atributuak:",
     "Username-LDAP User Mapping" : "LDAP-erabiltzaile-izena erabiltzailearen mapeatzea",
     "Clear Username-LDAP User Mapping" : "Garbitu LDAP-erabiltzaile-izenaren erabiltzaile mapaketa",
-    "Clear Groupname-LDAP Group Mapping" : "Garbitu LDAP-talde-izenaren talde mapaketa"
+    "Clear Groupname-LDAP Group Mapping" : "Garbitu LDAP-talde-izenaren talde mapaketa",
+    "LDAP" : "LDAP",
+    "<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>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/he.js b/apps/user_ldap/l10n/he.js
index d4b03c5df55..06e0f58aa9e 100644
--- a/apps/user_ldap/l10n/he.js
+++ b/apps/user_ldap/l10n/he.js
@@ -3,10 +3,6 @@ OC.L10N.register(
     {
     "Failed to clear the mappings." : "כשל בניקוי המיפויים.",
     "Failed to delete the server configuration" : "כשל במחיקת הגדרות השרת",
-    "The configuration is invalid: anonymous bind is not allowed." : "התצורה אינה חוקית: חיבור אנונימי אסור",
-    "The configuration is valid and the connection could be established!" : "התצורה תקפה וניתן לבצע חיבור!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "התצורה תקפה, אך הקישור נכשל. יש לבדוק את הגדרות השרת והחיבור.",
-    "The configuration is invalid. Please have a look at the logs for further details." : "התצורה אינה חוקית. יש לבדוק את הלוגים לפרטים נוספים.",
     "No action specified" : "לא צויינה פעולה",
     "No configuration specified" : "לא הוגדרה תצורה",
     "No data specified" : "לא הוגדר מידע",
@@ -38,16 +34,13 @@ OC.L10N.register(
     "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "שינוי המצב יאפשר שאילתות LDAP אוטמטיות. בהתאם לגודל ה- LDAP שלך ייתכן והפעולה תיקח זמן רב. האם ברצונך לשנות את המצב?",
     "Mode switch" : "שינוי מצב",
     "Select attributes" : "בחירת מאפיינים",
-    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "משתמש לא אותר. יש לבדוק את מאפייני ההתחברות ושם המשתמש. מסנן אפקטיבי (העתקה והדבקה לאימות שורת פקודה):<br/>",
     "User found and settings verified." : "משתמש אותר והגדרות אומתו.",
-    "An unspecified error occurred. Please check the settings and the log." : "אירעה שגיאה לא מזוהה. יש לבדוק את ההגדרות ואת הלוג.",
     "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "סינון החיפוש אינו חוקי. ככל הנראה בשל שיאה תחבירית כגון מספר לא שווה של פתח-סוגריים וסגור-סוגריים. יש לתקן.",
     "A connection error to LDAP / AD occurred, please check host, port and credentials." : "אירעה שגיאת חיבור ל- LDAP / AD, יש לבדוק את השרת, שער החיבור - פורט ופרטי הכניסה. ",
     "Please provide a login name to test against" : "יש לספק שם משתמש לבדיקה מולו",
     "The group box was disabled, because the LDAP / AD server does not support memberOf." : "שדה הקבוצה נוטרל, כיוון ששרת ה- LDAP / AD לא תומך ב- memberOf.",
     "_%s group found_::_%s groups found_" : ["אותרה %s קבוצה","אותרו %s קבוצות"],
     "_%s user found_::_%s users found_" : ["אותר %s משתמש","אותרו %s משתמשים"],
-    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "לא אותר מאפיין שם תצוגה למשתמש. יש לספק אותו בעצמך בהגדרות ldap מתקדמות.",
     "Could not find the desired feature" : "לא אותרה התכונה הרצויה",
     "Invalid Host" : "מארח לא חוקי",
     "Test Configuration" : "בדיקת הגדרות",
@@ -64,9 +57,7 @@ OC.L10N.register(
     "When logging in, %s will find the user based on the following attributes:" : "כאשר מתחברים, %s יחפש את המשתמש על פי המאפיינים הבאים:",
     "LDAP / AD Username:" : "שם משתמש LDAP / AD:",
     "LDAP / AD Email Address:" : "כתובת דואר אלקטרוני LDAP / AD:",
-    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "מאפשר התחברות אל מול מאפיין דואר אלקטרוני. Mail וכן mailPrimaryAddress יהיו מותרים לשימוש.",
     "Other Attributes:" : "מאפיינים נוספים:",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "מגדיר את הסינון הפעיל, כשיש ניסיון התחברות. %%uid מחליף את שם המשתמש בפעולת ההתחברות. לדוגמא: \"uid=%%uid\"",
     "Test Loginname" : "בדיקת שם התחברות",
     "Verify settings" : "מאמת הגדרות",
     "1. Server" : "1. שרת",
@@ -91,7 +82,6 @@ OC.L10N.register(
     "Saving" : "שמירה",
     "Back" : "אחורה",
     "Continue" : "המשך",
-    "LDAP" : "LDAP",
     "Server" : "שרת",
     "Users" : "משתמשים",
     "Login Attributes" : "פרטי כניסה",
@@ -141,12 +131,7 @@ OC.L10N.register(
     "Username-LDAP User Mapping" : "מיפוי שם משתמש LDAP:",
     "Clear Username-LDAP User Mapping" : "ניקוי מיפוי שם משתמש LDAP:",
     "Clear Groupname-LDAP Group Mapping" : "ניקוי מיפוי שם משתמש קבוצה LDAP:",
-    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "שומר המקום %uid חסר. הוא יוחלף עם שם המשתמש בזמן שאילתת LDAP / AD.",
-    "Verify settings and count groups" : "מאמת הגדרות וסופר קבוצות",
-    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "מאפשר התחברות אל מול שם משתמש LDAP / AD, שהוא רק uid או samaccountname ויזוהה.",
-    "Add a new and blank configuration" : "הוספת תצורה חדשה וריקה",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "ניתן להשמיט את הפרוטוקול, אך SSL מחייב. לפיכך יש להתחיל עם 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>אזהרה:</b> יישומים user_ldap ו- user_webdavauth אינם תואמים. תופעות לא מוסברות עלולות להתקיים. כדאי לפנות למנהל המערכת כדי שינטרל אחד מהם.",
-    "in bytes" : "בבתים"
+    "LDAP" : "LDAP",
+    "<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>אזהרה:</b> יישומים user_ldap ו- user_webdavauth אינם תואמים. תופעות לא מוסברות עלולות להתקיים. כדאי לפנות למנהל המערכת כדי שינטרל אחד מהם."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/he.json b/apps/user_ldap/l10n/he.json
index 0a46acadaf4..7fd376cc27f 100644
--- a/apps/user_ldap/l10n/he.json
+++ b/apps/user_ldap/l10n/he.json
@@ -1,10 +1,6 @@
 { "translations": {
     "Failed to clear the mappings." : "כשל בניקוי המיפויים.",
     "Failed to delete the server configuration" : "כשל במחיקת הגדרות השרת",
-    "The configuration is invalid: anonymous bind is not allowed." : "התצורה אינה חוקית: חיבור אנונימי אסור",
-    "The configuration is valid and the connection could be established!" : "התצורה תקפה וניתן לבצע חיבור!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "התצורה תקפה, אך הקישור נכשל. יש לבדוק את הגדרות השרת והחיבור.",
-    "The configuration is invalid. Please have a look at the logs for further details." : "התצורה אינה חוקית. יש לבדוק את הלוגים לפרטים נוספים.",
     "No action specified" : "לא צויינה פעולה",
     "No configuration specified" : "לא הוגדרה תצורה",
     "No data specified" : "לא הוגדר מידע",
@@ -36,16 +32,13 @@
     "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "שינוי המצב יאפשר שאילתות LDAP אוטמטיות. בהתאם לגודל ה- LDAP שלך ייתכן והפעולה תיקח זמן רב. האם ברצונך לשנות את המצב?",
     "Mode switch" : "שינוי מצב",
     "Select attributes" : "בחירת מאפיינים",
-    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "משתמש לא אותר. יש לבדוק את מאפייני ההתחברות ושם המשתמש. מסנן אפקטיבי (העתקה והדבקה לאימות שורת פקודה):<br/>",
     "User found and settings verified." : "משתמש אותר והגדרות אומתו.",
-    "An unspecified error occurred. Please check the settings and the log." : "אירעה שגיאה לא מזוהה. יש לבדוק את ההגדרות ואת הלוג.",
     "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "סינון החיפוש אינו חוקי. ככל הנראה בשל שיאה תחבירית כגון מספר לא שווה של פתח-סוגריים וסגור-סוגריים. יש לתקן.",
     "A connection error to LDAP / AD occurred, please check host, port and credentials." : "אירעה שגיאת חיבור ל- LDAP / AD, יש לבדוק את השרת, שער החיבור - פורט ופרטי הכניסה. ",
     "Please provide a login name to test against" : "יש לספק שם משתמש לבדיקה מולו",
     "The group box was disabled, because the LDAP / AD server does not support memberOf." : "שדה הקבוצה נוטרל, כיוון ששרת ה- LDAP / AD לא תומך ב- memberOf.",
     "_%s group found_::_%s groups found_" : ["אותרה %s קבוצה","אותרו %s קבוצות"],
     "_%s user found_::_%s users found_" : ["אותר %s משתמש","אותרו %s משתמשים"],
-    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "לא אותר מאפיין שם תצוגה למשתמש. יש לספק אותו בעצמך בהגדרות ldap מתקדמות.",
     "Could not find the desired feature" : "לא אותרה התכונה הרצויה",
     "Invalid Host" : "מארח לא חוקי",
     "Test Configuration" : "בדיקת הגדרות",
@@ -62,9 +55,7 @@
     "When logging in, %s will find the user based on the following attributes:" : "כאשר מתחברים, %s יחפש את המשתמש על פי המאפיינים הבאים:",
     "LDAP / AD Username:" : "שם משתמש LDAP / AD:",
     "LDAP / AD Email Address:" : "כתובת דואר אלקטרוני LDAP / AD:",
-    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "מאפשר התחברות אל מול מאפיין דואר אלקטרוני. Mail וכן mailPrimaryAddress יהיו מותרים לשימוש.",
     "Other Attributes:" : "מאפיינים נוספים:",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "מגדיר את הסינון הפעיל, כשיש ניסיון התחברות. %%uid מחליף את שם המשתמש בפעולת ההתחברות. לדוגמא: \"uid=%%uid\"",
     "Test Loginname" : "בדיקת שם התחברות",
     "Verify settings" : "מאמת הגדרות",
     "1. Server" : "1. שרת",
@@ -89,7 +80,6 @@
     "Saving" : "שמירה",
     "Back" : "אחורה",
     "Continue" : "המשך",
-    "LDAP" : "LDAP",
     "Server" : "שרת",
     "Users" : "משתמשים",
     "Login Attributes" : "פרטי כניסה",
@@ -139,12 +129,7 @@
     "Username-LDAP User Mapping" : "מיפוי שם משתמש LDAP:",
     "Clear Username-LDAP User Mapping" : "ניקוי מיפוי שם משתמש LDAP:",
     "Clear Groupname-LDAP Group Mapping" : "ניקוי מיפוי שם משתמש קבוצה LDAP:",
-    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "שומר המקום %uid חסר. הוא יוחלף עם שם המשתמש בזמן שאילתת LDAP / AD.",
-    "Verify settings and count groups" : "מאמת הגדרות וסופר קבוצות",
-    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "מאפשר התחברות אל מול שם משתמש LDAP / AD, שהוא רק uid או samaccountname ויזוהה.",
-    "Add a new and blank configuration" : "הוספת תצורה חדשה וריקה",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "ניתן להשמיט את הפרוטוקול, אך SSL מחייב. לפיכך יש להתחיל עם 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>אזהרה:</b> יישומים user_ldap ו- user_webdavauth אינם תואמים. תופעות לא מוסברות עלולות להתקיים. כדאי לפנות למנהל המערכת כדי שינטרל אחד מהם.",
-    "in bytes" : "בבתים"
+    "LDAP" : "LDAP",
+    "<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>אזהרה:</b> יישומים user_ldap ו- user_webdavauth אינם תואמים. תופעות לא מוסברות עלולות להתקיים. כדאי לפנות למנהל המערכת כדי שינטרל אחד מהם."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/is.js b/apps/user_ldap/l10n/is.js
index b158b796056..ad321c10c29 100644
--- a/apps/user_ldap/l10n/is.js
+++ b/apps/user_ldap/l10n/is.js
@@ -1,41 +1,103 @@
 OC.L10N.register(
     "user_ldap",
     {
+    "Failed to clear the mappings." : "Mistókst að hreinsa varpanir.",
+    "Failed to delete the server configuration" : "Mistókst að eyða uppsetningu þjónsins",
+    "Valid configuration, connection established!" : "Gild uppsetning, tengingu komið á!",
+    "Valid configuration, but binding failed. Please check the server settings and credentials." : "Uppsetningin er gild, en binding mistókst. Skoðaðu stillingar þjónsins og auðkenni.",
+    "Invalid configuration. Please have a look at the logs for further details." : "Uppsetningin er ógild. Skoðaðu atvikaskrárnar til að sjá nánari upplýsingar.",
     "No action specified" : "Engin aðgerð tiltekin",
+    "No configuration specified" : "Engin uppsetning tiltekin",
     "No data specified" : "Engin gögn tiltekin",
+    " Could not set configuration %s" : "Gat ekki sett uppsetningu %s",
     "Action does not exist" : "Aðgerð er ekki til",
+    "LDAP user and group backend" : "LDAP notandi og bakendi hóps",
+    "Renewing …" : "Endurnýja …",
+    "Very weak password" : "Mjög veikt lykilorð",
+    "Weak password" : "Veikt lykilorð",
+    "So-so password" : "Miðlungs lykilorð",
+    "Good password" : "Gott lykilorð",
+    "Strong password" : "Sterkt lykilorð",
+    "Testing configuration…" : "Prófa stillingar…",
     "Configuration incorrect" : "Röng uppsetning",
+    "Configuration incomplete" : "Ófullgerð uppsetning",
     "Configuration OK" : "Stillingar eru í lagi",
     "Select groups" : "Veldu hópa",
+    "Please check the credentials, they seem to be wrong." : "Athugaðu auðkennin, þau líta út fyrir að vera röng.",
     "{nthServer}. Server" : "{nthServer}. Þjónn",
+    "More than 1,000 directory entries available." : "Meira en 1,000 möppufærslur tiltækar.",
+    "Do you really want to delete the current Server Configuration?" : "Ertu viss um að þú viljir eyða núgildandi uppsetningu á þjóninum?",
     "Confirm Deletion" : "Staðfesta eyðingu",
+    "Mappings cleared successfully!" : "Það tókst að hreinsa varpanir!",
+    "Error while clearing the mappings." : "Villa við að hreinsa út varpanir.",
+    "Mode switch" : "Skipta um ham",
     "Select attributes" : "Veldu eigindi",
+    "User found and settings verified." : "Notandi fannst og stillingar yfirfarnar.",
+    "Password change rejected. Hint: " : "Breytingu á lykilorði hafnað. Ábending: ",
+    "Please login with the new password" : "Skráðu þig inn með nýja lykilorðinu",
+    "Your password will expire tomorrow." : "Lykilorðið þitt rennur út á morgun.",
+    "Your password will expire today." : "Lykilorðið þitt rennur út í dag.",
+    "_Your password will expire within %n day._::_Your password will expire within %n days._" : ["Lykilorðið þitt rennur út innan %n dags.","Lykilorðið þitt rennur út innan %n daga."],
+    "LDAP / AD integration" : "LDAP / AD samþætting",
     "_%s group found_::_%s groups found_" : ["%s hópur fannst","%s hópar fundust"],
     "_%s user found_::_%s users found_" : ["%s notandi fannst","%s notendur fundust"],
+    "Could not find the desired feature" : "Gat ekki fundið eiginleika sem óskað var eftir",
     "Invalid Host" : "Ógild vél",
-    "Server" : "Þjónn",
-    "Users" : "Notendur",
-    "Login Attributes" : "Eigindi innskráningar",
-    "Groups" : "Hópar",
-    "Test Configuration" : "Prúfa uppsetningu",
+    "Test Configuration" : "Prófa uppsetningu",
     "Help" : "Hjálp",
+    "Only from these groups:" : "Aðeins úr þessum hópum:",
     "Search groups" : "Leita í hópum",
     "Available groups" : "Tiltækir hópar",
     "Selected groups" : "Valdir hópar",
+    "Edit LDAP Query" : "Breyta LDAP-fyrirspurn",
+    "LDAP Filter:" : "LDAP sía:",
+    "Verify settings and count the groups" : "Sannprófa stillingar og telja hópa",
+    "LDAP / AD Username:" : "LDAP / AD notandanafn:",
+    "LDAP / AD Email Address:" : "LDAP / AD tölvupóstfang:",
+    "Other Attributes:" : "Önnur eigindi:",
+    "Test Loginname" : "Prófa innskráningarnafn",
     "Verify settings" : "Sannprófa stillingar",
     "1. Server" : "1. Þjónn",
     "%s. Server:" : "%s. Þjónn:",
+    "Add a new configuration" : "Bæta við nýrri uppsetningu",
+    "Delete the current configuration" : "Eyða núgildandi uppsetningu",
     "Host" : "Hýsill",
     "Port" : "Gátt",
     "Detect Port" : "Finna gátt",
+    "User DN" : "DN notanda",
     "Password" : "Lykilorð",
+    "Verify settings and count users" : "Sannprófa stillingar og telja notendur",
     "Saving" : "Vistun",
     "Back" : "Til baka",
     "Continue" : "Halda áfram",
-    "LDAP" : "LDAP",
+    "Please renew your password." : "Endurnýjaðu lykilorðið þitt",
+    "An internal error occurred." : "Innri villa kom upp.",
+    "Please try again or contact your administrator." : "Reyndu aftur eða hafðu samband við kerfisstjóra.",
+    "Current password" : "Núverandi lykilorð",
+    "New password" : "Nýtt lykilorð",
+    "Renew password" : "Endurnýja lykilorð",
+    "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?",
+    "Wrong password." : "Rangt lykilorð.",
+    "Cancel" : "Hætta við",
+    "Server" : "Þjónn",
+    "Users" : "Notendur",
+    "Login Attributes" : "Eigindi innskráningar",
+    "Groups" : "Hópar",
     "Expert" : "Snillingur",
     "Advanced" : "Ítarlegt",
     "Connection Settings" : "Valkostir tengingar ",
-    "in bytes" : "í bætum"
+    "Configuration Active" : "Uppsetning er virk",
+    "Disable Main Server" : "Gera aðalþjón óvirkan",
+    "Turn off SSL certificate validation." : "Slökkva á sannvottun SSL-skilríkja.",
+    "in seconds. A change empties the cache." : "í sekúndum. Breyting tæmir skyndiminnið.",
+    "Directory Settings" : "Stillingar möppu",
+    "Nested Groups" : "Faldaðir hópar",
+    "(New password is sent as plain text to LDAP)" : "(Nýtt lykilorð er sent sem hreinn texti til LDAP)",
+    "Special Attributes" : "Sérstök eigindi",
+    "Quota Field" : "Gagnasvið fyrir kvóta",
+    "Quota Default" : "Sjálfgefinn kvóti",
+    "Email Field" : "Gagnasvið fyrir netfang",
+    "Internal Username" : "Innra notandanafn",
+    "LDAP" : "LDAP"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/user_ldap/l10n/is.json b/apps/user_ldap/l10n/is.json
index 3c049382900..dd7d0b236fe 100644
--- a/apps/user_ldap/l10n/is.json
+++ b/apps/user_ldap/l10n/is.json
@@ -1,39 +1,101 @@
 { "translations": {
+    "Failed to clear the mappings." : "Mistókst að hreinsa varpanir.",
+    "Failed to delete the server configuration" : "Mistókst að eyða uppsetningu þjónsins",
+    "Valid configuration, connection established!" : "Gild uppsetning, tengingu komið á!",
+    "Valid configuration, but binding failed. Please check the server settings and credentials." : "Uppsetningin er gild, en binding mistókst. Skoðaðu stillingar þjónsins og auðkenni.",
+    "Invalid configuration. Please have a look at the logs for further details." : "Uppsetningin er ógild. Skoðaðu atvikaskrárnar til að sjá nánari upplýsingar.",
     "No action specified" : "Engin aðgerð tiltekin",
+    "No configuration specified" : "Engin uppsetning tiltekin",
     "No data specified" : "Engin gögn tiltekin",
+    " Could not set configuration %s" : "Gat ekki sett uppsetningu %s",
     "Action does not exist" : "Aðgerð er ekki til",
+    "LDAP user and group backend" : "LDAP notandi og bakendi hóps",
+    "Renewing …" : "Endurnýja …",
+    "Very weak password" : "Mjög veikt lykilorð",
+    "Weak password" : "Veikt lykilorð",
+    "So-so password" : "Miðlungs lykilorð",
+    "Good password" : "Gott lykilorð",
+    "Strong password" : "Sterkt lykilorð",
+    "Testing configuration…" : "Prófa stillingar…",
     "Configuration incorrect" : "Röng uppsetning",
+    "Configuration incomplete" : "Ófullgerð uppsetning",
     "Configuration OK" : "Stillingar eru í lagi",
     "Select groups" : "Veldu hópa",
+    "Please check the credentials, they seem to be wrong." : "Athugaðu auðkennin, þau líta út fyrir að vera röng.",
     "{nthServer}. Server" : "{nthServer}. Þjónn",
+    "More than 1,000 directory entries available." : "Meira en 1,000 möppufærslur tiltækar.",
+    "Do you really want to delete the current Server Configuration?" : "Ertu viss um að þú viljir eyða núgildandi uppsetningu á þjóninum?",
     "Confirm Deletion" : "Staðfesta eyðingu",
+    "Mappings cleared successfully!" : "Það tókst að hreinsa varpanir!",
+    "Error while clearing the mappings." : "Villa við að hreinsa út varpanir.",
+    "Mode switch" : "Skipta um ham",
     "Select attributes" : "Veldu eigindi",
+    "User found and settings verified." : "Notandi fannst og stillingar yfirfarnar.",
+    "Password change rejected. Hint: " : "Breytingu á lykilorði hafnað. Ábending: ",
+    "Please login with the new password" : "Skráðu þig inn með nýja lykilorðinu",
+    "Your password will expire tomorrow." : "Lykilorðið þitt rennur út á morgun.",
+    "Your password will expire today." : "Lykilorðið þitt rennur út í dag.",
+    "_Your password will expire within %n day._::_Your password will expire within %n days._" : ["Lykilorðið þitt rennur út innan %n dags.","Lykilorðið þitt rennur út innan %n daga."],
+    "LDAP / AD integration" : "LDAP / AD samþætting",
     "_%s group found_::_%s groups found_" : ["%s hópur fannst","%s hópar fundust"],
     "_%s user found_::_%s users found_" : ["%s notandi fannst","%s notendur fundust"],
+    "Could not find the desired feature" : "Gat ekki fundið eiginleika sem óskað var eftir",
     "Invalid Host" : "Ógild vél",
-    "Server" : "Þjónn",
-    "Users" : "Notendur",
-    "Login Attributes" : "Eigindi innskráningar",
-    "Groups" : "Hópar",
-    "Test Configuration" : "Prúfa uppsetningu",
+    "Test Configuration" : "Prófa uppsetningu",
     "Help" : "Hjálp",
+    "Only from these groups:" : "Aðeins úr þessum hópum:",
     "Search groups" : "Leita í hópum",
     "Available groups" : "Tiltækir hópar",
     "Selected groups" : "Valdir hópar",
+    "Edit LDAP Query" : "Breyta LDAP-fyrirspurn",
+    "LDAP Filter:" : "LDAP sía:",
+    "Verify settings and count the groups" : "Sannprófa stillingar og telja hópa",
+    "LDAP / AD Username:" : "LDAP / AD notandanafn:",
+    "LDAP / AD Email Address:" : "LDAP / AD tölvupóstfang:",
+    "Other Attributes:" : "Önnur eigindi:",
+    "Test Loginname" : "Prófa innskráningarnafn",
     "Verify settings" : "Sannprófa stillingar",
     "1. Server" : "1. Þjónn",
     "%s. Server:" : "%s. Þjónn:",
+    "Add a new configuration" : "Bæta við nýrri uppsetningu",
+    "Delete the current configuration" : "Eyða núgildandi uppsetningu",
     "Host" : "Hýsill",
     "Port" : "Gátt",
     "Detect Port" : "Finna gátt",
+    "User DN" : "DN notanda",
     "Password" : "Lykilorð",
+    "Verify settings and count users" : "Sannprófa stillingar og telja notendur",
     "Saving" : "Vistun",
     "Back" : "Til baka",
     "Continue" : "Halda áfram",
-    "LDAP" : "LDAP",
+    "Please renew your password." : "Endurnýjaðu lykilorðið þitt",
+    "An internal error occurred." : "Innri villa kom upp.",
+    "Please try again or contact your administrator." : "Reyndu aftur eða hafðu samband við kerfisstjóra.",
+    "Current password" : "Núverandi lykilorð",
+    "New password" : "Nýtt lykilorð",
+    "Renew password" : "Endurnýja lykilorð",
+    "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?",
+    "Wrong password." : "Rangt lykilorð.",
+    "Cancel" : "Hætta við",
+    "Server" : "Þjónn",
+    "Users" : "Notendur",
+    "Login Attributes" : "Eigindi innskráningar",
+    "Groups" : "Hópar",
     "Expert" : "Snillingur",
     "Advanced" : "Ítarlegt",
     "Connection Settings" : "Valkostir tengingar ",
-    "in bytes" : "í bætum"
+    "Configuration Active" : "Uppsetning er virk",
+    "Disable Main Server" : "Gera aðalþjón óvirkan",
+    "Turn off SSL certificate validation." : "Slökkva á sannvottun SSL-skilríkja.",
+    "in seconds. A change empties the cache." : "í sekúndum. Breyting tæmir skyndiminnið.",
+    "Directory Settings" : "Stillingar möppu",
+    "Nested Groups" : "Faldaðir hópar",
+    "(New password is sent as plain text to LDAP)" : "(Nýtt lykilorð er sent sem hreinn texti til LDAP)",
+    "Special Attributes" : "Sérstök eigindi",
+    "Quota Field" : "Gagnasvið fyrir kvóta",
+    "Quota Default" : "Sjálfgefinn kvóti",
+    "Email Field" : "Gagnasvið fyrir netfang",
+    "Internal Username" : "Innra notandanafn",
+    "LDAP" : "LDAP"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/lv.js b/apps/user_ldap/l10n/lv.js
index b671b528729..8f6ae7d279f 100644
--- a/apps/user_ldap/l10n/lv.js
+++ b/apps/user_ldap/l10n/lv.js
@@ -1,25 +1,75 @@
 OC.L10N.register(
     "user_ldap",
     {
+    "Failed to clear the mappings." : "Neizdevās nodzēstu samērošanu.",
     "Failed to delete the server configuration" : "Neizdevās izdzēst servera konfigurāciju",
-    "The configuration is valid and the connection could be established!" : "Konfigurācija ir derīga un varēja izveidot savienojumu!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurācija ir derīga, bet sasaiste neizdevās. Lūdzu, pārbaudiet servera iestatījumus un akreditācijas datus.",
+    "No action specified" : "Nav norādīta darbība",
+    "No configuration specified" : "Nav norādīta konfigurācija",
+    "No data specified" : "Nav norādīti dati",
+    " Could not set configuration %s" : "Nevarēja iestatīt konfigurāciju %s",
+    "Action does not exist" : "Darbība neeksistē",
+    "The Base DN appears to be wrong" : "DN bāze šķiet nepareiza",
+    "Testing configuration…" : "Konfigurācijas pārbaude...",
+    "Configuration incorrect" : "Nepareiza konfigurācija",
+    "Configuration incomplete" : "Nepilnīga konfigurācija",
+    "Configuration OK" : "Konfigurācija OK",
     "Select groups" : "Izvēlieties grupas",
+    "Select object classes" : "Atlasiet objektu klases",
+    "Please check the credentials, they seem to be wrong." : "Lūdzu, pārbaudiet akreditācijas datus, tie šķiet nepareizi.",
+    "Please specify the port, it could not be auto-detected." : "Lūdzu, norādiet portu, tas nevarēja būt noteikts automātiski.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "DN bāzi nevarēja noteikt, lūdzu, pārskatiet datus, resursdatoru un portu.",
+    "Could not detect Base DN, please enter it manually." : "Nevarēja noteikt DN bāzi, lūdzu, ievadiet to manuāli.",
+    "{nthServer}. Server" : "{nthServer}. Serveris",
+    "No object found in the given Base DN. Please revise." : "Neviens objekts nav atrasts konkrētā DN bāzē. Lūdzu pārskatīt.",
+    "More than 1,000 directory entries available." : "Vairāk nekā 1,000 kataloga ieraksti ir pieejami.",
+    " entries available within the provided Base DN" : "ieraksti pieejami ar nosacījumu DN bāzē",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Radās kļūda. Lūdzu, pārbaudiet bāzes DN, kā arī savienojuma iestatījumus vai akreditācijas datus.",
     "Do you really want to delete the current Server Configuration?" : "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?",
     "Confirm Deletion" : "Apstiprināt dzēšanu",
-    "Users" : "Lietotāji",
-    "Groups" : "Grupas",
+    "Mappings cleared successfully!" : "Kartējumi notīrīta veiksmīgi!",
+    "Error while clearing the mappings." : "Kļūda, dzēšot kartējumus.",
+    "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP operācijas kļūda. Anonīma sasaiste, iespējams, nav atļauta.",
+    "Select attributes" : "Atlasīt atribūtus",
+    "Password change rejected. Hint: " : "Paroles maiņas noraidīja. Padoms:",
+    "LDAP / AD integration" : "LDAP / AD integrācija",
+    "_%s group found_::_%s groups found_" : ["%s grupas atrastas","%s grupas atrastas","%s grupas atrastas"],
+    "_%s user found_::_%s users found_" : ["%s lietotāji atrasti","%s lietotāji atrasti","%s lietotāji atrasti"],
+    "Invalid Host" : "Nederīgs resursdators",
     "Test Configuration" : "Testa konfigurācija",
     "Help" : "Palīdzība",
+    "Only these object classes:" : "Tikai šo objektu kategorijas:",
+    "Only from these groups:" : "Tikai no šīm grupām:",
+    "Search groups" : "Meklēt grupas",
+    "Available groups" : "Pieejamās grupas",
+    "Selected groups" : "Izvēlētās grupas",
+    "Edit LDAP Query" : "Labot LDAP vaicājumu",
+    "LDAP Filter:" : "LDAP filtrs:",
+    "LDAP / AD Username:" : "LDAP / AD lietotājvārds:",
+    "LDAP / AD Email Address:" : "LDAP / AD e-pasta adrese:",
+    "Other Attributes:" : "Citi atribūti:",
+    "Test Loginname" : "Pārbaudiet lietotājvārdu",
+    "Verify settings" : "Pārbaudīt iestatījumus",
+    "1. Server" : "1. Serveris",
+    "%s. Server:" : "%s. Serveris:",
     "Host" : "Resursdators",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Var neiekļaut protokolu, izņemot, ja vajag SSL. Tad sākums ir ldaps://",
     "Port" : "Ports",
+    "Detect Port" : "Noteikt portu",
     "User DN" : "Lietotāja 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." : "Klienta lietotāja DN, ar ko veiks sasaisti, piemēram, uid=agent,dc=example,dc=com. Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu.",
     "Password" : "Parole",
     "For anonymous access, leave DN and Password empty." : "Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu.",
     "One Base DN per line" : "Viena bāzes DN rindā",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Lietotājiem un grupām bāzes DN var norādīt cilnē “Paplašināti”",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Lietotājiem un grupām var norādīt bāzes DN  cilnē “Paplašināti”",
+    "Detect Base DN" : "Noteikt bāzes DN",
+    "Test Base DN" : "Testēt bāzes DN",
+    "Saving" : "Saglabā",
+    "Back" : "Atpakaļ",
+    "Continue" : "Turpināt",
+    "Server" : "Serveris",
+    "Users" : "Lietotāji",
+    "Login Attributes" : "Pieteikšanās atribūti",
+    "Groups" : "Grupas",
+    "Expert" : "Eksperts",
     "Advanced" : "Paplašināti",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Brīdinājums:</b> PHP LDAP modulis nav uzinstalēts, aizmugure nedarbosies. Lūdzu, prasiet savam sistēmas administratoram kādu no tām deaktivēt.",
     "Connection Settings" : "Savienojuma iestatījumi",
@@ -35,7 +85,7 @@ OC.L10N.register(
     "Directory Settings" : "Direktorijas iestatījumi",
     "User Display Name Field" : "Lietotāja redzamā vārda lauks",
     "Base User Tree" : "Bāzes lietotāju koks",
-    "One User Base DN per line" : "Viena lietotāju bāzes DN rindā",
+    "One User Base DN per line" : "Viens lietotājs bāzes DN rindā",
     "User Search Attributes" : "Lietotāju meklēšanas atribūts",
     "Optional; one attribute per line" : "Neobligāti; viens atribūts rindā",
     "Group Display Name Field" : "Grupas redzamā nosaukuma lauks",
@@ -43,12 +93,18 @@ OC.L10N.register(
     "One Group Base DN per line" : "Viena grupu bāzes DN rindā",
     "Group Search Attributes" : "Grupu meklēšanas atribūts",
     "Group-Member association" : "Grupu piederības asociācija",
+    "Enable LDAP password changes per user" : "Iespējot LDAP paroles maiņu katram lietotājam",
+    "(New password is sent as plain text to LDAP)" : "(Jaunā parole tiek nosūtīta kā vienkāršs teksts ar LDAP)",
     "Special Attributes" : "Īpašie atribūti",
     "Quota Field" : "Kvotu lauks",
     "Quota Default" : "Kvotas noklusējums",
-    "in bytes" : "baitos",
     "Email Field" : "E-pasta lauks",
     "User Home Folder Naming Rule" : "Lietotāja mājas mapes nosaukšanas kārtula",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu."
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu.",
+    "Internal Username" : "Iekšējais lietotājvārds",
+    "Override UUID detection" : "Ignorēt UUID noteikšanu",
+    "UUID Attribute for Users:" : "UUID atribūti lietotājiem:",
+    "UUID Attribute for Groups:" : "UUID atribūti grupām:",
+    "LDAP" : "LDAP"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/user_ldap/l10n/lv.json b/apps/user_ldap/l10n/lv.json
index 44f2b7c048d..85f4f3722d3 100644
--- a/apps/user_ldap/l10n/lv.json
+++ b/apps/user_ldap/l10n/lv.json
@@ -1,23 +1,73 @@
 { "translations": {
+    "Failed to clear the mappings." : "Neizdevās nodzēstu samērošanu.",
     "Failed to delete the server configuration" : "Neizdevās izdzēst servera konfigurāciju",
-    "The configuration is valid and the connection could be established!" : "Konfigurācija ir derīga un varēja izveidot savienojumu!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurācija ir derīga, bet sasaiste neizdevās. Lūdzu, pārbaudiet servera iestatījumus un akreditācijas datus.",
+    "No action specified" : "Nav norādīta darbība",
+    "No configuration specified" : "Nav norādīta konfigurācija",
+    "No data specified" : "Nav norādīti dati",
+    " Could not set configuration %s" : "Nevarēja iestatīt konfigurāciju %s",
+    "Action does not exist" : "Darbība neeksistē",
+    "The Base DN appears to be wrong" : "DN bāze šķiet nepareiza",
+    "Testing configuration…" : "Konfigurācijas pārbaude...",
+    "Configuration incorrect" : "Nepareiza konfigurācija",
+    "Configuration incomplete" : "Nepilnīga konfigurācija",
+    "Configuration OK" : "Konfigurācija OK",
     "Select groups" : "Izvēlieties grupas",
+    "Select object classes" : "Atlasiet objektu klases",
+    "Please check the credentials, they seem to be wrong." : "Lūdzu, pārbaudiet akreditācijas datus, tie šķiet nepareizi.",
+    "Please specify the port, it could not be auto-detected." : "Lūdzu, norādiet portu, tas nevarēja būt noteikts automātiski.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "DN bāzi nevarēja noteikt, lūdzu, pārskatiet datus, resursdatoru un portu.",
+    "Could not detect Base DN, please enter it manually." : "Nevarēja noteikt DN bāzi, lūdzu, ievadiet to manuāli.",
+    "{nthServer}. Server" : "{nthServer}. Serveris",
+    "No object found in the given Base DN. Please revise." : "Neviens objekts nav atrasts konkrētā DN bāzē. Lūdzu pārskatīt.",
+    "More than 1,000 directory entries available." : "Vairāk nekā 1,000 kataloga ieraksti ir pieejami.",
+    " entries available within the provided Base DN" : "ieraksti pieejami ar nosacījumu DN bāzē",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Radās kļūda. Lūdzu, pārbaudiet bāzes DN, kā arī savienojuma iestatījumus vai akreditācijas datus.",
     "Do you really want to delete the current Server Configuration?" : "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?",
     "Confirm Deletion" : "Apstiprināt dzēšanu",
-    "Users" : "Lietotāji",
-    "Groups" : "Grupas",
+    "Mappings cleared successfully!" : "Kartējumi notīrīta veiksmīgi!",
+    "Error while clearing the mappings." : "Kļūda, dzēšot kartējumus.",
+    "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP operācijas kļūda. Anonīma sasaiste, iespējams, nav atļauta.",
+    "Select attributes" : "Atlasīt atribūtus",
+    "Password change rejected. Hint: " : "Paroles maiņas noraidīja. Padoms:",
+    "LDAP / AD integration" : "LDAP / AD integrācija",
+    "_%s group found_::_%s groups found_" : ["%s grupas atrastas","%s grupas atrastas","%s grupas atrastas"],
+    "_%s user found_::_%s users found_" : ["%s lietotāji atrasti","%s lietotāji atrasti","%s lietotāji atrasti"],
+    "Invalid Host" : "Nederīgs resursdators",
     "Test Configuration" : "Testa konfigurācija",
     "Help" : "Palīdzība",
+    "Only these object classes:" : "Tikai šo objektu kategorijas:",
+    "Only from these groups:" : "Tikai no šīm grupām:",
+    "Search groups" : "Meklēt grupas",
+    "Available groups" : "Pieejamās grupas",
+    "Selected groups" : "Izvēlētās grupas",
+    "Edit LDAP Query" : "Labot LDAP vaicājumu",
+    "LDAP Filter:" : "LDAP filtrs:",
+    "LDAP / AD Username:" : "LDAP / AD lietotājvārds:",
+    "LDAP / AD Email Address:" : "LDAP / AD e-pasta adrese:",
+    "Other Attributes:" : "Citi atribūti:",
+    "Test Loginname" : "Pārbaudiet lietotājvārdu",
+    "Verify settings" : "Pārbaudīt iestatījumus",
+    "1. Server" : "1. Serveris",
+    "%s. Server:" : "%s. Serveris:",
     "Host" : "Resursdators",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Var neiekļaut protokolu, izņemot, ja vajag SSL. Tad sākums ir ldaps://",
     "Port" : "Ports",
+    "Detect Port" : "Noteikt portu",
     "User DN" : "Lietotāja 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." : "Klienta lietotāja DN, ar ko veiks sasaisti, piemēram, uid=agent,dc=example,dc=com. Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu.",
     "Password" : "Parole",
     "For anonymous access, leave DN and Password empty." : "Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu.",
     "One Base DN per line" : "Viena bāzes DN rindā",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Lietotājiem un grupām bāzes DN var norādīt cilnē “Paplašināti”",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Lietotājiem un grupām var norādīt bāzes DN  cilnē “Paplašināti”",
+    "Detect Base DN" : "Noteikt bāzes DN",
+    "Test Base DN" : "Testēt bāzes DN",
+    "Saving" : "Saglabā",
+    "Back" : "Atpakaļ",
+    "Continue" : "Turpināt",
+    "Server" : "Serveris",
+    "Users" : "Lietotāji",
+    "Login Attributes" : "Pieteikšanās atribūti",
+    "Groups" : "Grupas",
+    "Expert" : "Eksperts",
     "Advanced" : "Paplašināti",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Brīdinājums:</b> PHP LDAP modulis nav uzinstalēts, aizmugure nedarbosies. Lūdzu, prasiet savam sistēmas administratoram kādu no tām deaktivēt.",
     "Connection Settings" : "Savienojuma iestatījumi",
@@ -33,7 +83,7 @@
     "Directory Settings" : "Direktorijas iestatījumi",
     "User Display Name Field" : "Lietotāja redzamā vārda lauks",
     "Base User Tree" : "Bāzes lietotāju koks",
-    "One User Base DN per line" : "Viena lietotāju bāzes DN rindā",
+    "One User Base DN per line" : "Viens lietotājs bāzes DN rindā",
     "User Search Attributes" : "Lietotāju meklēšanas atribūts",
     "Optional; one attribute per line" : "Neobligāti; viens atribūts rindā",
     "Group Display Name Field" : "Grupas redzamā nosaukuma lauks",
@@ -41,12 +91,18 @@
     "One Group Base DN per line" : "Viena grupu bāzes DN rindā",
     "Group Search Attributes" : "Grupu meklēšanas atribūts",
     "Group-Member association" : "Grupu piederības asociācija",
+    "Enable LDAP password changes per user" : "Iespējot LDAP paroles maiņu katram lietotājam",
+    "(New password is sent as plain text to LDAP)" : "(Jaunā parole tiek nosūtīta kā vienkāršs teksts ar LDAP)",
     "Special Attributes" : "Īpašie atribūti",
     "Quota Field" : "Kvotu lauks",
     "Quota Default" : "Kvotas noklusējums",
-    "in bytes" : "baitos",
     "Email Field" : "E-pasta lauks",
     "User Home Folder Naming Rule" : "Lietotāja mājas mapes nosaukšanas kārtula",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu."
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu.",
+    "Internal Username" : "Iekšējais lietotājvārds",
+    "Override UUID detection" : "Ignorēt UUID noteikšanu",
+    "UUID Attribute for Users:" : "UUID atribūti lietotājiem:",
+    "UUID Attribute for Groups:" : "UUID atribūti grupām:",
+    "LDAP" : "LDAP"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js
index 1d0b4481d95..81355c213d2 100644
--- a/apps/user_ldap/l10n/pt_PT.js
+++ b/apps/user_ldap/l10n/pt_PT.js
@@ -139,12 +139,7 @@ OC.L10N.register(
     "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestígios em todo o lado. A limpeza dos mapeamentos não é sensível à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental.",
     "Clear Username-LDAP User Mapping" : "Limpar mapeamento do utilizador-LDAP",
     "Clear Groupname-LDAP Group Mapping" : "Limpar o mapeamento do nome de grupo LDAP",
-    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "O campo %uid está em falta. Este será substituído pelo utilizador do ownCloud quando for efectuado o pedido ao LDAP / AD.",
-    "Verify settings and count groups" : "Verificar condições e contar grupos",
-    "Add a new and blank configuration" : "Adicione uma nova configuração em branco",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
     "LDAP" : "LDAP",
-    "<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>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.",
-    "in bytes" : "em bytes"
+    "<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>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json
index 32b97a07663..5c0b22104bb 100644
--- a/apps/user_ldap/l10n/pt_PT.json
+++ b/apps/user_ldap/l10n/pt_PT.json
@@ -137,12 +137,7 @@
     "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestígios em todo o lado. A limpeza dos mapeamentos não é sensível à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental.",
     "Clear Username-LDAP User Mapping" : "Limpar mapeamento do utilizador-LDAP",
     "Clear Groupname-LDAP Group Mapping" : "Limpar o mapeamento do nome de grupo LDAP",
-    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "O campo %uid está em falta. Este será substituído pelo utilizador do ownCloud quando for efectuado o pedido ao LDAP / AD.",
-    "Verify settings and count groups" : "Verificar condições e contar grupos",
-    "Add a new and blank configuration" : "Adicione uma nova configuração em branco",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
     "LDAP" : "LDAP",
-    "<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>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.",
-    "in bytes" : "em bytes"
+    "<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>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js
index cfc628cae30..320d3d252a5 100644
--- a/apps/user_ldap/l10n/sl.js
+++ b/apps/user_ldap/l10n/sl.js
@@ -59,9 +59,7 @@ OC.L10N.register(
     "When logging in, %s will find the user based on the following attributes:" : "Pri prijavi bodo prek %s najdeni uporabniki na osnovi navedenih atributov:",
     "LDAP / AD Username:" : "Uporabniško ime LDAP / AD:",
     "LDAP / AD Email Address:" : "Elektronski naslov LDAP / AD:",
-    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Dovoli prijavo z atributom elektronskega naslova. Dovoljena bosta naslova Mail and mailPrimaryAddress.",
     "Other Attributes:" : "Drugi atributi:",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"",
     "Test Loginname" : "Preizkusi prijavno ime",
     "Verify settings" : "Preveri nastavitve",
     "1. Server" : "1. strežnik",
@@ -86,7 +84,6 @@ OC.L10N.register(
     "Saving" : "Poteka shranjevanje ...",
     "Back" : "Nazaj",
     "Continue" : "Nadaljuj",
-    "LDAP" : "LDAP",
     "Server" : "Strežnik",
     "Users" : "Uporabniki",
     "Login Attributes" : "Atributi prijave",
@@ -140,12 +137,7 @@ OC.L10N.register(
     "Username-LDAP User Mapping" : "Uporabniška preslikava uporabniškega imena na LDAP",
     "Clear Username-LDAP User Mapping" : "Izbriši preslikavo uporabniškega imena na LDAP",
     "Clear Groupname-LDAP Group Mapping" : "Izbriši preslikavo skupine na LDAP",
-    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "Manjka držalo %uid. Zamenjano bo z uporabniškim imenom pri poizvedbah LDAP / AD.",
-    "Verify settings and count groups" : "Preveri nastavitve in preštej skupine",
-    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Omogoča prijavo prek LDAP / AD, ki je ali UID ali ime računa, ki bo zaznano.",
-    "Add a new and blank configuration" : "In nova, privzeta nastavitev",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z 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>Opozorilo:</b> določili user_ldap in user_webdavauth sta  neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poročilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogočiti.",
-    "in bytes" : "v bajtih"
+    "LDAP" : "LDAP",
+    "<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>Opozorilo:</b> določili user_ldap in user_webdavauth sta  neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poročilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogočiti."
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json
index 6f5a5d9674c..15972f2de9d 100644
--- a/apps/user_ldap/l10n/sl.json
+++ b/apps/user_ldap/l10n/sl.json
@@ -57,9 +57,7 @@
     "When logging in, %s will find the user based on the following attributes:" : "Pri prijavi bodo prek %s najdeni uporabniki na osnovi navedenih atributov:",
     "LDAP / AD Username:" : "Uporabniško ime LDAP / AD:",
     "LDAP / AD Email Address:" : "Elektronski naslov LDAP / AD:",
-    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Dovoli prijavo z atributom elektronskega naslova. Dovoljena bosta naslova Mail and mailPrimaryAddress.",
     "Other Attributes:" : "Drugi atributi:",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"",
     "Test Loginname" : "Preizkusi prijavno ime",
     "Verify settings" : "Preveri nastavitve",
     "1. Server" : "1. strežnik",
@@ -84,7 +82,6 @@
     "Saving" : "Poteka shranjevanje ...",
     "Back" : "Nazaj",
     "Continue" : "Nadaljuj",
-    "LDAP" : "LDAP",
     "Server" : "Strežnik",
     "Users" : "Uporabniki",
     "Login Attributes" : "Atributi prijave",
@@ -138,12 +135,7 @@
     "Username-LDAP User Mapping" : "Uporabniška preslikava uporabniškega imena na LDAP",
     "Clear Username-LDAP User Mapping" : "Izbriši preslikavo uporabniškega imena na LDAP",
     "Clear Groupname-LDAP Group Mapping" : "Izbriši preslikavo skupine na LDAP",
-    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "Manjka držalo %uid. Zamenjano bo z uporabniškim imenom pri poizvedbah LDAP / AD.",
-    "Verify settings and count groups" : "Preveri nastavitve in preštej skupine",
-    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Omogoča prijavo prek LDAP / AD, ki je ali UID ali ime računa, ki bo zaznano.",
-    "Add a new and blank configuration" : "In nova, privzeta nastavitev",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z 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>Opozorilo:</b> določili user_ldap in user_webdavauth sta  neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poročilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogočiti.",
-    "in bytes" : "v bajtih"
+    "LDAP" : "LDAP",
+    "<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>Opozorilo:</b> določili user_ldap in user_webdavauth sta  neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poročilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogočiti."
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/th.js b/apps/user_ldap/l10n/th.js
index b04775e1ab7..cb9baadadd4 100644
--- a/apps/user_ldap/l10n/th.js
+++ b/apps/user_ldap/l10n/th.js
@@ -57,9 +57,7 @@ OC.L10N.register(
     "When logging in, %s will find the user based on the following attributes:" : "เมื่อเข้าสู่ระบบ %s จะได้พบกับผู้ใช้ตามลักษณะดังต่อไปนี้:",
     "LDAP / AD Username:" : "ชื่อผู้ใช้ LDAP/AD:",
     "LDAP / AD Email Address:" : "ที่อยู่อีเมล LDAP/AD:",
-    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "อนุญาตให้เข้าสู่ระบบด้วยอีเมล Mail และ mailPrimaryAddress จะได้รับอนุญาต",
     "Other Attributes:" : "คุณลักษณะอื่นๆ:",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "กำหนดตัวกรองที่จะใช้ เมื่อพยายามเข้าสู่ระบบจะใช้ %%uid แทนชื่อผู้ใช้ในการดำเนินการเข้าสู่ระบบ ตัวอย่าง: \"uid=%%uid\"",
     "Test Loginname" : "ทดสอบชื่อที่ใช้ในการเข้าสู่ระบบ",
     "Verify settings" : "ตรวจสอบการตั้งค่า",
     "1. Server" : "1. เซิร์ฟเวอร์",
@@ -85,7 +83,6 @@ OC.L10N.register(
     "Saving" : "บันทึก",
     "Back" : "ย้อนกลับ",
     "Continue" : "ดำเนินการต่อ",
-    "LDAP" : "LDAP",
     "Server" : "เซิร์ฟเวอร์",
     "Users" : "ผู้ใช้งาน",
     "Login Attributes" : "คุณลักษณะการเข้าสู่ระบบ",
@@ -139,12 +136,7 @@ OC.L10N.register(
     "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "ชื่อผู้ใช้จะใช้ในการจัดเก็บและกำหนดข้อมูล (เมตา)  เพื่อรู้จักกับผู้ใช้และสามารถระบุได้อย่างแม่นยำ แต่ละ LDAP จะมีชื่อผู้ใช้ภายใน จึงต้องทำ Mapping ให้กับผู้ใช้ LDAP ชื่อผู้ใช้ที่ถูกสร้างขึ้นจะถูกแมปเข้ากับ UUID ของผู้ใช้ LDAP นอกจากนี้ DN ก็จะถูกแคชเช่นกันเพื่อลดการทำงานร่วมกันของ LDAP แต่มันก็ไม่ได้ใช้เพื่อระบุตัวตน หากมีการเปลี่ยนแปลง DN การเปลี่ยนแปลงจะถูกพบในทันที ชื่อผู้ใช้ภายในจะถูกใช้กับทั้งหมด การล้างแมปไม่มีผลต่อการกำหนดค่า LDAP ทั้งหมด! \nและจะเกิดขึ้นเฉพาะในการทดสอบหรือขั้นตอนการทดลอง",
     "Clear Username-LDAP User Mapping" : "ล้าง Username-LDAP ผู้ใช้ Mapping",
     "Clear Groupname-LDAP Group Mapping" : "ล้าง Groupname-LDAP กลุ่ม Mapping",
-    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "ตัวยึดตำแหน่ง %uid หายไป มันจะถูกแทนที่ด้วยชื่อที่ใช้ในการเข้าสู่ระบบเมื่อสอบถาม LDAP/AD",
-    "Verify settings and count groups" : "ตรวจสอบการตั้งค่าและจำนวนกลุ่มนับ",
-    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "อนุญาตให้ผู้ใช้เข้าสู่ระบบ LDAP/AD ซึ่งเป็นทั้ง uid หรือ samAccountName และมันจะถูกตรวจพบ",
-    "Add a new and blank configuration" : "เพิ่มใหม่และการกำหนดค่าว่าง",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย 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>คำเตือน:</b> แอพฯ user_ldap และ user_webdavauth เข้ากันไม่ได้ คุณอาจจะพบเหตุการณ์ที่ไม่คาดคิด กรุณาขอให้ผู้ดูแลระบบของคุณปิดการใช้งานบางอย่างของพวกเขา",
-    "in bytes" : "ในหน่วยไบต์"
+    "LDAP" : "LDAP",
+    "<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>คำเตือน:</b> แอพฯ user_ldap และ user_webdavauth เข้ากันไม่ได้ คุณอาจจะพบเหตุการณ์ที่ไม่คาดคิด กรุณาขอให้ผู้ดูแลระบบของคุณปิดการใช้งานบางอย่างของพวกเขา"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/th.json b/apps/user_ldap/l10n/th.json
index 89e89ca3022..3119a67aea6 100644
--- a/apps/user_ldap/l10n/th.json
+++ b/apps/user_ldap/l10n/th.json
@@ -55,9 +55,7 @@
     "When logging in, %s will find the user based on the following attributes:" : "เมื่อเข้าสู่ระบบ %s จะได้พบกับผู้ใช้ตามลักษณะดังต่อไปนี้:",
     "LDAP / AD Username:" : "ชื่อผู้ใช้ LDAP/AD:",
     "LDAP / AD Email Address:" : "ที่อยู่อีเมล LDAP/AD:",
-    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "อนุญาตให้เข้าสู่ระบบด้วยอีเมล Mail และ mailPrimaryAddress จะได้รับอนุญาต",
     "Other Attributes:" : "คุณลักษณะอื่นๆ:",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "กำหนดตัวกรองที่จะใช้ เมื่อพยายามเข้าสู่ระบบจะใช้ %%uid แทนชื่อผู้ใช้ในการดำเนินการเข้าสู่ระบบ ตัวอย่าง: \"uid=%%uid\"",
     "Test Loginname" : "ทดสอบชื่อที่ใช้ในการเข้าสู่ระบบ",
     "Verify settings" : "ตรวจสอบการตั้งค่า",
     "1. Server" : "1. เซิร์ฟเวอร์",
@@ -83,7 +81,6 @@
     "Saving" : "บันทึก",
     "Back" : "ย้อนกลับ",
     "Continue" : "ดำเนินการต่อ",
-    "LDAP" : "LDAP",
     "Server" : "เซิร์ฟเวอร์",
     "Users" : "ผู้ใช้งาน",
     "Login Attributes" : "คุณลักษณะการเข้าสู่ระบบ",
@@ -137,12 +134,7 @@
     "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "ชื่อผู้ใช้จะใช้ในการจัดเก็บและกำหนดข้อมูล (เมตา)  เพื่อรู้จักกับผู้ใช้และสามารถระบุได้อย่างแม่นยำ แต่ละ LDAP จะมีชื่อผู้ใช้ภายใน จึงต้องทำ Mapping ให้กับผู้ใช้ LDAP ชื่อผู้ใช้ที่ถูกสร้างขึ้นจะถูกแมปเข้ากับ UUID ของผู้ใช้ LDAP นอกจากนี้ DN ก็จะถูกแคชเช่นกันเพื่อลดการทำงานร่วมกันของ LDAP แต่มันก็ไม่ได้ใช้เพื่อระบุตัวตน หากมีการเปลี่ยนแปลง DN การเปลี่ยนแปลงจะถูกพบในทันที ชื่อผู้ใช้ภายในจะถูกใช้กับทั้งหมด การล้างแมปไม่มีผลต่อการกำหนดค่า LDAP ทั้งหมด! \nและจะเกิดขึ้นเฉพาะในการทดสอบหรือขั้นตอนการทดลอง",
     "Clear Username-LDAP User Mapping" : "ล้าง Username-LDAP ผู้ใช้ Mapping",
     "Clear Groupname-LDAP Group Mapping" : "ล้าง Groupname-LDAP กลุ่ม Mapping",
-    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "ตัวยึดตำแหน่ง %uid หายไป มันจะถูกแทนที่ด้วยชื่อที่ใช้ในการเข้าสู่ระบบเมื่อสอบถาม LDAP/AD",
-    "Verify settings and count groups" : "ตรวจสอบการตั้งค่าและจำนวนกลุ่มนับ",
-    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "อนุญาตให้ผู้ใช้เข้าสู่ระบบ LDAP/AD ซึ่งเป็นทั้ง uid หรือ samAccountName และมันจะถูกตรวจพบ",
-    "Add a new and blank configuration" : "เพิ่มใหม่และการกำหนดค่าว่าง",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย 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>คำเตือน:</b> แอพฯ user_ldap และ user_webdavauth เข้ากันไม่ได้ คุณอาจจะพบเหตุการณ์ที่ไม่คาดคิด กรุณาขอให้ผู้ดูแลระบบของคุณปิดการใช้งานบางอย่างของพวกเขา",
-    "in bytes" : "ในหน่วยไบต์"
+    "LDAP" : "LDAP",
+    "<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>คำเตือน:</b> แอพฯ user_ldap และ user_webdavauth เข้ากันไม่ได้ คุณอาจจะพบเหตุการณ์ที่ไม่คาดคิด กรุณาขอให้ผู้ดูแลระบบของคุณปิดการใช้งานบางอย่างของพวกเขา"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/uk.js b/apps/user_ldap/l10n/uk.js
index 7bc2fbe8a39..2bb85b2229f 100644
--- a/apps/user_ldap/l10n/uk.js
+++ b/apps/user_ldap/l10n/uk.js
@@ -3,9 +3,6 @@ OC.L10N.register(
     {
     "Failed to clear the mappings." : "Не вдалося очистити відображення.",
     "Failed to delete the server configuration" : "Не вдалося видалити конфігурацію сервера",
-    "The configuration is valid and the connection could be established!" : "Конфігурація вірна і зв'язок може бути встановлений ​​!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфігурація вірна, але встановити зв'язок не вдалося. Будь ласка, перевірте налаштування сервера і облікові дані.",
-    "The configuration is invalid. Please have a look at the logs for further details." : "Конфігурація є недійсною. Будь ласка, дивіться журнали для отримання додаткової інформації.",
     "No action specified" : "Ніяких дій не вказано",
     "No configuration specified" : "Немає конфігурації",
     "No data specified" : "Немає даних",
@@ -26,12 +23,8 @@ OC.L10N.register(
     "User found and settings verified." : "Користувача знайдено і налаштування перевірені.",
     "_%s group found_::_%s groups found_" : [" %s група знайдена "," %s груп знайдено ","%s груп знайдено "],
     "_%s user found_::_%s users found_" : ["%s користувача знайдено","%s користувачів знайдено","%s користувачів знайдено"],
-    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не вдалося виявити ім'я користувача. Будь ласка, сформулюйте самі в розширених налаштуваннях LDAP.",
     "Could not find the desired feature" : "Не вдалося знайти потрібну функцію",
     "Invalid Host" : "Невірний Host",
-    "Server" : "Сервер",
-    "Users" : "Користувачі",
-    "Groups" : "Групи",
     "Test Configuration" : "Тестове налаштування",
     "Help" : "Допомога",
     "Groups meeting these criteria are available in %s:" : "Групи, що відповідають цим критеріям доступні в %s:",
@@ -43,11 +36,9 @@ OC.L10N.register(
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Фільтр визначає, які LDAP групи повинні мати доступ до %s примірника.",
     "LDAP / AD Email Address:" : "LDAP / AD Email адреса:",
     "Other Attributes:" : "Інші Атрибути:",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Визначає фільтр, який слід застосовувати при спробі входу.\n%%uid замінює ім'я користувача при вході в систему. Приклад: \"uid=%%uid\"",
     "1. Server" : "1. Сервер",
     "%s. Server:" : "%s. Сервер:",
     "Host" : "Хост",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
     "Port" : "Порт",
     "Detect Port" : "Визначити Порт",
     "User DN" : "DN Користувача",
@@ -62,10 +53,11 @@ OC.L10N.register(
     "Saving" : "Збереження",
     "Back" : "Назад",
     "Continue" : "Продовжити",
-    "LDAP" : "LDAP",
+    "Server" : "Сервер",
+    "Users" : "Користувачі",
+    "Groups" : "Групи",
     "Expert" : "Експерт",
     "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>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його.",
     "Connection Settings" : "Налаштування З'єднання",
     "Configuration Active" : "Налаштування Активне",
@@ -99,12 +91,10 @@ OC.L10N.register(
     "Special Attributes" : "Спеціальні Атрибути",
     "Quota Field" : "Поле Квоти",
     "Quota Default" : "Квота за замовчанням",
-    "in bytes" : "в байтах",
     "Email Field" : "Поле E-mail",
     "User Home Folder Naming Rule" : "Правило іменування домашньої теки користувача",
     "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD.",
     "Internal Username" : "Внутрішня Ім'я користувача",
-    "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "За замовчуванням внутрішнє ім'я користувача буде створено з атрибуту UUID. Таким чином ім'я користувача є унікальним і не потребує перетворення символів. Внутрішнє ім'я користувача може складатися лише з наступних символів: [A-Za-z0-9 _ @ -.]. Інші символи заміняються відповідними з таблиці ASCII або пропускаються. При збігу до імені буде додано або збільшено число. Внутрішнє ім'я користувача використовується для внутрішньої ідентифікації користувача. Це також ім'я за замовчуванням для домашньої теки користувача та частина віддалених URL, наприклад, для всіх сервісів *DAV. За допомогою цієї установки можна змінити поведінку за замовчуванням. Для досягнення поведінки, що була до OwnCloud 5, введіть атрибут ім'я користувача, що відображається,  в наступне поле. Залиште порожнім для режиму за замовчуванням. Зміни будуть діяти тільки для нових підключень (доданих) користувачів LDAP.",
     "Internal Username Attribute:" : "Внутрішня Ім'я користувача, Атрибут:",
     "Override UUID detection" : "Перекрити вивід UUID ",
     "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "За замовчуванням ownCloud визначає атрибут UUID автоматично. Цей атрибут використовується для того, щоб достовірно ідентифікувати користувачів і групи LDAP. Також на підставі атрибута UUID створюється внутрішнє ім'я користувача, якщо вище не вказано інакше. Ви можете перевизначити це налаштування та вказати свій атрибут за вибором. Ви повинні упевнитися, що обраний вами атрибут може бути вибраний для користувачів і груп, а також те, що він унікальний. Залиште поле порожнім для поведінки за замовчуванням. Зміни вступлять в силу тільки для нових підключених (доданих) користувачів і груп LDAP.",
@@ -113,6 +103,8 @@ OC.L10N.register(
     "Username-LDAP User Mapping" : "Картографія Імен користувачів-LDAP ",
     "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "ownCloud використовує імена користувачів для зберігання та призначення метаданих. Для точної ідентифікації та розпізнавання користувачів, кожен користувач LDAP буде мати своє внутрішнє ім'я користувача. Це вимагає прив'язки імені користувача ownCloud до користувача LDAP. При створенні ім'я користувача призначається ідентифікатором UUID користувача LDAP. Крім цього кешируєтся доменне ім'я (DN) для зменшення числа звернень до LDAP, однак воно не використовується для ідентифікації. Якщо доменне ім'я було змінено, про це стане відомо ownCloud. Внутрішнє ім'я ownCloud використовується повсюдно в ownCloud. Після скидання прив'язок в базі можуть зберегтися залишки старої інформації. Скидання прив'язок не прив'язане до конфігурації, воно вплине на всі LDAP підключення! Ні в якому разі не рекомендується скидати прив'язки якщо система вже знаходиться в експлуатації, тільки на етапі тестування.",
     "Clear Username-LDAP User Mapping" : "Очистити картографію Імен користувачів-LDAP",
-    "Clear Groupname-LDAP Group Mapping" : "Очистити картографію Імен груп-LDAP"
+    "Clear Groupname-LDAP Group Mapping" : "Очистити картографію Імен груп-LDAP",
+    "LDAP" : "LDAP",
+    "<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>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_ldap/l10n/uk.json b/apps/user_ldap/l10n/uk.json
index 056dcd1917a..b7fcbbf031c 100644
--- a/apps/user_ldap/l10n/uk.json
+++ b/apps/user_ldap/l10n/uk.json
@@ -1,9 +1,6 @@
 { "translations": {
     "Failed to clear the mappings." : "Не вдалося очистити відображення.",
     "Failed to delete the server configuration" : "Не вдалося видалити конфігурацію сервера",
-    "The configuration is valid and the connection could be established!" : "Конфігурація вірна і зв'язок може бути встановлений ​​!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Конфігурація вірна, але встановити зв'язок не вдалося. Будь ласка, перевірте налаштування сервера і облікові дані.",
-    "The configuration is invalid. Please have a look at the logs for further details." : "Конфігурація є недійсною. Будь ласка, дивіться журнали для отримання додаткової інформації.",
     "No action specified" : "Ніяких дій не вказано",
     "No configuration specified" : "Немає конфігурації",
     "No data specified" : "Немає даних",
@@ -24,12 +21,8 @@
     "User found and settings verified." : "Користувача знайдено і налаштування перевірені.",
     "_%s group found_::_%s groups found_" : [" %s група знайдена "," %s груп знайдено ","%s груп знайдено "],
     "_%s user found_::_%s users found_" : ["%s користувача знайдено","%s користувачів знайдено","%s користувачів знайдено"],
-    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Не вдалося виявити ім'я користувача. Будь ласка, сформулюйте самі в розширених налаштуваннях LDAP.",
     "Could not find the desired feature" : "Не вдалося знайти потрібну функцію",
     "Invalid Host" : "Невірний Host",
-    "Server" : "Сервер",
-    "Users" : "Користувачі",
-    "Groups" : "Групи",
     "Test Configuration" : "Тестове налаштування",
     "Help" : "Допомога",
     "Groups meeting these criteria are available in %s:" : "Групи, що відповідають цим критеріям доступні в %s:",
@@ -41,11 +34,9 @@
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Фільтр визначає, які LDAP групи повинні мати доступ до %s примірника.",
     "LDAP / AD Email Address:" : "LDAP / AD Email адреса:",
     "Other Attributes:" : "Інші Атрибути:",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Визначає фільтр, який слід застосовувати при спробі входу.\n%%uid замінює ім'я користувача при вході в систему. Приклад: \"uid=%%uid\"",
     "1. Server" : "1. Сервер",
     "%s. Server:" : "%s. Сервер:",
     "Host" : "Хост",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
     "Port" : "Порт",
     "Detect Port" : "Визначити Порт",
     "User DN" : "DN Користувача",
@@ -60,10 +51,11 @@
     "Saving" : "Збереження",
     "Back" : "Назад",
     "Continue" : "Продовжити",
-    "LDAP" : "LDAP",
+    "Server" : "Сервер",
+    "Users" : "Користувачі",
+    "Groups" : "Групи",
     "Expert" : "Експерт",
     "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>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його.",
     "Connection Settings" : "Налаштування З'єднання",
     "Configuration Active" : "Налаштування Активне",
@@ -97,12 +89,10 @@
     "Special Attributes" : "Спеціальні Атрибути",
     "Quota Field" : "Поле Квоти",
     "Quota Default" : "Квота за замовчанням",
-    "in bytes" : "в байтах",
     "Email Field" : "Поле E-mail",
     "User Home Folder Naming Rule" : "Правило іменування домашньої теки користувача",
     "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD.",
     "Internal Username" : "Внутрішня Ім'я користувача",
-    "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "За замовчуванням внутрішнє ім'я користувача буде створено з атрибуту UUID. Таким чином ім'я користувача є унікальним і не потребує перетворення символів. Внутрішнє ім'я користувача може складатися лише з наступних символів: [A-Za-z0-9 _ @ -.]. Інші символи заміняються відповідними з таблиці ASCII або пропускаються. При збігу до імені буде додано або збільшено число. Внутрішнє ім'я користувача використовується для внутрішньої ідентифікації користувача. Це також ім'я за замовчуванням для домашньої теки користувача та частина віддалених URL, наприклад, для всіх сервісів *DAV. За допомогою цієї установки можна змінити поведінку за замовчуванням. Для досягнення поведінки, що була до OwnCloud 5, введіть атрибут ім'я користувача, що відображається,  в наступне поле. Залиште порожнім для режиму за замовчуванням. Зміни будуть діяти тільки для нових підключень (доданих) користувачів LDAP.",
     "Internal Username Attribute:" : "Внутрішня Ім'я користувача, Атрибут:",
     "Override UUID detection" : "Перекрити вивід UUID ",
     "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "За замовчуванням ownCloud визначає атрибут UUID автоматично. Цей атрибут використовується для того, щоб достовірно ідентифікувати користувачів і групи LDAP. Також на підставі атрибута UUID створюється внутрішнє ім'я користувача, якщо вище не вказано інакше. Ви можете перевизначити це налаштування та вказати свій атрибут за вибором. Ви повинні упевнитися, що обраний вами атрибут може бути вибраний для користувачів і груп, а також те, що він унікальний. Залиште поле порожнім для поведінки за замовчуванням. Зміни вступлять в силу тільки для нових підключених (доданих) користувачів і груп LDAP.",
@@ -111,6 +101,8 @@
     "Username-LDAP User Mapping" : "Картографія Імен користувачів-LDAP ",
     "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "ownCloud використовує імена користувачів для зберігання та призначення метаданих. Для точної ідентифікації та розпізнавання користувачів, кожен користувач LDAP буде мати своє внутрішнє ім'я користувача. Це вимагає прив'язки імені користувача ownCloud до користувача LDAP. При створенні ім'я користувача призначається ідентифікатором UUID користувача LDAP. Крім цього кешируєтся доменне ім'я (DN) для зменшення числа звернень до LDAP, однак воно не використовується для ідентифікації. Якщо доменне ім'я було змінено, про це стане відомо ownCloud. Внутрішнє ім'я ownCloud використовується повсюдно в ownCloud. Після скидання прив'язок в базі можуть зберегтися залишки старої інформації. Скидання прив'язок не прив'язане до конфігурації, воно вплине на всі LDAP підключення! Ні в якому разі не рекомендується скидати прив'язки якщо система вже знаходиться в експлуатації, тільки на етапі тестування.",
     "Clear Username-LDAP User Mapping" : "Очистити картографію Імен користувачів-LDAP",
-    "Clear Groupname-LDAP Group Mapping" : "Очистити картографію Імен груп-LDAP"
+    "Clear Groupname-LDAP Group Mapping" : "Очистити картографію Імен груп-LDAP",
+    "LDAP" : "LDAP",
+    "<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>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/zh_TW.js b/apps/user_ldap/l10n/zh_TW.js
index a1d33015abf..0f4118c24d7 100644
--- a/apps/user_ldap/l10n/zh_TW.js
+++ b/apps/user_ldap/l10n/zh_TW.js
@@ -3,10 +3,6 @@ OC.L10N.register(
     {
     "Failed to clear the mappings." : "清除映射失敗",
     "Failed to delete the server configuration" : "刪除伺服器設定時失敗",
-    "The configuration is invalid: anonymous bind is not allowed." : "設定檔無效: 不允許匿名使者",
-    "The configuration is valid and the connection could be established!" : "設定有效且連線可建立",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "設定有效但連線無法建立，請檢查伺服器設定與認證資料。",
-    "The configuration is invalid. Please have a look at the logs for further details." : "設定無效，更多細節請參閱 ownCloud 的記錄檔。",
     "No action specified" : "沒有指定操作",
     "No configuration specified" : "沒有指定設定",
     "No data specified" : "沒有指定資料",
@@ -36,15 +32,12 @@ OC.L10N.register(
     "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "切換模式會使LDAP自動抓取資訊，抓取資訊的時間依您的LDAP大小而定，可能會花一點時間，您確定要切換模式?",
     "Mode switch" : "模式切換",
     "Select attributes" : "選擇屬性",
-    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "找不到使用者，請檢查您的登入資料以及使用者名稱。驗證(複製貼上到命令提示位元做認證):<br/>",
     "User found and settings verified." : "使用者存在，設定值正確",
-    "An unspecified error occurred. Please check the settings and the log." : "發生預期之外的錯誤，請檢查設定和記錄檔",
     "A connection error to LDAP / AD occurred, please check host, port and credentials." : "連線到 LDAP/AD出現錯誤，請檢查主機，連接阜和驗證資訊",
     "Please provide a login name to test against" : "請提供登入姓名以便再次測試",
     "The group box was disabled, because the LDAP / AD server does not support memberOf." : "群組盒已經停用，LDAP/AD 伺服器並不支援",
     "_%s group found_::_%s groups found_" : ["找到 %s 群組"],
     "_%s user found_::_%s users found_" : ["找到 %s 使用者"],
-    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "無法偵測使用者的顯示名稱，請您自行在ldap設定中指定",
     "Could not find the desired feature" : "無法找到所需的功能",
     "Invalid Host" : "無效的Host",
     "Test Configuration" : "測試此設定",
@@ -59,7 +52,6 @@ OC.L10N.register(
     "LDAP / AD Username:" : "LDAP / AD 使用者名稱:",
     "LDAP / AD Email Address:" : "LDAP / AD 電子郵件:",
     "Other Attributes:" : "其他屬性:",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "試圖登入時會定義要套用的篩選器。登入過程中%%uid會取代使用者名稱。例如:\"uid=%%uid\"",
     "Test Loginname" : "測試登入姓名",
     "Verify settings" : "驗證設定",
     "1. Server" : "1. 伺服器",
@@ -83,13 +75,11 @@ OC.L10N.register(
     "Saving" : "儲存",
     "Back" : "返回",
     "Continue" : "繼續",
-    "LDAP" : "LDAP",
     "Server" : "伺服器",
     "Users" : "使用者",
     "Login Attributes" : "登入的設定",
     "Groups" : "群組",
     "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>警告:</b> 應用程式user_ldap和user_webdavauth互不相容。可能會造成無法預期的結果。請要求您的系統管理員將兩者其中之一停用。",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>警告：</b>沒有安裝 PHP LDAP 模組，後端系統將無法運作，請要求您的系統管理員安裝模組。",
     "Connection Settings" : "連線設定",
     "Configuration Active" : "設定使用中",
@@ -126,9 +116,7 @@ OC.L10N.register(
     "Override UUID detection" : "偵測覆寫UUID",
     "UUID Attribute for Users:" : "使用者的UUID值:",
     "UUID Attribute for Groups:" : "群組的UUID值:",
-    "Verify settings and count groups" : "驗證設定並計算群組數",
-    "Add a new and blank configuration" : "新增一個空白的設定檔",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "若您不需要 SSL 加密連線則不需輸入通訊協定，反之請輸入 ldaps://",
-    "in bytes" : "以位元組為單位"
+    "LDAP" : "LDAP",
+    "<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>警告:</b> 應用程式user_ldap和user_webdavauth互不相容。可能會造成無法預期的結果。請要求您的系統管理員將兩者其中之一停用。"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/zh_TW.json b/apps/user_ldap/l10n/zh_TW.json
index 0275b15c270..b43aec23cd3 100644
--- a/apps/user_ldap/l10n/zh_TW.json
+++ b/apps/user_ldap/l10n/zh_TW.json
@@ -1,10 +1,6 @@
 { "translations": {
     "Failed to clear the mappings." : "清除映射失敗",
     "Failed to delete the server configuration" : "刪除伺服器設定時失敗",
-    "The configuration is invalid: anonymous bind is not allowed." : "設定檔無效: 不允許匿名使者",
-    "The configuration is valid and the connection could be established!" : "設定有效且連線可建立",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "設定有效但連線無法建立，請檢查伺服器設定與認證資料。",
-    "The configuration is invalid. Please have a look at the logs for further details." : "設定無效，更多細節請參閱 ownCloud 的記錄檔。",
     "No action specified" : "沒有指定操作",
     "No configuration specified" : "沒有指定設定",
     "No data specified" : "沒有指定資料",
@@ -34,15 +30,12 @@
     "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "切換模式會使LDAP自動抓取資訊，抓取資訊的時間依您的LDAP大小而定，可能會花一點時間，您確定要切換模式?",
     "Mode switch" : "模式切換",
     "Select attributes" : "選擇屬性",
-    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "找不到使用者，請檢查您的登入資料以及使用者名稱。驗證(複製貼上到命令提示位元做認證):<br/>",
     "User found and settings verified." : "使用者存在，設定值正確",
-    "An unspecified error occurred. Please check the settings and the log." : "發生預期之外的錯誤，請檢查設定和記錄檔",
     "A connection error to LDAP / AD occurred, please check host, port and credentials." : "連線到 LDAP/AD出現錯誤，請檢查主機，連接阜和驗證資訊",
     "Please provide a login name to test against" : "請提供登入姓名以便再次測試",
     "The group box was disabled, because the LDAP / AD server does not support memberOf." : "群組盒已經停用，LDAP/AD 伺服器並不支援",
     "_%s group found_::_%s groups found_" : ["找到 %s 群組"],
     "_%s user found_::_%s users found_" : ["找到 %s 使用者"],
-    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "無法偵測使用者的顯示名稱，請您自行在ldap設定中指定",
     "Could not find the desired feature" : "無法找到所需的功能",
     "Invalid Host" : "無效的Host",
     "Test Configuration" : "測試此設定",
@@ -57,7 +50,6 @@
     "LDAP / AD Username:" : "LDAP / AD 使用者名稱:",
     "LDAP / AD Email Address:" : "LDAP / AD 電子郵件:",
     "Other Attributes:" : "其他屬性:",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "試圖登入時會定義要套用的篩選器。登入過程中%%uid會取代使用者名稱。例如:\"uid=%%uid\"",
     "Test Loginname" : "測試登入姓名",
     "Verify settings" : "驗證設定",
     "1. Server" : "1. 伺服器",
@@ -81,13 +73,11 @@
     "Saving" : "儲存",
     "Back" : "返回",
     "Continue" : "繼續",
-    "LDAP" : "LDAP",
     "Server" : "伺服器",
     "Users" : "使用者",
     "Login Attributes" : "登入的設定",
     "Groups" : "群組",
     "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>警告:</b> 應用程式user_ldap和user_webdavauth互不相容。可能會造成無法預期的結果。請要求您的系統管理員將兩者其中之一停用。",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>警告：</b>沒有安裝 PHP LDAP 模組，後端系統將無法運作，請要求您的系統管理員安裝模組。",
     "Connection Settings" : "連線設定",
     "Configuration Active" : "設定使用中",
@@ -124,9 +114,7 @@
     "Override UUID detection" : "偵測覆寫UUID",
     "UUID Attribute for Users:" : "使用者的UUID值:",
     "UUID Attribute for Groups:" : "群組的UUID值:",
-    "Verify settings and count groups" : "驗證設定並計算群組數",
-    "Add a new and blank configuration" : "新增一個空白的設定檔",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "若您不需要 SSL 加密連線則不需輸入通訊協定，反之請輸入 ldaps://",
-    "in bytes" : "以位元組為單位"
+    "LDAP" : "LDAP",
+    "<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>警告:</b> 應用程式user_ldap和user_webdavauth互不相容。可能會造成無法預期的結果。請要求您的系統管理員將兩者其中之一停用。"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file