[tx-robot] updated from transifex

156 files changed, 636 insertions, 2660 deletions

diff --git a/apps/user_ldap/l10n/af_ZA.js b/apps/user_ldap/l10n/af_ZA.js
index 32c064489ec..e6f685c3c7f 100644
--- a/apps/user_ldap/l10n/af_ZA.js
+++ b/apps/user_ldap/l10n/af_ZA.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "Fout",
+    "Users" : "Gebruikers",
     "Help" : "Hulp",
     "Password" : "Wagwoord",
     "Continue" : "Gaan voort",
diff --git a/apps/user_ldap/l10n/af_ZA.json b/apps/user_ldap/l10n/af_ZA.json
index 79993ee299a..0e4852cb650 100644
--- a/apps/user_ldap/l10n/af_ZA.json
+++ b/apps/user_ldap/l10n/af_ZA.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Error" : "Fout",
+    "Users" : "Gebruikers",
     "Help" : "Hulp",
     "Password" : "Wagwoord",
     "Continue" : "Gaan voort",
diff --git a/apps/user_ldap/l10n/ar.js b/apps/user_ldap/l10n/ar.js
index d73ab8cde44..b940b69a1a7 100644
--- a/apps/user_ldap/l10n/ar.js
+++ b/apps/user_ldap/l10n/ar.js
@@ -10,30 +10,19 @@ OC.L10N.register(
     "No configuration specified" : "لم يتم تحديد الإعدادات.",
     "No data specified" : "لم يتم تحديد البيانات.",
     " Could not set configuration %s" : "تعذر تنفيذ الإعداد %s",
-    "Deletion failed" : "فشل الحذف",
-    "Take over settings from recent server configuration?" : "الحصول على الخصائص من آخر إعدادات في الخادم؟",
-    "Keep settings?" : "الاحتفاظ بالخصائص والإعدادات؟",
-    "{nthServer}. Server" : "الخادم {nthServer}.",
-    "Cannot add server configuration" : "تعذر إضافة الإعدادات للخادم.",
-    "mappings cleared" : "تم مسح الارتباطات (mappings)",
-    "Success" : "نجاح",
-    "Error" : "خطأ",
-    "Please specify a Base DN" : "يرجى تحديد اسم نطاق أساسي Base DN",
-    "Could not determine Base DN" : "تعذر التحقق من اسم النطاق الأساسي Base DN",
-    "Please specify the port" : "يرجى تحديد المنفذ",
-    "Configuration OK" : "الإعدادات صحيحة",
     "Configuration incorrect" : "الإعدادات غير صحيحة",
     "Configuration incomplete" : "الإعدادات غير مكتملة",
+    "Configuration OK" : "الإعدادات صحيحة",
     "Select groups" : "إختر مجموعة",
     "Select object classes" : "اختر أصناف المكونات",
-    "Select attributes" : "اختر الخصائص",
-    "Connection test succeeded" : "تم اختبار الاتصال بنجاح",
-    "Connection test failed" : "فشل اختبار الاتصال",
+    "{nthServer}. Server" : "الخادم {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "هل ترغب فعلاً في حذف إعدادات الخادم الحالي؟",
     "Confirm Deletion" : "تأكيد الحذف",
+    "Select attributes" : "اختر الخصائص",
     "_%s group found_::_%s groups found_" : ["لا توجد مجموعات: %s","تم إيجاد %s مجموعة واحدة","تم إيجاد %s مجموعتين","تم إيجاد %s مجموعات","تم إيجاد %s مجموعة","تم إيجاد %s مجموعة/مجموعات"],
     "Server" : "خادم",
-    "Save" : "حفظ",
+    "Users" : "المستخدمين",
+    "Groups" : "مجموعات",
     "Help" : "المساعدة",
     "Host" : "المضيف",
     "Port" : "المنفذ",
diff --git a/apps/user_ldap/l10n/ar.json b/apps/user_ldap/l10n/ar.json
index 735e7a6e141..20ba16d1481 100644
--- a/apps/user_ldap/l10n/ar.json
+++ b/apps/user_ldap/l10n/ar.json
@@ -8,30 +8,19 @@
     "No configuration specified" : "لم يتم تحديد الإعدادات.",
     "No data specified" : "لم يتم تحديد البيانات.",
     " Could not set configuration %s" : "تعذر تنفيذ الإعداد %s",
-    "Deletion failed" : "فشل الحذف",
-    "Take over settings from recent server configuration?" : "الحصول على الخصائص من آخر إعدادات في الخادم؟",
-    "Keep settings?" : "الاحتفاظ بالخصائص والإعدادات؟",
-    "{nthServer}. Server" : "الخادم {nthServer}.",
-    "Cannot add server configuration" : "تعذر إضافة الإعدادات للخادم.",
-    "mappings cleared" : "تم مسح الارتباطات (mappings)",
-    "Success" : "نجاح",
-    "Error" : "خطأ",
-    "Please specify a Base DN" : "يرجى تحديد اسم نطاق أساسي Base DN",
-    "Could not determine Base DN" : "تعذر التحقق من اسم النطاق الأساسي Base DN",
-    "Please specify the port" : "يرجى تحديد المنفذ",
-    "Configuration OK" : "الإعدادات صحيحة",
     "Configuration incorrect" : "الإعدادات غير صحيحة",
     "Configuration incomplete" : "الإعدادات غير مكتملة",
+    "Configuration OK" : "الإعدادات صحيحة",
     "Select groups" : "إختر مجموعة",
     "Select object classes" : "اختر أصناف المكونات",
-    "Select attributes" : "اختر الخصائص",
-    "Connection test succeeded" : "تم اختبار الاتصال بنجاح",
-    "Connection test failed" : "فشل اختبار الاتصال",
+    "{nthServer}. Server" : "الخادم {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "هل ترغب فعلاً في حذف إعدادات الخادم الحالي؟",
     "Confirm Deletion" : "تأكيد الحذف",
+    "Select attributes" : "اختر الخصائص",
     "_%s group found_::_%s groups found_" : ["لا توجد مجموعات: %s","تم إيجاد %s مجموعة واحدة","تم إيجاد %s مجموعتين","تم إيجاد %s مجموعات","تم إيجاد %s مجموعة","تم إيجاد %s مجموعة/مجموعات"],
     "Server" : "خادم",
-    "Save" : "حفظ",
+    "Users" : "المستخدمين",
+    "Groups" : "مجموعات",
     "Help" : "المساعدة",
     "Host" : "المضيف",
     "Port" : "المنفذ",
diff --git a/apps/user_ldap/l10n/ast.js b/apps/user_ldap/l10n/ast.js
index df63f758307..1ae219b25e6 100644
--- a/apps/user_ldap/l10n/ast.js
+++ b/apps/user_ldap/l10n/ast.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Nun s'especificó la configuración",
     "No data specified" : "Nun s'especificaron los datos",
     " Could not set configuration %s" : "Nun pudo afitase la configuración %s",
-    "Deletion failed" : "Falló'l borráu",
-    "Take over settings from recent server configuration?" : "¿Asumir los axustes actuales de la configuración del sirvidor?",
-    "Keep settings?" : "¿Caltener los axustes?",
-    "{nthServer}. Server" : "{nthServer}. Sirvidor",
-    "Cannot add server configuration" : "Nun pue amestase la configuración del sirvidor",
-    "mappings cleared" : "Asignaciones desaniciaes",
-    "Success" : "Con ésitu",
-    "Error" : "Fallu",
-    "Please specify a Base DN" : "Especifica un DN base",
-    "Could not determine Base DN" : "Nun pudo determinase un DN base",
-    "Please specify the port" : "Especifica'l puertu",
-    "Configuration OK" : "Configuración correuta",
     "Configuration incorrect" : "Configuración incorreuta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración correuta",
     "Select groups" : "Esbillar grupos",
     "Select object classes" : "Seleicionar la clas d'oxetu",
-    "Select attributes" : "Esbillar atributos",
-    "Connection test succeeded" : "Test de conexón esitosu",
-    "Connection test failed" : "Falló'l test de conexón",
+    "{nthServer}. Server" : "{nthServer}. Sirvidor",
     "Do you really want to delete the current Server Configuration?" : "¿Daveres que quies desaniciar la configuración actual del sirvidor?",
     "Confirm Deletion" : "Confirmar desaniciu",
+    "Select attributes" : "Esbillar atributos",
     "_%s group found_::_%s groups found_" : ["%s grupu alcontráu","%s grupos alcontraos"],
     "_%s user found_::_%s users found_" : ["%s usuariu alcontráu","%s usuarios alcontraos"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nun deteutamos el nome  d'atributu na pantalla d'usuariu. Por favor  especifícalu nos axustes avanzaos de ldap",
     "Could not find the desired feature" : "Nun pudo alcontrase la carauterística deseyada",
     "Invalid Host" : "Host inválidu",
     "Server" : "Sirvidor",
-    "User Filter" : "Filtru d'usuariu",
-    "Login Filter" : "Filtru de login",
-    "Group Filter" : "Filtru de Grupu",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios tán disponibles en %s:",
-    "only those object classes:" : "namái d'estes clases d'oxetu:",
-    "only from those groups:" : "manái d'estos grupos:",
-    "Edit raw filter instead" : "Editar el filtru en brutu en so llugar",
-    "Raw LDAP filter" : "Filtru LDAP en brutu",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtru especifica qué grupos LDAP van tener accesu a %s.",
     "Test Filter" : "Filtru de preba",
-    "groups found" : "grupos alcontraos",
-    "Users login with this attribute:" : "Aniciu de sesión d'usuarios con esti atributu:",
-    "LDAP Username:" : "Nome d'usuariu LDAP",
-    "LDAP Email Address:" : "Direición e-mail LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define'l filtru a aplicar cuando s'intenta identificar. %%uid va trocar al nome d'usuariu nel procesu d'identificación. Por exemplu: \"uid=%%uid\"",
     "1. Server" : "1. Sirvidor",
     "%s. Server:" : "%s. Sirvidor:",
-    "Add Server Configuration" : "Amestar configuración del sirvidor",
-    "Delete Configuration" : "Desaniciar configuración",
     "Host" : "Equipu",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pues omitir el protocolu, sacantes si necesites SSL. Nesi casu, entama con ldaps://",
     "Port" : "Puertu",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Inxerta manualmente los filtros de LDAP (recomendáu pa direutorios llargos)",
     "Limit %s access to users meeting these criteria:" : "Llendar l'accesu a %s a los usuarios que cumplan estos criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtru especifica qué usuarios LDAP puen tener accesu a %s.",
-    "users found" : "usuarios alcontraos",
     "Saving" : "Guardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/ast.json b/apps/user_ldap/l10n/ast.json
index 23c9bcebe8b..408febfb899 100644
--- a/apps/user_ldap/l10n/ast.json
+++ b/apps/user_ldap/l10n/ast.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Nun s'especificó la configuración",
     "No data specified" : "Nun s'especificaron los datos",
     " Could not set configuration %s" : "Nun pudo afitase la configuración %s",
-    "Deletion failed" : "Falló'l borráu",
-    "Take over settings from recent server configuration?" : "¿Asumir los axustes actuales de la configuración del sirvidor?",
-    "Keep settings?" : "¿Caltener los axustes?",
-    "{nthServer}. Server" : "{nthServer}. Sirvidor",
-    "Cannot add server configuration" : "Nun pue amestase la configuración del sirvidor",
-    "mappings cleared" : "Asignaciones desaniciaes",
-    "Success" : "Con ésitu",
-    "Error" : "Fallu",
-    "Please specify a Base DN" : "Especifica un DN base",
-    "Could not determine Base DN" : "Nun pudo determinase un DN base",
-    "Please specify the port" : "Especifica'l puertu",
-    "Configuration OK" : "Configuración correuta",
     "Configuration incorrect" : "Configuración incorreuta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración correuta",
     "Select groups" : "Esbillar grupos",
     "Select object classes" : "Seleicionar la clas d'oxetu",
-    "Select attributes" : "Esbillar atributos",
-    "Connection test succeeded" : "Test de conexón esitosu",
-    "Connection test failed" : "Falló'l test de conexón",
+    "{nthServer}. Server" : "{nthServer}. Sirvidor",
     "Do you really want to delete the current Server Configuration?" : "¿Daveres que quies desaniciar la configuración actual del sirvidor?",
     "Confirm Deletion" : "Confirmar desaniciu",
+    "Select attributes" : "Esbillar atributos",
     "_%s group found_::_%s groups found_" : ["%s grupu alcontráu","%s grupos alcontraos"],
     "_%s user found_::_%s users found_" : ["%s usuariu alcontráu","%s usuarios alcontraos"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nun deteutamos el nome  d'atributu na pantalla d'usuariu. Por favor  especifícalu nos axustes avanzaos de ldap",
     "Could not find the desired feature" : "Nun pudo alcontrase la carauterística deseyada",
     "Invalid Host" : "Host inválidu",
     "Server" : "Sirvidor",
-    "User Filter" : "Filtru d'usuariu",
-    "Login Filter" : "Filtru de login",
-    "Group Filter" : "Filtru de Grupu",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios tán disponibles en %s:",
-    "only those object classes:" : "namái d'estes clases d'oxetu:",
-    "only from those groups:" : "manái d'estos grupos:",
-    "Edit raw filter instead" : "Editar el filtru en brutu en so llugar",
-    "Raw LDAP filter" : "Filtru LDAP en brutu",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtru especifica qué grupos LDAP van tener accesu a %s.",
     "Test Filter" : "Filtru de preba",
-    "groups found" : "grupos alcontraos",
-    "Users login with this attribute:" : "Aniciu de sesión d'usuarios con esti atributu:",
-    "LDAP Username:" : "Nome d'usuariu LDAP",
-    "LDAP Email Address:" : "Direición e-mail LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define'l filtru a aplicar cuando s'intenta identificar. %%uid va trocar al nome d'usuariu nel procesu d'identificación. Por exemplu: \"uid=%%uid\"",
     "1. Server" : "1. Sirvidor",
     "%s. Server:" : "%s. Sirvidor:",
-    "Add Server Configuration" : "Amestar configuración del sirvidor",
-    "Delete Configuration" : "Desaniciar configuración",
     "Host" : "Equipu",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pues omitir el protocolu, sacantes si necesites SSL. Nesi casu, entama con ldaps://",
     "Port" : "Puertu",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Inxerta manualmente los filtros de LDAP (recomendáu pa direutorios llargos)",
     "Limit %s access to users meeting these criteria:" : "Llendar l'accesu a %s a los usuarios que cumplan estos criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtru especifica qué usuarios LDAP puen tener accesu a %s.",
-    "users found" : "usuarios alcontraos",
     "Saving" : "Guardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/az.js b/apps/user_ldap/l10n/az.js
index a4a190de240..b431ba72723 100644
--- a/apps/user_ldap/l10n/az.js
+++ b/apps/user_ldap/l10n/az.js
@@ -10,37 +10,23 @@ OC.L10N.register(
     "No configuration specified" : "Təyin edilmiş konfiqurasiya yoxdur",
     "No data specified" : "Təyin edilmiş data yoxdur",
     " Could not set configuration %s" : "%s configi təyin etmək mümkün olmadı",
-    "Deletion failed" : "Silinmədə səhv baş verdi",
-    "Take over settings from recent server configuration?" : "Biraz onceki konfiqlərən server konfiqini alaq?",
-    "Keep settings?" : "Ayarlar qalsın?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Server quraşdırmalarını əlavə etmək mümkün olmadı",
-    "mappings cleared" : "xəritələnmələr təmizləndi",
-    "Success" : "Uğur",
-    "Error" : "Səhv",
-    "Please specify a Base DN" : "Xahiş olunur Base DN təyin edəsiniz",
-    "Could not determine Base DN" : "Base DN-i təyin etmək olmur",
-    "Please specify the port" : "Xahiş olunur portu təyin edəsiniz",
-    "Configuration OK" : "Konfiqurasiya OK-dir",
     "Configuration incorrect" : "Konfiqurasiya düzgün deyil",
     "Configuration incomplete" : "Konfiqruasiya bitmiş deyil",
+    "Configuration OK" : "Konfiqurasiya OK-dir",
     "Select groups" : "Qrupları seç",
     "Select object classes" : "object class-larını seç",
-    "Select attributes" : "Atributları seç",
-    "Connection test succeeded" : "Qoşulma testi uğurlu oldu",
-    "Connection test failed" : "Qoşulma testi uğursuz oldu",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Siz hal-hazırki server konfiqini silmək istədiyinizdən həqiqətən əminsinizmi?",
     "Confirm Deletion" : "Silinmənin təsdiqi",
+    "Select attributes" : "Atributları seç",
     "_%s group found_::_%s groups found_" : ["%s qruplar tapıldı","%s qruplar tapıldı"],
     "_%s user found_::_%s users found_" : ["%s istifadəçilər tapıldı","%s istifadəçilər tapıldı"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "İstifadəçinin ekran atributu adını təyin etmək mümkün deyil. Xahiş olunur sizin özünüz onu əllə ldap konfiqində təyin edəsiniz.",
     "Could not find the desired feature" : "Arzulanılan imkanı tapmaq mümkün deyil",
     "Invalid Host" : "Yalnış Host",
     "Server" : "Server",
-    "User Filter" : "İstifadəçi süzgəci",
-    "Login Filter" : "Giriş süzgəci",
-    "Group Filter" : "Qrup süzgəci",
-    "Save" : "Saxlamaq",
+    "Users" : "İstifadəçilər",
+    "Groups" : "Qruplar",
     "Test Configuration" : "Konfiqurasiya testi",
     "Help" : "Kömək",
     "Host" : "Şəbəkədə ünvan",
diff --git a/apps/user_ldap/l10n/az.json b/apps/user_ldap/l10n/az.json
index 0e2afa6765d..aa5e52cb346 100644
--- a/apps/user_ldap/l10n/az.json
+++ b/apps/user_ldap/l10n/az.json
@@ -8,37 +8,23 @@
     "No configuration specified" : "Təyin edilmiş konfiqurasiya yoxdur",
     "No data specified" : "Təyin edilmiş data yoxdur",
     " Could not set configuration %s" : "%s configi təyin etmək mümkün olmadı",
-    "Deletion failed" : "Silinmədə səhv baş verdi",
-    "Take over settings from recent server configuration?" : "Biraz onceki konfiqlərən server konfiqini alaq?",
-    "Keep settings?" : "Ayarlar qalsın?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Server quraşdırmalarını əlavə etmək mümkün olmadı",
-    "mappings cleared" : "xəritələnmələr təmizləndi",
-    "Success" : "Uğur",
-    "Error" : "Səhv",
-    "Please specify a Base DN" : "Xahiş olunur Base DN təyin edəsiniz",
-    "Could not determine Base DN" : "Base DN-i təyin etmək olmur",
-    "Please specify the port" : "Xahiş olunur portu təyin edəsiniz",
-    "Configuration OK" : "Konfiqurasiya OK-dir",
     "Configuration incorrect" : "Konfiqurasiya düzgün deyil",
     "Configuration incomplete" : "Konfiqruasiya bitmiş deyil",
+    "Configuration OK" : "Konfiqurasiya OK-dir",
     "Select groups" : "Qrupları seç",
     "Select object classes" : "object class-larını seç",
-    "Select attributes" : "Atributları seç",
-    "Connection test succeeded" : "Qoşulma testi uğurlu oldu",
-    "Connection test failed" : "Qoşulma testi uğursuz oldu",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Siz hal-hazırki server konfiqini silmək istədiyinizdən həqiqətən əminsinizmi?",
     "Confirm Deletion" : "Silinmənin təsdiqi",
+    "Select attributes" : "Atributları seç",
     "_%s group found_::_%s groups found_" : ["%s qruplar tapıldı","%s qruplar tapıldı"],
     "_%s user found_::_%s users found_" : ["%s istifadəçilər tapıldı","%s istifadəçilər tapıldı"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "İstifadəçinin ekran atributu adını təyin etmək mümkün deyil. Xahiş olunur sizin özünüz onu əllə ldap konfiqində təyin edəsiniz.",
     "Could not find the desired feature" : "Arzulanılan imkanı tapmaq mümkün deyil",
     "Invalid Host" : "Yalnış Host",
     "Server" : "Server",
-    "User Filter" : "İstifadəçi süzgəci",
-    "Login Filter" : "Giriş süzgəci",
-    "Group Filter" : "Qrup süzgəci",
-    "Save" : "Saxlamaq",
+    "Users" : "İstifadəçilər",
+    "Groups" : "Qruplar",
     "Test Configuration" : "Konfiqurasiya testi",
     "Help" : "Kömək",
     "Host" : "Şəbəkədə ünvan",
diff --git a/apps/user_ldap/l10n/be.js b/apps/user_ldap/l10n/be.js
index b066b1be44f..dda51e8ac42 100644
--- a/apps/user_ldap/l10n/be.js
+++ b/apps/user_ldap/l10n/be.js
@@ -1,7 +1,6 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "Памылка",
     "Advanced" : "Дасведчаны"
 },
 "nplurals=4; 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/be.json b/apps/user_ldap/l10n/be.json
index 199294660f1..f70adabdbe1 100644
--- a/apps/user_ldap/l10n/be.json
+++ b/apps/user_ldap/l10n/be.json
@@ -1,5 +1,4 @@
 { "translations": {
-    "Error" : "Памылка",
     "Advanced" : "Дасведчаны"
 },"pluralForm" :"nplurals=4; 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/bg_BG.js b/apps/user_ldap/l10n/bg_BG.js
index 32752119b90..42f1a3759f2 100644
--- a/apps/user_ldap/l10n/bg_BG.js
+++ b/apps/user_ldap/l10n/bg_BG.js
@@ -10,55 +10,31 @@ OC.L10N.register(
     "No configuration specified" : "Не е посочена конфигурация",
     "No data specified" : "Не са посочени данни",
     " Could not set configuration %s" : "Неуспешно задаване на конфигруацията %s",
-    "Deletion failed" : "Неуспешно изтриване",
-    "Take over settings from recent server configuration?" : "Използвай настройките от скорошна сървърна конфигурация?",
-    "Keep settings?" : "Запази настройките?",
-    "{nthServer}. Server" : "{nthServer}. Сървър",
-    "Cannot add server configuration" : "Неуспешно добавяне на сървърна конфигурация.",
-    "mappings cleared" : "mapping-и създадени.",
-    "Success" : "Успех",
-    "Error" : "Грешка",
-    "Please specify a Base DN" : "Моля, посочи Base DN",
-    "Could not determine Base DN" : "Неуспешно установяване на Base DN",
-    "Please specify the port" : "Mоля, посочи портът",
-    "Configuration OK" : "Конфигурацията е ОК",
     "Configuration incorrect" : "Конфигурацията е грешна",
     "Configuration incomplete" : "Конфигурацията не е завършена",
+    "Configuration OK" : "Конфигурацията е ОК",
     "Select groups" : "Избери Групи",
     "Select object classes" : "Избери типове обекти",
-    "Select attributes" : "Избери атрибути",
-    "Connection test succeeded" : "Успешен тест на връзката.",
-    "Connection test failed" : "Неуспешен тест на връзката.",
+    "{nthServer}. Server" : "{nthServer}. Сървър",
     "Do you really want to delete the current Server Configuration?" : "Наистина ли искаш да изтриеш текущата Сървърна Конфигурация?",
     "Confirm Deletion" : "Потвърди Изтриването",
+    "Select attributes" : "Избери атрибути",
     "_%s group found_::_%s groups found_" : ["%s открита група","%s открити групи"],
     "_%s user found_::_%s users found_" : ["%s октрит потребител","%s октрити потребители"],
     "Could not find the desired feature" : "Не е открита желанта функция",
     "Invalid Host" : "Невалиден Сървър",
     "Server" : "Сървър",
-    "User Filter" : "User Filter",
-    "Login Filter" : "Login Filter",
-    "Group Filter" : "Group Filter",
-    "Save" : "Запиши",
+    "Users" : "Потребители",
+    "Groups" : "Групи",
     "Test Configuration" : "Тествай Конфигурацията",
     "Help" : "Помощ",
     "Groups meeting these criteria are available in %s:" : "Групи спазващи тези критерии са разположени в %s:",
-    "only those object classes:" : "само следните типове обекти:",
-    "only from those groups:" : "само от следните групи:",
-    "Edit raw filter instead" : "Промени raw филтъра",
-    "Raw LDAP filter" : "Raw LDAP филтър",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтърът посочва кои LDAP групи ще имат достъп до %s инсталацията.",
     "Test Filter" : "Тестов Филтър",
-    "groups found" : "открити групи",
-    "Users login with this attribute:" : "Потребителски профили с този атрибут:",
-    "LDAP Username:" : "LDAP Потребителско Име:",
-    "LDAP Email Address:" : "LDAP Имел Адрес:",
     "Other Attributes:" : "Други Атрибути:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Заявява филтърът, който да бъде приложен при опит за вписване. %%uid замества потребителското име в полето login action. Пример: \"uid=%%uid\".",
     "1. Server" : "1. Сървър",
     "%s. Server:" : "%s. Сървър:",
-    "Add Server Configuration" : "Добави Сървърна Конфигурация",
-    "Delete Configuration" : "Изтрий Конфигурацията",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Протоколът не задължителен освен ако не изискваш SLL. В такъв случай започни с ldaps://",
     "Port" : "Порт",
@@ -72,7 +48,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ръчно въвеждана на LDAP филтри(препоръчано за по-големи папки)",
     "Limit %s access to users meeting these criteria:" : "Ограничи достъпа на %s до потребители покриващи следните критерии:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Филтърът посочва кои LDAP потребители ще имат достъп до %s инсталацията.",
-    "users found" : "открити потребители",
     "Saving" : "Записване",
     "Back" : "Назад",
     "Continue" : "Продължи",
diff --git a/apps/user_ldap/l10n/bg_BG.json b/apps/user_ldap/l10n/bg_BG.json
index 9db25e037a1..f10290c783c 100644
--- a/apps/user_ldap/l10n/bg_BG.json
+++ b/apps/user_ldap/l10n/bg_BG.json
@@ -8,55 +8,31 @@
     "No configuration specified" : "Не е посочена конфигурация",
     "No data specified" : "Не са посочени данни",
     " Could not set configuration %s" : "Неуспешно задаване на конфигруацията %s",
-    "Deletion failed" : "Неуспешно изтриване",
-    "Take over settings from recent server configuration?" : "Използвай настройките от скорошна сървърна конфигурация?",
-    "Keep settings?" : "Запази настройките?",
-    "{nthServer}. Server" : "{nthServer}. Сървър",
-    "Cannot add server configuration" : "Неуспешно добавяне на сървърна конфигурация.",
-    "mappings cleared" : "mapping-и създадени.",
-    "Success" : "Успех",
-    "Error" : "Грешка",
-    "Please specify a Base DN" : "Моля, посочи Base DN",
-    "Could not determine Base DN" : "Неуспешно установяване на Base DN",
-    "Please specify the port" : "Mоля, посочи портът",
-    "Configuration OK" : "Конфигурацията е ОК",
     "Configuration incorrect" : "Конфигурацията е грешна",
     "Configuration incomplete" : "Конфигурацията не е завършена",
+    "Configuration OK" : "Конфигурацията е ОК",
     "Select groups" : "Избери Групи",
     "Select object classes" : "Избери типове обекти",
-    "Select attributes" : "Избери атрибути",
-    "Connection test succeeded" : "Успешен тест на връзката.",
-    "Connection test failed" : "Неуспешен тест на връзката.",
+    "{nthServer}. Server" : "{nthServer}. Сървър",
     "Do you really want to delete the current Server Configuration?" : "Наистина ли искаш да изтриеш текущата Сървърна Конфигурация?",
     "Confirm Deletion" : "Потвърди Изтриването",
+    "Select attributes" : "Избери атрибути",
     "_%s group found_::_%s groups found_" : ["%s открита група","%s открити групи"],
     "_%s user found_::_%s users found_" : ["%s октрит потребител","%s октрити потребители"],
     "Could not find the desired feature" : "Не е открита желанта функция",
     "Invalid Host" : "Невалиден Сървър",
     "Server" : "Сървър",
-    "User Filter" : "User Filter",
-    "Login Filter" : "Login Filter",
-    "Group Filter" : "Group Filter",
-    "Save" : "Запиши",
+    "Users" : "Потребители",
+    "Groups" : "Групи",
     "Test Configuration" : "Тествай Конфигурацията",
     "Help" : "Помощ",
     "Groups meeting these criteria are available in %s:" : "Групи спазващи тези критерии са разположени в %s:",
-    "only those object classes:" : "само следните типове обекти:",
-    "only from those groups:" : "само от следните групи:",
-    "Edit raw filter instead" : "Промени raw филтъра",
-    "Raw LDAP filter" : "Raw LDAP филтър",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтърът посочва кои LDAP групи ще имат достъп до %s инсталацията.",
     "Test Filter" : "Тестов Филтър",
-    "groups found" : "открити групи",
-    "Users login with this attribute:" : "Потребителски профили с този атрибут:",
-    "LDAP Username:" : "LDAP Потребителско Име:",
-    "LDAP Email Address:" : "LDAP Имел Адрес:",
     "Other Attributes:" : "Други Атрибути:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Заявява филтърът, който да бъде приложен при опит за вписване. %%uid замества потребителското име в полето login action. Пример: \"uid=%%uid\".",
     "1. Server" : "1. Сървър",
     "%s. Server:" : "%s. Сървър:",
-    "Add Server Configuration" : "Добави Сървърна Конфигурация",
-    "Delete Configuration" : "Изтрий Конфигурацията",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Протоколът не задължителен освен ако не изискваш SLL. В такъв случай започни с ldaps://",
     "Port" : "Порт",
@@ -70,7 +46,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ръчно въвеждана на LDAP филтри(препоръчано за по-големи папки)",
     "Limit %s access to users meeting these criteria:" : "Ограничи достъпа на %s до потребители покриващи следните критерии:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Филтърът посочва кои LDAP потребители ще имат достъп до %s инсталацията.",
-    "users found" : "открити потребители",
     "Saving" : "Записване",
     "Back" : "Назад",
     "Continue" : "Продължи",
diff --git a/apps/user_ldap/l10n/bn_BD.js b/apps/user_ldap/l10n/bn_BD.js
index d52c5eb953a..3ee845c475f 100644
--- a/apps/user_ldap/l10n/bn_BD.js
+++ b/apps/user_ldap/l10n/bn_BD.js
@@ -10,54 +10,30 @@ OC.L10N.register(
     "No configuration specified" : " কোন কনফিগারেসন সুনির্দিষ্ট নয়",
     "No data specified" : "কোন ডাটা সুনির্দিষ্ট নয়",
     " Could not set configuration %s" : "%s কনফিগারেসন ঠিক করা গেল না",
-    "Deletion failed" : "মুছার আদেশ ব্যার্থ হলো",
-    "Take over settings from recent server configuration?" : "সদ্য সার্ভার কনফিগারেসন থেকে নিয়ামকসমূহ নিতে হবে?",
-    "Keep settings?" : "নিয়ামকসমূহ সংরক্ষণ করবো?",
-    "{nthServer}. Server" : "{nthServer}. সার্ভার",
-    "Cannot add server configuration" : "সার্ভার কনফিগারেসন যোগ করা যাবেনা",
-    "mappings cleared" : "মানচিত্রায়ন মোছা হলো",
-    "Success" : "সাফল্য",
-    "Error" : "সমস্যা",
-    "Please specify a Base DN" : "দয়া করে একটি Base DN নির্দিষ্ট করুন",
-    "Could not determine Base DN" : "Base DN নির্ধারণ করা গেলনা",
-    "Please specify the port" : "পোর্ট সুনির্দিষ্ট করুন",
-    "Configuration OK" : "কনফিগারেসন ঠিক আছে",
     "Configuration incorrect" : "ভুল কনফিগারেসন",
     "Configuration incomplete" : "অসম্পূর্ণ কনফিগারেসন",
+    "Configuration OK" : "কনফিগারেসন ঠিক আছে",
     "Select groups" : "গ্রুপ নির্ধারণ",
     "Select object classes" : "অবজেক্ট ক্লাস নির্ধারণ",
-    "Select attributes" : "বৈশিষ্ট্য নির্ধারণ",
-    "Connection test succeeded" : "যোগাযোগ পরীক্ষা সার্থক",
-    "Connection test failed" : "যোগাযোগ পরীক্ষা ব্যার্থ",
+    "{nthServer}. Server" : "{nthServer}. সার্ভার",
     "Do you really want to delete the current Server Configuration?" : "আপনি কি সত্যিই চলতি সার্ভার কনফিগারেসন মুছতে চান?",
     "Confirm Deletion" : "মোছার আদেশ নিশ্চিত করুন",
+    "Select attributes" : "বৈশিষ্ট্য নির্ধারণ",
     "_%s group found_::_%s groups found_" : ["%s গ্রুপ পাওয়া গেছে","%s গ্রুপ পাওয়া গেছে"],
     "_%s user found_::_%s users found_" : ["%s ব্যাবহারকারী পাওয়া গেছে","%s ব্যাবহারকারী পাওয়া গেছে"],
     "Could not find the desired feature" : "চাহিদামাফিক ফিচারটি পাওয়া গেলনা",
     "Invalid Host" : "অবৈধ হোস্ট",
     "Server" : "সার্ভার",
-    "User Filter" : "ব্যবহারকারী তালিকা ছাঁকনী",
-    "Login Filter" : "প্রবেশ ছাঁকনী",
-    "Group Filter" : "গোষ্ঠী ছাঁকনী",
-    "Save" : "সংরক্ষণ",
+    "Users" : "ব্যবহারকারী",
+    "Groups" : "গোষ্ঠীসমূহ",
     "Test Configuration" : "পরীক্ষামূলক কনফিগারেসন",
     "Help" : "সহায়িকা",
     "Groups meeting these criteria are available in %s:" : "প্রদত্ত বৈশিষ্ট্য অনুযায়ী %s এ প্রাপ্তব্য গ্রুপসমূহ:",
-    "only those object classes:" : "শুধুমাত্র সেইসব অবজেক্ট ক্লাস:",
-    "only from those groups:" : "শুধুমাত্র বর্ণিত গ্রুপসমূহ হতে:",
-    "Edit raw filter instead" : "অসম্পূর্ণ ফিল্টার সম্পাদনা করুন",
-    "Raw LDAP filter" : "অসম্পূর্ণ LDAP ফিল্টার",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "ফিল্টারটি %s সার্ভারে কোন কোন LDAP গ্রুপ প্রবেশাধিকার পাবে তা নির্ধারণ করে।",
-    "groups found" : "গ্রুপ পাওয়া গেছে",
-    "Users login with this attribute:" : "এই বৈশিষ্ট্য নিয়ে ব্যবহারকারী প্রবেশ করতে পারেন:",
-    "LDAP Username:" : "LDAP ব্যাবহারকারী নাম:",
-    "LDAP Email Address:" : "LDAP ই-মেইল ঠিকানা:",
     "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\"",
     "1. Server" : "1. সার্ভার",
     "%s. Server:" : "%s. সার্ভার:",
-    "Add Server Configuration" : "সার্ভার কনফিগারেসন যোগ কর",
-    "Delete Configuration" : "কনফিগারেসন মুছে ফেল",
     "Host" : "হোস্ট",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL আবশ্যক  না হলে  আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://",
     "Port" : "পোর্ট",
@@ -69,7 +45,6 @@ OC.L10N.register(
     "You can specify Base DN for users and groups in the Advanced tab" : "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।",
     "Limit %s access to users meeting these criteria:" : "%s এ প্রবেশাধিকার এই শর্তধারী ব্যবহারকারীর মাঝে সীমিত রাখ:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "এই ফিল্টারটি কোন কোন LDAP ব্যবহারকারী %s সার্ভারে প্রবেশ করবেন তা বাছাই করে।",
-    "users found" : "ব্যাবহারকারী পাওয়া গেছে",
     "Back" : "পেছনে যাও",
     "Continue" : "চালিয়ে যাও",
     "Expert" : "দক্ষ",
diff --git a/apps/user_ldap/l10n/bn_BD.json b/apps/user_ldap/l10n/bn_BD.json
index 0c21103de4f..250565a3a82 100644
--- a/apps/user_ldap/l10n/bn_BD.json
+++ b/apps/user_ldap/l10n/bn_BD.json
@@ -8,54 +8,30 @@
     "No configuration specified" : " কোন কনফিগারেসন সুনির্দিষ্ট নয়",
     "No data specified" : "কোন ডাটা সুনির্দিষ্ট নয়",
     " Could not set configuration %s" : "%s কনফিগারেসন ঠিক করা গেল না",
-    "Deletion failed" : "মুছার আদেশ ব্যার্থ হলো",
-    "Take over settings from recent server configuration?" : "সদ্য সার্ভার কনফিগারেসন থেকে নিয়ামকসমূহ নিতে হবে?",
-    "Keep settings?" : "নিয়ামকসমূহ সংরক্ষণ করবো?",
-    "{nthServer}. Server" : "{nthServer}. সার্ভার",
-    "Cannot add server configuration" : "সার্ভার কনফিগারেসন যোগ করা যাবেনা",
-    "mappings cleared" : "মানচিত্রায়ন মোছা হলো",
-    "Success" : "সাফল্য",
-    "Error" : "সমস্যা",
-    "Please specify a Base DN" : "দয়া করে একটি Base DN নির্দিষ্ট করুন",
-    "Could not determine Base DN" : "Base DN নির্ধারণ করা গেলনা",
-    "Please specify the port" : "পোর্ট সুনির্দিষ্ট করুন",
-    "Configuration OK" : "কনফিগারেসন ঠিক আছে",
     "Configuration incorrect" : "ভুল কনফিগারেসন",
     "Configuration incomplete" : "অসম্পূর্ণ কনফিগারেসন",
+    "Configuration OK" : "কনফিগারেসন ঠিক আছে",
     "Select groups" : "গ্রুপ নির্ধারণ",
     "Select object classes" : "অবজেক্ট ক্লাস নির্ধারণ",
-    "Select attributes" : "বৈশিষ্ট্য নির্ধারণ",
-    "Connection test succeeded" : "যোগাযোগ পরীক্ষা সার্থক",
-    "Connection test failed" : "যোগাযোগ পরীক্ষা ব্যার্থ",
+    "{nthServer}. Server" : "{nthServer}. সার্ভার",
     "Do you really want to delete the current Server Configuration?" : "আপনি কি সত্যিই চলতি সার্ভার কনফিগারেসন মুছতে চান?",
     "Confirm Deletion" : "মোছার আদেশ নিশ্চিত করুন",
+    "Select attributes" : "বৈশিষ্ট্য নির্ধারণ",
     "_%s group found_::_%s groups found_" : ["%s গ্রুপ পাওয়া গেছে","%s গ্রুপ পাওয়া গেছে"],
     "_%s user found_::_%s users found_" : ["%s ব্যাবহারকারী পাওয়া গেছে","%s ব্যাবহারকারী পাওয়া গেছে"],
     "Could not find the desired feature" : "চাহিদামাফিক ফিচারটি পাওয়া গেলনা",
     "Invalid Host" : "অবৈধ হোস্ট",
     "Server" : "সার্ভার",
-    "User Filter" : "ব্যবহারকারী তালিকা ছাঁকনী",
-    "Login Filter" : "প্রবেশ ছাঁকনী",
-    "Group Filter" : "গোষ্ঠী ছাঁকনী",
-    "Save" : "সংরক্ষণ",
+    "Users" : "ব্যবহারকারী",
+    "Groups" : "গোষ্ঠীসমূহ",
     "Test Configuration" : "পরীক্ষামূলক কনফিগারেসন",
     "Help" : "সহায়িকা",
     "Groups meeting these criteria are available in %s:" : "প্রদত্ত বৈশিষ্ট্য অনুযায়ী %s এ প্রাপ্তব্য গ্রুপসমূহ:",
-    "only those object classes:" : "শুধুমাত্র সেইসব অবজেক্ট ক্লাস:",
-    "only from those groups:" : "শুধুমাত্র বর্ণিত গ্রুপসমূহ হতে:",
-    "Edit raw filter instead" : "অসম্পূর্ণ ফিল্টার সম্পাদনা করুন",
-    "Raw LDAP filter" : "অসম্পূর্ণ LDAP ফিল্টার",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "ফিল্টারটি %s সার্ভারে কোন কোন LDAP গ্রুপ প্রবেশাধিকার পাবে তা নির্ধারণ করে।",
-    "groups found" : "গ্রুপ পাওয়া গেছে",
-    "Users login with this attribute:" : "এই বৈশিষ্ট্য নিয়ে ব্যবহারকারী প্রবেশ করতে পারেন:",
-    "LDAP Username:" : "LDAP ব্যাবহারকারী নাম:",
-    "LDAP Email Address:" : "LDAP ই-মেইল ঠিকানা:",
     "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\"",
     "1. Server" : "1. সার্ভার",
     "%s. Server:" : "%s. সার্ভার:",
-    "Add Server Configuration" : "সার্ভার কনফিগারেসন যোগ কর",
-    "Delete Configuration" : "কনফিগারেসন মুছে ফেল",
     "Host" : "হোস্ট",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL আবশ্যক  না হলে  আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://",
     "Port" : "পোর্ট",
@@ -67,7 +43,6 @@
     "You can specify Base DN for users and groups in the Advanced tab" : "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।",
     "Limit %s access to users meeting these criteria:" : "%s এ প্রবেশাধিকার এই শর্তধারী ব্যবহারকারীর মাঝে সীমিত রাখ:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "এই ফিল্টারটি কোন কোন LDAP ব্যবহারকারী %s সার্ভারে প্রবেশ করবেন তা বাছাই করে।",
-    "users found" : "ব্যাবহারকারী পাওয়া গেছে",
     "Back" : "পেছনে যাও",
     "Continue" : "চালিয়ে যাও",
     "Expert" : "দক্ষ",
diff --git a/apps/user_ldap/l10n/bn_IN.js b/apps/user_ldap/l10n/bn_IN.js
index 88930252486..c0e75c83618 100644
--- a/apps/user_ldap/l10n/bn_IN.js
+++ b/apps/user_ldap/l10n/bn_IN.js
@@ -1,8 +1,6 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "ভুল",
-    "Save" : "সেভ",
     "Host" : "হোস্ট"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/bn_IN.json b/apps/user_ldap/l10n/bn_IN.json
index c9907ef3cae..e80623a1235 100644
--- a/apps/user_ldap/l10n/bn_IN.json
+++ b/apps/user_ldap/l10n/bn_IN.json
@@ -1,6 +1,4 @@
 { "translations": {
-    "Error" : "ভুল",
-    "Save" : "সেভ",
     "Host" : "হোস্ট"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/bs.js b/apps/user_ldap/l10n/bs.js
index 5d9a2405dc7..a30255595fe 100644
--- a/apps/user_ldap/l10n/bs.js
+++ b/apps/user_ldap/l10n/bs.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Brisanje nije uspjelo",
-    "Error" : "Greška",
-    "Save" : "Spasi",
+    "Users" : "Korisnici",
+    "Groups" : "Grupe",
     "Help" : "Pomoć",
     "Port" : "Priključak",
     "Password" : "Lozinka",
diff --git a/apps/user_ldap/l10n/bs.json b/apps/user_ldap/l10n/bs.json
index 4591e65fb91..3172f54cf89 100644
--- a/apps/user_ldap/l10n/bs.json
+++ b/apps/user_ldap/l10n/bs.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Brisanje nije uspjelo",
-    "Error" : "Greška",
-    "Save" : "Spasi",
+    "Users" : "Korisnici",
+    "Groups" : "Grupe",
     "Help" : "Pomoć",
     "Port" : "Priključak",
     "Password" : "Lozinka",
diff --git a/apps/user_ldap/l10n/ca.js b/apps/user_ldap/l10n/ca.js
index 0a99e88517d..cf25823642b 100644
--- a/apps/user_ldap/l10n/ca.js
+++ b/apps/user_ldap/l10n/ca.js
@@ -10,54 +10,30 @@ OC.L10N.register(
     "No configuration specified" : "No heu especificat cap configuració",
     "No data specified" : "No heu especificat cap dada",
     " Could not set configuration %s" : "No s'ha pogut establir la configuració %s",
-    "Deletion failed" : "Eliminació fallida",
-    "Take over settings from recent server configuration?" : "Voleu prendre l'arranjament de la configuració actual del servidor?",
-    "Keep settings?" : "Voleu mantenir la configuració?",
-    "{nthServer}. Server" : "{nthServer}. Servidor",
-    "Cannot add server configuration" : "No es pot afegir la configuració del servidor",
-    "mappings cleared" : "s'han eliminat els mapatges",
-    "Success" : "Èxit",
-    "Error" : "Error",
-    "Please specify a Base DN" : "Especifiqueu una base DN",
-    "Could not determine Base DN" : "No s'ha pogut determinar la base DN",
-    "Please specify the port" : "Especifiqueu el port",
-    "Configuration OK" : "Configuració correcte",
     "Configuration incorrect" : "Configuració incorrecte",
     "Configuration incomplete" : "Configuració incompleta",
+    "Configuration OK" : "Configuració correcte",
     "Select groups" : "Selecciona els grups",
     "Select object classes" : "Seleccioneu les classes dels objectes",
-    "Select attributes" : "Seleccioneu els atributs",
-    "Connection test succeeded" : "La prova de connexió ha reeixit",
-    "Connection test failed" : "La prova de connexió ha fallat",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
     "Do you really want to delete the current Server Configuration?" : "Voleu eliminar la configuració actual del servidor?",
     "Confirm Deletion" : "Confirma l'eliminació",
+    "Select attributes" : "Seleccioneu els atributs",
     "_%s group found_::_%s groups found_" : ["S'ha trobat %s grup","S'han trobat %s grups"],
     "_%s user found_::_%s users found_" : ["S'ha trobat %s usuari","S'han trobat %s usuaris"],
     "Could not find the desired feature" : "La característica desitjada no s'ha trobat",
     "Invalid Host" : "Ordinador central no vàlid",
     "Server" : "Servidor",
-    "User Filter" : "Filtre d'usuari",
-    "Login Filter" : "Filtre d'acreditació",
-    "Group Filter" : "Filtre de grup",
-    "Save" : "Desa",
+    "Users" : "Usuaris",
+    "Groups" : "Grups",
     "Test Configuration" : "Comprovació de la configuració",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Els grups que compleixen aquests criteris estan disponibles a %s:",
-    "only those object classes:" : "només aquestes classes d'objecte:",
-    "only from those groups:" : "només d'aquests grups",
-    "Edit raw filter instead" : "Edita filtre raw",
-    "Raw LDAP filter" : "Filtre raw LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtre especifica quins grups LDAP haurien de tenir accés a la instància %s.",
-    "groups found" : "grups trobats",
-    "Users login with this attribute:" : "Usuaris acreditats amb aquest atribut:",
-    "LDAP Username:" : "Nom d'usuari LDAP:",
-    "LDAP Email Address:" : "Adreça de correu electrònic LDAP:",
     "Other Attributes:" : "Altres atributs:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Afegeix la configuració del servidor",
-    "Delete Configuration" : "Esborra la configuració",
     "Host" : "Equip remot",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
     "Port" : "Port",
@@ -69,7 +45,6 @@ OC.L10N.register(
     "You can specify Base DN for users and groups in the Advanced tab" : "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat",
     "Limit %s access to users meeting these criteria:" : "Limita l'accés a %s usuaris que compleixin amb aquest criteri:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtre especifica quins usuaris LDAP haurien de tenir accés a la instància %s",
-    "users found" : "usuaris trobats",
     "Back" : "Enrera",
     "Continue" : "Continua",
     "Expert" : "Expert",
diff --git a/apps/user_ldap/l10n/ca.json b/apps/user_ldap/l10n/ca.json
index e34ab1e1256..87030688650 100644
--- a/apps/user_ldap/l10n/ca.json
+++ b/apps/user_ldap/l10n/ca.json
@@ -8,54 +8,30 @@
     "No configuration specified" : "No heu especificat cap configuració",
     "No data specified" : "No heu especificat cap dada",
     " Could not set configuration %s" : "No s'ha pogut establir la configuració %s",
-    "Deletion failed" : "Eliminació fallida",
-    "Take over settings from recent server configuration?" : "Voleu prendre l'arranjament de la configuració actual del servidor?",
-    "Keep settings?" : "Voleu mantenir la configuració?",
-    "{nthServer}. Server" : "{nthServer}. Servidor",
-    "Cannot add server configuration" : "No es pot afegir la configuració del servidor",
-    "mappings cleared" : "s'han eliminat els mapatges",
-    "Success" : "Èxit",
-    "Error" : "Error",
-    "Please specify a Base DN" : "Especifiqueu una base DN",
-    "Could not determine Base DN" : "No s'ha pogut determinar la base DN",
-    "Please specify the port" : "Especifiqueu el port",
-    "Configuration OK" : "Configuració correcte",
     "Configuration incorrect" : "Configuració incorrecte",
     "Configuration incomplete" : "Configuració incompleta",
+    "Configuration OK" : "Configuració correcte",
     "Select groups" : "Selecciona els grups",
     "Select object classes" : "Seleccioneu les classes dels objectes",
-    "Select attributes" : "Seleccioneu els atributs",
-    "Connection test succeeded" : "La prova de connexió ha reeixit",
-    "Connection test failed" : "La prova de connexió ha fallat",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
     "Do you really want to delete the current Server Configuration?" : "Voleu eliminar la configuració actual del servidor?",
     "Confirm Deletion" : "Confirma l'eliminació",
+    "Select attributes" : "Seleccioneu els atributs",
     "_%s group found_::_%s groups found_" : ["S'ha trobat %s grup","S'han trobat %s grups"],
     "_%s user found_::_%s users found_" : ["S'ha trobat %s usuari","S'han trobat %s usuaris"],
     "Could not find the desired feature" : "La característica desitjada no s'ha trobat",
     "Invalid Host" : "Ordinador central no vàlid",
     "Server" : "Servidor",
-    "User Filter" : "Filtre d'usuari",
-    "Login Filter" : "Filtre d'acreditació",
-    "Group Filter" : "Filtre de grup",
-    "Save" : "Desa",
+    "Users" : "Usuaris",
+    "Groups" : "Grups",
     "Test Configuration" : "Comprovació de la configuració",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Els grups que compleixen aquests criteris estan disponibles a %s:",
-    "only those object classes:" : "només aquestes classes d'objecte:",
-    "only from those groups:" : "només d'aquests grups",
-    "Edit raw filter instead" : "Edita filtre raw",
-    "Raw LDAP filter" : "Filtre raw LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtre especifica quins grups LDAP haurien de tenir accés a la instància %s.",
-    "groups found" : "grups trobats",
-    "Users login with this attribute:" : "Usuaris acreditats amb aquest atribut:",
-    "LDAP Username:" : "Nom d'usuari LDAP:",
-    "LDAP Email Address:" : "Adreça de correu electrònic LDAP:",
     "Other Attributes:" : "Altres atributs:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Afegeix la configuració del servidor",
-    "Delete Configuration" : "Esborra la configuració",
     "Host" : "Equip remot",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
     "Port" : "Port",
@@ -67,7 +43,6 @@
     "You can specify Base DN for users and groups in the Advanced tab" : "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat",
     "Limit %s access to users meeting these criteria:" : "Limita l'accés a %s usuaris que compleixin amb aquest criteri:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtre especifica quins usuaris LDAP haurien de tenir accés a la instància %s",
-    "users found" : "usuaris trobats",
     "Back" : "Enrera",
     "Continue" : "Continua",
     "Expert" : "Expert",
diff --git a/apps/user_ldap/l10n/cs_CZ.js b/apps/user_ldap/l10n/cs_CZ.js
index 8af26f62def..1b0daba6559 100644
--- a/apps/user_ldap/l10n/cs_CZ.js
+++ b/apps/user_ldap/l10n/cs_CZ.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Neurčena žádná konfigurace",
     "No data specified" : "Neurčena žádná data",
     " Could not set configuration %s" : "Nelze nastavit konfiguraci %s",
-    "Deletion failed" : "Mazání selhalo",
-    "Take over settings from recent server configuration?" : "Převzít nastavení z nedávné konfigurace serveru?",
-    "Keep settings?" : "Ponechat nastavení?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Nelze přidat nastavení serveru",
-    "mappings cleared" : "mapování zrušeno",
-    "Success" : "Úspěch",
-    "Error" : "Chyba",
-    "Please specify a Base DN" : "Uveďte prosím Base DN",
-    "Could not determine Base DN" : "Nelze určit Base DN",
-    "Please specify the port" : "Prosím zadejte port",
-    "Configuration OK" : "Konfigurace v pořádku",
     "Configuration incorrect" : "Nesprávná konfigurace",
     "Configuration incomplete" : "Nekompletní konfigurace",
+    "Configuration OK" : "Konfigurace v pořádku",
     "Select groups" : "Vyberte skupiny",
     "Select object classes" : "Vyberte objektové třídy",
-    "Select attributes" : "Vyberte atributy",
-    "Connection test succeeded" : "Test spojení byl úspěšný",
-    "Connection test failed" : "Test spojení selhal",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Opravdu si přejete smazat současné nastavení serveru?",
     "Confirm Deletion" : "Potvrdit smazání",
+    "Select attributes" : "Vyberte atributy",
     "_%s group found_::_%s groups found_" : ["nalezena %s skupina","nalezeny %s skupiny","nalezeno %s skupin"],
     "_%s user found_::_%s users found_" : ["nalezen %s uživatel","nalezeni %s uživatelé","nalezeno %s uživatelů"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nelze detekovat atribut pro zobrazení jména uživatele. Upřesněte ho prosím sami v rozšířeném nastavení LDAP.",
     "Could not find the desired feature" : "Nelze nalézt požadovanou vlastnost",
     "Invalid Host" : "Neplatný hostitel",
     "Server" : "Server",
-    "User Filter" : "Uživatelský filtr",
-    "Login Filter" : "Přihlašovací filtr",
-    "Group Filter" : "Filtr skupin",
-    "Save" : "Uložit",
+    "Users" : "Uživatelé",
+    "Groups" : "Skupiny",
     "Test Configuration" : "Vyzkoušet nastavení",
     "Help" : "Nápověda",
     "Groups meeting these criteria are available in %s:" : "Skupiny splňující tyto podmínky jsou k dispozici v %s:",
-    "only those object classes:" : "pouze tyto objektové třídy:",
-    "only from those groups:" : "pouze z těchto skupin:",
-    "Edit raw filter instead" : "Edituj filtr přímo",
-    "Raw LDAP filter" : "Původní filtr LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
     "Test Filter" : "Otestovat filtr",
-    "groups found" : "nalezené skupiny",
-    "Users login with this attribute:" : "Uživatelé se přihlašují s tímto atributem:",
-    "LDAP Username:" : "LDAP uživatelské jméno:",
-    "LDAP Email Address:" : "LDAP emailová adresa:",
     "Other Attributes:" : "Další atributy:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Přidat nastavení serveru",
-    "Delete Configuration" : "Odstranit konfiguraci",
     "Host" : "Počítač",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučeno pro obsáhlé adresáře)",
     "Limit %s access to users meeting these criteria:" : "Omezit přístup %s uživatelům splňujícím tyto podmínky:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
-    "users found" : "nalezení uživatelé",
     "Saving" : "Ukládá se",
     "Back" : "Zpět",
     "Continue" : "Pokračovat",
diff --git a/apps/user_ldap/l10n/cs_CZ.json b/apps/user_ldap/l10n/cs_CZ.json
index 2831a5689d6..44f27988475 100644
--- a/apps/user_ldap/l10n/cs_CZ.json
+++ b/apps/user_ldap/l10n/cs_CZ.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Neurčena žádná konfigurace",
     "No data specified" : "Neurčena žádná data",
     " Could not set configuration %s" : "Nelze nastavit konfiguraci %s",
-    "Deletion failed" : "Mazání selhalo",
-    "Take over settings from recent server configuration?" : "Převzít nastavení z nedávné konfigurace serveru?",
-    "Keep settings?" : "Ponechat nastavení?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Nelze přidat nastavení serveru",
-    "mappings cleared" : "mapování zrušeno",
-    "Success" : "Úspěch",
-    "Error" : "Chyba",
-    "Please specify a Base DN" : "Uveďte prosím Base DN",
-    "Could not determine Base DN" : "Nelze určit Base DN",
-    "Please specify the port" : "Prosím zadejte port",
-    "Configuration OK" : "Konfigurace v pořádku",
     "Configuration incorrect" : "Nesprávná konfigurace",
     "Configuration incomplete" : "Nekompletní konfigurace",
+    "Configuration OK" : "Konfigurace v pořádku",
     "Select groups" : "Vyberte skupiny",
     "Select object classes" : "Vyberte objektové třídy",
-    "Select attributes" : "Vyberte atributy",
-    "Connection test succeeded" : "Test spojení byl úspěšný",
-    "Connection test failed" : "Test spojení selhal",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Opravdu si přejete smazat současné nastavení serveru?",
     "Confirm Deletion" : "Potvrdit smazání",
+    "Select attributes" : "Vyberte atributy",
     "_%s group found_::_%s groups found_" : ["nalezena %s skupina","nalezeny %s skupiny","nalezeno %s skupin"],
     "_%s user found_::_%s users found_" : ["nalezen %s uživatel","nalezeni %s uživatelé","nalezeno %s uživatelů"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nelze detekovat atribut pro zobrazení jména uživatele. Upřesněte ho prosím sami v rozšířeném nastavení LDAP.",
     "Could not find the desired feature" : "Nelze nalézt požadovanou vlastnost",
     "Invalid Host" : "Neplatný hostitel",
     "Server" : "Server",
-    "User Filter" : "Uživatelský filtr",
-    "Login Filter" : "Přihlašovací filtr",
-    "Group Filter" : "Filtr skupin",
-    "Save" : "Uložit",
+    "Users" : "Uživatelé",
+    "Groups" : "Skupiny",
     "Test Configuration" : "Vyzkoušet nastavení",
     "Help" : "Nápověda",
     "Groups meeting these criteria are available in %s:" : "Skupiny splňující tyto podmínky jsou k dispozici v %s:",
-    "only those object classes:" : "pouze tyto objektové třídy:",
-    "only from those groups:" : "pouze z těchto skupin:",
-    "Edit raw filter instead" : "Edituj filtr přímo",
-    "Raw LDAP filter" : "Původní filtr LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
     "Test Filter" : "Otestovat filtr",
-    "groups found" : "nalezené skupiny",
-    "Users login with this attribute:" : "Uživatelé se přihlašují s tímto atributem:",
-    "LDAP Username:" : "LDAP uživatelské jméno:",
-    "LDAP Email Address:" : "LDAP emailová adresa:",
     "Other Attributes:" : "Další atributy:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Přidat nastavení serveru",
-    "Delete Configuration" : "Odstranit konfiguraci",
     "Host" : "Počítač",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučeno pro obsáhlé adresáře)",
     "Limit %s access to users meeting these criteria:" : "Omezit přístup %s uživatelům splňujícím tyto podmínky:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
-    "users found" : "nalezení uživatelé",
     "Saving" : "Ukládá se",
     "Back" : "Zpět",
     "Continue" : "Pokračovat",
diff --git a/apps/user_ldap/l10n/cy_GB.js b/apps/user_ldap/l10n/cy_GB.js
index 95242960eff..3d47b3b4e66 100644
--- a/apps/user_ldap/l10n/cy_GB.js
+++ b/apps/user_ldap/l10n/cy_GB.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Methwyd dileu",
-    "Error" : "Gwall",
-    "Save" : "Cadw",
+    "Users" : "Defnyddwyr",
+    "Groups" : "Grwpiau",
     "Help" : "Cymorth",
     "Password" : "Cyfrinair",
     "Advanced" : "Uwch"
diff --git a/apps/user_ldap/l10n/cy_GB.json b/apps/user_ldap/l10n/cy_GB.json
index fccfbf1fb5d..8140e36f49d 100644
--- a/apps/user_ldap/l10n/cy_GB.json
+++ b/apps/user_ldap/l10n/cy_GB.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Methwyd dileu",
-    "Error" : "Gwall",
-    "Save" : "Cadw",
+    "Users" : "Defnyddwyr",
+    "Groups" : "Grwpiau",
     "Help" : "Cymorth",
     "Password" : "Cyfrinair",
     "Advanced" : "Uwch"
diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js
index aecaa21a614..6db29699fcf 100644
--- a/apps/user_ldap/l10n/da.js
+++ b/apps/user_ldap/l10n/da.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Der er ikke angivet en konfiguration",
     "No data specified" : "Der er ikke angivet data",
     " Could not set configuration %s" : "Kunne ikke indstille konfigurationen %s",
-    "Deletion failed" : "Fejl ved sletning",
-    "Take over settings from recent server configuration?" : "Overtag indstillinger fra nylig server konfiguration? ",
-    "Keep settings?" : "Behold indstillinger?",
-    "{nthServer}. Server" : "{nthServer}. server",
-    "Cannot add server configuration" : "Kan ikke tilføje serverkonfiguration",
-    "mappings cleared" : "forbindelser blev ryddet",
-    "Success" : "Succes",
-    "Error" : "Fejl",
-    "Please specify a Base DN" : "Angiv venligst en Base DN",
-    "Could not determine Base DN" : "Kunne ikke fastslå Base DN",
-    "Please specify the port" : "Angiv venligst porten",
-    "Configuration OK" : "Konfigurationen er OK",
     "Configuration incorrect" : "Konfigurationen er ikke korrekt",
     "Configuration incomplete" : "Konfigurationen er ikke komplet",
+    "Configuration OK" : "Konfigurationen er OK",
     "Select groups" : "Vælg grupper",
     "Select object classes" : "Vælg objektklasser",
-    "Select attributes" : "Vælg attributter",
-    "Connection test succeeded" : "Forbindelsestesten lykkedes",
-    "Connection test failed" : "Forbindelsestesten mislykkedes",
+    "{nthServer}. Server" : "{nthServer}. server",
     "Do you really want to delete the current Server Configuration?" : "Ønsker du virkelig at slette den nuværende Server Konfiguration?",
     "Confirm Deletion" : "Bekræft Sletning",
+    "Select attributes" : "Vælg attributter",
     "_%s group found_::_%s groups found_" : ["Der blev fundet %s gruppe","Der blev fundet %s grupper"],
     "_%s user found_::_%s users found_" : ["Der blev fundet %s bruger","Der blev fundet %s brugere"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunne ikke registrere navneattributten for visning af bruger. Angiv den venligst selv i de avancerede ldap-indstillinger.",
     "Could not find the desired feature" : "Fandt ikke den ønskede funktion",
     "Invalid Host" : "Ugyldig vært",
     "Server" : "Server",
-    "User Filter" : "Brugerfilter",
-    "Login Filter" : "Login-filter",
-    "Group Filter" : "Gruppe Filter",
-    "Save" : "Gem",
+    "Users" : "Brugere",
+    "Groups" : "Grupper",
     "Test Configuration" : "Test Konfiguration",
     "Help" : "Hjælp",
     "Groups meeting these criteria are available in %s:" : "Grupper som opfylder disse kriterier er tilgængelige i %s:",
-    "only those object classes:" : "kun disse objektklasser:",
-    "only from those groups:" : "kun fra disse grupper:",
-    "Edit raw filter instead" : "Redigér rå filter i stedet",
-    "Raw LDAP filter" : "Råt LDAP-filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret angiver hvilke LDAP-grupper, der skal have adgang til instansen %s.",
     "Test Filter" : "Test filter",
-    "groups found" : "grupper blev fundet",
-    "Users login with this attribute:" : "Brugeres login med dette attribut:",
-    "LDAP Username:" : "LDAP-brugernavn:",
-    "LDAP Email Address:" : "LDAP e-mailadresse:",
     "Other Attributes:" : "Andre attributter:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer dét filter der anvendes, når der er forsøg på at logge ind. %%uuid erstattter brugernavnet i login-handlingen. Eksempel: \"uid=%%uuid\"",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
-    "Add Server Configuration" : "Tilføj Server Konfiguration",
-    "Delete Configuration" : "Slet konfiguration",
     "Host" : "Vært",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Angiv LDAP-filtre manuelt (anbefales til større kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begræns %s-adgangen til brugere som imødekommer disse kriterier:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret angiver hvilke LDAP-brugere, der skal have adgang til %s-instansen.",
-    "users found" : "brugere blev fundet",
     "Saving" : "Gemmer",
     "Back" : "Tilbage",
     "Continue" : "Videre",
diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json
index 817af6fa381..ffbc502f76b 100644
--- a/apps/user_ldap/l10n/da.json
+++ b/apps/user_ldap/l10n/da.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Der er ikke angivet en konfiguration",
     "No data specified" : "Der er ikke angivet data",
     " Could not set configuration %s" : "Kunne ikke indstille konfigurationen %s",
-    "Deletion failed" : "Fejl ved sletning",
-    "Take over settings from recent server configuration?" : "Overtag indstillinger fra nylig server konfiguration? ",
-    "Keep settings?" : "Behold indstillinger?",
-    "{nthServer}. Server" : "{nthServer}. server",
-    "Cannot add server configuration" : "Kan ikke tilføje serverkonfiguration",
-    "mappings cleared" : "forbindelser blev ryddet",
-    "Success" : "Succes",
-    "Error" : "Fejl",
-    "Please specify a Base DN" : "Angiv venligst en Base DN",
-    "Could not determine Base DN" : "Kunne ikke fastslå Base DN",
-    "Please specify the port" : "Angiv venligst porten",
-    "Configuration OK" : "Konfigurationen er OK",
     "Configuration incorrect" : "Konfigurationen er ikke korrekt",
     "Configuration incomplete" : "Konfigurationen er ikke komplet",
+    "Configuration OK" : "Konfigurationen er OK",
     "Select groups" : "Vælg grupper",
     "Select object classes" : "Vælg objektklasser",
-    "Select attributes" : "Vælg attributter",
-    "Connection test succeeded" : "Forbindelsestesten lykkedes",
-    "Connection test failed" : "Forbindelsestesten mislykkedes",
+    "{nthServer}. Server" : "{nthServer}. server",
     "Do you really want to delete the current Server Configuration?" : "Ønsker du virkelig at slette den nuværende Server Konfiguration?",
     "Confirm Deletion" : "Bekræft Sletning",
+    "Select attributes" : "Vælg attributter",
     "_%s group found_::_%s groups found_" : ["Der blev fundet %s gruppe","Der blev fundet %s grupper"],
     "_%s user found_::_%s users found_" : ["Der blev fundet %s bruger","Der blev fundet %s brugere"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunne ikke registrere navneattributten for visning af bruger. Angiv den venligst selv i de avancerede ldap-indstillinger.",
     "Could not find the desired feature" : "Fandt ikke den ønskede funktion",
     "Invalid Host" : "Ugyldig vært",
     "Server" : "Server",
-    "User Filter" : "Brugerfilter",
-    "Login Filter" : "Login-filter",
-    "Group Filter" : "Gruppe Filter",
-    "Save" : "Gem",
+    "Users" : "Brugere",
+    "Groups" : "Grupper",
     "Test Configuration" : "Test Konfiguration",
     "Help" : "Hjælp",
     "Groups meeting these criteria are available in %s:" : "Grupper som opfylder disse kriterier er tilgængelige i %s:",
-    "only those object classes:" : "kun disse objektklasser:",
-    "only from those groups:" : "kun fra disse grupper:",
-    "Edit raw filter instead" : "Redigér rå filter i stedet",
-    "Raw LDAP filter" : "Råt LDAP-filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret angiver hvilke LDAP-grupper, der skal have adgang til instansen %s.",
     "Test Filter" : "Test filter",
-    "groups found" : "grupper blev fundet",
-    "Users login with this attribute:" : "Brugeres login med dette attribut:",
-    "LDAP Username:" : "LDAP-brugernavn:",
-    "LDAP Email Address:" : "LDAP e-mailadresse:",
     "Other Attributes:" : "Andre attributter:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer dét filter der anvendes, når der er forsøg på at logge ind. %%uuid erstattter brugernavnet i login-handlingen. Eksempel: \"uid=%%uuid\"",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
-    "Add Server Configuration" : "Tilføj Server Konfiguration",
-    "Delete Configuration" : "Slet konfiguration",
     "Host" : "Vært",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Angiv LDAP-filtre manuelt (anbefales til større kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begræns %s-adgangen til brugere som imødekommer disse kriterier:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret angiver hvilke LDAP-brugere, der skal have adgang til %s-instansen.",
-    "users found" : "brugere blev fundet",
     "Saving" : "Gemmer",
     "Back" : "Tilbage",
     "Continue" : "Videre",
diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js
index ab9f2b65527..e77e664d904 100644
--- a/apps/user_ldap/l10n/de.js
+++ b/apps/user_ldap/l10n/de.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Keine Konfiguration angegeben",
     "No data specified" : "Keine Daten angegeben",
     " Could not set configuration %s" : "Die Konfiguration %s konnte nicht gesetzt werden",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
-    "Keep settings?" : "Einstellungen beibehalten?",
-    "{nthServer}. Server" : "{nthServer}. - Server",
-    "Cannot add server configuration" : "Die Serverkonfiguration kann nicht hinzugefügt werden",
-    "mappings cleared" : "Zuordnungen gelöscht",
-    "Success" : "Erfolgreich",
-    "Error" : "Fehler",
-    "Please specify a Base DN" : "Bitte einen Basis-DN angeben",
-    "Could not determine Base DN" : "Basis-DN konnte nicht ermittelt werden",
-    "Please specify the port" : "Bitte Port angeben",
-    "Configuration OK" : "Konfiguration OK",
     "Configuration incorrect" : "Konfiguration nicht korrekt",
     "Configuration incomplete" : "Konfiguration nicht vollständig",
+    "Configuration OK" : "Konfiguration OK",
     "Select groups" : "Gruppen auswählen",
     "Select object classes" : "Objektklassen auswählen",
-    "Select attributes" : "Attribute auswählen",
-    "Connection test succeeded" : "Verbindungstest erfolgreich",
-    "Connection test failed" : "Verbindungstest fehlgeschlagen",
+    "{nthServer}. Server" : "{nthServer}. - Server",
     "Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Select attributes" : "Attribute auswählen",
     "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
     "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Das Anzeigename-Attribut des Benutzers konnte nicht gefunden werden. Bitte gib es in den erweiterten LDAP-Einstellungen selber an.",
     "Could not find the desired feature" : "Die gewünschte Funktion konnte nicht gefunden werden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
-    "User Filter" : "Nutzer-Filter",
-    "Login Filter" : "Anmeldefilter",
-    "Group Filter" : "Gruppen-Filter",
-    "Save" : "Speichern",
+    "Users" : "Benutzer",
+    "Groups" : "Gruppen",
     "Test Configuration" : "Testkonfiguration",
     "Help" : "Hilfe",
     "Groups meeting these criteria are available in %s:" : "Gruppen, auf die diese Kriterien zutreffen, sind verfügbar in %s:",
-    "only those object classes:" : "Nur diese Objektklassen:",
-    "only from those groups:" : "Nur aus diesen Gruppen:",
-    "Edit raw filter instead" : "Original-Filter stattdessen bearbeiten",
-    "Raw LDAP filter" : "Original LDAP-Filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter bestimmt, welche LDAP-Gruppen Zugriff auf die %s-Instanz haben sollen.",
     "Test Filter" : "Testfilter",
-    "groups found" : "Gruppen gefunden",
-    "Users login with this attribute:" : "Nutzeranmeldung mit diesem Attribut:",
-    "LDAP Username:" : "LDAP-Benutzername:",
-    "LDAP Email Address:" : "LDAP-E-Mail-Adresse:",
     "Other Attributes:" : "Andere Attribute:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
-    "Delete Configuration" : "Konfiguration löschen",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://",
     "Port" : "Port",
@@ -68,12 +44,11 @@ OC.L10N.register(
     "Password" : "Passwort",
     "For anonymous access, leave DN and Password empty." : "Lasse die Felder DN und Passwort für anonymen Zugang leer.",
     "One Base DN per line" : "Einen Basis-DN pro Zeile",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Du kannst Basis-DN für Benutzer und Gruppen im „Erweitert“-Reiter angeben",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Du kannst die Basis-DN für Benutzer und Gruppen im Reiter „Fortgeschritten“ angeben",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.",
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)",
     "Limit %s access to users meeting these criteria:" : "Den %s-Zugriff auf Benutzer, die den folgenden Kriterien entsprechen, beschränken:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.",
-    "users found" : "Benutzer gefunden",
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json
index a5dc44d91b1..407e5bb73d4 100644
--- a/apps/user_ldap/l10n/de.json
+++ b/apps/user_ldap/l10n/de.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Keine Konfiguration angegeben",
     "No data specified" : "Keine Daten angegeben",
     " Could not set configuration %s" : "Die Konfiguration %s konnte nicht gesetzt werden",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
-    "Keep settings?" : "Einstellungen beibehalten?",
-    "{nthServer}. Server" : "{nthServer}. - Server",
-    "Cannot add server configuration" : "Die Serverkonfiguration kann nicht hinzugefügt werden",
-    "mappings cleared" : "Zuordnungen gelöscht",
-    "Success" : "Erfolgreich",
-    "Error" : "Fehler",
-    "Please specify a Base DN" : "Bitte einen Basis-DN angeben",
-    "Could not determine Base DN" : "Basis-DN konnte nicht ermittelt werden",
-    "Please specify the port" : "Bitte Port angeben",
-    "Configuration OK" : "Konfiguration OK",
     "Configuration incorrect" : "Konfiguration nicht korrekt",
     "Configuration incomplete" : "Konfiguration nicht vollständig",
+    "Configuration OK" : "Konfiguration OK",
     "Select groups" : "Gruppen auswählen",
     "Select object classes" : "Objektklassen auswählen",
-    "Select attributes" : "Attribute auswählen",
-    "Connection test succeeded" : "Verbindungstest erfolgreich",
-    "Connection test failed" : "Verbindungstest fehlgeschlagen",
+    "{nthServer}. Server" : "{nthServer}. - Server",
     "Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Select attributes" : "Attribute auswählen",
     "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
     "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Das Anzeigename-Attribut des Benutzers konnte nicht gefunden werden. Bitte gib es in den erweiterten LDAP-Einstellungen selber an.",
     "Could not find the desired feature" : "Die gewünschte Funktion konnte nicht gefunden werden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
-    "User Filter" : "Nutzer-Filter",
-    "Login Filter" : "Anmeldefilter",
-    "Group Filter" : "Gruppen-Filter",
-    "Save" : "Speichern",
+    "Users" : "Benutzer",
+    "Groups" : "Gruppen",
     "Test Configuration" : "Testkonfiguration",
     "Help" : "Hilfe",
     "Groups meeting these criteria are available in %s:" : "Gruppen, auf die diese Kriterien zutreffen, sind verfügbar in %s:",
-    "only those object classes:" : "Nur diese Objektklassen:",
-    "only from those groups:" : "Nur aus diesen Gruppen:",
-    "Edit raw filter instead" : "Original-Filter stattdessen bearbeiten",
-    "Raw LDAP filter" : "Original LDAP-Filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter bestimmt, welche LDAP-Gruppen Zugriff auf die %s-Instanz haben sollen.",
     "Test Filter" : "Testfilter",
-    "groups found" : "Gruppen gefunden",
-    "Users login with this attribute:" : "Nutzeranmeldung mit diesem Attribut:",
-    "LDAP Username:" : "LDAP-Benutzername:",
-    "LDAP Email Address:" : "LDAP-E-Mail-Adresse:",
     "Other Attributes:" : "Andere Attribute:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
-    "Delete Configuration" : "Konfiguration löschen",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://",
     "Port" : "Port",
@@ -66,12 +42,11 @@
     "Password" : "Passwort",
     "For anonymous access, leave DN and Password empty." : "Lasse die Felder DN und Passwort für anonymen Zugang leer.",
     "One Base DN per line" : "Einen Basis-DN pro Zeile",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Du kannst Basis-DN für Benutzer und Gruppen im „Erweitert“-Reiter angeben",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Du kannst die Basis-DN für Benutzer und Gruppen im Reiter „Fortgeschritten“ angeben",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.",
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)",
     "Limit %s access to users meeting these criteria:" : "Den %s-Zugriff auf Benutzer, die den folgenden Kriterien entsprechen, beschränken:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.",
-    "users found" : "Benutzer gefunden",
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
diff --git a/apps/user_ldap/l10n/de_AT.js b/apps/user_ldap/l10n/de_AT.js
index b7f72cb5bc9..5695ad9c987 100644
--- a/apps/user_ldap/l10n/de_AT.js
+++ b/apps/user_ldap/l10n/de_AT.js
@@ -10,48 +10,25 @@ OC.L10N.register(
     "No configuration specified" : "Keine Konfiguration angegeben",
     "No data specified" : "Keine Daten angegeben",
     " Could not set configuration %s" : "Konfiguration %s konnte nicht gespeichert werden",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Server-Einstellungen von letztem Server übernehmen?",
-    "Keep settings?" : "Einstellungen behalten?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Server-Konfiguration konnte nicht hinzugefügt werden",
-    "mappings cleared" : "Verbindungen gelöscht",
-    "Success" : "Erfolg",
-    "Error" : "Fehler",
-    "Please specify a Base DN" : "Bitte einen Basis DN angeben",
-    "Could not determine Base DN" : "Basis DN konnte nicht festgelegt werden",
-    "Please specify the port" : "Bitte den Port angeben",
-    "Configuration OK" : "Konfiguration OK",
     "Configuration incorrect" : "Konfiguration fehlerhaft",
     "Configuration incomplete" : "Konfiguration unvollständig",
+    "Configuration OK" : "Konfiguration OK",
     "Select groups" : "Gruppen wählen",
     "Select object classes" : "Objekt-Klassen wählen",
-    "Select attributes" : "Attribute wählen",
-    "Connection test succeeded" : "Verbindungsversuch erfolgreich",
-    "Connection test failed" : "Verbindungsversuch gescheitert",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Soll die momentane Server-Konfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Select attributes" : "Attribute wählen",
     "Could not find the desired feature" : "Funktion konnte nicht gefunden werden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
-    "User Filter" : "User Filter",
-    "Login Filter" : "Login Filter",
-    "Group Filter" : "Gruppen FIlter",
-    "Save" : "Speichern",
     "Test Configuration" : "Konfiguration testen",
     "Help" : "Hilfe",
     "Groups meeting these criteria are available in %s:" : "Gruppen die den Kriterien entsprechen sind verfügbar unter %s:",
-    "only those object classes:" : "nur diese Objektklassen:",
-    "only from those groups:" : "nur von diesen Gruppen:",
-    "groups found" : "Gruppen gefunden",
-    "LDAP Username:" : "LDAP Benutzername:",
-    "LDAP Email Address:" : "LDAP Email-Adresse:",
     "Other Attributes:" : "Andere Atribute:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Legt den beim Login verwendeten Filter fest. %%uid ersetzt den Benutzernamen beim Login. Beispiel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Server-Konfiguration hinzufügen",
-    "Delete Configuration" : "Konfiguration löschen",
     "Host" : "Host",
     "Port" : "Port",
     "User DN" : "User DN",
@@ -61,7 +38,6 @@ OC.L10N.register(
     "You can specify Base DN for users and groups in the Advanced tab" : "Basis DN für User und Gruppen können im Fortgeschritten-Tab festgelegt werden",
     "Limit %s access to users meeting these criteria:" : "Zugang auf %s für User die diese Kriterien erfüllen limitieren:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter spezifiziert welche LDAP User Zugang zu %s haben.",
-    "users found" : "User gefunden",
     "Back" : "Zurück",
     "Continue" : "Weiter",
     "Expert" : "Experte",
diff --git a/apps/user_ldap/l10n/de_AT.json b/apps/user_ldap/l10n/de_AT.json
index b6b305659c0..f9aabf1e4d4 100644
--- a/apps/user_ldap/l10n/de_AT.json
+++ b/apps/user_ldap/l10n/de_AT.json
@@ -8,48 +8,25 @@
     "No configuration specified" : "Keine Konfiguration angegeben",
     "No data specified" : "Keine Daten angegeben",
     " Could not set configuration %s" : "Konfiguration %s konnte nicht gespeichert werden",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Server-Einstellungen von letztem Server übernehmen?",
-    "Keep settings?" : "Einstellungen behalten?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Server-Konfiguration konnte nicht hinzugefügt werden",
-    "mappings cleared" : "Verbindungen gelöscht",
-    "Success" : "Erfolg",
-    "Error" : "Fehler",
-    "Please specify a Base DN" : "Bitte einen Basis DN angeben",
-    "Could not determine Base DN" : "Basis DN konnte nicht festgelegt werden",
-    "Please specify the port" : "Bitte den Port angeben",
-    "Configuration OK" : "Konfiguration OK",
     "Configuration incorrect" : "Konfiguration fehlerhaft",
     "Configuration incomplete" : "Konfiguration unvollständig",
+    "Configuration OK" : "Konfiguration OK",
     "Select groups" : "Gruppen wählen",
     "Select object classes" : "Objekt-Klassen wählen",
-    "Select attributes" : "Attribute wählen",
-    "Connection test succeeded" : "Verbindungsversuch erfolgreich",
-    "Connection test failed" : "Verbindungsversuch gescheitert",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Soll die momentane Server-Konfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Select attributes" : "Attribute wählen",
     "Could not find the desired feature" : "Funktion konnte nicht gefunden werden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
-    "User Filter" : "User Filter",
-    "Login Filter" : "Login Filter",
-    "Group Filter" : "Gruppen FIlter",
-    "Save" : "Speichern",
     "Test Configuration" : "Konfiguration testen",
     "Help" : "Hilfe",
     "Groups meeting these criteria are available in %s:" : "Gruppen die den Kriterien entsprechen sind verfügbar unter %s:",
-    "only those object classes:" : "nur diese Objektklassen:",
-    "only from those groups:" : "nur von diesen Gruppen:",
-    "groups found" : "Gruppen gefunden",
-    "LDAP Username:" : "LDAP Benutzername:",
-    "LDAP Email Address:" : "LDAP Email-Adresse:",
     "Other Attributes:" : "Andere Atribute:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Legt den beim Login verwendeten Filter fest. %%uid ersetzt den Benutzernamen beim Login. Beispiel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Server-Konfiguration hinzufügen",
-    "Delete Configuration" : "Konfiguration löschen",
     "Host" : "Host",
     "Port" : "Port",
     "User DN" : "User DN",
@@ -59,7 +36,6 @@
     "You can specify Base DN for users and groups in the Advanced tab" : "Basis DN für User und Gruppen können im Fortgeschritten-Tab festgelegt werden",
     "Limit %s access to users meeting these criteria:" : "Zugang auf %s für User die diese Kriterien erfüllen limitieren:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter spezifiziert welche LDAP User Zugang zu %s haben.",
-    "users found" : "User gefunden",
     "Back" : "Zurück",
     "Continue" : "Weiter",
     "Expert" : "Experte",
diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js
index 7690d619cd0..3290e715673 100644
--- a/apps/user_ldap/l10n/de_DE.js
+++ b/apps/user_ldap/l10n/de_DE.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Keine Konfiguration angegeben",
     "No data specified" : "Keine Daten angegeben",
     " Could not set configuration %s" : "Die Konfiguration %s konnte nicht gesetzt werden",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
-    "Keep settings?" : "Einstellungen beibehalten?",
-    "{nthServer}. Server" : "{nthServer}. - Server",
-    "Cannot add server configuration" : "Die Serverkonfiguration kann nicht hinzugefügt werden",
-    "mappings cleared" : "Zuordnungen gelöscht",
-    "Success" : "Erfolg",
-    "Error" : "Fehler",
-    "Please specify a Base DN" : "Bitte einen Basis-DN angeben",
-    "Could not determine Base DN" : "Basis-DN konnte nicht ermittelt werden",
-    "Please specify the port" : "Bitte Port angeben",
-    "Configuration OK" : "Konfiguration OK",
     "Configuration incorrect" : "Konfiguration nicht korrekt",
     "Configuration incomplete" : "Konfiguration nicht vollständig",
+    "Configuration OK" : "Konfiguration OK",
     "Select groups" : "Gruppen auswählen",
     "Select object classes" : "Objektklassen auswählen",
-    "Select attributes" : "Attribute auswählen",
-    "Connection test succeeded" : "Verbindungstest erfolgreich",
-    "Connection test failed" : "Verbindungstest fehlgeschlagen",
+    "{nthServer}. Server" : "{nthServer}. - Server",
     "Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Select attributes" : "Attribute auswählen",
     "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
     "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Das Anzeigename-Attribut des Benutzers konnte nicht gefunden werden. Bitte geben Sie es in den erweiterten LDAP-Einstellungen selber an.",
     "Could not find the desired feature" : "Die gewünschte Funktion konnte nicht gefunden werden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
-    "User Filter" : "Benutzer-Filter",
-    "Login Filter" : "Anmeldefilter",
-    "Group Filter" : "Gruppen-Filter",
-    "Save" : "Speichern",
+    "Users" : "Benutzer",
+    "Groups" : "Gruppen",
     "Test Configuration" : "Testkonfiguration",
     "Help" : "Hilfe",
     "Groups meeting these criteria are available in %s:" : "Gruppen, auf die diese Kriterien zutreffen, sind verfügbar in %s:",
-    "only those object classes:" : "Nur diese Objektklassen:",
-    "only from those groups:" : "Nur aus diesen Gruppen:",
-    "Edit raw filter instead" : "Original-Filter stattdessen bearbeiten",
-    "Raw LDAP filter" : "Original LDAP-Filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter bestimmt, welche LDAP-Gruppen Zugriff auf die %s-Instanz haben sollen.",
     "Test Filter" : "Testfilter",
-    "groups found" : "Gruppen gefunden",
-    "Users login with this attribute:" : "Benutzeranmeldung mit diesem Attribut:",
-    "LDAP Username:" : "LDAP-Benutzername:",
-    "LDAP Email Address:" : "LDAP-E-Mail-Adresse:",
     "Other Attributes:" : "Andere Attribute:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
-    "Delete Configuration" : "Konfiguration löschen",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
     "Port" : "Port",
@@ -68,19 +44,18 @@ OC.L10N.register(
     "Password" : "Passwort",
     "For anonymous access, leave DN and Password empty." : "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
     "One Base DN per line" : "Einen Basis-DN pro Zeile",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Sie können Basis-DN für Benutzer und Gruppen im „Erweitert“-Reiter angeben",
+    "You can specify Base DN for users and groups in the Advanced tab" : " Sie können die Basis-DN für Benutzer und Gruppen im Reiter „Fortgeschritten“ angeben",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.",
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)",
     "Limit %s access to users meeting these criteria:" : "Den %s-Zugriff auf Benutzer, die den folgenden Kriterien entsprechen, beschränken:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.",
-    "users found" : "Benutzer gefunden",
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
     "LDAP" : "LDAP",
     "Expert" : "Experte",
     "Advanced" : "Fortgeschritten",
-    "<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann deshalb zu unerwartetem Systemverhalten kommen. Bitten kontaktieren Sie Ihren Systemadministator und bitten Sie um die Deaktivierung einer der beiden Anwendungen.",
+    "<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann deshalb zu unerwartetem Systemverhalten kommen. Bitte kontaktieren Sie Ihren Systemadministator und bitten Sie um die Deaktivierung einer der beiden Anwendungen.",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte kontaktieren Sie Ihren Systemadministrator und bitten Sie um die Installation des Moduls.",
     "Connection Settings" : "Verbindungseinstellungen",
     "Configuration Active" : "Konfiguration aktiv",
diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json
index bdd5393bded..3467cbc6082 100644
--- a/apps/user_ldap/l10n/de_DE.json
+++ b/apps/user_ldap/l10n/de_DE.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Keine Konfiguration angegeben",
     "No data specified" : "Keine Daten angegeben",
     " Could not set configuration %s" : "Die Konfiguration %s konnte nicht gesetzt werden",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
-    "Keep settings?" : "Einstellungen beibehalten?",
-    "{nthServer}. Server" : "{nthServer}. - Server",
-    "Cannot add server configuration" : "Die Serverkonfiguration kann nicht hinzugefügt werden",
-    "mappings cleared" : "Zuordnungen gelöscht",
-    "Success" : "Erfolg",
-    "Error" : "Fehler",
-    "Please specify a Base DN" : "Bitte einen Basis-DN angeben",
-    "Could not determine Base DN" : "Basis-DN konnte nicht ermittelt werden",
-    "Please specify the port" : "Bitte Port angeben",
-    "Configuration OK" : "Konfiguration OK",
     "Configuration incorrect" : "Konfiguration nicht korrekt",
     "Configuration incomplete" : "Konfiguration nicht vollständig",
+    "Configuration OK" : "Konfiguration OK",
     "Select groups" : "Gruppen auswählen",
     "Select object classes" : "Objektklassen auswählen",
-    "Select attributes" : "Attribute auswählen",
-    "Connection test succeeded" : "Verbindungstest erfolgreich",
-    "Connection test failed" : "Verbindungstest fehlgeschlagen",
+    "{nthServer}. Server" : "{nthServer}. - Server",
     "Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
     "Confirm Deletion" : "Löschen bestätigen",
+    "Select attributes" : "Attribute auswählen",
     "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
     "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Das Anzeigename-Attribut des Benutzers konnte nicht gefunden werden. Bitte geben Sie es in den erweiterten LDAP-Einstellungen selber an.",
     "Could not find the desired feature" : "Die gewünschte Funktion konnte nicht gefunden werden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
-    "User Filter" : "Benutzer-Filter",
-    "Login Filter" : "Anmeldefilter",
-    "Group Filter" : "Gruppen-Filter",
-    "Save" : "Speichern",
+    "Users" : "Benutzer",
+    "Groups" : "Gruppen",
     "Test Configuration" : "Testkonfiguration",
     "Help" : "Hilfe",
     "Groups meeting these criteria are available in %s:" : "Gruppen, auf die diese Kriterien zutreffen, sind verfügbar in %s:",
-    "only those object classes:" : "Nur diese Objektklassen:",
-    "only from those groups:" : "Nur aus diesen Gruppen:",
-    "Edit raw filter instead" : "Original-Filter stattdessen bearbeiten",
-    "Raw LDAP filter" : "Original LDAP-Filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter bestimmt, welche LDAP-Gruppen Zugriff auf die %s-Instanz haben sollen.",
     "Test Filter" : "Testfilter",
-    "groups found" : "Gruppen gefunden",
-    "Users login with this attribute:" : "Benutzeranmeldung mit diesem Attribut:",
-    "LDAP Username:" : "LDAP-Benutzername:",
-    "LDAP Email Address:" : "LDAP-E-Mail-Adresse:",
     "Other Attributes:" : "Andere Attribute:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
-    "Delete Configuration" : "Konfiguration löschen",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
     "Port" : "Port",
@@ -66,19 +42,18 @@
     "Password" : "Passwort",
     "For anonymous access, leave DN and Password empty." : "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
     "One Base DN per line" : "Einen Basis-DN pro Zeile",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Sie können Basis-DN für Benutzer und Gruppen im „Erweitert“-Reiter angeben",
+    "You can specify Base DN for users and groups in the Advanced tab" : " Sie können die Basis-DN für Benutzer und Gruppen im Reiter „Fortgeschritten“ angeben",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser geeignet für größere Installationen, benötigt aber erweiterte LDAP-Kenntnisse.",
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (empfohlen für große Verzeichnisse)",
     "Limit %s access to users meeting these criteria:" : "Den %s-Zugriff auf Benutzer, die den folgenden Kriterien entsprechen, beschränken:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter gibt an, welche LDAP-Benutzer Zugriff auf die %s-Instanz haben sollen.",
-    "users found" : "Benutzer gefunden",
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
     "LDAP" : "LDAP",
     "Expert" : "Experte",
     "Advanced" : "Fortgeschritten",
-    "<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann deshalb zu unerwartetem Systemverhalten kommen. Bitten kontaktieren Sie Ihren Systemadministator und bitten Sie um die Deaktivierung einer der beiden Anwendungen.",
+    "<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann deshalb zu unerwartetem Systemverhalten kommen. Bitte kontaktieren Sie Ihren Systemadministator und bitten Sie um die Deaktivierung einer der beiden Anwendungen.",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte kontaktieren Sie Ihren Systemadministrator und bitten Sie um die Installation des Moduls.",
     "Connection Settings" : "Verbindungseinstellungen",
     "Configuration Active" : "Konfiguration aktiv",
diff --git a/apps/user_ldap/l10n/el.js b/apps/user_ldap/l10n/el.js
index f19d0023cd4..90d3258234c 100644
--- a/apps/user_ldap/l10n/el.js
+++ b/apps/user_ldap/l10n/el.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Καμμία διαμόρφωση δεν προσδιορίστηκε",
     "No data specified" : "Δεν προσδιορίστηκαν δεδομένα",
     " Could not set configuration %s" : "Αδυναμία ρύθμισης %s",
-    "Deletion failed" : "Η διαγραφή απέτυχε",
-    "Take over settings from recent server configuration?" : "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?",
-    "Keep settings?" : "Διατήρηση ρυθμίσεων;",
-    "{nthServer}. Server" : "{nthServer}. Διακομιστής",
-    "Cannot add server configuration" : "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
-    "mappings cleared" : "αντιστοιχίες εκκαθαρίστηκαν",
-    "Success" : "Επιτυχία",
-    "Error" : "Σφάλμα",
-    "Please specify a Base DN" : "Παρακαλώ ορίστε ένα βασικό Διακεκριμένο Όνομα",
-    "Could not determine Base DN" : "Δεν ήταν δυνατό να καθοριστεί το βασικό Διακεκριμένο Όνομα",
-    "Please specify the port" : "Παρακαλώ ορίστε την θύρα",
-    "Configuration OK" : "Η διαμόρφωση είναι εντάξει",
     "Configuration incorrect" : "Η διαμόρφωση είναι λανθασμένη",
     "Configuration incomplete" : "Η διαμόρφωση είναι ελλιπής",
+    "Configuration OK" : "Η διαμόρφωση είναι εντάξει",
     "Select groups" : "Επιλέξτε ομάδες",
     "Select object classes" : "Επιλογή κλάσης αντικειμένων",
-    "Select attributes" : "Επιλογή χαρακτηριστικών",
-    "Connection test succeeded" : "Επιτυχημένη δοκιμαστική σύνδεση",
-    "Connection test failed" : "Αποτυχημένη δοκιμαστική σύνδεσης.",
+    "{nthServer}. Server" : "{nthServer}. Διακομιστής",
     "Do you really want to delete the current Server Configuration?" : "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
     "Confirm Deletion" : "Επιβεβαίωση Διαγραφής",
+    "Select attributes" : "Επιλογή χαρακτηριστικών",
     "_%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" : "Άκυρος εξυπηρετητής",
     "Server" : "Διακομιστής",
-    "User Filter" : "Φίλτρο χρηστών",
-    "Login Filter" : "Φίλτρο Εισόδου",
-    "Group Filter" : "Group Filter",
-    "Save" : "Αποθήκευση",
+    "Users" : "Χρήστες",
+    "Groups" : "Ομάδες",
     "Test Configuration" : "Δοκιμαστικες ρυθμισεις",
     "Help" : "Βοήθεια",
     "Groups meeting these criteria are available in %s:" : "Οι ομάδες που πληρούν τα κριτήρια είναι διαθέσιμες σε %s:",
-    "only those object classes:" : "μόνο αυτές οι κλάσεις αντικειμένων:",
-    "only from those groups:" : "μόνο από αυτές τις ομάδες:",
-    "Edit raw filter instead" : "Επεξεργασία πρωτογενούς φίλτρου αντί αυτού",
-    "Raw LDAP filter" : "Πρωτογενές φίλτρο ",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιες ομάδες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
     "Test Filter" : "Φίλτρο Ελέγχου",
-    "groups found" : "ομάδες βρέθηκαν",
-    "Users login with this attribute:" : "Οι χρήστες εισέρχονται με αυτό το χαρακτηριστικό:",
-    "LDAP Username:" : "Όνομα χρήστη LDAP:",
-    "LDAP Email Address:" : "Διεύθυνση ηλ. ταχυδρομείου LDAP:",
     "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\"",
     "1. Server" : "1. Διακομιστής",
     "%s. Server:" : "%s. Διακομιστής:",
-    "Add Server Configuration" : "Προσθήκη Ρυθμίσεων Διακομιστή",
-    "Delete Configuration" : "Απαλοιφή ρυθμίσεων",
     "Host" : "Διακομιστής",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
     "Port" : "Θύρα",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Εισάγετε με μη αυτόματο τρόπο φίλτρα LDAP (προτείνεται για μεγάλους καταλόγους)",
     "Limit %s access to users meeting these criteria:" : "Περιορισμός της πρόσβασης %s σε χρήστες που πληρούν τα κριτήρια:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιοι χρήστες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
-    "users found" : "χρήστες βρέθηκαν",
     "Saving" : "Αποθήκευση",
     "Back" : "Επιστροφή",
     "Continue" : "Συνέχεια",
diff --git a/apps/user_ldap/l10n/el.json b/apps/user_ldap/l10n/el.json
index 49a4813b0a4..b6fbb731b2b 100644
--- a/apps/user_ldap/l10n/el.json
+++ b/apps/user_ldap/l10n/el.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Καμμία διαμόρφωση δεν προσδιορίστηκε",
     "No data specified" : "Δεν προσδιορίστηκαν δεδομένα",
     " Could not set configuration %s" : "Αδυναμία ρύθμισης %s",
-    "Deletion failed" : "Η διαγραφή απέτυχε",
-    "Take over settings from recent server configuration?" : "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?",
-    "Keep settings?" : "Διατήρηση ρυθμίσεων;",
-    "{nthServer}. Server" : "{nthServer}. Διακομιστής",
-    "Cannot add server configuration" : "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
-    "mappings cleared" : "αντιστοιχίες εκκαθαρίστηκαν",
-    "Success" : "Επιτυχία",
-    "Error" : "Σφάλμα",
-    "Please specify a Base DN" : "Παρακαλώ ορίστε ένα βασικό Διακεκριμένο Όνομα",
-    "Could not determine Base DN" : "Δεν ήταν δυνατό να καθοριστεί το βασικό Διακεκριμένο Όνομα",
-    "Please specify the port" : "Παρακαλώ ορίστε την θύρα",
-    "Configuration OK" : "Η διαμόρφωση είναι εντάξει",
     "Configuration incorrect" : "Η διαμόρφωση είναι λανθασμένη",
     "Configuration incomplete" : "Η διαμόρφωση είναι ελλιπής",
+    "Configuration OK" : "Η διαμόρφωση είναι εντάξει",
     "Select groups" : "Επιλέξτε ομάδες",
     "Select object classes" : "Επιλογή κλάσης αντικειμένων",
-    "Select attributes" : "Επιλογή χαρακτηριστικών",
-    "Connection test succeeded" : "Επιτυχημένη δοκιμαστική σύνδεση",
-    "Connection test failed" : "Αποτυχημένη δοκιμαστική σύνδεσης.",
+    "{nthServer}. Server" : "{nthServer}. Διακομιστής",
     "Do you really want to delete the current Server Configuration?" : "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
     "Confirm Deletion" : "Επιβεβαίωση Διαγραφής",
+    "Select attributes" : "Επιλογή χαρακτηριστικών",
     "_%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" : "Άκυρος εξυπηρετητής",
     "Server" : "Διακομιστής",
-    "User Filter" : "Φίλτρο χρηστών",
-    "Login Filter" : "Φίλτρο Εισόδου",
-    "Group Filter" : "Group Filter",
-    "Save" : "Αποθήκευση",
+    "Users" : "Χρήστες",
+    "Groups" : "Ομάδες",
     "Test Configuration" : "Δοκιμαστικες ρυθμισεις",
     "Help" : "Βοήθεια",
     "Groups meeting these criteria are available in %s:" : "Οι ομάδες που πληρούν τα κριτήρια είναι διαθέσιμες σε %s:",
-    "only those object classes:" : "μόνο αυτές οι κλάσεις αντικειμένων:",
-    "only from those groups:" : "μόνο από αυτές τις ομάδες:",
-    "Edit raw filter instead" : "Επεξεργασία πρωτογενούς φίλτρου αντί αυτού",
-    "Raw LDAP filter" : "Πρωτογενές φίλτρο ",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιες ομάδες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
     "Test Filter" : "Φίλτρο Ελέγχου",
-    "groups found" : "ομάδες βρέθηκαν",
-    "Users login with this attribute:" : "Οι χρήστες εισέρχονται με αυτό το χαρακτηριστικό:",
-    "LDAP Username:" : "Όνομα χρήστη LDAP:",
-    "LDAP Email Address:" : "Διεύθυνση ηλ. ταχυδρομείου LDAP:",
     "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\"",
     "1. Server" : "1. Διακομιστής",
     "%s. Server:" : "%s. Διακομιστής:",
-    "Add Server Configuration" : "Προσθήκη Ρυθμίσεων Διακομιστή",
-    "Delete Configuration" : "Απαλοιφή ρυθμίσεων",
     "Host" : "Διακομιστής",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
     "Port" : "Θύρα",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Εισάγετε με μη αυτόματο τρόπο φίλτρα LDAP (προτείνεται για μεγάλους καταλόγους)",
     "Limit %s access to users meeting these criteria:" : "Περιορισμός της πρόσβασης %s σε χρήστες που πληρούν τα κριτήρια:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιοι χρήστες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
-    "users found" : "χρήστες βρέθηκαν",
     "Saving" : "Αποθήκευση",
     "Back" : "Επιστροφή",
     "Continue" : "Συνέχεια",
diff --git a/apps/user_ldap/l10n/en_GB.js b/apps/user_ldap/l10n/en_GB.js
index 3ddcd982d74..4cfbae15ced 100644
--- a/apps/user_ldap/l10n/en_GB.js
+++ b/apps/user_ldap/l10n/en_GB.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "No configuration specified",
     "No data specified" : "No data specified",
     " Could not set configuration %s" : " Could not set configuration %s",
-    "Deletion failed" : "Deletion failed",
-    "Take over settings from recent server configuration?" : "Take over settings from recent server configuration?",
-    "Keep settings?" : "Keep settings?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Cannot add server configuration",
-    "mappings cleared" : "mappings cleared",
-    "Success" : "Success",
-    "Error" : "Error",
-    "Please specify a Base DN" : "Please specify a Base DN",
-    "Could not determine Base DN" : "Could not determine Base DN",
-    "Please specify the port" : "Please specify the port",
-    "Configuration OK" : "Configuration OK",
     "Configuration incorrect" : "Configuration incorrect",
     "Configuration incomplete" : "Configuration incomplete",
+    "Configuration OK" : "Configuration OK",
     "Select groups" : "Select groups",
     "Select object classes" : "Select object classes",
-    "Select attributes" : "Select attributes",
-    "Connection test succeeded" : "Connection test succeeded",
-    "Connection test failed" : "Connection test failed",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Do you really want to delete the current Server Configuration?",
     "Confirm Deletion" : "Confirm Deletion",
+    "Select attributes" : "Select attributes",
     "_%s group found_::_%s groups found_" : ["%s group found","%s groups found"],
     "_%s user found_::_%s users found_" : ["%s user found","%s users found"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.",
     "Could not find the desired feature" : "Could not find the desired feature",
     "Invalid Host" : "Invalid Host",
     "Server" : "Server",
-    "User Filter" : "User Filter",
-    "Login Filter" : "Login Filter",
-    "Group Filter" : "Group Filter",
-    "Save" : "Save",
+    "Users" : "Users",
+    "Groups" : "Groups",
     "Test Configuration" : "Test Configuration",
     "Help" : "Help",
     "Groups meeting these criteria are available in %s:" : "Groups meeting these criteria are available in %s:",
-    "only those object classes:" : "only those object classes:",
-    "only from those groups:" : "only from those groups:",
-    "Edit raw filter instead" : "Edit raw filter instead",
-    "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "The filter specifies which LDAP groups shall have access to the %s instance.",
     "Test Filter" : "Test Filter",
-    "groups found" : "groups found",
-    "Users login with this attribute:" : "Users login with this attribute:",
-    "LDAP Username:" : "LDAP Username:",
-    "LDAP Email Address:" : "LDAP Email Address:",
     "Other Attributes:" : "Other Attributes:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Add Server Configuration",
-    "Delete Configuration" : "Delete Configuration",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "You can omit the protocol, except you require SSL. Then start with ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Manually enter LDAP filters (recommended for large directories)",
     "Limit %s access to users meeting these criteria:" : "Limit %s access to users meeting these criteria:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "The filter specifies which LDAP users shall have access to the %s instance.",
-    "users found" : "users found",
     "Saving" : "Saving",
     "Back" : "Back",
     "Continue" : "Continue",
diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json
index fabe3d94764..5a352c0ffa6 100644
--- a/apps/user_ldap/l10n/en_GB.json
+++ b/apps/user_ldap/l10n/en_GB.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "No configuration specified",
     "No data specified" : "No data specified",
     " Could not set configuration %s" : " Could not set configuration %s",
-    "Deletion failed" : "Deletion failed",
-    "Take over settings from recent server configuration?" : "Take over settings from recent server configuration?",
-    "Keep settings?" : "Keep settings?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Cannot add server configuration",
-    "mappings cleared" : "mappings cleared",
-    "Success" : "Success",
-    "Error" : "Error",
-    "Please specify a Base DN" : "Please specify a Base DN",
-    "Could not determine Base DN" : "Could not determine Base DN",
-    "Please specify the port" : "Please specify the port",
-    "Configuration OK" : "Configuration OK",
     "Configuration incorrect" : "Configuration incorrect",
     "Configuration incomplete" : "Configuration incomplete",
+    "Configuration OK" : "Configuration OK",
     "Select groups" : "Select groups",
     "Select object classes" : "Select object classes",
-    "Select attributes" : "Select attributes",
-    "Connection test succeeded" : "Connection test succeeded",
-    "Connection test failed" : "Connection test failed",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Do you really want to delete the current Server Configuration?",
     "Confirm Deletion" : "Confirm Deletion",
+    "Select attributes" : "Select attributes",
     "_%s group found_::_%s groups found_" : ["%s group found","%s groups found"],
     "_%s user found_::_%s users found_" : ["%s user found","%s users found"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.",
     "Could not find the desired feature" : "Could not find the desired feature",
     "Invalid Host" : "Invalid Host",
     "Server" : "Server",
-    "User Filter" : "User Filter",
-    "Login Filter" : "Login Filter",
-    "Group Filter" : "Group Filter",
-    "Save" : "Save",
+    "Users" : "Users",
+    "Groups" : "Groups",
     "Test Configuration" : "Test Configuration",
     "Help" : "Help",
     "Groups meeting these criteria are available in %s:" : "Groups meeting these criteria are available in %s:",
-    "only those object classes:" : "only those object classes:",
-    "only from those groups:" : "only from those groups:",
-    "Edit raw filter instead" : "Edit raw filter instead",
-    "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "The filter specifies which LDAP groups shall have access to the %s instance.",
     "Test Filter" : "Test Filter",
-    "groups found" : "groups found",
-    "Users login with this attribute:" : "Users login with this attribute:",
-    "LDAP Username:" : "LDAP Username:",
-    "LDAP Email Address:" : "LDAP Email Address:",
     "Other Attributes:" : "Other Attributes:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Add Server Configuration",
-    "Delete Configuration" : "Delete Configuration",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "You can omit the protocol, except you require SSL. Then start with ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Manually enter LDAP filters (recommended for large directories)",
     "Limit %s access to users meeting these criteria:" : "Limit %s access to users meeting these criteria:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "The filter specifies which LDAP users shall have access to the %s instance.",
-    "users found" : "users found",
     "Saving" : "Saving",
     "Back" : "Back",
     "Continue" : "Continue",
diff --git a/apps/user_ldap/l10n/eo.js b/apps/user_ldap/l10n/eo.js
index 4bd99570cfb..3d6461d4821 100644
--- a/apps/user_ldap/l10n/eo.js
+++ b/apps/user_ldap/l10n/eo.js
@@ -2,49 +2,31 @@ OC.L10N.register(
     "user_ldap",
     {
     "Failed to delete the server configuration" : "Malsukcesis forigo de la agordo de servilo",
-    "Deletion failed" : "Forigo malsukcesis",
-    "Keep settings?" : "Ĉu daŭrigi la agordon?",
-    "{nthServer}. Server" : "{nthServer}. Servilo",
-    "Cannot add server configuration" : "Ne eblas aldoni agordon de servilo",
-    "Success" : "Sukceso",
-    "Error" : "Eraro",
-    "Configuration OK" : "La agordaro ĝustas",
     "Configuration incorrect" : "La agordaro malĝustas",
     "Configuration incomplete" : "La agordaro neplenas",
+    "Configuration OK" : "La agordaro ĝustas",
     "Select groups" : "Elekti grupojn",
     "Select object classes" : "Elekti objektoklasojn",
-    "Select attributes" : "Elekti atribuojn",
-    "Connection test succeeded" : "Provo de konekto sukcesis",
-    "Connection test failed" : "Provo de konekto malsukcesis",
+    "{nthServer}. Server" : "{nthServer}. Servilo",
     "Confirm Deletion" : "Konfirmi forigon",
+    "Select attributes" : "Elekti atribuojn",
     "_%s group found_::_%s groups found_" : ["%s grupo troviĝis","%s grupoj troviĝis"],
     "_%s user found_::_%s users found_" : ["%s uzanto troviĝis","%s uzanto troviĝis"],
     "Invalid Host" : "Nevalida gastigo",
     "Server" : "Servilo",
-    "User Filter" : "Filtrilo de uzanto",
-    "Login Filter" : "Ensaluta filtrilo",
-    "Group Filter" : "Filtrilo de grupo",
-    "Save" : "Konservi",
+    "Users" : "Uzantoj",
+    "Groups" : "Grupoj",
     "Test Configuration" : "Provi agordon",
     "Help" : "Helpo",
-    "only those object classes:" : "nur tiuj objektoklasoj:",
-    "only from those groups:" : "nur el tiuj grupoj:",
-    "groups found" : "grupoj trovitaj",
-    "Users login with this attribute:" : "Uzantoj ensalutas kun ĉi tiu atributo:",
-    "LDAP Username:" : "LDAP-uzantonomo:",
-    "LDAP Email Address:" : "LDAP-retpoŝtadreso:",
     "Other Attributes:" : "Aliaj atribuoj:",
     "1. Server" : "1. Servilo",
     "%s. Server:" : "%s. Servilo:",
-    "Add Server Configuration" : "Aldoni agordon de servilo",
-    "Delete Configuration" : "Forigi agordaron",
     "Host" : "Gastigo",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
     "Port" : "Pordo",
     "User DN" : "Uzanto-DN",
     "Password" : "Pasvorto",
     "For anonymous access, leave DN and Password empty." : "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
-    "users found" : "uzantoj trovitaj",
     "Back" : "Antaŭen",
     "Expert" : "Sperta",
     "Advanced" : "Progresinta",
diff --git a/apps/user_ldap/l10n/eo.json b/apps/user_ldap/l10n/eo.json
index ffb3b06c9ce..efaef91d9b0 100644
--- a/apps/user_ldap/l10n/eo.json
+++ b/apps/user_ldap/l10n/eo.json
@@ -1,48 +1,30 @@
 { "translations": {
     "Failed to delete the server configuration" : "Malsukcesis forigo de la agordo de servilo",
-    "Deletion failed" : "Forigo malsukcesis",
-    "Keep settings?" : "Ĉu daŭrigi la agordon?",
-    "{nthServer}. Server" : "{nthServer}. Servilo",
-    "Cannot add server configuration" : "Ne eblas aldoni agordon de servilo",
-    "Success" : "Sukceso",
-    "Error" : "Eraro",
-    "Configuration OK" : "La agordaro ĝustas",
     "Configuration incorrect" : "La agordaro malĝustas",
     "Configuration incomplete" : "La agordaro neplenas",
+    "Configuration OK" : "La agordaro ĝustas",
     "Select groups" : "Elekti grupojn",
     "Select object classes" : "Elekti objektoklasojn",
-    "Select attributes" : "Elekti atribuojn",
-    "Connection test succeeded" : "Provo de konekto sukcesis",
-    "Connection test failed" : "Provo de konekto malsukcesis",
+    "{nthServer}. Server" : "{nthServer}. Servilo",
     "Confirm Deletion" : "Konfirmi forigon",
+    "Select attributes" : "Elekti atribuojn",
     "_%s group found_::_%s groups found_" : ["%s grupo troviĝis","%s grupoj troviĝis"],
     "_%s user found_::_%s users found_" : ["%s uzanto troviĝis","%s uzanto troviĝis"],
     "Invalid Host" : "Nevalida gastigo",
     "Server" : "Servilo",
-    "User Filter" : "Filtrilo de uzanto",
-    "Login Filter" : "Ensaluta filtrilo",
-    "Group Filter" : "Filtrilo de grupo",
-    "Save" : "Konservi",
+    "Users" : "Uzantoj",
+    "Groups" : "Grupoj",
     "Test Configuration" : "Provi agordon",
     "Help" : "Helpo",
-    "only those object classes:" : "nur tiuj objektoklasoj:",
-    "only from those groups:" : "nur el tiuj grupoj:",
-    "groups found" : "grupoj trovitaj",
-    "Users login with this attribute:" : "Uzantoj ensalutas kun ĉi tiu atributo:",
-    "LDAP Username:" : "LDAP-uzantonomo:",
-    "LDAP Email Address:" : "LDAP-retpoŝtadreso:",
     "Other Attributes:" : "Aliaj atribuoj:",
     "1. Server" : "1. Servilo",
     "%s. Server:" : "%s. Servilo:",
-    "Add Server Configuration" : "Aldoni agordon de servilo",
-    "Delete Configuration" : "Forigi agordaron",
     "Host" : "Gastigo",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
     "Port" : "Pordo",
     "User DN" : "Uzanto-DN",
     "Password" : "Pasvorto",
     "For anonymous access, leave DN and Password empty." : "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
-    "users found" : "uzantoj trovitaj",
     "Back" : "Antaŭen",
     "Expert" : "Sperta",
     "Advanced" : "Progresinta",
diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js
index 5f0bae4e13b..45b29d6d20c 100644
--- a/apps/user_ldap/l10n/es.js
+++ b/apps/user_ldap/l10n/es.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "No se ha especificado la configuración",
     "No data specified" : "No se han especificado los datos",
     " Could not set configuration %s" : "No se pudo establecer la configuración %s",
-    "Deletion failed" : "Falló el borrado",
-    "Take over settings from recent server configuration?" : "¿Asumir los ajustes actuales de la configuración del servidor?",
-    "Keep settings?" : "¿Mantener la configuración?",
-    "{nthServer}. Server" : "{nthServer}. servidor",
-    "Cannot add server configuration" : "No se puede añadir la configuración del servidor",
-    "mappings cleared" : "Asignaciones borradas",
-    "Success" : "Éxito",
-    "Error" : "Error",
-    "Please specify a Base DN" : "Especifique un DN base",
-    "Could not determine Base DN" : "No se pudo determinar un DN base",
-    "Please specify the port" : "Especifique el puerto",
-    "Configuration OK" : "Configuración correcta",
     "Configuration incorrect" : "Configuración Incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración correcta",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccionar la clase de objeto",
-    "Select attributes" : "Seleccionar atributos",
-    "Connection test succeeded" : "La prueba de conexión fue exitosa",
-    "Connection test failed" : "La prueba de conexión falló",
+    "{nthServer}. Server" : "{nthServer}. servidor",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar eliminación",
+    "Select attributes" : "Seleccionar atributos",
     "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
     "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "No se pudo detectar el atributo de nombre de usuario pantalla. Por favor especifique lo mismo en ajustes avanzados ldap.",
     "Could not find the desired feature" : "No se puede encontrar la función deseada.",
     "Invalid Host" : "Host inválido",
     "Server" : "Servidor",
-    "User Filter" : "Filtro de usuario",
-    "Login Filter" : "Filtro de login",
-    "Group Filter" : "Filtro de grupo",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios están disponibles en %s:",
-    "only those object classes:" : "solamente de estas clases de objeto:",
-    "only from those groups:" : "solamente de estos grupos:",
-    "Edit raw filter instead" : "Editar el filtro en bruto en su lugar",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
     "Test Filter" : "Filtro de prueba",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Los usuarios inician sesión con este atributo:",
-    "LDAP Username:" : "Nombre de usuario LDAP:",
-    "LDAP Email Address:" : "Dirección e-mail LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Agregar configuracion del servidor",
-    "Delete Configuration" : "Borrar configuración",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
     "Port" : "Puerto",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)",
     "Limit %s access to users meeting these criteria:" : "Limitar el acceso a %s a los usuarios que cumplan estos criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
-    "users found" : "usuarios encontrados",
     "Saving" : "Guardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json
index c9bd3e10266..b99bf215b8e 100644
--- a/apps/user_ldap/l10n/es.json
+++ b/apps/user_ldap/l10n/es.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "No se ha especificado la configuración",
     "No data specified" : "No se han especificado los datos",
     " Could not set configuration %s" : "No se pudo establecer la configuración %s",
-    "Deletion failed" : "Falló el borrado",
-    "Take over settings from recent server configuration?" : "¿Asumir los ajustes actuales de la configuración del servidor?",
-    "Keep settings?" : "¿Mantener la configuración?",
-    "{nthServer}. Server" : "{nthServer}. servidor",
-    "Cannot add server configuration" : "No se puede añadir la configuración del servidor",
-    "mappings cleared" : "Asignaciones borradas",
-    "Success" : "Éxito",
-    "Error" : "Error",
-    "Please specify a Base DN" : "Especifique un DN base",
-    "Could not determine Base DN" : "No se pudo determinar un DN base",
-    "Please specify the port" : "Especifique el puerto",
-    "Configuration OK" : "Configuración correcta",
     "Configuration incorrect" : "Configuración Incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración correcta",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccionar la clase de objeto",
-    "Select attributes" : "Seleccionar atributos",
-    "Connection test succeeded" : "La prueba de conexión fue exitosa",
-    "Connection test failed" : "La prueba de conexión falló",
+    "{nthServer}. Server" : "{nthServer}. servidor",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar eliminación",
+    "Select attributes" : "Seleccionar atributos",
     "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
     "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "No se pudo detectar el atributo de nombre de usuario pantalla. Por favor especifique lo mismo en ajustes avanzados ldap.",
     "Could not find the desired feature" : "No se puede encontrar la función deseada.",
     "Invalid Host" : "Host inválido",
     "Server" : "Servidor",
-    "User Filter" : "Filtro de usuario",
-    "Login Filter" : "Filtro de login",
-    "Group Filter" : "Filtro de grupo",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios están disponibles en %s:",
-    "only those object classes:" : "solamente de estas clases de objeto:",
-    "only from those groups:" : "solamente de estos grupos:",
-    "Edit raw filter instead" : "Editar el filtro en bruto en su lugar",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
     "Test Filter" : "Filtro de prueba",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Los usuarios inician sesión con este atributo:",
-    "LDAP Username:" : "Nombre de usuario LDAP:",
-    "LDAP Email Address:" : "Dirección e-mail LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Agregar configuracion del servidor",
-    "Delete Configuration" : "Borrar configuración",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
     "Port" : "Puerto",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)",
     "Limit %s access to users meeting these criteria:" : "Limitar el acceso a %s a los usuarios que cumplan estos criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
-    "users found" : "usuarios encontrados",
     "Saving" : "Guardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/es_AR.js b/apps/user_ldap/l10n/es_AR.js
index 6be422a0800..2c64848eee1 100644
--- a/apps/user_ldap/l10n/es_AR.js
+++ b/apps/user_ldap/l10n/es_AR.js
@@ -10,44 +10,26 @@ OC.L10N.register(
     "No configuration specified" : "No se ha especificado una configuración",
     "No data specified" : "No se ha especificado datos",
     " Could not set configuration %s" : "No se pudo asignar la configuración %s",
-    "Deletion failed" : "Error al borrar",
-    "Take over settings from recent server configuration?" : "Tomar los valores de la anterior configuración de servidor?",
-    "Keep settings?" : "¿Mantener preferencias?",
-    "Cannot add server configuration" : "No se pudo añadir la configuración del servidor",
-    "mappings cleared" : "Asignaciones borradas",
-    "Success" : "Éxito",
-    "Error" : "Error",
-    "Configuration OK" : "Configuración válida",
     "Configuration incorrect" : "Configuración incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración válida",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccionar las clases de objetos",
-    "Select attributes" : "Seleccionar atributos",
-    "Connection test succeeded" : "El este de conexión ha sido completado satisfactoriamente",
-    "Connection test failed" : "Falló es test de conexión",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea borrar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar borrado",
+    "Select attributes" : "Seleccionar atributos",
     "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
     "_%s user found_::_%s users found_" : ["%s usuario encontrado","%s usuarios encontrados"],
     "Could not find the desired feature" : "No se pudo encontrar la característica deseada",
     "Invalid Host" : "Host inválido",
-    "Group Filter" : "Filtro de grupo",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Probar configuración",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen con estos criterios están disponibles en %s:",
-    "only those object classes:" : "solo estos objetos de clases:",
-    "only from those groups:" : "solo provenientes de estos grupos:",
-    "Edit raw filter instead" : "Editar filtro en bruto",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica qué grupos LDAP deben tener acceso a la instancia %s.",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Los usuarios inician sesión con este atributo:",
-    "LDAP Username:" : "Nombre de usuario LDAP:",
-    "LDAP Email Address:" : "Correo electrónico LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
-    "Add Server Configuration" : "Añadir Configuración del Servidor",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://",
     "Port" : "Puerto",
@@ -59,7 +41,6 @@ OC.L10N.register(
     "You can specify Base DN for users and groups in the Advanced tab" : "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\"",
     "Limit %s access to users meeting these criteria:" : "Limitar acceso %s a los usuarios que cumplen con este criterio:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica cuáles usuarios LDAP deben tener acceso a la instancia %s.",
-    "users found" : "usuarios encontrados",
     "Back" : "Volver",
     "Continue" : "Continuar",
     "Advanced" : "Avanzado",
diff --git a/apps/user_ldap/l10n/es_AR.json b/apps/user_ldap/l10n/es_AR.json
index 5e70ef4390e..5fc5d320291 100644
--- a/apps/user_ldap/l10n/es_AR.json
+++ b/apps/user_ldap/l10n/es_AR.json
@@ -8,44 +8,26 @@
     "No configuration specified" : "No se ha especificado una configuración",
     "No data specified" : "No se ha especificado datos",
     " Could not set configuration %s" : "No se pudo asignar la configuración %s",
-    "Deletion failed" : "Error al borrar",
-    "Take over settings from recent server configuration?" : "Tomar los valores de la anterior configuración de servidor?",
-    "Keep settings?" : "¿Mantener preferencias?",
-    "Cannot add server configuration" : "No se pudo añadir la configuración del servidor",
-    "mappings cleared" : "Asignaciones borradas",
-    "Success" : "Éxito",
-    "Error" : "Error",
-    "Configuration OK" : "Configuración válida",
     "Configuration incorrect" : "Configuración incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración válida",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccionar las clases de objetos",
-    "Select attributes" : "Seleccionar atributos",
-    "Connection test succeeded" : "El este de conexión ha sido completado satisfactoriamente",
-    "Connection test failed" : "Falló es test de conexión",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea borrar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar borrado",
+    "Select attributes" : "Seleccionar atributos",
     "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
     "_%s user found_::_%s users found_" : ["%s usuario encontrado","%s usuarios encontrados"],
     "Could not find the desired feature" : "No se pudo encontrar la característica deseada",
     "Invalid Host" : "Host inválido",
-    "Group Filter" : "Filtro de grupo",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Probar configuración",
     "Help" : "Ayuda",
     "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen con estos criterios están disponibles en %s:",
-    "only those object classes:" : "solo estos objetos de clases:",
-    "only from those groups:" : "solo provenientes de estos grupos:",
-    "Edit raw filter instead" : "Editar filtro en bruto",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica qué grupos LDAP deben tener acceso a la instancia %s.",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Los usuarios inician sesión con este atributo:",
-    "LDAP Username:" : "Nombre de usuario LDAP:",
-    "LDAP Email Address:" : "Correo electrónico LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
-    "Add Server Configuration" : "Añadir Configuración del Servidor",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://",
     "Port" : "Puerto",
@@ -57,7 +39,6 @@
     "You can specify Base DN for users and groups in the Advanced tab" : "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\"",
     "Limit %s access to users meeting these criteria:" : "Limitar acceso %s a los usuarios que cumplen con este criterio:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica cuáles usuarios LDAP deben tener acceso a la instancia %s.",
-    "users found" : "usuarios encontrados",
     "Back" : "Volver",
     "Continue" : "Continuar",
     "Advanced" : "Avanzado",
diff --git a/apps/user_ldap/l10n/es_CL.js b/apps/user_ldap/l10n/es_CL.js
index 699bbd8ff9e..1877d101731 100644
--- a/apps/user_ldap/l10n/es_CL.js
+++ b/apps/user_ldap/l10n/es_CL.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "Error",
+    "Users" : "Usuarios",
     "Help" : "Ayuda",
     "Password" : "Clave"
 },
diff --git a/apps/user_ldap/l10n/es_CL.json b/apps/user_ldap/l10n/es_CL.json
index 6f98a92cece..4d6eb54b727 100644
--- a/apps/user_ldap/l10n/es_CL.json
+++ b/apps/user_ldap/l10n/es_CL.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Error" : "Error",
+    "Users" : "Usuarios",
     "Help" : "Ayuda",
     "Password" : "Clave"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/user_ldap/l10n/es_MX.js b/apps/user_ldap/l10n/es_MX.js
index a2860ddd60e..0b7eb8085b9 100644
--- a/apps/user_ldap/l10n/es_MX.js
+++ b/apps/user_ldap/l10n/es_MX.js
@@ -10,41 +10,25 @@ OC.L10N.register(
     "No configuration specified" : "No se ha especificado la configuración",
     "No data specified" : "No se han especificado los datos",
     " Could not set configuration %s" : "No se pudo establecer la configuración %s",
-    "Deletion failed" : "Falló el borrado",
-    "Take over settings from recent server configuration?" : "¿Asumir los ajustes actuales de la configuración del servidor?",
-    "Keep settings?" : "¿Mantener la configuración?",
-    "Cannot add server configuration" : "No se puede añadir la configuración del servidor",
-    "mappings cleared" : "Asignaciones borradas",
-    "Success" : "Éxito",
-    "Error" : "Error",
-    "Configuration OK" : "Configuración OK",
     "Configuration incorrect" : "Configuración Incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración OK",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccionar la clase de objeto",
-    "Select attributes" : "Seleccionar atributos",
-    "Connection test succeeded" : "La prueba de conexión fue exitosa",
-    "Connection test failed" : "La prueba de conexión falló",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar eliminación",
+    "Select attributes" : "Seleccionar atributos",
     "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
     "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
     "Could not find the desired feature" : "No se puede encontrar la función deseada.",
     "Invalid Host" : "Host inválido",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
-    "only those object classes:" : "solamente de estas clases de objeto:",
-    "only from those groups:" : "solamente de estos grupos:",
-    "Edit raw filter instead" : "Editar el filtro en bruto en su lugar",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
-    "groups found" : "grupos encontrados",
-    "LDAP Username:" : "Nombre de usuario LDAP:",
-    "LDAP Email Address:" : "Dirección e-mail LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
-    "Add Server Configuration" : "Agregar configuracion del servidor",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
     "Port" : "Puerto",
@@ -55,7 +39,6 @@ OC.L10N.register(
     "One Base DN per line" : "Un DN Base por línea",
     "You can specify Base DN for users and groups in the Advanced tab" : "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
-    "users found" : "usuarios encontrados",
     "Back" : "Atrás",
     "Continue" : "Continuar",
     "Advanced" : "Avanzado",
diff --git a/apps/user_ldap/l10n/es_MX.json b/apps/user_ldap/l10n/es_MX.json
index 0f25e3dec5f..d458644b137 100644
--- a/apps/user_ldap/l10n/es_MX.json
+++ b/apps/user_ldap/l10n/es_MX.json
@@ -8,41 +8,25 @@
     "No configuration specified" : "No se ha especificado la configuración",
     "No data specified" : "No se han especificado los datos",
     " Could not set configuration %s" : "No se pudo establecer la configuración %s",
-    "Deletion failed" : "Falló el borrado",
-    "Take over settings from recent server configuration?" : "¿Asumir los ajustes actuales de la configuración del servidor?",
-    "Keep settings?" : "¿Mantener la configuración?",
-    "Cannot add server configuration" : "No se puede añadir la configuración del servidor",
-    "mappings cleared" : "Asignaciones borradas",
-    "Success" : "Éxito",
-    "Error" : "Error",
-    "Configuration OK" : "Configuración OK",
     "Configuration incorrect" : "Configuración Incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración OK",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccionar la clase de objeto",
-    "Select attributes" : "Seleccionar atributos",
-    "Connection test succeeded" : "La prueba de conexión fue exitosa",
-    "Connection test failed" : "La prueba de conexión falló",
     "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
     "Confirm Deletion" : "Confirmar eliminación",
+    "Select attributes" : "Seleccionar atributos",
     "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
     "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
     "Could not find the desired feature" : "No se puede encontrar la función deseada.",
     "Invalid Host" : "Host inválido",
-    "Save" : "Guardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Configuración de prueba",
     "Help" : "Ayuda",
-    "only those object classes:" : "solamente de estas clases de objeto:",
-    "only from those groups:" : "solamente de estos grupos:",
-    "Edit raw filter instead" : "Editar el filtro en bruto en su lugar",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
-    "groups found" : "grupos encontrados",
-    "LDAP Username:" : "Nombre de usuario LDAP:",
-    "LDAP Email Address:" : "Dirección e-mail LDAP:",
     "Other Attributes:" : "Otros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
-    "Add Server Configuration" : "Agregar configuracion del servidor",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
     "Port" : "Puerto",
@@ -53,7 +37,6 @@
     "One Base DN per line" : "Un DN Base por línea",
     "You can specify Base DN for users and groups in the Advanced tab" : "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
-    "users found" : "usuarios encontrados",
     "Back" : "Atrás",
     "Continue" : "Continuar",
     "Advanced" : "Avanzado",
diff --git a/apps/user_ldap/l10n/et_EE.js b/apps/user_ldap/l10n/et_EE.js
index f726859e825..08c696977d8 100644
--- a/apps/user_ldap/l10n/et_EE.js
+++ b/apps/user_ldap/l10n/et_EE.js
@@ -10,55 +10,31 @@ OC.L10N.register(
     "No configuration specified" : "Seadistust pole määratletud",
     "No data specified" : "Andmeid pole määratletud",
     " Could not set configuration %s" : "Ei suutnud seadistada %s",
-    "Deletion failed" : "Kustutamine ebaõnnestus",
-    "Take over settings from recent server configuration?" : "Võta sätted viimasest serveri seadistusest?",
-    "Keep settings?" : "Säilitada seadistused?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Ei suuda lisada serveri seadistust",
-    "mappings cleared" : "vastendused puhastatud",
-    "Success" : "Korras",
-    "Error" : "Viga",
-    "Please specify a Base DN" : "Palun määra baas DN",
-    "Could not determine Base DN" : "Baas DN-i tuvastamine ebaõnnestus",
-    "Please specify the port" : "Palun määra post",
-    "Configuration OK" : "Seadistus on korras",
     "Configuration incorrect" : "Seadistus on vigane",
     "Configuration incomplete" : "Seadistus on puudulik",
+    "Configuration OK" : "Seadistus on korras",
     "Select groups" : "Vali grupid",
     "Select object classes" : "Vali objekti klassid",
-    "Select attributes" : "Vali atribuudid",
-    "Connection test succeeded" : "Ühenduse testimine õnnestus",
-    "Connection test failed" : "Ühenduse testimine ebaõnnestus",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Oled kindel, et tahad kustutada praegust serveri seadistust?",
     "Confirm Deletion" : "Kinnita kustutamine",
+    "Select attributes" : "Vali atribuudid",
     "_%s group found_::_%s groups found_" : ["%s grupp leitud","%s gruppi leitud"],
     "_%s user found_::_%s users found_" : ["%s kasutaja leitud","%s kasutajat leitud"],
     "Could not find the desired feature" : "Ei suuda leida soovitud funktsioonaalsust",
     "Invalid Host" : "Vigane server",
     "Server" : "Server",
-    "User Filter" : "Kasutaja filter",
-    "Login Filter" : "Kasutajanime filter",
-    "Group Filter" : "Grupi filter",
-    "Save" : "Salvesta",
+    "Users" : "Kasutajad",
+    "Groups" : "Grupid",
     "Test Configuration" : "Testi seadistust",
     "Help" : "Abiinfo",
     "Groups meeting these criteria are available in %s:" : "Kriteeriumiga sobivad grupid on saadaval %s:",
-    "only those object classes:" : "ainult need objektiklassid:",
-    "only from those groups:" : "ainult nendest gruppidest:",
-    "Edit raw filter instead" : "Selle asemel muuda filtrit",
-    "Raw LDAP filter" : "LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter määrab millised LDAP grupid saavad ligipääsu sellele %s instantsile.",
     "Test Filter" : "Testi filtrit",
-    "groups found" : "gruppi leitud",
-    "Users login with this attribute:" : "Logimiseks kasutatkse atribuuti: ",
-    "LDAP Username:" : "LDAP kasutajanimi:",
-    "LDAP Email Address:" : "LDAP e-posti aadress:",
     "Other Attributes:" : "Muud atribuudid:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Lisa serveri seadistus",
-    "Delete Configuration" : "Kustuta seadistused",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://",
     "Port" : "Port",
@@ -72,7 +48,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Sisesta LDAP filtrid automaatselt (sooitatav suurtele kataloogidele)",
     "Limit %s access to users meeting these criteria:" : "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filter määrab millised LDAP kasutajad pääsevad ligi %s instantsile.",
-    "users found" : "kasutajat leitud",
     "Saving" : "Salvestamine",
     "Back" : "Tagasi",
     "Continue" : "Jätka",
diff --git a/apps/user_ldap/l10n/et_EE.json b/apps/user_ldap/l10n/et_EE.json
index 6994bacb485..21b25b52d1a 100644
--- a/apps/user_ldap/l10n/et_EE.json
+++ b/apps/user_ldap/l10n/et_EE.json
@@ -8,55 +8,31 @@
     "No configuration specified" : "Seadistust pole määratletud",
     "No data specified" : "Andmeid pole määratletud",
     " Could not set configuration %s" : "Ei suutnud seadistada %s",
-    "Deletion failed" : "Kustutamine ebaõnnestus",
-    "Take over settings from recent server configuration?" : "Võta sätted viimasest serveri seadistusest?",
-    "Keep settings?" : "Säilitada seadistused?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Ei suuda lisada serveri seadistust",
-    "mappings cleared" : "vastendused puhastatud",
-    "Success" : "Korras",
-    "Error" : "Viga",
-    "Please specify a Base DN" : "Palun määra baas DN",
-    "Could not determine Base DN" : "Baas DN-i tuvastamine ebaõnnestus",
-    "Please specify the port" : "Palun määra post",
-    "Configuration OK" : "Seadistus on korras",
     "Configuration incorrect" : "Seadistus on vigane",
     "Configuration incomplete" : "Seadistus on puudulik",
+    "Configuration OK" : "Seadistus on korras",
     "Select groups" : "Vali grupid",
     "Select object classes" : "Vali objekti klassid",
-    "Select attributes" : "Vali atribuudid",
-    "Connection test succeeded" : "Ühenduse testimine õnnestus",
-    "Connection test failed" : "Ühenduse testimine ebaõnnestus",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Oled kindel, et tahad kustutada praegust serveri seadistust?",
     "Confirm Deletion" : "Kinnita kustutamine",
+    "Select attributes" : "Vali atribuudid",
     "_%s group found_::_%s groups found_" : ["%s grupp leitud","%s gruppi leitud"],
     "_%s user found_::_%s users found_" : ["%s kasutaja leitud","%s kasutajat leitud"],
     "Could not find the desired feature" : "Ei suuda leida soovitud funktsioonaalsust",
     "Invalid Host" : "Vigane server",
     "Server" : "Server",
-    "User Filter" : "Kasutaja filter",
-    "Login Filter" : "Kasutajanime filter",
-    "Group Filter" : "Grupi filter",
-    "Save" : "Salvesta",
+    "Users" : "Kasutajad",
+    "Groups" : "Grupid",
     "Test Configuration" : "Testi seadistust",
     "Help" : "Abiinfo",
     "Groups meeting these criteria are available in %s:" : "Kriteeriumiga sobivad grupid on saadaval %s:",
-    "only those object classes:" : "ainult need objektiklassid:",
-    "only from those groups:" : "ainult nendest gruppidest:",
-    "Edit raw filter instead" : "Selle asemel muuda filtrit",
-    "Raw LDAP filter" : "LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter määrab millised LDAP grupid saavad ligipääsu sellele %s instantsile.",
     "Test Filter" : "Testi filtrit",
-    "groups found" : "gruppi leitud",
-    "Users login with this attribute:" : "Logimiseks kasutatkse atribuuti: ",
-    "LDAP Username:" : "LDAP kasutajanimi:",
-    "LDAP Email Address:" : "LDAP e-posti aadress:",
     "Other Attributes:" : "Muud atribuudid:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Lisa serveri seadistus",
-    "Delete Configuration" : "Kustuta seadistused",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://",
     "Port" : "Port",
@@ -70,7 +46,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Sisesta LDAP filtrid automaatselt (sooitatav suurtele kataloogidele)",
     "Limit %s access to users meeting these criteria:" : "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filter määrab millised LDAP kasutajad pääsevad ligi %s instantsile.",
-    "users found" : "kasutajat leitud",
     "Saving" : "Salvestamine",
     "Back" : "Tagasi",
     "Continue" : "Jätka",
diff --git a/apps/user_ldap/l10n/eu.js b/apps/user_ldap/l10n/eu.js
index 3fb4c747006..b846dfa1e10 100644
--- a/apps/user_ldap/l10n/eu.js
+++ b/apps/user_ldap/l10n/eu.js
@@ -10,55 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Ez da konfiguraziorik zehaztu",
     "No data specified" : "Ez da daturik zehaztu",
     " Could not set configuration %s" : "Ezin izan da %s konfigurazioa ezarri",
-    "Deletion failed" : "Ezabaketak huts egin du",
-    "Take over settings from recent server configuration?" : "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?",
-    "Keep settings?" : "Mantendu ezarpenak?",
-    "{nthServer}. Server" : "{nthServer}. Zerbitzaria",
-    "Cannot add server configuration" : "Ezin da zerbitzariaren konfigurazioa gehitu",
-    "mappings cleared" : "Mapeatzeak garbi",
-    "Success" : "Arrakasta",
-    "Error" : "Errorea",
-    "Please specify a Base DN" : "Mesdez zehaztu Base DN",
-    "Could not determine Base DN" : "Ezin izan da zehaztu Base DN",
-    "Please specify the port" : "Mesdez zehaztu portua",
-    "Configuration OK" : "Konfigurazioa ongi dago",
     "Configuration incorrect" : "Konfigurazioa ez dago ongi",
     "Configuration incomplete" : "Konfigurazioa osatu gabe dago",
+    "Configuration OK" : "Konfigurazioa ongi dago",
     "Select groups" : "Hautatu taldeak",
     "Select object classes" : "Hautatu objektu klaseak",
-    "Select attributes" : "Hautatu atributuak",
-    "Connection test succeeded" : "Konexio froga ongi burutu da",
-    "Connection test failed" : "Konexio frogak huts egin du",
+    "{nthServer}. Server" : "{nthServer}. Zerbitzaria",
     "Do you really want to delete the current Server Configuration?" : "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
     "Confirm Deletion" : "Baieztatu Ezabatzea",
+    "Select attributes" : "Hautatu atributuak",
     "_%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",
     "Server" : "Zerbitzaria",
-    "User Filter" : "Erabiltzaileen iragazkia",
-    "Login Filter" : "Saioa hasteko Iragazkia",
-    "Group Filter" : "Taldeen iragazkia",
-    "Save" : "Gorde",
+    "Users" : "Erabiltzaileak",
+    "Groups" : "Taldeak",
     "Test Configuration" : "Egiaztatu Konfigurazioa",
     "Help" : "Laguntza",
     "Groups meeting these criteria are available in %s:" : "Baldintza horiek betetzen dituzten taldeak bertan eskuragarri %s:",
-    "only those object classes:" : "bakarrik objektu klase hauetakoak:",
-    "only from those groups:" : "bakarrik talde hauetakoak:",
-    "Raw LDAP filter" : "Raw 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:",
     "Test Filter" : "Frogatu Iragazkia",
-    "groups found" : "talde aurkituta",
-    "Users login with this attribute:" : "Erabiltzaileak atributu honekin sartzen dira:",
-    "LDAP Username:" : "LDAP Erabiltzaile izena:",
-    "LDAP Email Address:" : "LDAP Eposta 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\"",
     "1. Server" : "1. Zerbitzaria",
     "%s. Server:" : "%s. Zerbitzaria:",
-    "Add Server Configuration" : "Gehitu Zerbitzariaren Konfigurazioa",
-    "Delete Configuration" : "Ezabatu 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",
@@ -71,7 +48,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Eskuz sartu LDAP iragazkiak (direktorio handietarako gomendatuta)",
     "Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
-    "users found" : "erabiltzaile aurkituta",
     "Saving" : "Gordetzen",
     "Back" : "Atzera",
     "Continue" : "Jarraitu",
diff --git a/apps/user_ldap/l10n/eu.json b/apps/user_ldap/l10n/eu.json
index cd89875f96f..247618ea884 100644
--- a/apps/user_ldap/l10n/eu.json
+++ b/apps/user_ldap/l10n/eu.json
@@ -8,55 +8,32 @@
     "No configuration specified" : "Ez da konfiguraziorik zehaztu",
     "No data specified" : "Ez da daturik zehaztu",
     " Could not set configuration %s" : "Ezin izan da %s konfigurazioa ezarri",
-    "Deletion failed" : "Ezabaketak huts egin du",
-    "Take over settings from recent server configuration?" : "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?",
-    "Keep settings?" : "Mantendu ezarpenak?",
-    "{nthServer}. Server" : "{nthServer}. Zerbitzaria",
-    "Cannot add server configuration" : "Ezin da zerbitzariaren konfigurazioa gehitu",
-    "mappings cleared" : "Mapeatzeak garbi",
-    "Success" : "Arrakasta",
-    "Error" : "Errorea",
-    "Please specify a Base DN" : "Mesdez zehaztu Base DN",
-    "Could not determine Base DN" : "Ezin izan da zehaztu Base DN",
-    "Please specify the port" : "Mesdez zehaztu portua",
-    "Configuration OK" : "Konfigurazioa ongi dago",
     "Configuration incorrect" : "Konfigurazioa ez dago ongi",
     "Configuration incomplete" : "Konfigurazioa osatu gabe dago",
+    "Configuration OK" : "Konfigurazioa ongi dago",
     "Select groups" : "Hautatu taldeak",
     "Select object classes" : "Hautatu objektu klaseak",
-    "Select attributes" : "Hautatu atributuak",
-    "Connection test succeeded" : "Konexio froga ongi burutu da",
-    "Connection test failed" : "Konexio frogak huts egin du",
+    "{nthServer}. Server" : "{nthServer}. Zerbitzaria",
     "Do you really want to delete the current Server Configuration?" : "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
     "Confirm Deletion" : "Baieztatu Ezabatzea",
+    "Select attributes" : "Hautatu atributuak",
     "_%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",
     "Server" : "Zerbitzaria",
-    "User Filter" : "Erabiltzaileen iragazkia",
-    "Login Filter" : "Saioa hasteko Iragazkia",
-    "Group Filter" : "Taldeen iragazkia",
-    "Save" : "Gorde",
+    "Users" : "Erabiltzaileak",
+    "Groups" : "Taldeak",
     "Test Configuration" : "Egiaztatu Konfigurazioa",
     "Help" : "Laguntza",
     "Groups meeting these criteria are available in %s:" : "Baldintza horiek betetzen dituzten taldeak bertan eskuragarri %s:",
-    "only those object classes:" : "bakarrik objektu klase hauetakoak:",
-    "only from those groups:" : "bakarrik talde hauetakoak:",
-    "Raw LDAP filter" : "Raw 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:",
     "Test Filter" : "Frogatu Iragazkia",
-    "groups found" : "talde aurkituta",
-    "Users login with this attribute:" : "Erabiltzaileak atributu honekin sartzen dira:",
-    "LDAP Username:" : "LDAP Erabiltzaile izena:",
-    "LDAP Email Address:" : "LDAP Eposta 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\"",
     "1. Server" : "1. Zerbitzaria",
     "%s. Server:" : "%s. Zerbitzaria:",
-    "Add Server Configuration" : "Gehitu Zerbitzariaren Konfigurazioa",
-    "Delete Configuration" : "Ezabatu 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",
@@ -69,7 +46,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Eskuz sartu LDAP iragazkiak (direktorio handietarako gomendatuta)",
     "Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
-    "users found" : "erabiltzaile aurkituta",
     "Saving" : "Gordetzen",
     "Back" : "Atzera",
     "Continue" : "Jarraitu",
diff --git a/apps/user_ldap/l10n/fa.js b/apps/user_ldap/l10n/fa.js
index 9ce5edf8742..81f065ef7a4 100644
--- a/apps/user_ldap/l10n/fa.js
+++ b/apps/user_ldap/l10n/fa.js
@@ -8,45 +8,26 @@ OC.L10N.register(
     "No action specified" : "فعالیتی مشخص نشده است",
     "No configuration specified" : "هیچ پیکربندی مشخص نشده است",
     "No data specified" : "داده ای مشخص نشده است",
-    "Deletion failed" : "حذف کردن انجام نشد",
-    "Keep settings?" : "آیا تنظیمات ذخیره شود ؟",
-    "{nthServer}. Server" : "سرور {nthServer}.",
-    "Cannot add server configuration" : "نمی توان پیکربندی سرور را اضافه نمود",
-    "mappings cleared" : "نگاشت پاک شده است",
-    "Success" : "موفقیت",
-    "Error" : "خطا",
-    "Please specify a Base DN" : "لطفا نام دامنه (DN) پایه را مشخص کنید.",
-    "Could not determine Base DN" : "امکان تشخیص نام دامنه (DN) پایه وجود ندارد",
-    "Please specify the port" : "لطفا پورت مورد نظر را مشخص کنید.",
-    "Configuration OK" : "پیکربندی صحیح است",
     "Configuration incorrect" : "پیکربندی نادرست است",
     "Configuration incomplete" : "پیکربندی کامل نیست",
+    "Configuration OK" : "پیکربندی صحیح است",
     "Select groups" : "انتخاب گروه ها",
     "Select object classes" : "انتخاب کلاس های اشیا",
-    "Select attributes" : "انتخاب مشخصه ها",
-    "Connection test succeeded" : "تست اتصال با موفقیت انجام گردید",
-    "Connection test failed" : "تست اتصال ناموفق بود",
+    "{nthServer}. Server" : "سرور {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟",
     "Confirm Deletion" : "تایید حذف",
+    "Select attributes" : "انتخاب مشخصه ها",
     "_%s group found_::_%s groups found_" : ["%s گروه بافت شد"],
     "_%s user found_::_%s users found_" : ["%s کاربر بافت شد"],
     "Invalid Host" : "هاست نامعتبر است",
     "Server" : "سرور",
-    "User Filter" : "فیلتر کاربر",
-    "Login Filter" : "فیلتر لاگین",
-    "Group Filter" : "فیلتر گروه",
-    "Save" : "ذخیره",
+    "Users" : "کاربران",
+    "Groups" : "گروه ها",
     "Test Configuration" : "امتحان پیکربندی",
     "Help" : "راه‌نما",
-    "Raw LDAP filter" : "فیلتر ال.دپ خام",
-    "groups found" : "گروه های یافت شده",
-    "LDAP Username:" : "نام کاربری LDAP:",
-    "LDAP Email Address:" : "آدرس ایمیل LDAP:",
     "Other Attributes:" : "مشخصه های دیگر:",
     "1. Server" : "1. سرور",
     "%s. Server:" : "%s. سرور:",
-    "Add Server Configuration" : "افزودن پیکربندی سرور",
-    "Delete Configuration" : "حذف پیکربندی",
     "Host" : "میزبانی",
     "Port" : "درگاه",
     "User DN" : "کاربر DN",
@@ -54,7 +35,6 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "برای دسترسی ناشناس، DN را رها نموده و رمزعبور را خالی بگذارید.",
     "One Base DN per line" : "یک پایه DN در هر خط",
     "You can specify Base DN for users and groups in the Advanced tab" : "شما می توانید پایه DN را برای کاربران و گروه ها در زبانه Advanced مشخص کنید.",
-    "users found" : "کاربران یافت شده",
     "Back" : "بازگشت",
     "Continue" : "ادامه",
     "Expert" : "حرفه ای",
diff --git a/apps/user_ldap/l10n/fa.json b/apps/user_ldap/l10n/fa.json
index b8ac9269a52..2716f90e10f 100644
--- a/apps/user_ldap/l10n/fa.json
+++ b/apps/user_ldap/l10n/fa.json
@@ -6,45 +6,26 @@
     "No action specified" : "فعالیتی مشخص نشده است",
     "No configuration specified" : "هیچ پیکربندی مشخص نشده است",
     "No data specified" : "داده ای مشخص نشده است",
-    "Deletion failed" : "حذف کردن انجام نشد",
-    "Keep settings?" : "آیا تنظیمات ذخیره شود ؟",
-    "{nthServer}. Server" : "سرور {nthServer}.",
-    "Cannot add server configuration" : "نمی توان پیکربندی سرور را اضافه نمود",
-    "mappings cleared" : "نگاشت پاک شده است",
-    "Success" : "موفقیت",
-    "Error" : "خطا",
-    "Please specify a Base DN" : "لطفا نام دامنه (DN) پایه را مشخص کنید.",
-    "Could not determine Base DN" : "امکان تشخیص نام دامنه (DN) پایه وجود ندارد",
-    "Please specify the port" : "لطفا پورت مورد نظر را مشخص کنید.",
-    "Configuration OK" : "پیکربندی صحیح است",
     "Configuration incorrect" : "پیکربندی نادرست است",
     "Configuration incomplete" : "پیکربندی کامل نیست",
+    "Configuration OK" : "پیکربندی صحیح است",
     "Select groups" : "انتخاب گروه ها",
     "Select object classes" : "انتخاب کلاس های اشیا",
-    "Select attributes" : "انتخاب مشخصه ها",
-    "Connection test succeeded" : "تست اتصال با موفقیت انجام گردید",
-    "Connection test failed" : "تست اتصال ناموفق بود",
+    "{nthServer}. Server" : "سرور {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟",
     "Confirm Deletion" : "تایید حذف",
+    "Select attributes" : "انتخاب مشخصه ها",
     "_%s group found_::_%s groups found_" : ["%s گروه بافت شد"],
     "_%s user found_::_%s users found_" : ["%s کاربر بافت شد"],
     "Invalid Host" : "هاست نامعتبر است",
     "Server" : "سرور",
-    "User Filter" : "فیلتر کاربر",
-    "Login Filter" : "فیلتر لاگین",
-    "Group Filter" : "فیلتر گروه",
-    "Save" : "ذخیره",
+    "Users" : "کاربران",
+    "Groups" : "گروه ها",
     "Test Configuration" : "امتحان پیکربندی",
     "Help" : "راه‌نما",
-    "Raw LDAP filter" : "فیلتر ال.دپ خام",
-    "groups found" : "گروه های یافت شده",
-    "LDAP Username:" : "نام کاربری LDAP:",
-    "LDAP Email Address:" : "آدرس ایمیل LDAP:",
     "Other Attributes:" : "مشخصه های دیگر:",
     "1. Server" : "1. سرور",
     "%s. Server:" : "%s. سرور:",
-    "Add Server Configuration" : "افزودن پیکربندی سرور",
-    "Delete Configuration" : "حذف پیکربندی",
     "Host" : "میزبانی",
     "Port" : "درگاه",
     "User DN" : "کاربر DN",
@@ -52,7 +33,6 @@
     "For anonymous access, leave DN and Password empty." : "برای دسترسی ناشناس، DN را رها نموده و رمزعبور را خالی بگذارید.",
     "One Base DN per line" : "یک پایه DN در هر خط",
     "You can specify Base DN for users and groups in the Advanced tab" : "شما می توانید پایه DN را برای کاربران و گروه ها در زبانه Advanced مشخص کنید.",
-    "users found" : "کاربران یافت شده",
     "Back" : "بازگشت",
     "Continue" : "ادامه",
     "Expert" : "حرفه ای",
diff --git a/apps/user_ldap/l10n/fi_FI.js b/apps/user_ldap/l10n/fi_FI.js
index e36e2520462..ab7d74e0b41 100644
--- a/apps/user_ldap/l10n/fi_FI.js
+++ b/apps/user_ldap/l10n/fi_FI.js
@@ -3,44 +3,37 @@ OC.L10N.register(
     {
     "Failed to delete the server configuration" : "Palvelinmäärityksen poistaminen epäonnistui",
     "The configuration is valid and the connection could be established!" : "Määritys on kelvollinen ja yhteys kyettiin muodostamaan!",
-    "Deletion failed" : "Poisto epäonnistui",
-    "Take over settings from recent server configuration?" : "Otetaanko asetukset viimeisimmistä palvelinmäärityksistä?",
-    "Keep settings?" : "Säilytetäänkö asetukset?",
-    "Cannot add server configuration" : "Palvelinasetusten lisäys epäonnistui",
-    "Success" : "Onnistui!",
-    "Error" : "Virhe",
-    "Please specify the port" : "Määritä portti",
-    "Configuration OK" : "Määritykset OK",
+    "No action specified" : "Toimintoa ei määritetty",
+    "Action does not exist" : "Toimintoa ei ole olemassa.",
     "Configuration incorrect" : "Määritykset väärin",
     "Configuration incomplete" : "Määritykset puutteelliset",
+    "Configuration OK" : "Määritykset OK",
     "Select groups" : "Valitse ryhmät",
-    "Connection test succeeded" : "Yhteystesti onnistui",
-    "Connection test failed" : "Yhteystesti epäonnistui",
     "Do you really want to delete the current Server Configuration?" : "Haluatko varmasti poistaa nykyisen palvelinmäärityksen?",
     "Confirm Deletion" : "Vahvista poisto",
     "_%s group found_::_%s groups found_" : ["%s ryhmä löytynyt","%s ryhmää löytynyt"],
     "_%s user found_::_%s users found_" : ["%s käyttäjä löytynyt","%s käyttäjää löytynyt"],
     "Server" : "Palvelin",
-    "Group Filter" : "Ryhmien suodatus",
-    "Save" : "Tallenna",
+    "Users" : "Käyttäjät",
+    "Groups" : "Ryhmät",
     "Test Configuration" : "Testaa määritys",
     "Help" : "Ohje",
-    "groups found" : "ryhmää löytynyt",
-    "LDAP Username:" : "LDAP-käyttäjätunnus:",
-    "LDAP Email Address:" : "LDAP-sähköpostiosoite:",
+    "Search groups" : "Etsi ryhmiä",
+    "Available groups" : "Käytettävissä olevat ryhmät",
+    "Selected groups" : "Valitut ryhmät",
+    "LDAP Filter:" : "LDAP-suodatin:",
+    "Verify settings" : "Vahvista asetukset",
     "1. Server" : "1. Palvelin",
     "%s. Server:" : "%s. Palvelin:",
-    "Add Server Configuration" : "Lisää palvelinmääritys",
-    "Delete Configuration" : "Poista määritys",
     "Host" : "Isäntä",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://",
     "Port" : "Portti",
+    "Detect Port" : "Havaitse portti",
     "User DN" : "Käyttäjän 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." : "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi.",
     "Password" : "Salasana",
     "For anonymous access, leave DN and Password empty." : "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi ",
     "You can specify Base DN for users and groups in the Advanced tab" : "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä  ",
-    "users found" : "käyttäjää löytynyt",
     "Saving" : "Tallennetaan",
     "Back" : "Takaisin",
     "Continue" : "Jatka",
diff --git a/apps/user_ldap/l10n/fi_FI.json b/apps/user_ldap/l10n/fi_FI.json
index 8081756a0e9..ce8e20c56ef 100644
--- a/apps/user_ldap/l10n/fi_FI.json
+++ b/apps/user_ldap/l10n/fi_FI.json
@@ -1,44 +1,37 @@
 { "translations": {
     "Failed to delete the server configuration" : "Palvelinmäärityksen poistaminen epäonnistui",
     "The configuration is valid and the connection could be established!" : "Määritys on kelvollinen ja yhteys kyettiin muodostamaan!",
-    "Deletion failed" : "Poisto epäonnistui",
-    "Take over settings from recent server configuration?" : "Otetaanko asetukset viimeisimmistä palvelinmäärityksistä?",
-    "Keep settings?" : "Säilytetäänkö asetukset?",
-    "Cannot add server configuration" : "Palvelinasetusten lisäys epäonnistui",
-    "Success" : "Onnistui!",
-    "Error" : "Virhe",
-    "Please specify the port" : "Määritä portti",
-    "Configuration OK" : "Määritykset OK",
+    "No action specified" : "Toimintoa ei määritetty",
+    "Action does not exist" : "Toimintoa ei ole olemassa.",
     "Configuration incorrect" : "Määritykset väärin",
     "Configuration incomplete" : "Määritykset puutteelliset",
+    "Configuration OK" : "Määritykset OK",
     "Select groups" : "Valitse ryhmät",
-    "Connection test succeeded" : "Yhteystesti onnistui",
-    "Connection test failed" : "Yhteystesti epäonnistui",
     "Do you really want to delete the current Server Configuration?" : "Haluatko varmasti poistaa nykyisen palvelinmäärityksen?",
     "Confirm Deletion" : "Vahvista poisto",
     "_%s group found_::_%s groups found_" : ["%s ryhmä löytynyt","%s ryhmää löytynyt"],
     "_%s user found_::_%s users found_" : ["%s käyttäjä löytynyt","%s käyttäjää löytynyt"],
     "Server" : "Palvelin",
-    "Group Filter" : "Ryhmien suodatus",
-    "Save" : "Tallenna",
+    "Users" : "Käyttäjät",
+    "Groups" : "Ryhmät",
     "Test Configuration" : "Testaa määritys",
     "Help" : "Ohje",
-    "groups found" : "ryhmää löytynyt",
-    "LDAP Username:" : "LDAP-käyttäjätunnus:",
-    "LDAP Email Address:" : "LDAP-sähköpostiosoite:",
+    "Search groups" : "Etsi ryhmiä",
+    "Available groups" : "Käytettävissä olevat ryhmät",
+    "Selected groups" : "Valitut ryhmät",
+    "LDAP Filter:" : "LDAP-suodatin:",
+    "Verify settings" : "Vahvista asetukset",
     "1. Server" : "1. Palvelin",
     "%s. Server:" : "%s. Palvelin:",
-    "Add Server Configuration" : "Lisää palvelinmääritys",
-    "Delete Configuration" : "Poista määritys",
     "Host" : "Isäntä",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://",
     "Port" : "Portti",
+    "Detect Port" : "Havaitse portti",
     "User DN" : "Käyttäjän 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." : "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi.",
     "Password" : "Salasana",
     "For anonymous access, leave DN and Password empty." : "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi ",
     "You can specify Base DN for users and groups in the Advanced tab" : "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä  ",
-    "users found" : "käyttäjää löytynyt",
     "Saving" : "Tallennetaan",
     "Back" : "Takaisin",
     "Continue" : "Jatka",
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index 75b8cd4d78e..cd71fa7905c 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -10,56 +10,49 @@ OC.L10N.register(
     "No configuration specified" : "Aucune configuration spécifiée",
     "No data specified" : "Aucune donnée spécifiée",
     " Could not set configuration %s" : "Impossible de spécifier la configuration %s",
-    "Deletion failed" : "La suppression a échoué",
-    "Take over settings from recent server configuration?" : "Récupérer les paramètres depuis une configuration récente du serveur ?",
-    "Keep settings?" : "Garder ces paramètres ?",
-    "{nthServer}. Server" : "{nthServer}. Serveur",
-    "Cannot add server configuration" : "Impossible d'ajouter la configuration du serveur",
-    "mappings cleared" : "associations supprimées",
-    "Success" : "Succès",
-    "Error" : "Erreur",
-    "Please specify a Base DN" : "Veuillez spécifier un DN de base",
-    "Could not determine Base DN" : "Impossible de déterminer le DN de base",
-    "Please specify the port" : "Veuillez indiquer le port",
-    "Configuration OK" : "Configuration OK",
+    "Action does not exist" : "L'action n'existe pas",
     "Configuration incorrect" : "Configuration incorrecte",
     "Configuration incomplete" : "Configuration incomplète",
+    "Configuration OK" : "Configuration OK",
     "Select groups" : "Sélectionnez les groupes",
     "Select object classes" : "Sélectionner les classes d'objet",
-    "Select attributes" : "Sélectionner les attributs",
-    "Connection test succeeded" : "Test de connexion réussi",
-    "Connection test failed" : "Test de connexion échoué",
+    "Please check the credentials, they seem to be wrong." : "Veuillez vérifier vos informations d'identification",
+    "Please specify the port, it could not be auto-detected." : "Veuillez spécifier le port, il n'a pu être détecté automatiquement",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Le DN de base n'a pu être détecté automatiquement. Vérifiez les informations d'identification, l'hôte et le port.",
+    "Could not detect Base DN, please enter it manually." : "Impossible de détecter le DN de base, veuillez le spécifier manuellement",
+    "{nthServer}. Server" : "{nthServer}. Serveur",
+    "No object found in the given Base DN. Please revise." : "Aucun objet trouvé dans le DN de base spécifié. Veuillez le vérifier.",
+    "More then 1.000 directory entries available." : "Plus de 1 000 entrées d'annuaire disponibles",
+    " entries available within the provided Base DN" : "entrées disponibles dans le DN de base spécifié",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Une erreur est survenue. Veuillez vérifier le DN de base, ainsi que les paramètres de connexion et les informations d'identification",
     "Do you really want to delete the current Server Configuration?" : "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
     "Confirm Deletion" : "Confirmer la suppression",
+    "Mappings cleared successfully!" : "Succès de la suppression des associations!",
+    "Error while clearing the mappings." : "Erreur lors de la suppression des associations.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "La sauvegarde a échoué. Veuillez vérifier que la base de données est opérationnelle. Rechargez avant de poursuivre.",
+    "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?" : "Changer de mode activera les requêtes LDAP automatiques. Selon la taille de votre annuaire LDAP, cela peut prendre du temps. Voulez-vous toujours changer de mode ?",
+    "Mode switch" : "Changer de mode",
+    "Select attributes" : "Sélectionner les attributs",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilisateur introuvable. Veuillez vérifier les attributs de login et le nom d'utilisateur. Filtre effectif (à copier-coller pour valider en ligne de commande):<br/>",
+    "User found and settings verified." : "Utilisateur trouvé et paramètres vérifiés.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres vérifiés, mais seul le premier utilisateur pourra se connecter. Considérez utiliser un filtre plus restrictif.",
     "_%s group found_::_%s groups found_" : ["%s groupe trouvé","%s groupes trouvés"],
     "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossible de détecter l'attribut contenant le nom d'affichage des utilisateurs. Veuillez l'indiquer vous-même dans les paramètres ldap avancés.",
     "Could not find the desired feature" : "Impossible de trouver la fonction souhaitée",
     "Invalid Host" : "Hôte non valide",
     "Server" : "Serveur",
-    "User Filter" : "Filtre utilisateur",
-    "Login Filter" : "Filtre de login",
-    "Group Filter" : "Filtre de groupes",
-    "Save" : "Sauvegarder",
+    "Users" : "Utilisateurs",
+    "Groups" : "Groupes",
     "Test Configuration" : "Tester la configuration",
     "Help" : "Aide",
     "Groups meeting these criteria are available in %s:" : "Les groupes respectant ces critères sont disponibles dans %s :",
-    "only those object classes:" : "seulement ces classes d'objet :",
-    "only from those groups:" : "seulement de ces groupes :",
-    "Edit raw filter instead" : "Éditer le filtre raw à la place",
-    "Raw LDAP filter" : "Filtre Raw LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Le filtre spécifie quels groupes LDAP ont accès à l'instance %s.",
     "Test Filter" : "Test du filtre",
-    "groups found" : "groupes trouvés",
-    "Users login with this attribute:" : "Les utilisateurs se connectent en utilisant cet attribut :",
-    "LDAP Username:" : "Nom d'utilisateur LDAP :",
-    "LDAP Email Address:" : "Adresse email LDAP :",
     "Other Attributes:" : "Autres attributs :",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur. Exemple : \"uid=%%uid\"",
     "1. Server" : "1. Serveur",
     "%s. Server:" : "%s. Serveur :",
-    "Add Server Configuration" : "Ajouter une configuration de serveur",
-    "Delete Configuration" : "Suppression de la configuration",
     "Host" : "Hôte",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
     "Port" : "Port",
@@ -73,7 +66,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Entrée manuelle des filtres LDAP (recommandé pour les annuaires de grande ampleur)",
     "Limit %s access to users meeting these criteria:" : "Limiter l'accès à %s aux utilisateurs respectant ces critères :",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Le filtre spécifie quels utilisateurs LDAP doivent avoir accès à l'instance %s.",
-    "users found" : "utilisateurs trouvés",
     "Saving" : "Enregistrement...",
     "Back" : "Retour",
     "Continue" : "Poursuivre",
@@ -115,14 +107,14 @@ OC.L10N.register(
     "Special Attributes" : "Attributs spéciaux",
     "Quota Field" : "Champ du quota",
     "Quota Default" : "Quota par défaut",
-    "in bytes" : "en bytes",
+    "in bytes" : "en octets",
     "Email Field" : "Champ Email",
-    "User Home Folder Naming Rule" : "Convention de nommage du répertoire utilisateur",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide ",
+    "User Home Folder Naming Rule" : "Règle de nommage du répertoire utilisateur",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide pour user name (défaut). Vous pouvez aussi spécifier un attribut LDAP / AD.",
     "Internal Username" : "Nom d'utilisateur interne",
     "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." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est ajouté/incrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. Il fait aussi partie de certains URL de services, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
     "Internal Username Attribute:" : "Nom d'utilisateur interne :",
-    "Override UUID detection" : "Surcharger la détection d'UUID",
+    "Override UUID detection" : "Passer outre la détection d'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." : "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
     "UUID Attribute for Users:" : "Attribut UUID pour les Utilisateurs :",
     "UUID Attribute for Groups:" : "Attribut UUID pour les Groupes :",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 40469d3fc9a..709fe2c7ceb 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -8,56 +8,49 @@
     "No configuration specified" : "Aucune configuration spécifiée",
     "No data specified" : "Aucune donnée spécifiée",
     " Could not set configuration %s" : "Impossible de spécifier la configuration %s",
-    "Deletion failed" : "La suppression a échoué",
-    "Take over settings from recent server configuration?" : "Récupérer les paramètres depuis une configuration récente du serveur ?",
-    "Keep settings?" : "Garder ces paramètres ?",
-    "{nthServer}. Server" : "{nthServer}. Serveur",
-    "Cannot add server configuration" : "Impossible d'ajouter la configuration du serveur",
-    "mappings cleared" : "associations supprimées",
-    "Success" : "Succès",
-    "Error" : "Erreur",
-    "Please specify a Base DN" : "Veuillez spécifier un DN de base",
-    "Could not determine Base DN" : "Impossible de déterminer le DN de base",
-    "Please specify the port" : "Veuillez indiquer le port",
-    "Configuration OK" : "Configuration OK",
+    "Action does not exist" : "L'action n'existe pas",
     "Configuration incorrect" : "Configuration incorrecte",
     "Configuration incomplete" : "Configuration incomplète",
+    "Configuration OK" : "Configuration OK",
     "Select groups" : "Sélectionnez les groupes",
     "Select object classes" : "Sélectionner les classes d'objet",
-    "Select attributes" : "Sélectionner les attributs",
-    "Connection test succeeded" : "Test de connexion réussi",
-    "Connection test failed" : "Test de connexion échoué",
+    "Please check the credentials, they seem to be wrong." : "Veuillez vérifier vos informations d'identification",
+    "Please specify the port, it could not be auto-detected." : "Veuillez spécifier le port, il n'a pu être détecté automatiquement",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Le DN de base n'a pu être détecté automatiquement. Vérifiez les informations d'identification, l'hôte et le port.",
+    "Could not detect Base DN, please enter it manually." : "Impossible de détecter le DN de base, veuillez le spécifier manuellement",
+    "{nthServer}. Server" : "{nthServer}. Serveur",
+    "No object found in the given Base DN. Please revise." : "Aucun objet trouvé dans le DN de base spécifié. Veuillez le vérifier.",
+    "More then 1.000 directory entries available." : "Plus de 1 000 entrées d'annuaire disponibles",
+    " entries available within the provided Base DN" : "entrées disponibles dans le DN de base spécifié",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Une erreur est survenue. Veuillez vérifier le DN de base, ainsi que les paramètres de connexion et les informations d'identification",
     "Do you really want to delete the current Server Configuration?" : "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
     "Confirm Deletion" : "Confirmer la suppression",
+    "Mappings cleared successfully!" : "Succès de la suppression des associations!",
+    "Error while clearing the mappings." : "Erreur lors de la suppression des associations.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "La sauvegarde a échoué. Veuillez vérifier que la base de données est opérationnelle. Rechargez avant de poursuivre.",
+    "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?" : "Changer de mode activera les requêtes LDAP automatiques. Selon la taille de votre annuaire LDAP, cela peut prendre du temps. Voulez-vous toujours changer de mode ?",
+    "Mode switch" : "Changer de mode",
+    "Select attributes" : "Sélectionner les attributs",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilisateur introuvable. Veuillez vérifier les attributs de login et le nom d'utilisateur. Filtre effectif (à copier-coller pour valider en ligne de commande):<br/>",
+    "User found and settings verified." : "Utilisateur trouvé et paramètres vérifiés.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres vérifiés, mais seul le premier utilisateur pourra se connecter. Considérez utiliser un filtre plus restrictif.",
     "_%s group found_::_%s groups found_" : ["%s groupe trouvé","%s groupes trouvés"],
     "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossible de détecter l'attribut contenant le nom d'affichage des utilisateurs. Veuillez l'indiquer vous-même dans les paramètres ldap avancés.",
     "Could not find the desired feature" : "Impossible de trouver la fonction souhaitée",
     "Invalid Host" : "Hôte non valide",
     "Server" : "Serveur",
-    "User Filter" : "Filtre utilisateur",
-    "Login Filter" : "Filtre de login",
-    "Group Filter" : "Filtre de groupes",
-    "Save" : "Sauvegarder",
+    "Users" : "Utilisateurs",
+    "Groups" : "Groupes",
     "Test Configuration" : "Tester la configuration",
     "Help" : "Aide",
     "Groups meeting these criteria are available in %s:" : "Les groupes respectant ces critères sont disponibles dans %s :",
-    "only those object classes:" : "seulement ces classes d'objet :",
-    "only from those groups:" : "seulement de ces groupes :",
-    "Edit raw filter instead" : "Éditer le filtre raw à la place",
-    "Raw LDAP filter" : "Filtre Raw LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Le filtre spécifie quels groupes LDAP ont accès à l'instance %s.",
     "Test Filter" : "Test du filtre",
-    "groups found" : "groupes trouvés",
-    "Users login with this attribute:" : "Les utilisateurs se connectent en utilisant cet attribut :",
-    "LDAP Username:" : "Nom d'utilisateur LDAP :",
-    "LDAP Email Address:" : "Adresse email LDAP :",
     "Other Attributes:" : "Autres attributs :",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur. Exemple : \"uid=%%uid\"",
     "1. Server" : "1. Serveur",
     "%s. Server:" : "%s. Serveur :",
-    "Add Server Configuration" : "Ajouter une configuration de serveur",
-    "Delete Configuration" : "Suppression de la configuration",
     "Host" : "Hôte",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
     "Port" : "Port",
@@ -71,7 +64,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Entrée manuelle des filtres LDAP (recommandé pour les annuaires de grande ampleur)",
     "Limit %s access to users meeting these criteria:" : "Limiter l'accès à %s aux utilisateurs respectant ces critères :",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Le filtre spécifie quels utilisateurs LDAP doivent avoir accès à l'instance %s.",
-    "users found" : "utilisateurs trouvés",
     "Saving" : "Enregistrement...",
     "Back" : "Retour",
     "Continue" : "Poursuivre",
@@ -113,14 +105,14 @@
     "Special Attributes" : "Attributs spéciaux",
     "Quota Field" : "Champ du quota",
     "Quota Default" : "Quota par défaut",
-    "in bytes" : "en bytes",
+    "in bytes" : "en octets",
     "Email Field" : "Champ Email",
-    "User Home Folder Naming Rule" : "Convention de nommage du répertoire utilisateur",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide ",
+    "User Home Folder Naming Rule" : "Règle de nommage du répertoire utilisateur",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide pour user name (défaut). Vous pouvez aussi spécifier un attribut LDAP / AD.",
     "Internal Username" : "Nom d'utilisateur interne",
     "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." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est ajouté/incrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. Il fait aussi partie de certains URL de services, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
     "Internal Username Attribute:" : "Nom d'utilisateur interne :",
-    "Override UUID detection" : "Surcharger la détection d'UUID",
+    "Override UUID detection" : "Passer outre la détection d'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." : "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
     "UUID Attribute for Users:" : "Attribut UUID pour les Utilisateurs :",
     "UUID Attribute for Groups:" : "Attribut UUID pour les Groupes :",
diff --git a/apps/user_ldap/l10n/gl.js b/apps/user_ldap/l10n/gl.js
index db5e70e8bbb..7a89f87cfd1 100644
--- a/apps/user_ldap/l10n/gl.js
+++ b/apps/user_ldap/l10n/gl.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Non se especificou unha configuración",
     "No data specified" : "Non se especificaron datos",
     " Could not set configuration %s" : "Non foi posíbel estabelecer a configuración %s",
-    "Deletion failed" : "Produciuse un fallo ao eliminar",
-    "Take over settings from recent server configuration?" : "Tomar os recentes axustes de configuración do servidor?",
-    "Keep settings?" : "Manter os axustes?",
-    "{nthServer}. Server" : "{nthServer}. Servidor",
-    "Cannot add server configuration" : "Non é posíbel engadir a configuración do servidor",
-    "mappings cleared" : "limpadas as asignacións",
-    "Success" : "Correcto",
-    "Error" : "Erro",
-    "Please specify a Base DN" : "Indique un DN base",
-    "Could not determine Base DN" : "Non se puido determinar o DN base",
-    "Please specify the port" : "Especifique un porto",
-    "Configuration OK" : "Configuración correcta",
     "Configuration incorrect" : "Configuración incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración correcta",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccione as clases de obxectos",
-    "Select attributes" : "Seleccione os atributos",
-    "Connection test succeeded" : "A proba de conexión foi satisfactoria",
-    "Connection test failed" : "A proba de conexión fracasou",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
     "Do you really want to delete the current Server Configuration?" : "Confirma que quere eliminar a configuración actual do servidor?",
     "Confirm Deletion" : "Confirmar a eliminación",
+    "Select attributes" : "Seleccione os atributos",
     "_%s group found_::_%s groups found_" : ["Atopouse %s grupo","Atopáronse %s grupos"],
     "_%s user found_::_%s users found_" : ["Atopouse %s usuario","Atopáronse %s usuarios"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Non foi posíbel detectar o atributo nome de usuario que mostrar. Especifíqueo vostede mesmo nos axustes avanzados de LDAP.",
     "Could not find the desired feature" : "Non foi posíbel atopar a función desexada",
     "Invalid Host" : "Máquina incorrecta",
     "Server" : "Servidor",
-    "User Filter" : "Filtro do usuario",
-    "Login Filter" : "Filtro de acceso",
-    "Group Filter" : "Filtro de grupo",
-    "Save" : "Gardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Probar a configuración",
     "Help" : "Axuda",
     "Groups meeting these criteria are available in %s:" : "Os grupos que cumpren estes criterios están dispoñíbeis en %s:",
-    "only those object classes:" : "só as clases de obxecto:",
-    "only from those groups:" : "só dos grupos:",
-    "Edit raw filter instead" : "Editar, no seu canto, o filtro en bruto",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica que grupos LDAP teñen acceso á instancia %s.",
     "Test Filter" : "Filtro de probas",
-    "groups found" : "atopáronse grupos",
-    "Users login with this attribute:" : "Os usuarios inician sesión con este atributo:",
-    "LDAP Username:" : "Nome de usuario LDAP:",
-    "LDAP Email Address:" : "Enderezo de correo LDAP:",
     "Other Attributes:" : "Outros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso. Exemplo: «uid=%%uid»",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Engadir a configuración do servidor",
-    "Delete Configuration" : "Eliminar a configuración",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://",
     "Port" : "Porto",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Introduza manualmente os filtros LDAP (recomendado para directorios grandes)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acceso a %s para os usuarios que cumpren con estes criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica que usuarios LDAP teñen acceso á instancia %s.",
-    "users found" : "atopáronse usuarios",
     "Saving" : "Gardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/gl.json b/apps/user_ldap/l10n/gl.json
index c2f209e1b25..9a19b3a0541 100644
--- a/apps/user_ldap/l10n/gl.json
+++ b/apps/user_ldap/l10n/gl.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Non se especificou unha configuración",
     "No data specified" : "Non se especificaron datos",
     " Could not set configuration %s" : "Non foi posíbel estabelecer a configuración %s",
-    "Deletion failed" : "Produciuse un fallo ao eliminar",
-    "Take over settings from recent server configuration?" : "Tomar os recentes axustes de configuración do servidor?",
-    "Keep settings?" : "Manter os axustes?",
-    "{nthServer}. Server" : "{nthServer}. Servidor",
-    "Cannot add server configuration" : "Non é posíbel engadir a configuración do servidor",
-    "mappings cleared" : "limpadas as asignacións",
-    "Success" : "Correcto",
-    "Error" : "Erro",
-    "Please specify a Base DN" : "Indique un DN base",
-    "Could not determine Base DN" : "Non se puido determinar o DN base",
-    "Please specify the port" : "Especifique un porto",
-    "Configuration OK" : "Configuración correcta",
     "Configuration incorrect" : "Configuración incorrecta",
     "Configuration incomplete" : "Configuración incompleta",
+    "Configuration OK" : "Configuración correcta",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Seleccione as clases de obxectos",
-    "Select attributes" : "Seleccione os atributos",
-    "Connection test succeeded" : "A proba de conexión foi satisfactoria",
-    "Connection test failed" : "A proba de conexión fracasou",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
     "Do you really want to delete the current Server Configuration?" : "Confirma que quere eliminar a configuración actual do servidor?",
     "Confirm Deletion" : "Confirmar a eliminación",
+    "Select attributes" : "Seleccione os atributos",
     "_%s group found_::_%s groups found_" : ["Atopouse %s grupo","Atopáronse %s grupos"],
     "_%s user found_::_%s users found_" : ["Atopouse %s usuario","Atopáronse %s usuarios"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Non foi posíbel detectar o atributo nome de usuario que mostrar. Especifíqueo vostede mesmo nos axustes avanzados de LDAP.",
     "Could not find the desired feature" : "Non foi posíbel atopar a función desexada",
     "Invalid Host" : "Máquina incorrecta",
     "Server" : "Servidor",
-    "User Filter" : "Filtro do usuario",
-    "Login Filter" : "Filtro de acceso",
-    "Group Filter" : "Filtro de grupo",
-    "Save" : "Gardar",
+    "Users" : "Usuarios",
+    "Groups" : "Grupos",
     "Test Configuration" : "Probar a configuración",
     "Help" : "Axuda",
     "Groups meeting these criteria are available in %s:" : "Os grupos que cumpren estes criterios están dispoñíbeis en %s:",
-    "only those object classes:" : "só as clases de obxecto:",
-    "only from those groups:" : "só dos grupos:",
-    "Edit raw filter instead" : "Editar, no seu canto, o filtro en bruto",
-    "Raw LDAP filter" : "Filtro LDAP en bruto",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica que grupos LDAP teñen acceso á instancia %s.",
     "Test Filter" : "Filtro de probas",
-    "groups found" : "atopáronse grupos",
-    "Users login with this attribute:" : "Os usuarios inician sesión con este atributo:",
-    "LDAP Username:" : "Nome de usuario LDAP:",
-    "LDAP Email Address:" : "Enderezo de correo LDAP:",
     "Other Attributes:" : "Outros atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso. Exemplo: «uid=%%uid»",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Engadir a configuración do servidor",
-    "Delete Configuration" : "Eliminar a configuración",
     "Host" : "Servidor",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://",
     "Port" : "Porto",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Introduza manualmente os filtros LDAP (recomendado para directorios grandes)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acceso a %s para os usuarios que cumpren con estes criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica que usuarios LDAP teñen acceso á instancia %s.",
-    "users found" : "atopáronse usuarios",
     "Saving" : "Gardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/he.js b/apps/user_ldap/l10n/he.js
index ea428764a0a..1baa1d43a66 100644
--- a/apps/user_ldap/l10n/he.js
+++ b/apps/user_ldap/l10n/he.js
@@ -1,18 +1,11 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "מחיקה נכשלה",
-    "Keep settings?" : "האם לשמור את ההגדרות?",
-    "Cannot add server configuration" : "לא ניתן להוסיף את הגדרות השרת",
-    "Error" : "שגיאה",
-    "Connection test succeeded" : "בדיקת החיבור עברה בהצלחה",
-    "Connection test failed" : "בדיקת החיבור נכשלה",
     "Do you really want to delete the current Server Configuration?" : "האם אכן למחוק את הגדרות השרת הנוכחיות?",
     "Confirm Deletion" : "אישור המחיקה",
-    "Group Filter" : "סנן קבוצה",
-    "Save" : "שמירה",
+    "Users" : "משתמשים",
+    "Groups" : "קבוצות",
     "Help" : "עזרה",
-    "Add Server Configuration" : "הוספת הגדרות השרת",
     "Host" : "מארח",
     "Port" : "פורט",
     "User DN" : "DN משתמש",
diff --git a/apps/user_ldap/l10n/he.json b/apps/user_ldap/l10n/he.json
index c136cfc17a1..77ef6d25887 100644
--- a/apps/user_ldap/l10n/he.json
+++ b/apps/user_ldap/l10n/he.json
@@ -1,16 +1,9 @@
 { "translations": {
-    "Deletion failed" : "מחיקה נכשלה",
-    "Keep settings?" : "האם לשמור את ההגדרות?",
-    "Cannot add server configuration" : "לא ניתן להוסיף את הגדרות השרת",
-    "Error" : "שגיאה",
-    "Connection test succeeded" : "בדיקת החיבור עברה בהצלחה",
-    "Connection test failed" : "בדיקת החיבור נכשלה",
     "Do you really want to delete the current Server Configuration?" : "האם אכן למחוק את הגדרות השרת הנוכחיות?",
     "Confirm Deletion" : "אישור המחיקה",
-    "Group Filter" : "סנן קבוצה",
-    "Save" : "שמירה",
+    "Users" : "משתמשים",
+    "Groups" : "קבוצות",
     "Help" : "עזרה",
-    "Add Server Configuration" : "הוספת הגדרות השרת",
     "Host" : "מארח",
     "Port" : "פורט",
     "User DN" : "DN משתמש",
diff --git a/apps/user_ldap/l10n/hi.js b/apps/user_ldap/l10n/hi.js
index 3141087a7a0..5f9924248b3 100644
--- a/apps/user_ldap/l10n/hi.js
+++ b/apps/user_ldap/l10n/hi.js
@@ -1,8 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "त्रुटि",
-    "Save" : "सहेजें",
+    "Users" : "उपयोगकर्ता",
     "Help" : "सहयोग",
     "Password" : "पासवर्ड",
     "Advanced" : "उन्नत"
diff --git a/apps/user_ldap/l10n/hi.json b/apps/user_ldap/l10n/hi.json
index 2364492d706..2ea4feefc94 100644
--- a/apps/user_ldap/l10n/hi.json
+++ b/apps/user_ldap/l10n/hi.json
@@ -1,6 +1,5 @@
 { "translations": {
-    "Error" : "त्रुटि",
-    "Save" : "सहेजें",
+    "Users" : "उपयोगकर्ता",
     "Help" : "सहयोग",
     "Password" : "पासवर्ड",
     "Advanced" : "उन्नत"
diff --git a/apps/user_ldap/l10n/hr.js b/apps/user_ldap/l10n/hr.js
index af414089cc0..e9c7ce4e17b 100644
--- a/apps/user_ldap/l10n/hr.js
+++ b/apps/user_ldap/l10n/hr.js
@@ -2,9 +2,8 @@ OC.L10N.register(
     "user_ldap",
     {
     "Failed to delete the server configuration" : "Greška prilikom brisanja konfiguracije poslužitelja.",
-    "Deletion failed" : "Brisanje nije uspjelo",
-    "Error" : "Greška",
-    "Save" : "Snimi",
+    "Users" : "Korisnici",
+    "Groups" : "Grupe",
     "Help" : "Pomoć",
     "Host" : "Poslužitelj",
     "Port" : "Port",
diff --git a/apps/user_ldap/l10n/hr.json b/apps/user_ldap/l10n/hr.json
index 63cb919ac55..8aad60517c7 100644
--- a/apps/user_ldap/l10n/hr.json
+++ b/apps/user_ldap/l10n/hr.json
@@ -1,8 +1,7 @@
 { "translations": {
     "Failed to delete the server configuration" : "Greška prilikom brisanja konfiguracije poslužitelja.",
-    "Deletion failed" : "Brisanje nije uspjelo",
-    "Error" : "Greška",
-    "Save" : "Snimi",
+    "Users" : "Korisnici",
+    "Groups" : "Grupe",
     "Help" : "Pomoć",
     "Host" : "Poslužitelj",
     "Port" : "Port",
diff --git a/apps/user_ldap/l10n/hu_HU.js b/apps/user_ldap/l10n/hu_HU.js
index 8548724aea7..d6fe2fde2d8 100644
--- a/apps/user_ldap/l10n/hu_HU.js
+++ b/apps/user_ldap/l10n/hu_HU.js
@@ -10,55 +10,31 @@ OC.L10N.register(
     "No configuration specified" : "Nincs megadva konfiguráció",
     "No data specified" : "Nincs adat megadva",
     " Could not set configuration %s" : "A(z) %s konfiguráció nem állítható be",
-    "Deletion failed" : "A törlés nem sikerült",
-    "Take over settings from recent server configuration?" : "Vegyük át a beállításokat az előző konfigurációból?",
-    "Keep settings?" : "Tartsuk meg a beállításokat?",
-    "{nthServer}. Server" : "{nthServer}. Kiszolgáló",
-    "Cannot add server configuration" : "Az új  kiszolgáló konfigurációja nem hozható létre",
-    "mappings cleared" : "Töröltük a hozzárendeléseket",
-    "Success" : "Sikeres végrehajtás",
-    "Error" : "Hiba",
-    "Please specify a Base DN" : "Adja meg az alap/Base/ DN-t",
-    "Could not determine Base DN" : "nem sikerült azonosítani az alap/Base/ DN-t",
-    "Please specify the port" : "Add meg a portot",
-    "Configuration OK" : "Konfiguráció OK",
     "Configuration incorrect" : "Konfiguráió hibás",
     "Configuration incomplete" : "Konfiguráció nincs befejezve",
+    "Configuration OK" : "Konfiguráció OK",
     "Select groups" : "Csoportok kiválasztása",
     "Select object classes" : "Objektumosztályok kiválasztása",
-    "Select attributes" : "Attribútumok kiválasztása",
-    "Connection test succeeded" : "A kapcsolatellenőrzés eredménye: sikerült",
-    "Connection test failed" : "A kapcsolatellenőrzés eredménye: nem sikerült",
+    "{nthServer}. Server" : "{nthServer}. Kiszolgáló",
     "Do you really want to delete the current Server Configuration?" : "Tényleg törölni szeretné a kiszolgáló beállításait?",
     "Confirm Deletion" : "A törlés megerősítése",
+    "Select attributes" : "Attribútumok kiválasztása",
     "_%s group found_::_%s groups found_" : ["%s csoport van","%s csoport van"],
     "_%s user found_::_%s users found_" : ["%s felhasználó van","%s felhasználó van"],
     "Could not find the desired feature" : "A kívánt funkció nem található",
     "Invalid Host" : "Érvénytelen gépnév",
     "Server" : "Kiszolgáló",
-    "User Filter" : "Felhasználói szűrő",
-    "Login Filter" : "Bejelentkezési szűrő",
-    "Group Filter" : "A csoportok szűrője",
-    "Save" : "Mentés",
+    "Users" : "Felhasználók",
+    "Groups" : "Csoportok",
     "Test Configuration" : "A beállítások tesztelése",
     "Help" : "Súgó",
     "Groups meeting these criteria are available in %s:" : "A %s szolgáltatás azon csoportok létezését veszi figyelembe, amik a következő feltételeknek felelnek meg:",
-    "only those object classes:" : "csak ezek az objektumosztályok:",
-    "only from those groups:" : "csak ezek a csoportok:",
-    "Edit raw filter instead" : "Inkább közvetlenül megadom a szűrési kifejezést:",
-    "Raw LDAP filter" : "Az LDAP szűrőkifejezés",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP csoportok lesznek jogosultak %s elérésére.",
     "Test Filter" : "Test szűrő ",
-    "groups found" : "csoport van",
-    "Users login with this attribute:" : "A felhasználók ezzel az attribútummal jelentkeznek be:",
-    "LDAP Username:" : "LDAP felhasználónév:",
-    "LDAP Email Address:" : "LDAP e-mail cím:",
     "Other Attributes:" : "Más attribútumok:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül. Például: \"uid=%%uid\"",
     "1. Server" : "1. Kiszolgáló",
     "%s. Server:" : "%s. kiszolgáló",
-    "Add Server Configuration" : "Új kiszolgáló beállításának hozzáadása",
-    "Delete Configuration" : "Konfiguráció törlés",
     "Host" : "Kiszolgáló",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így:  ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP szűrők kézi beállitása (ajánlott a nagy könyvtáraknál)",
     "Limit %s access to users meeting these criteria:" : "Korlátozzuk a %s szolgáltatás elérését azokra a felhasználókra, akik megfelelnek a következő feltételeknek:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP felhasználók lesznek jogosultak %s elérésére.",
-    "users found" : "felhasználó van",
     "Saving" : "Mentés",
     "Back" : "Vissza",
     "Continue" : "Folytatás",
diff --git a/apps/user_ldap/l10n/hu_HU.json b/apps/user_ldap/l10n/hu_HU.json
index a9d9a69195a..d793887c0b2 100644
--- a/apps/user_ldap/l10n/hu_HU.json
+++ b/apps/user_ldap/l10n/hu_HU.json
@@ -8,55 +8,31 @@
     "No configuration specified" : "Nincs megadva konfiguráció",
     "No data specified" : "Nincs adat megadva",
     " Could not set configuration %s" : "A(z) %s konfiguráció nem állítható be",
-    "Deletion failed" : "A törlés nem sikerült",
-    "Take over settings from recent server configuration?" : "Vegyük át a beállításokat az előző konfigurációból?",
-    "Keep settings?" : "Tartsuk meg a beállításokat?",
-    "{nthServer}. Server" : "{nthServer}. Kiszolgáló",
-    "Cannot add server configuration" : "Az új  kiszolgáló konfigurációja nem hozható létre",
-    "mappings cleared" : "Töröltük a hozzárendeléseket",
-    "Success" : "Sikeres végrehajtás",
-    "Error" : "Hiba",
-    "Please specify a Base DN" : "Adja meg az alap/Base/ DN-t",
-    "Could not determine Base DN" : "nem sikerült azonosítani az alap/Base/ DN-t",
-    "Please specify the port" : "Add meg a portot",
-    "Configuration OK" : "Konfiguráció OK",
     "Configuration incorrect" : "Konfiguráió hibás",
     "Configuration incomplete" : "Konfiguráció nincs befejezve",
+    "Configuration OK" : "Konfiguráció OK",
     "Select groups" : "Csoportok kiválasztása",
     "Select object classes" : "Objektumosztályok kiválasztása",
-    "Select attributes" : "Attribútumok kiválasztása",
-    "Connection test succeeded" : "A kapcsolatellenőrzés eredménye: sikerült",
-    "Connection test failed" : "A kapcsolatellenőrzés eredménye: nem sikerült",
+    "{nthServer}. Server" : "{nthServer}. Kiszolgáló",
     "Do you really want to delete the current Server Configuration?" : "Tényleg törölni szeretné a kiszolgáló beállításait?",
     "Confirm Deletion" : "A törlés megerősítése",
+    "Select attributes" : "Attribútumok kiválasztása",
     "_%s group found_::_%s groups found_" : ["%s csoport van","%s csoport van"],
     "_%s user found_::_%s users found_" : ["%s felhasználó van","%s felhasználó van"],
     "Could not find the desired feature" : "A kívánt funkció nem található",
     "Invalid Host" : "Érvénytelen gépnév",
     "Server" : "Kiszolgáló",
-    "User Filter" : "Felhasználói szűrő",
-    "Login Filter" : "Bejelentkezési szűrő",
-    "Group Filter" : "A csoportok szűrője",
-    "Save" : "Mentés",
+    "Users" : "Felhasználók",
+    "Groups" : "Csoportok",
     "Test Configuration" : "A beállítások tesztelése",
     "Help" : "Súgó",
     "Groups meeting these criteria are available in %s:" : "A %s szolgáltatás azon csoportok létezését veszi figyelembe, amik a következő feltételeknek felelnek meg:",
-    "only those object classes:" : "csak ezek az objektumosztályok:",
-    "only from those groups:" : "csak ezek a csoportok:",
-    "Edit raw filter instead" : "Inkább közvetlenül megadom a szűrési kifejezést:",
-    "Raw LDAP filter" : "Az LDAP szűrőkifejezés",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP csoportok lesznek jogosultak %s elérésére.",
     "Test Filter" : "Test szűrő ",
-    "groups found" : "csoport van",
-    "Users login with this attribute:" : "A felhasználók ezzel az attribútummal jelentkeznek be:",
-    "LDAP Username:" : "LDAP felhasználónév:",
-    "LDAP Email Address:" : "LDAP e-mail cím:",
     "Other Attributes:" : "Más attribútumok:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül. Például: \"uid=%%uid\"",
     "1. Server" : "1. Kiszolgáló",
     "%s. Server:" : "%s. kiszolgáló",
-    "Add Server Configuration" : "Új kiszolgáló beállításának hozzáadása",
-    "Delete Configuration" : "Konfiguráció törlés",
     "Host" : "Kiszolgáló",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így:  ldaps://",
     "Port" : "Port",
@@ -69,7 +45,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP szűrők kézi beállitása (ajánlott a nagy könyvtáraknál)",
     "Limit %s access to users meeting these criteria:" : "Korlátozzuk a %s szolgáltatás elérését azokra a felhasználókra, akik megfelelnek a következő feltételeknek:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP felhasználók lesznek jogosultak %s elérésére.",
-    "users found" : "felhasználó van",
     "Saving" : "Mentés",
     "Back" : "Vissza",
     "Continue" : "Folytatás",
diff --git a/apps/user_ldap/l10n/ia.js b/apps/user_ldap/l10n/ia.js
index 0b6d9e3018a..c129620ee87 100644
--- a/apps/user_ldap/l10n/ia.js
+++ b/apps/user_ldap/l10n/ia.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Il falleva deler",
-    "Error" : "Error",
-    "Save" : "Salveguardar",
+    "Users" : "Usatores",
+    "Groups" : "Gruppos",
     "Help" : "Adjuta",
     "Password" : "Contrasigno",
     "Back" : "Retro",
diff --git a/apps/user_ldap/l10n/ia.json b/apps/user_ldap/l10n/ia.json
index 5b2b7df298d..86b535fd079 100644
--- a/apps/user_ldap/l10n/ia.json
+++ b/apps/user_ldap/l10n/ia.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Il falleva deler",
-    "Error" : "Error",
-    "Save" : "Salveguardar",
+    "Users" : "Usatores",
+    "Groups" : "Gruppos",
     "Help" : "Adjuta",
     "Password" : "Contrasigno",
     "Back" : "Retro",
diff --git a/apps/user_ldap/l10n/id.js b/apps/user_ldap/l10n/id.js
index 3319f9bea58..255ee3ee1c8 100644
--- a/apps/user_ldap/l10n/id.js
+++ b/apps/user_ldap/l10n/id.js
@@ -10,54 +10,30 @@ OC.L10N.register(
     "No configuration specified" : "Tidak ada konfigurasi yang ditetapkan",
     "No data specified" : "Tidak ada data yang ditetapkan",
     " Could not set configuration %s" : "Tidak dapat menyetel konfigurasi %s",
-    "Deletion failed" : "Penghapusan gagal",
-    "Take over settings from recent server configuration?" : "Mengambil alih pengaturan dari konfigurasi server saat ini?",
-    "Keep settings?" : "Biarkan pengaturan?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Gagal menambah konfigurasi server",
-    "mappings cleared" : "pemetaan dibersihkan",
-    "Success" : "Berhasil",
-    "Error" : "Kesalahan",
-    "Please specify a Base DN" : "Sialakan menetapkan Base DN",
-    "Could not determine Base DN" : "Tidak dapat menetapkan Base DN",
-    "Please specify the port" : "Silakan tetapkan port",
-    "Configuration OK" : "Konfigurasi Oke",
     "Configuration incorrect" : "Konfigurasi salah",
     "Configuration incomplete" : "Konfigurasi tidak lengkap",
+    "Configuration OK" : "Konfigurasi Oke",
     "Select groups" : "Pilih grup",
     "Select object classes" : "Pilik kelas obyek",
-    "Select attributes" : "Pilih atribut",
-    "Connection test succeeded" : "Pemeriksaan koneksi berhasil",
-    "Connection test failed" : "Pemeriksaan koneksi gagal",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Apakan Anda ingin menghapus Konfigurasi Server saat ini?",
     "Confirm Deletion" : "Konfirmasi Penghapusan",
+    "Select attributes" : "Pilih atribut",
     "_%s group found_::_%s groups found_" : ["%s grup ditemukan"],
     "_%s user found_::_%s users found_" : ["%s pengguna ditemukan"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Tidak mendeteksi atribut nama tampilan pengguna. Silakan menentukannya sendiri di pengaturan ldap lanjutan.",
     "Could not find the desired feature" : "Tidak dapat menemukan fitur yang diinginkan",
     "Invalid Host" : "Host tidak sah",
     "Server" : "Server",
-    "User Filter" : "Penyaring Pengguna",
-    "Login Filter" : "Penyaring Masuk",
-    "Group Filter" : "Penyaring grup",
-    "Save" : "Simpan",
+    "Users" : "Pengguna",
+    "Groups" : "Grup",
     "Test Configuration" : "Uji Konfigurasi",
     "Help" : "Bantuan",
     "Groups meeting these criteria are available in %s:" : "Grup memenuhi kriteria ini tersedia di %s:",
-    "only those object classes:" : "hanya kelas objek:",
-    "only from those groups:" : "hanya dari kelompok:",
-    "Edit raw filter instead" : "Sunting penyaring raw",
-    "Raw LDAP filter" : "Penyaring LDAP raw",
     "Test Filter" : "Uji Penyaring",
-    "groups found" : "grup ditemukan",
-    "Users login with this attribute:" : "Login pengguna dengan atribut ini:",
-    "LDAP Username:" : "Nama pengguna LDAP:",
-    "LDAP Email Address:" : "Alamat Email LDAP:",
     "Other Attributes:" : "Atribut Lain:",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Tambah Konfigurasi Server",
-    "Delete Configuration" : "Hapus Konfigurasi",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol dapat tidak ditulis, kecuali Anda menggunakan SSL. Lalu jalankan dengan ldaps://",
     "Port" : "Port",
@@ -69,7 +45,6 @@ OC.L10N.register(
     "You can specify Base DN for users and groups in the Advanced tab" : "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
     "Manually enter LDAP filters (recommended for large directories)" : "Masukkan penyaring LDAP secara manual (direkomendasikan untuk direktori yang besar)",
     "Limit %s access to users meeting these criteria:" : "Batasi akses %s untuk pengguna yang sesuai dengan kriteria berikut:",
-    "users found" : "pengguna ditemukan",
     "Saving" : "Menyimpan",
     "Back" : "Kembali",
     "Continue" : "Lanjutkan",
diff --git a/apps/user_ldap/l10n/id.json b/apps/user_ldap/l10n/id.json
index c6a7ecd2e95..bbff7d43f0b 100644
--- a/apps/user_ldap/l10n/id.json
+++ b/apps/user_ldap/l10n/id.json
@@ -8,54 +8,30 @@
     "No configuration specified" : "Tidak ada konfigurasi yang ditetapkan",
     "No data specified" : "Tidak ada data yang ditetapkan",
     " Could not set configuration %s" : "Tidak dapat menyetel konfigurasi %s",
-    "Deletion failed" : "Penghapusan gagal",
-    "Take over settings from recent server configuration?" : "Mengambil alih pengaturan dari konfigurasi server saat ini?",
-    "Keep settings?" : "Biarkan pengaturan?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Gagal menambah konfigurasi server",
-    "mappings cleared" : "pemetaan dibersihkan",
-    "Success" : "Berhasil",
-    "Error" : "Kesalahan",
-    "Please specify a Base DN" : "Sialakan menetapkan Base DN",
-    "Could not determine Base DN" : "Tidak dapat menetapkan Base DN",
-    "Please specify the port" : "Silakan tetapkan port",
-    "Configuration OK" : "Konfigurasi Oke",
     "Configuration incorrect" : "Konfigurasi salah",
     "Configuration incomplete" : "Konfigurasi tidak lengkap",
+    "Configuration OK" : "Konfigurasi Oke",
     "Select groups" : "Pilih grup",
     "Select object classes" : "Pilik kelas obyek",
-    "Select attributes" : "Pilih atribut",
-    "Connection test succeeded" : "Pemeriksaan koneksi berhasil",
-    "Connection test failed" : "Pemeriksaan koneksi gagal",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Apakan Anda ingin menghapus Konfigurasi Server saat ini?",
     "Confirm Deletion" : "Konfirmasi Penghapusan",
+    "Select attributes" : "Pilih atribut",
     "_%s group found_::_%s groups found_" : ["%s grup ditemukan"],
     "_%s user found_::_%s users found_" : ["%s pengguna ditemukan"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Tidak mendeteksi atribut nama tampilan pengguna. Silakan menentukannya sendiri di pengaturan ldap lanjutan.",
     "Could not find the desired feature" : "Tidak dapat menemukan fitur yang diinginkan",
     "Invalid Host" : "Host tidak sah",
     "Server" : "Server",
-    "User Filter" : "Penyaring Pengguna",
-    "Login Filter" : "Penyaring Masuk",
-    "Group Filter" : "Penyaring grup",
-    "Save" : "Simpan",
+    "Users" : "Pengguna",
+    "Groups" : "Grup",
     "Test Configuration" : "Uji Konfigurasi",
     "Help" : "Bantuan",
     "Groups meeting these criteria are available in %s:" : "Grup memenuhi kriteria ini tersedia di %s:",
-    "only those object classes:" : "hanya kelas objek:",
-    "only from those groups:" : "hanya dari kelompok:",
-    "Edit raw filter instead" : "Sunting penyaring raw",
-    "Raw LDAP filter" : "Penyaring LDAP raw",
     "Test Filter" : "Uji Penyaring",
-    "groups found" : "grup ditemukan",
-    "Users login with this attribute:" : "Login pengguna dengan atribut ini:",
-    "LDAP Username:" : "Nama pengguna LDAP:",
-    "LDAP Email Address:" : "Alamat Email LDAP:",
     "Other Attributes:" : "Atribut Lain:",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Tambah Konfigurasi Server",
-    "Delete Configuration" : "Hapus Konfigurasi",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol dapat tidak ditulis, kecuali Anda menggunakan SSL. Lalu jalankan dengan ldaps://",
     "Port" : "Port",
@@ -67,7 +43,6 @@
     "You can specify Base DN for users and groups in the Advanced tab" : "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
     "Manually enter LDAP filters (recommended for large directories)" : "Masukkan penyaring LDAP secara manual (direkomendasikan untuk direktori yang besar)",
     "Limit %s access to users meeting these criteria:" : "Batasi akses %s untuk pengguna yang sesuai dengan kriteria berikut:",
-    "users found" : "pengguna ditemukan",
     "Saving" : "Menyimpan",
     "Back" : "Kembali",
     "Continue" : "Lanjutkan",
diff --git a/apps/user_ldap/l10n/is.js b/apps/user_ldap/l10n/is.js
index 920d3888240..1532ec7baff 100644
--- a/apps/user_ldap/l10n/is.js
+++ b/apps/user_ldap/l10n/is.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Keep settings?" : "Geyma stillingar ?",
-    "Error" : "Villa",
-    "Save" : "Vista",
+    "Users" : "Notendur",
+    "Groups" : "Hópar",
     "Test Configuration" : "Prúfa uppsetningu",
     "Help" : "Hjálp",
     "Host" : "Netþjónn",
diff --git a/apps/user_ldap/l10n/is.json b/apps/user_ldap/l10n/is.json
index 8c676efc7c7..c3ae29c3735 100644
--- a/apps/user_ldap/l10n/is.json
+++ b/apps/user_ldap/l10n/is.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Keep settings?" : "Geyma stillingar ?",
-    "Error" : "Villa",
-    "Save" : "Vista",
+    "Users" : "Notendur",
+    "Groups" : "Hópar",
     "Test Configuration" : "Prúfa uppsetningu",
     "Help" : "Hjálp",
     "Host" : "Netþjónn",
diff --git a/apps/user_ldap/l10n/it.js b/apps/user_ldap/l10n/it.js
index 3d0faefbcd0..f0b06342af2 100644
--- a/apps/user_ldap/l10n/it.js
+++ b/apps/user_ldap/l10n/it.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Nessuna configurazione specificata",
     "No data specified" : "Nessun dato specificato",
     " Could not set configuration %s" : "Impossibile impostare la configurazione %s",
-    "Deletion failed" : "Eliminazione non riuscita",
-    "Take over settings from recent server configuration?" : "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
-    "Keep settings?" : "Vuoi mantenere le impostazioni?",
-    "{nthServer}. Server" : "{nthServer}. server",
-    "Cannot add server configuration" : "Impossibile aggiungere la configurazione del server",
-    "mappings cleared" : "associazioni cancellate",
-    "Success" : "Riuscito",
-    "Error" : "Errore",
-    "Please specify a Base DN" : "Specifica un DN base",
-    "Could not determine Base DN" : "Impossibile determinare il DN base",
-    "Please specify the port" : "Specifica la porta",
-    "Configuration OK" : "Configurazione corretta",
     "Configuration incorrect" : "Configurazione non corretta",
     "Configuration incomplete" : "Configurazione incompleta",
+    "Configuration OK" : "Configurazione corretta",
     "Select groups" : "Seleziona i gruppi",
     "Select object classes" : "Seleziona le classi di oggetti",
-    "Select attributes" : "Seleziona gli attributi",
-    "Connection test succeeded" : "Prova di connessione riuscita",
-    "Connection test failed" : "Prova di connessione non riuscita",
+    "{nthServer}. Server" : "{nthServer}. server",
     "Do you really want to delete the current Server Configuration?" : "Vuoi davvero eliminare la configurazione attuale del server?",
     "Confirm Deletion" : "Conferma l'eliminazione",
+    "Select attributes" : "Seleziona gli attributi",
     "_%s group found_::_%s groups found_" : ["%s gruppo trovato","%s gruppi trovati"],
     "_%s user found_::_%s users found_" : ["%s utente trovato","%s utenti trovati"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossibile rilevare l'attributo nome visualizzato dell'utente. Specificalo nelle impostazioni avanzate di ldap.",
     "Could not find the desired feature" : "Impossibile trovare la funzionalità desiderata",
     "Invalid Host" : "Host non valido",
     "Server" : "Server",
-    "User Filter" : "Filtro utente",
-    "Login Filter" : "Filtro accesso",
-    "Group Filter" : "Filtro gruppo",
-    "Save" : "Salva",
+    "Users" : "Utenti",
+    "Groups" : "Gruppi",
     "Test Configuration" : "Prova configurazione",
     "Help" : "Aiuto",
     "Groups meeting these criteria are available in %s:" : "I gruppi che corrispondono a questi criteri sono disponibili in %s:",
-    "only those object classes:" : "solo queste classi di oggetti:",
-    "only from those groups:" : "solo da questi gruppi:",
-    "Edit raw filter instead" : "Modifica invece il filtro grezzo",
-    "Raw LDAP filter" : "Filtro LDAP grezzo",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Il filtro specifica quali gruppi LDAP devono avere accesso all'istanza %s.",
     "Test Filter" : "Prova filtro",
-    "groups found" : "gruppi trovati",
-    "Users login with this attribute:" : "Utenti con questo attributo:",
-    "LDAP Username:" : "Nome utente LDAP:",
-    "LDAP Email Address:" : "Indirizzo email LDAP:",
     "Other Attributes:" : "Altri attributi:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso. Esempio: \"uid=%%uid\"",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
-    "Add Server Configuration" : "Aggiungi configurazione del server",
-    "Delete Configuration" : "Elimina configurazione",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
     "Port" : "Porta",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Digita manualmente i filtri LDAP (consigliato per directory grandi)",
     "Limit %s access to users meeting these criteria:" : "Limita l'accesso a %s ai gruppi che verificano questi criteri:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Il filtro specifica quali utenti LDAP devono avere accesso all'istanza %s.",
-    "users found" : "utenti trovati",
     "Saving" : "Salvataggio",
     "Back" : "Indietro",
     "Continue" : "Continua",
diff --git a/apps/user_ldap/l10n/it.json b/apps/user_ldap/l10n/it.json
index c5c4950379e..115bdb3b0cd 100644
--- a/apps/user_ldap/l10n/it.json
+++ b/apps/user_ldap/l10n/it.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Nessuna configurazione specificata",
     "No data specified" : "Nessun dato specificato",
     " Could not set configuration %s" : "Impossibile impostare la configurazione %s",
-    "Deletion failed" : "Eliminazione non riuscita",
-    "Take over settings from recent server configuration?" : "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
-    "Keep settings?" : "Vuoi mantenere le impostazioni?",
-    "{nthServer}. Server" : "{nthServer}. server",
-    "Cannot add server configuration" : "Impossibile aggiungere la configurazione del server",
-    "mappings cleared" : "associazioni cancellate",
-    "Success" : "Riuscito",
-    "Error" : "Errore",
-    "Please specify a Base DN" : "Specifica un DN base",
-    "Could not determine Base DN" : "Impossibile determinare il DN base",
-    "Please specify the port" : "Specifica la porta",
-    "Configuration OK" : "Configurazione corretta",
     "Configuration incorrect" : "Configurazione non corretta",
     "Configuration incomplete" : "Configurazione incompleta",
+    "Configuration OK" : "Configurazione corretta",
     "Select groups" : "Seleziona i gruppi",
     "Select object classes" : "Seleziona le classi di oggetti",
-    "Select attributes" : "Seleziona gli attributi",
-    "Connection test succeeded" : "Prova di connessione riuscita",
-    "Connection test failed" : "Prova di connessione non riuscita",
+    "{nthServer}. Server" : "{nthServer}. server",
     "Do you really want to delete the current Server Configuration?" : "Vuoi davvero eliminare la configurazione attuale del server?",
     "Confirm Deletion" : "Conferma l'eliminazione",
+    "Select attributes" : "Seleziona gli attributi",
     "_%s group found_::_%s groups found_" : ["%s gruppo trovato","%s gruppi trovati"],
     "_%s user found_::_%s users found_" : ["%s utente trovato","%s utenti trovati"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossibile rilevare l'attributo nome visualizzato dell'utente. Specificalo nelle impostazioni avanzate di ldap.",
     "Could not find the desired feature" : "Impossibile trovare la funzionalità desiderata",
     "Invalid Host" : "Host non valido",
     "Server" : "Server",
-    "User Filter" : "Filtro utente",
-    "Login Filter" : "Filtro accesso",
-    "Group Filter" : "Filtro gruppo",
-    "Save" : "Salva",
+    "Users" : "Utenti",
+    "Groups" : "Gruppi",
     "Test Configuration" : "Prova configurazione",
     "Help" : "Aiuto",
     "Groups meeting these criteria are available in %s:" : "I gruppi che corrispondono a questi criteri sono disponibili in %s:",
-    "only those object classes:" : "solo queste classi di oggetti:",
-    "only from those groups:" : "solo da questi gruppi:",
-    "Edit raw filter instead" : "Modifica invece il filtro grezzo",
-    "Raw LDAP filter" : "Filtro LDAP grezzo",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Il filtro specifica quali gruppi LDAP devono avere accesso all'istanza %s.",
     "Test Filter" : "Prova filtro",
-    "groups found" : "gruppi trovati",
-    "Users login with this attribute:" : "Utenti con questo attributo:",
-    "LDAP Username:" : "Nome utente LDAP:",
-    "LDAP Email Address:" : "Indirizzo email LDAP:",
     "Other Attributes:" : "Altri attributi:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso. Esempio: \"uid=%%uid\"",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
-    "Add Server Configuration" : "Aggiungi configurazione del server",
-    "Delete Configuration" : "Elimina configurazione",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
     "Port" : "Porta",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Digita manualmente i filtri LDAP (consigliato per directory grandi)",
     "Limit %s access to users meeting these criteria:" : "Limita l'accesso a %s ai gruppi che verificano questi criteri:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Il filtro specifica quali utenti LDAP devono avere accesso all'istanza %s.",
-    "users found" : "utenti trovati",
     "Saving" : "Salvataggio",
     "Back" : "Indietro",
     "Continue" : "Continua",
diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js
index 84ae5b22991..fd2ef9c9145 100644
--- a/apps/user_ldap/l10n/ja.js
+++ b/apps/user_ldap/l10n/ja.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "構成が指定されていません",
     "No data specified" : "データが指定されていません",
     " Could not set configuration %s" : "構成 %s を設定できませんでした",
-    "Deletion failed" : "削除に失敗しました",
-    "Take over settings from recent server configuration?" : "最新のサーバー設定から設定を引き継ぎますか？",
-    "Keep settings?" : "設定を保持しますか？",
-    "{nthServer}. Server" : "{nthServer}. サーバー",
-    "Cannot add server configuration" : "サーバー設定を追加できません",
-    "mappings cleared" : "マッピングをクリアしました",
-    "Success" : "成功",
-    "Error" : "エラー",
-    "Please specify a Base DN" : "ベースDN を指定してください",
-    "Could not determine Base DN" : "ベースDNを決定できませんでした",
-    "Please specify the port" : "ポートを指定してください",
-    "Configuration OK" : "設定OK",
     "Configuration incorrect" : "設定に誤りがあります",
     "Configuration incomplete" : "設定が不完全です",
+    "Configuration OK" : "設定OK",
     "Select groups" : "グループを選択",
     "Select object classes" : "オブジェクトクラスを選択",
-    "Select attributes" : "属性を選択",
-    "Connection test succeeded" : "接続テストに成功しました",
-    "Connection test failed" : "接続テストに失敗しました",
+    "{nthServer}. Server" : "{nthServer}. サーバー",
     "Do you really want to delete the current Server Configuration?" : "現在のサーバー設定を本当に削除してもよろしいですか？",
     "Confirm Deletion" : "削除の確認",
+    "Select attributes" : "属性を選択",
     "_%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." : "ユーザー表示名の属性を検出できませんでした。詳細設定で対応する属性を指定してください。",
     "Could not find the desired feature" : "望ましい機能は見つかりませんでした",
     "Invalid Host" : "無効なホスト",
     "Server" : "サーバー",
-    "User Filter" : "ユーザーフィルター",
-    "Login Filter" : "ログインフィルター",
-    "Group Filter" : "グループフィルター",
-    "Save" : "保存",
+    "Users" : "ユーザー",
+    "Groups" : "グループ",
     "Test Configuration" : "設定をテスト",
     "Help" : "ヘルプ",
     "Groups meeting these criteria are available in %s:" : "これらの基準を満たすグループが %s で利用可能:",
-    "only those object classes:" : "このオブジェクトクラスのみ:",
-    "only from those groups:" : "次のグループから:",
-    "Edit raw filter instead" : "フィルターを直接編集",
-    "Raw LDAP filter" : "LDAPフィルター",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルターは、どの LDAP グループが %s にアクセスするかを指定します。",
     "Test Filter" : "フィルターをテスト",
-    "groups found" : "グループが見つかりました",
-    "Users login with this attribute:" : "この属性でユーザーログイン:",
-    "LDAP Username:" : "LDAPユーザー名:",
-    "LDAP Email Address:" : "LDAPメールアドレス:",
     "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\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. サーバー:",
-    "Add Server Configuration" : "サーバー設定を追加",
-    "Delete Configuration" : "設定を削除",
     "Host" : "ホスト",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
     "Port" : "ポート",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
     "Limit %s access to users meeting these criteria:" : "以下のフィルターに適合するユーザーのみ %s へアクセスを許可:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "フィルターは、どのLDAPユーザーが %s にアクセスするかを指定します。",
-    "users found" : "ユーザーが見つかりました",
     "Saving" : "保存中",
     "Back" : "戻る",
     "Continue" : "続ける",
diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json
index a03d120b1e8..7117cb0ec17 100644
--- a/apps/user_ldap/l10n/ja.json
+++ b/apps/user_ldap/l10n/ja.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "構成が指定されていません",
     "No data specified" : "データが指定されていません",
     " Could not set configuration %s" : "構成 %s を設定できませんでした",
-    "Deletion failed" : "削除に失敗しました",
-    "Take over settings from recent server configuration?" : "最新のサーバー設定から設定を引き継ぎますか？",
-    "Keep settings?" : "設定を保持しますか？",
-    "{nthServer}. Server" : "{nthServer}. サーバー",
-    "Cannot add server configuration" : "サーバー設定を追加できません",
-    "mappings cleared" : "マッピングをクリアしました",
-    "Success" : "成功",
-    "Error" : "エラー",
-    "Please specify a Base DN" : "ベースDN を指定してください",
-    "Could not determine Base DN" : "ベースDNを決定できませんでした",
-    "Please specify the port" : "ポートを指定してください",
-    "Configuration OK" : "設定OK",
     "Configuration incorrect" : "設定に誤りがあります",
     "Configuration incomplete" : "設定が不完全です",
+    "Configuration OK" : "設定OK",
     "Select groups" : "グループを選択",
     "Select object classes" : "オブジェクトクラスを選択",
-    "Select attributes" : "属性を選択",
-    "Connection test succeeded" : "接続テストに成功しました",
-    "Connection test failed" : "接続テストに失敗しました",
+    "{nthServer}. Server" : "{nthServer}. サーバー",
     "Do you really want to delete the current Server Configuration?" : "現在のサーバー設定を本当に削除してもよろしいですか？",
     "Confirm Deletion" : "削除の確認",
+    "Select attributes" : "属性を選択",
     "_%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." : "ユーザー表示名の属性を検出できませんでした。詳細設定で対応する属性を指定してください。",
     "Could not find the desired feature" : "望ましい機能は見つかりませんでした",
     "Invalid Host" : "無効なホスト",
     "Server" : "サーバー",
-    "User Filter" : "ユーザーフィルター",
-    "Login Filter" : "ログインフィルター",
-    "Group Filter" : "グループフィルター",
-    "Save" : "保存",
+    "Users" : "ユーザー",
+    "Groups" : "グループ",
     "Test Configuration" : "設定をテスト",
     "Help" : "ヘルプ",
     "Groups meeting these criteria are available in %s:" : "これらの基準を満たすグループが %s で利用可能:",
-    "only those object classes:" : "このオブジェクトクラスのみ:",
-    "only from those groups:" : "次のグループから:",
-    "Edit raw filter instead" : "フィルターを直接編集",
-    "Raw LDAP filter" : "LDAPフィルター",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルターは、どの LDAP グループが %s にアクセスするかを指定します。",
     "Test Filter" : "フィルターをテスト",
-    "groups found" : "グループが見つかりました",
-    "Users login with this attribute:" : "この属性でユーザーログイン:",
-    "LDAP Username:" : "LDAPユーザー名:",
-    "LDAP Email Address:" : "LDAPメールアドレス:",
     "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\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. サーバー:",
-    "Add Server Configuration" : "サーバー設定を追加",
-    "Delete Configuration" : "設定を削除",
     "Host" : "ホスト",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
     "Port" : "ポート",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
     "Limit %s access to users meeting these criteria:" : "以下のフィルターに適合するユーザーのみ %s へアクセスを許可:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "フィルターは、どのLDAPユーザーが %s にアクセスするかを指定します。",
-    "users found" : "ユーザーが見つかりました",
     "Saving" : "保存中",
     "Back" : "戻る",
     "Continue" : "続ける",
diff --git a/apps/user_ldap/l10n/ka_GE.js b/apps/user_ldap/l10n/ka_GE.js
index 8258d994a9d..c2fc858d153 100644
--- a/apps/user_ldap/l10n/ka_GE.js
+++ b/apps/user_ldap/l10n/ka_GE.js
@@ -4,22 +4,13 @@ OC.L10N.register(
     "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." : "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.",
-    "Deletion failed" : "წაშლა ვერ განხორციელდა",
-    "Take over settings from recent server configuration?" : "დაბრუნდებით სერვერის წინა კონფიგურაციაში?",
-    "Keep settings?" : "დავტოვოთ პარამეტრები?",
-    "Cannot add server configuration" : "სერვერის პარამეტრების დამატება ვერ მოხერხდა",
-    "Success" : "დასრულდა",
-    "Error" : "შეცდომა",
     "Select groups" : "ჯგუფების არჩევა",
-    "Connection test succeeded" : "კავშირის ტესტირება მოხერხდა",
-    "Connection test failed" : "კავშირის ტესტირება ვერ მოხერხდა",
     "Do you really want to delete the current Server Configuration?" : "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?",
     "Confirm Deletion" : "წაშლის დადასტურება",
-    "Group Filter" : "ჯგუფის ფილტრი",
-    "Save" : "შენახვა",
+    "Users" : "მომხმარებელი",
+    "Groups" : "ჯგუფები",
     "Test Configuration" : "კავშირის ტესტირება",
     "Help" : "დახმარება",
-    "Add Server Configuration" : "სერვერის პარამეტრების დამატება",
     "Host" : "ჰოსტი",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "თქვენ შეგიძლიათ გამოტოვოთ პროტოკოლი. გარდა ამისა გჭირდებათ SSL. შემდეგ დაიწყეთ ldaps://",
     "Port" : "პორტი",
diff --git a/apps/user_ldap/l10n/ka_GE.json b/apps/user_ldap/l10n/ka_GE.json
index 432ec44637d..be93dc5a626 100644
--- a/apps/user_ldap/l10n/ka_GE.json
+++ b/apps/user_ldap/l10n/ka_GE.json
@@ -2,22 +2,13 @@
     "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." : "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.",
-    "Deletion failed" : "წაშლა ვერ განხორციელდა",
-    "Take over settings from recent server configuration?" : "დაბრუნდებით სერვერის წინა კონფიგურაციაში?",
-    "Keep settings?" : "დავტოვოთ პარამეტრები?",
-    "Cannot add server configuration" : "სერვერის პარამეტრების დამატება ვერ მოხერხდა",
-    "Success" : "დასრულდა",
-    "Error" : "შეცდომა",
     "Select groups" : "ჯგუფების არჩევა",
-    "Connection test succeeded" : "კავშირის ტესტირება მოხერხდა",
-    "Connection test failed" : "კავშირის ტესტირება ვერ მოხერხდა",
     "Do you really want to delete the current Server Configuration?" : "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?",
     "Confirm Deletion" : "წაშლის დადასტურება",
-    "Group Filter" : "ჯგუფის ფილტრი",
-    "Save" : "შენახვა",
+    "Users" : "მომხმარებელი",
+    "Groups" : "ჯგუფები",
     "Test Configuration" : "კავშირის ტესტირება",
     "Help" : "დახმარება",
-    "Add Server Configuration" : "სერვერის პარამეტრების დამატება",
     "Host" : "ჰოსტი",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "თქვენ შეგიძლიათ გამოტოვოთ პროტოკოლი. გარდა ამისა გჭირდებათ SSL. შემდეგ დაიწყეთ ldaps://",
     "Port" : "პორტი",
diff --git a/apps/user_ldap/l10n/km.js b/apps/user_ldap/l10n/km.js
index 31d78a10c64..a42ee7b14f1 100644
--- a/apps/user_ldap/l10n/km.js
+++ b/apps/user_ldap/l10n/km.js
@@ -2,17 +2,11 @@ OC.L10N.register(
     "user_ldap",
     {
     "Failed to delete the server configuration" : "លុប​ការ​កំណត់​រចនា​សម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ មិន​បាន​សម្រេច",
-    "Deletion failed" : "លុប​មិន​បាន​សម្រេច",
-    "Keep settings?" : "រក្សា​ទុក​ការ​កំណត់?",
-    "Cannot add server configuration" : "មិន​អាច​បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
-    "Error" : "កំហុស",
-    "Connection test succeeded" : "សាក​ល្បង​ការ​ត​ភ្ជាប់ បាន​ជោគជ័យ",
-    "Connection test failed" : "សាកល្បង​ការ​តភ្ជាប់ មិន​បាន​សម្រេច",
     "Do you really want to delete the current Server Configuration?" : "តើ​អ្នក​ពិត​ជា​ចង់​លុប​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ​បច្ចុប្បន្ន​មែន​ទេ?",
     "Confirm Deletion" : "បញ្ជាក់​ការ​លុប",
-    "Save" : "រក្សាទុក",
+    "Users" : "អ្នកប្រើ",
+    "Groups" : "ក្រុ",
     "Help" : "ជំនួយ",
-    "Add Server Configuration" : "បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
     "Host" : "ម៉ាស៊ីន​ផ្ទុក",
     "Port" : "ច្រក",
     "Password" : "ពាក្យសម្ងាត់",
diff --git a/apps/user_ldap/l10n/km.json b/apps/user_ldap/l10n/km.json
index ef431cbff4f..5c8ec8897ba 100644
--- a/apps/user_ldap/l10n/km.json
+++ b/apps/user_ldap/l10n/km.json
@@ -1,16 +1,10 @@
 { "translations": {
     "Failed to delete the server configuration" : "លុប​ការ​កំណត់​រចនា​សម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ មិន​បាន​សម្រេច",
-    "Deletion failed" : "លុប​មិន​បាន​សម្រេច",
-    "Keep settings?" : "រក្សា​ទុក​ការ​កំណត់?",
-    "Cannot add server configuration" : "មិន​អាច​បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
-    "Error" : "កំហុស",
-    "Connection test succeeded" : "សាក​ល្បង​ការ​ត​ភ្ជាប់ បាន​ជោគជ័យ",
-    "Connection test failed" : "សាកល្បង​ការ​តភ្ជាប់ មិន​បាន​សម្រេច",
     "Do you really want to delete the current Server Configuration?" : "តើ​អ្នក​ពិត​ជា​ចង់​លុប​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ​បច្ចុប្បន្ន​មែន​ទេ?",
     "Confirm Deletion" : "បញ្ជាក់​ការ​លុប",
-    "Save" : "រក្សាទុក",
+    "Users" : "អ្នកប្រើ",
+    "Groups" : "ក្រុ",
     "Help" : "ជំនួយ",
-    "Add Server Configuration" : "បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
     "Host" : "ម៉ាស៊ីន​ផ្ទុក",
     "Port" : "ច្រក",
     "Password" : "ពាក្យសម្ងាត់",
diff --git a/apps/user_ldap/l10n/kn.js b/apps/user_ldap/l10n/kn.js
index 5731cd96b65..f70fc699983 100644
--- a/apps/user_ldap/l10n/kn.js
+++ b/apps/user_ldap/l10n/kn.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "ತಪ್ಪಾಗಿದೆ",
-    "Save" : "ಉಳಿಸಿ",
+    "Users" : "ಬಳಕೆದಾರರು",
+    "Groups" : "ಗುಂಪುಗಳು",
     "Help" : "ಸಹಾಯ",
     "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
     "Port" : "ರೇವು",
diff --git a/apps/user_ldap/l10n/kn.json b/apps/user_ldap/l10n/kn.json
index 8cb3c34a54d..39705ffba6a 100644
--- a/apps/user_ldap/l10n/kn.json
+++ b/apps/user_ldap/l10n/kn.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Error" : "ತಪ್ಪಾಗಿದೆ",
-    "Save" : "ಉಳಿಸಿ",
+    "Users" : "ಬಳಕೆದಾರರು",
+    "Groups" : "ಗುಂಪುಗಳು",
     "Help" : "ಸಹಾಯ",
     "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
     "Port" : "ರೇವು",
diff --git a/apps/user_ldap/l10n/ko.js b/apps/user_ldap/l10n/ko.js
index 85607d571b6..94be236ab63 100644
--- a/apps/user_ldap/l10n/ko.js
+++ b/apps/user_ldap/l10n/ko.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "설정이 지정되지 않음",
     "No data specified" : "데이터가 지정되지 않음",
     " Could not set configuration %s" : " 설정 %s을(를) 지정할 수 없음",
-    "Deletion failed" : "삭제 실패",
-    "Take over settings from recent server configuration?" : "최근 서버 설정을 다시 불러오시겠습니까?",
-    "Keep settings?" : "설정을 유지하겠습니까?",
-    "{nthServer}. Server" : "{nthServer}. 서버",
-    "Cannot add server configuration" : "서버 설정을 추가할 수 없음",
-    "mappings cleared" : "매핑 삭제됨",
-    "Success" : "성공",
-    "Error" : "오류",
-    "Please specify a Base DN" : "기본 DN을 입력하십시오",
-    "Could not determine Base DN" : "기본 DN을 결정할 수 없음",
-    "Please specify the port" : "포트를 입력하십시오",
-    "Configuration OK" : "설정 올바름",
     "Configuration incorrect" : "설정 올바르지 않음",
     "Configuration incomplete" : "설정 불완전함",
+    "Configuration OK" : "설정 올바름",
     "Select groups" : "그룹 선택",
     "Select object classes" : "객체 클래스 선택",
-    "Select attributes" : "속성 선택",
-    "Connection test succeeded" : "연결 시험 성공",
-    "Connection test failed" : "연결 시험 실패",
+    "{nthServer}. Server" : "{nthServer}. 서버",
     "Do you really want to delete the current Server Configuration?" : "현재 서버 설정을 지우시겠습니까?",
     "Confirm Deletion" : "삭제 확인",
+    "Select attributes" : "속성 선택",
     "_%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" : "잘못된 호스트",
     "Server" : "서버",
-    "User Filter" : "사용자 필터",
-    "Login Filter" : "로그인 필터",
-    "Group Filter" : "그룹 필터",
-    "Save" : "저장",
+    "Users" : "사용자",
+    "Groups" : "그룹",
     "Test Configuration" : "설정 시험",
     "Help" : "도움말",
     "Groups meeting these criteria are available in %s:" : "이 조건을 만족하는 그룹은 %s에 있습니다:",
-    "only those object classes:" : "다음 객체 클래스만:",
-    "only from those groups:" : "다음 그룹에서만:",
-    "Edit raw filter instead" : "필터 직접 편집",
-    "Raw LDAP filter" : "LDAP 필터",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 그룹을 설정합니다.",
     "Test Filter" : "필터 시험",
-    "groups found" : "그룹 찾음",
-    "Users login with this attribute:" : "다음 속성으로 사용자 로그인:",
-    "LDAP Username:" : "LDAP 사용자 이름:",
-    "LDAP Email Address:" : "LDAP 이메일 주소:",
     "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\"",
     "1. Server" : "1. 서버",
     "%s. Server:" : "%s. 서버:",
-    "Add Server Configuration" : "서버 설정 추가",
-    "Delete Configuration" : "설정 삭제",
     "Host" : "호스트",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL을 사용하지 않으면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오.",
     "Port" : "포트",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "수동으로 LDAP 필터 입력(대형 사이트에 추천)",
     "Limit %s access to users meeting these criteria:" : "다음 조건을 만족하는 사용자만 %s 접근 허용:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 사용자를 설정합니다.",
-    "users found" : "사용자 찾음",
     "Saving" : "저장 중",
     "Back" : "뒤로",
     "Continue" : "계속",
diff --git a/apps/user_ldap/l10n/ko.json b/apps/user_ldap/l10n/ko.json
index 9179f76480e..d426febafcd 100644
--- a/apps/user_ldap/l10n/ko.json
+++ b/apps/user_ldap/l10n/ko.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "설정이 지정되지 않음",
     "No data specified" : "데이터가 지정되지 않음",
     " Could not set configuration %s" : " 설정 %s을(를) 지정할 수 없음",
-    "Deletion failed" : "삭제 실패",
-    "Take over settings from recent server configuration?" : "최근 서버 설정을 다시 불러오시겠습니까?",
-    "Keep settings?" : "설정을 유지하겠습니까?",
-    "{nthServer}. Server" : "{nthServer}. 서버",
-    "Cannot add server configuration" : "서버 설정을 추가할 수 없음",
-    "mappings cleared" : "매핑 삭제됨",
-    "Success" : "성공",
-    "Error" : "오류",
-    "Please specify a Base DN" : "기본 DN을 입력하십시오",
-    "Could not determine Base DN" : "기본 DN을 결정할 수 없음",
-    "Please specify the port" : "포트를 입력하십시오",
-    "Configuration OK" : "설정 올바름",
     "Configuration incorrect" : "설정 올바르지 않음",
     "Configuration incomplete" : "설정 불완전함",
+    "Configuration OK" : "설정 올바름",
     "Select groups" : "그룹 선택",
     "Select object classes" : "객체 클래스 선택",
-    "Select attributes" : "속성 선택",
-    "Connection test succeeded" : "연결 시험 성공",
-    "Connection test failed" : "연결 시험 실패",
+    "{nthServer}. Server" : "{nthServer}. 서버",
     "Do you really want to delete the current Server Configuration?" : "현재 서버 설정을 지우시겠습니까?",
     "Confirm Deletion" : "삭제 확인",
+    "Select attributes" : "속성 선택",
     "_%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" : "잘못된 호스트",
     "Server" : "서버",
-    "User Filter" : "사용자 필터",
-    "Login Filter" : "로그인 필터",
-    "Group Filter" : "그룹 필터",
-    "Save" : "저장",
+    "Users" : "사용자",
+    "Groups" : "그룹",
     "Test Configuration" : "설정 시험",
     "Help" : "도움말",
     "Groups meeting these criteria are available in %s:" : "이 조건을 만족하는 그룹은 %s에 있습니다:",
-    "only those object classes:" : "다음 객체 클래스만:",
-    "only from those groups:" : "다음 그룹에서만:",
-    "Edit raw filter instead" : "필터 직접 편집",
-    "Raw LDAP filter" : "LDAP 필터",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 그룹을 설정합니다.",
     "Test Filter" : "필터 시험",
-    "groups found" : "그룹 찾음",
-    "Users login with this attribute:" : "다음 속성으로 사용자 로그인:",
-    "LDAP Username:" : "LDAP 사용자 이름:",
-    "LDAP Email Address:" : "LDAP 이메일 주소:",
     "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\"",
     "1. Server" : "1. 서버",
     "%s. Server:" : "%s. 서버:",
-    "Add Server Configuration" : "서버 설정 추가",
-    "Delete Configuration" : "설정 삭제",
     "Host" : "호스트",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL을 사용하지 않으면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오.",
     "Port" : "포트",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "수동으로 LDAP 필터 입력(대형 사이트에 추천)",
     "Limit %s access to users meeting these criteria:" : "다음 조건을 만족하는 사용자만 %s 접근 허용:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 사용자를 설정합니다.",
-    "users found" : "사용자 찾음",
     "Saving" : "저장 중",
     "Back" : "뒤로",
     "Continue" : "계속",
diff --git a/apps/user_ldap/l10n/ku_IQ.js b/apps/user_ldap/l10n/ku_IQ.js
index 0efd01a4fc2..35a4747c8e1 100644
--- a/apps/user_ldap/l10n/ku_IQ.js
+++ b/apps/user_ldap/l10n/ku_IQ.js
@@ -1,9 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Success" : "سه‌رکه‌وتن",
-    "Error" : "هه‌ڵه",
-    "Save" : "پاشکه‌وتکردن",
+    "Users" : "به‌كارهێنه‌ر",
     "Help" : "یارمەتی",
     "Password" : "وشەی تێپەربو",
     "Advanced" : "هه‌ڵبژاردنی پیشكه‌وتوو"
diff --git a/apps/user_ldap/l10n/ku_IQ.json b/apps/user_ldap/l10n/ku_IQ.json
index ecb9742663b..0b776905a9a 100644
--- a/apps/user_ldap/l10n/ku_IQ.json
+++ b/apps/user_ldap/l10n/ku_IQ.json
@@ -1,7 +1,5 @@
 { "translations": {
-    "Success" : "سه‌رکه‌وتن",
-    "Error" : "هه‌ڵه",
-    "Save" : "پاشکه‌وتکردن",
+    "Users" : "به‌كارهێنه‌ر",
     "Help" : "یارمەتی",
     "Password" : "وشەی تێپەربو",
     "Advanced" : "هه‌ڵبژاردنی پیشكه‌وتوو"
diff --git a/apps/user_ldap/l10n/lb.js b/apps/user_ldap/l10n/lb.js
index 69cd462ffc1..78e8ca45c38 100644
--- a/apps/user_ldap/l10n/lb.js
+++ b/apps/user_ldap/l10n/lb.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Konnt net läschen",
-    "Error" : "Fehler",
-    "Save" : "Späicheren",
+    "Users" : "Benotzer",
+    "Groups" : "Gruppen",
     "Help" : "Hëllef",
     "Host" : "Host",
     "Password" : "Passwuert",
diff --git a/apps/user_ldap/l10n/lb.json b/apps/user_ldap/l10n/lb.json
index 9b2d7ff9da0..7776bf5e76a 100644
--- a/apps/user_ldap/l10n/lb.json
+++ b/apps/user_ldap/l10n/lb.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Konnt net läschen",
-    "Error" : "Fehler",
-    "Save" : "Späicheren",
+    "Users" : "Benotzer",
+    "Groups" : "Gruppen",
     "Help" : "Hëllef",
     "Host" : "Host",
     "Password" : "Passwuert",
diff --git a/apps/user_ldap/l10n/lt_LT.js b/apps/user_ldap/l10n/lt_LT.js
index ca6ae94c622..84d3cb8463e 100644
--- a/apps/user_ldap/l10n/lt_LT.js
+++ b/apps/user_ldap/l10n/lt_LT.js
@@ -4,22 +4,13 @@ OC.L10N.register(
     "Failed to clear the mappings." : "Nepavyko išvalyti sąsajų.",
     "Failed to delete the server configuration" : "Nepavyko pašalinti serverio konfigūracijos",
     "The configuration is valid and the connection could be established!" : "Konfigūracija yra tinkama bei prisijungta sėkmingai!",
-    "Deletion failed" : "Ištrinti nepavyko",
-    "Keep settings?" : "Išlaikyti nustatymus?",
-    "Cannot add server configuration" : "Negalima pridėti serverio konfigūracijos",
-    "mappings cleared" : "susiejimai išvalyti",
-    "Success" : "Sėkmingai",
-    "Error" : "Klaida",
     "Select groups" : "Pasirinkti grupes",
-    "Connection test succeeded" : "Ryšio patikrinimas pavyko",
-    "Connection test failed" : "Ryšio patikrinimas nepavyko",
     "Do you really want to delete the current Server Configuration?" : "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?",
     "Confirm Deletion" : "Patvirtinkite trynimą",
-    "Group Filter" : "Grupės filtras",
-    "Save" : "Išsaugoti",
+    "Users" : "Vartotojai",
+    "Groups" : "Grupės",
     "Test Configuration" : "Bandyti konfigūraciją",
     "Help" : "Pagalba",
-    "Add Server Configuration" : "Pridėti serverio konfigūraciją",
     "Host" : "Mazgas",
     "Port" : "Prievadas",
     "User DN" : "Naudotojas DN",
diff --git a/apps/user_ldap/l10n/lt_LT.json b/apps/user_ldap/l10n/lt_LT.json
index 982af1cc4f4..fd385a1e8dc 100644
--- a/apps/user_ldap/l10n/lt_LT.json
+++ b/apps/user_ldap/l10n/lt_LT.json
@@ -2,22 +2,13 @@
     "Failed to clear the mappings." : "Nepavyko išvalyti sąsajų.",
     "Failed to delete the server configuration" : "Nepavyko pašalinti serverio konfigūracijos",
     "The configuration is valid and the connection could be established!" : "Konfigūracija yra tinkama bei prisijungta sėkmingai!",
-    "Deletion failed" : "Ištrinti nepavyko",
-    "Keep settings?" : "Išlaikyti nustatymus?",
-    "Cannot add server configuration" : "Negalima pridėti serverio konfigūracijos",
-    "mappings cleared" : "susiejimai išvalyti",
-    "Success" : "Sėkmingai",
-    "Error" : "Klaida",
     "Select groups" : "Pasirinkti grupes",
-    "Connection test succeeded" : "Ryšio patikrinimas pavyko",
-    "Connection test failed" : "Ryšio patikrinimas nepavyko",
     "Do you really want to delete the current Server Configuration?" : "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?",
     "Confirm Deletion" : "Patvirtinkite trynimą",
-    "Group Filter" : "Grupės filtras",
-    "Save" : "Išsaugoti",
+    "Users" : "Vartotojai",
+    "Groups" : "Grupės",
     "Test Configuration" : "Bandyti konfigūraciją",
     "Help" : "Pagalba",
-    "Add Server Configuration" : "Pridėti serverio konfigūraciją",
     "Host" : "Mazgas",
     "Port" : "Prievadas",
     "User DN" : "Naudotojas DN",
diff --git a/apps/user_ldap/l10n/lv.js b/apps/user_ldap/l10n/lv.js
index 270bf16e926..b671b528729 100644
--- a/apps/user_ldap/l10n/lv.js
+++ b/apps/user_ldap/l10n/lv.js
@@ -4,21 +4,13 @@ OC.L10N.register(
     "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.",
-    "Deletion failed" : "Neizdevās izdzēst",
-    "Take over settings from recent server configuration?" : "Paņemt iestatījumus no nesenas servera konfigurācijas?",
-    "Keep settings?" : "Paturēt iestatījumus?",
-    "Cannot add server configuration" : "Nevar pievienot servera konfigurāciju",
-    "Error" : "Kļūda",
     "Select groups" : "Izvēlieties grupas",
-    "Connection test succeeded" : "Savienojuma tests ir veiksmīgs",
-    "Connection test failed" : "Savienojuma tests cieta neveiksmi",
     "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",
-    "Group Filter" : "Grupu filtrs",
-    "Save" : "Saglabāt",
+    "Users" : "Lietotāji",
+    "Groups" : "Grupas",
     "Test Configuration" : "Testa konfigurācija",
     "Help" : "Palīdzība",
-    "Add Server Configuration" : "Pievienot servera konfigurāciju",
     "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",
diff --git a/apps/user_ldap/l10n/lv.json b/apps/user_ldap/l10n/lv.json
index 4d628f3a65e..44f2b7c048d 100644
--- a/apps/user_ldap/l10n/lv.json
+++ b/apps/user_ldap/l10n/lv.json
@@ -2,21 +2,13 @@
     "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.",
-    "Deletion failed" : "Neizdevās izdzēst",
-    "Take over settings from recent server configuration?" : "Paņemt iestatījumus no nesenas servera konfigurācijas?",
-    "Keep settings?" : "Paturēt iestatījumus?",
-    "Cannot add server configuration" : "Nevar pievienot servera konfigurāciju",
-    "Error" : "Kļūda",
     "Select groups" : "Izvēlieties grupas",
-    "Connection test succeeded" : "Savienojuma tests ir veiksmīgs",
-    "Connection test failed" : "Savienojuma tests cieta neveiksmi",
     "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",
-    "Group Filter" : "Grupu filtrs",
-    "Save" : "Saglabāt",
+    "Users" : "Lietotāji",
+    "Groups" : "Grupas",
     "Test Configuration" : "Testa konfigurācija",
     "Help" : "Palīdzība",
-    "Add Server Configuration" : "Pievienot servera konfigurāciju",
     "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",
diff --git a/apps/user_ldap/l10n/mk.js b/apps/user_ldap/l10n/mk.js
index 647a3de34e0..560aa4b6b8c 100644
--- a/apps/user_ldap/l10n/mk.js
+++ b/apps/user_ldap/l10n/mk.js
@@ -1,14 +1,9 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Бришењето е неуспешно",
-    "Keep settings?" : "Да ги сочувам нагодувањата?",
-    "Cannot add server configuration" : "Не можам да ја додадам конфигурацијата на серверот",
-    "Error" : "Грешка",
-    "Connection test succeeded" : "Тестот за поврзување е успешен",
-    "Connection test failed" : "Тестот за поврзување не е успешен",
     "Confirm Deletion" : "Потврдете го бришењето",
-    "Save" : "Сними",
+    "Users" : "Корисници",
+    "Groups" : "Групи",
     "Help" : "Помош",
     "Host" : "Домаќин",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://",
diff --git a/apps/user_ldap/l10n/mk.json b/apps/user_ldap/l10n/mk.json
index c36be82ae88..85fab2fb2d1 100644
--- a/apps/user_ldap/l10n/mk.json
+++ b/apps/user_ldap/l10n/mk.json
@@ -1,12 +1,7 @@
 { "translations": {
-    "Deletion failed" : "Бришењето е неуспешно",
-    "Keep settings?" : "Да ги сочувам нагодувањата?",
-    "Cannot add server configuration" : "Не можам да ја додадам конфигурацијата на серверот",
-    "Error" : "Грешка",
-    "Connection test succeeded" : "Тестот за поврзување е успешен",
-    "Connection test failed" : "Тестот за поврзување не е успешен",
     "Confirm Deletion" : "Потврдете го бришењето",
-    "Save" : "Сними",
+    "Users" : "Корисници",
+    "Groups" : "Групи",
     "Help" : "Помош",
     "Host" : "Домаќин",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://",
diff --git a/apps/user_ldap/l10n/mn.js b/apps/user_ldap/l10n/mn.js
index fd9e5c652b0..304c0247840 100644
--- a/apps/user_ldap/l10n/mn.js
+++ b/apps/user_ldap/l10n/mn.js
@@ -1,7 +1,6 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Save" : "Хадгалах",
     "Password" : "Нууц үг"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/mn.json b/apps/user_ldap/l10n/mn.json
index 5e4e1a6572e..13788221f43 100644
--- a/apps/user_ldap/l10n/mn.json
+++ b/apps/user_ldap/l10n/mn.json
@@ -1,5 +1,4 @@
 { "translations": {
-    "Save" : "Хадгалах",
     "Password" : "Нууц үг"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ms_MY.js b/apps/user_ldap/l10n/ms_MY.js
index 5b318d77a98..74bdc1b820f 100644
--- a/apps/user_ldap/l10n/ms_MY.js
+++ b/apps/user_ldap/l10n/ms_MY.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Pemadaman gagal",
-    "Error" : "Ralat",
-    "Save" : "Simpan",
+    "Users" : "Pengguna",
+    "Groups" : "Kumpulan",
     "Help" : "Bantuan",
     "Password" : "Kata laluan",
     "Back" : "Kembali",
diff --git a/apps/user_ldap/l10n/ms_MY.json b/apps/user_ldap/l10n/ms_MY.json
index c86ace3c3a6..1d26cfcaf3d 100644
--- a/apps/user_ldap/l10n/ms_MY.json
+++ b/apps/user_ldap/l10n/ms_MY.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Pemadaman gagal",
-    "Error" : "Ralat",
-    "Save" : "Simpan",
+    "Users" : "Pengguna",
+    "Groups" : "Kumpulan",
     "Help" : "Bantuan",
     "Password" : "Kata laluan",
     "Back" : "Kembali",
diff --git a/apps/user_ldap/l10n/my_MM.js b/apps/user_ldap/l10n/my_MM.js
index faeec3ea889..5af581c8593 100644
--- a/apps/user_ldap/l10n/my_MM.js
+++ b/apps/user_ldap/l10n/my_MM.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
+    "Users" : "သုံးစွဲသူ",
     "Help" : "အကူအညီ",
     "Password" : "စကားဝှက်",
     "Advanced" : "အဆင့်မြင့်"
diff --git a/apps/user_ldap/l10n/my_MM.json b/apps/user_ldap/l10n/my_MM.json
index 88cf16a7694..f057d32bc24 100644
--- a/apps/user_ldap/l10n/my_MM.json
+++ b/apps/user_ldap/l10n/my_MM.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Users" : "သုံးစွဲသူ",
     "Help" : "အကူအညီ",
     "Password" : "စကားဝှက်",
     "Advanced" : "အဆင့်မြင့်"
diff --git a/apps/user_ldap/l10n/nb_NO.js b/apps/user_ldap/l10n/nb_NO.js
index bede99104f8..c28947a62fb 100644
--- a/apps/user_ldap/l10n/nb_NO.js
+++ b/apps/user_ldap/l10n/nb_NO.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Ingen konfigurasjon spesifisert",
     "No data specified" : "Ingen data spesifisert",
     " Could not set configuration %s" : "Klarte ikke å sette konfigurasjon %s",
-    "Deletion failed" : "Sletting mislyktes",
-    "Take over settings from recent server configuration?" : "Hent innstillinger fra tidligere tjener-konfigurasjon?",
-    "Keep settings?" : "Behold innstillinger?",
-    "{nthServer}. Server" : "{nthServer}. server",
-    "Cannot add server configuration" : "Kan ikke legge til tjener-konfigurasjon",
-    "mappings cleared" : "tilknytninger nullstilt",
-    "Success" : "Suksess",
-    "Error" : "Feil",
-    "Please specify a Base DN" : "Vennligst spesifiser en hoved-DN",
-    "Could not determine Base DN" : "Kunne ikke fastslå hoved-DN",
-    "Please specify the port" : "Vennligst spesifiser port",
-    "Configuration OK" : "Konfigurasjon OK",
     "Configuration incorrect" : "Konfigurasjon feil",
     "Configuration incomplete" : "Konfigurasjon ufullstendig",
+    "Configuration OK" : "Konfigurasjon OK",
     "Select groups" : "Velg grupper",
     "Select object classes" : "Velg objektklasser",
-    "Select attributes" : "Velg attributter",
-    "Connection test succeeded" : "Tilkoblingstest lyktes",
-    "Connection test failed" : "Tilkoblingstest mislyktes",
+    "{nthServer}. Server" : "{nthServer}. server",
     "Do you really want to delete the current Server Configuration?" : "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
     "Confirm Deletion" : "Bekreft sletting",
+    "Select attributes" : "Velg attributter",
     "_%s group found_::_%s groups found_" : ["%s gruppe funnet","%s grupper funnet"],
     "_%s user found_::_%s users found_" : ["%s bruker funnet","%s brukere funnet"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunne ikke påvise attributt for brukers visningsnavn. Du må selv spesifisere det i avanserte LDAP-innstillinger.",
     "Could not find the desired feature" : "Fant ikke den ønskede funksjonaliteten",
     "Invalid Host" : "Ugyldig tjener",
     "Server" : "Server",
-    "User Filter" : "Brukerfilter",
-    "Login Filter" : "Innloggingsfilter",
-    "Group Filter" : "Gruppefilter",
-    "Save" : "Lagre",
+    "Users" : "Brukere",
+    "Groups" : "Grupper",
     "Test Configuration" : "Test konfigurasjonen",
     "Help" : "Hjelp",
     "Groups meeting these criteria are available in %s:" : "Grupper som tilfredsstiller disse kriteriene er tilgjengelige i %s:",
-    "only those object classes:" : "kun disse objektklassene:",
-    "only from those groups:" : "kun fra disse gruppene:",
-    "Edit raw filter instead" : "Rediger ubearbeidet filter i stedet",
-    "Raw LDAP filter" : "Ubearbeidet LDAP-filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-grupper som skal ha tilgang til %s-instansen.",
     "Test Filter" : "Test filter",
-    "groups found" : "grupper funnet",
-    "Users login with this attribute:" : "Brukere logger inn med denne attributten:",
-    "LDAP Username:" : "LDAP-brukernavn:",
-    "LDAP Email Address:" : "LDAP-epostadresse:",
     "Other Attributes:" : "Andre attributter:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer filteret som skal brukes når noen prøver å logge inn. %%uid erstatter brukernavnet i innloggingen. Eksempel: \"uid=%%uid\"",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
-    "Add Server Configuration" : "Legg til tjener-konfigurasjon",
-    "Delete Configuration" : "Slett konfigurasjon",
     "Host" : "Tjener",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan utelate protokollen, men du er påkrevd å bruke SSL.  Deretter starte med ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Legg inn LDAP-filtre manuelt (anbefalt for store kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begrens %s-tilgang til brukere som tilfredsstiller disse kriteriene:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-brukere som skal ha tilgang til %s-instansen.",
-    "users found" : "brukere funnet",
     "Saving" : "Lagrer",
     "Back" : "Tilbake",
     "Continue" : "Fortsett",
diff --git a/apps/user_ldap/l10n/nb_NO.json b/apps/user_ldap/l10n/nb_NO.json
index 366c8cd9cae..cd399a4eb62 100644
--- a/apps/user_ldap/l10n/nb_NO.json
+++ b/apps/user_ldap/l10n/nb_NO.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Ingen konfigurasjon spesifisert",
     "No data specified" : "Ingen data spesifisert",
     " Could not set configuration %s" : "Klarte ikke å sette konfigurasjon %s",
-    "Deletion failed" : "Sletting mislyktes",
-    "Take over settings from recent server configuration?" : "Hent innstillinger fra tidligere tjener-konfigurasjon?",
-    "Keep settings?" : "Behold innstillinger?",
-    "{nthServer}. Server" : "{nthServer}. server",
-    "Cannot add server configuration" : "Kan ikke legge til tjener-konfigurasjon",
-    "mappings cleared" : "tilknytninger nullstilt",
-    "Success" : "Suksess",
-    "Error" : "Feil",
-    "Please specify a Base DN" : "Vennligst spesifiser en hoved-DN",
-    "Could not determine Base DN" : "Kunne ikke fastslå hoved-DN",
-    "Please specify the port" : "Vennligst spesifiser port",
-    "Configuration OK" : "Konfigurasjon OK",
     "Configuration incorrect" : "Konfigurasjon feil",
     "Configuration incomplete" : "Konfigurasjon ufullstendig",
+    "Configuration OK" : "Konfigurasjon OK",
     "Select groups" : "Velg grupper",
     "Select object classes" : "Velg objektklasser",
-    "Select attributes" : "Velg attributter",
-    "Connection test succeeded" : "Tilkoblingstest lyktes",
-    "Connection test failed" : "Tilkoblingstest mislyktes",
+    "{nthServer}. Server" : "{nthServer}. server",
     "Do you really want to delete the current Server Configuration?" : "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
     "Confirm Deletion" : "Bekreft sletting",
+    "Select attributes" : "Velg attributter",
     "_%s group found_::_%s groups found_" : ["%s gruppe funnet","%s grupper funnet"],
     "_%s user found_::_%s users found_" : ["%s bruker funnet","%s brukere funnet"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunne ikke påvise attributt for brukers visningsnavn. Du må selv spesifisere det i avanserte LDAP-innstillinger.",
     "Could not find the desired feature" : "Fant ikke den ønskede funksjonaliteten",
     "Invalid Host" : "Ugyldig tjener",
     "Server" : "Server",
-    "User Filter" : "Brukerfilter",
-    "Login Filter" : "Innloggingsfilter",
-    "Group Filter" : "Gruppefilter",
-    "Save" : "Lagre",
+    "Users" : "Brukere",
+    "Groups" : "Grupper",
     "Test Configuration" : "Test konfigurasjonen",
     "Help" : "Hjelp",
     "Groups meeting these criteria are available in %s:" : "Grupper som tilfredsstiller disse kriteriene er tilgjengelige i %s:",
-    "only those object classes:" : "kun disse objektklassene:",
-    "only from those groups:" : "kun fra disse gruppene:",
-    "Edit raw filter instead" : "Rediger ubearbeidet filter i stedet",
-    "Raw LDAP filter" : "Ubearbeidet LDAP-filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-grupper som skal ha tilgang til %s-instansen.",
     "Test Filter" : "Test filter",
-    "groups found" : "grupper funnet",
-    "Users login with this attribute:" : "Brukere logger inn med denne attributten:",
-    "LDAP Username:" : "LDAP-brukernavn:",
-    "LDAP Email Address:" : "LDAP-epostadresse:",
     "Other Attributes:" : "Andre attributter:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer filteret som skal brukes når noen prøver å logge inn. %%uid erstatter brukernavnet i innloggingen. Eksempel: \"uid=%%uid\"",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
-    "Add Server Configuration" : "Legg til tjener-konfigurasjon",
-    "Delete Configuration" : "Slett konfigurasjon",
     "Host" : "Tjener",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan utelate protokollen, men du er påkrevd å bruke SSL.  Deretter starte med ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Legg inn LDAP-filtre manuelt (anbefalt for store kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begrens %s-tilgang til brukere som tilfredsstiller disse kriteriene:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-brukere som skal ha tilgang til %s-instansen.",
-    "users found" : "brukere funnet",
     "Saving" : "Lagrer",
     "Back" : "Tilbake",
     "Continue" : "Fortsett",
diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js
index 67c46ea674f..12fead8651a 100644
--- a/apps/user_ldap/l10n/nl.js
+++ b/apps/user_ldap/l10n/nl.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Geen configuratie opgegeven",
     "No data specified" : "Geen gegevens verstrekt",
     " Could not set configuration %s" : "Kon configuratie %s niet instellen",
-    "Deletion failed" : "Verwijderen mislukt",
-    "Take over settings from recent server configuration?" : "Overnemen instellingen van de recente serverconfiguratie?",
-    "Keep settings?" : "Instellingen bewaren?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Kon de serverconfiguratie niet toevoegen",
-    "mappings cleared" : "vertaaltabel leeggemaakt",
-    "Success" : "Succes",
-    "Error" : "Fout",
-    "Please specify a Base DN" : "Geef een Base DN op",
-    "Could not determine Base DN" : "Kon de Base DN niet vaststellen",
-    "Please specify the port" : "Geef de poort op",
-    "Configuration OK" : "Configuratie OK",
     "Configuration incorrect" : "Configuratie onjuist",
     "Configuration incomplete" : "Configuratie incompleet",
+    "Configuration OK" : "Configuratie OK",
     "Select groups" : "Selecteer groepen",
     "Select object classes" : "Selecteer objectklasse",
-    "Select attributes" : "Selecteer attributen",
-    "Connection test succeeded" : "Verbindingstest geslaagd",
-    "Connection test failed" : "Verbindingstest mislukt",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
     "Confirm Deletion" : "Bevestig verwijderen",
+    "Select attributes" : "Selecteer attributen",
     "_%s group found_::_%s groups found_" : ["%s groep gevonden","%s groepen gevonden"],
     "_%s user found_::_%s users found_" : ["%s gebruiker gevonden","%s gebruikers gevonden"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kon het weergavenaam attribuut van de gebruiker niet vinden. Geef het zelf op in de geavanceerde ldap instellingen.",
     "Could not find the desired feature" : "Kon de gewenste functie niet vinden",
     "Invalid Host" : "Ongeldige server",
     "Server" : "Server",
-    "User Filter" : "Gebruikersfilter",
-    "Login Filter" : "Inlogfilter",
-    "Group Filter" : "Groep Filter",
-    "Save" : "Bewaren",
+    "Users" : "Gebruikers",
+    "Groups" : "Groepen",
     "Test Configuration" : "Test configuratie",
     "Help" : "Help",
     "Groups meeting these criteria are available in %s:" : "Groepsafspraken die voldoen aan deze criteria zijn beschikbaar in %s:",
-    "only those object classes:" : "alleen deze objectklassen",
-    "only from those groups:" : "alleen van deze groepen:",
-    "Edit raw filter instead" : "Bewerk raw filter",
-    "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Dit filter geeft aan welke LDAP groepen toegang hebben tot %s.",
     "Test Filter" : "Testfilter",
-    "groups found" : "groepen gevonden",
-    "Users login with this attribute:" : "Gebruikers loggen in met dit attribuut:",
-    "LDAP Username:" : "LDAP Username:",
-    "LDAP Email Address:" : "LDAP e-mailadres:",
     "Other Attributes:" : "Overige attributen:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definiëert het toe te passen filter als er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam bij het inloggen. Bijvoorbeeld: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Toevoegen serverconfiguratie",
-    "Delete Configuration" : "Verwijder configuratie",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://",
     "Port" : "Poort",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Handmatig invoeren LDAP filters (aanbevolen voor grote directories)",
     "Limit %s access to users meeting these criteria:" : "Beperk %s toegang tot gebruikers die voldoen aan deze criteria:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Dit filter geeft aan welke LDAP gebruikers toegang hebben tot %s.",
-    "users found" : "gebruikers gevonden",
     "Saving" : "Opslaan",
     "Back" : "Terug",
     "Continue" : "Verder",
diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json
index 39fb5fbea10..5aa26c02386 100644
--- a/apps/user_ldap/l10n/nl.json
+++ b/apps/user_ldap/l10n/nl.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Geen configuratie opgegeven",
     "No data specified" : "Geen gegevens verstrekt",
     " Could not set configuration %s" : "Kon configuratie %s niet instellen",
-    "Deletion failed" : "Verwijderen mislukt",
-    "Take over settings from recent server configuration?" : "Overnemen instellingen van de recente serverconfiguratie?",
-    "Keep settings?" : "Instellingen bewaren?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Kon de serverconfiguratie niet toevoegen",
-    "mappings cleared" : "vertaaltabel leeggemaakt",
-    "Success" : "Succes",
-    "Error" : "Fout",
-    "Please specify a Base DN" : "Geef een Base DN op",
-    "Could not determine Base DN" : "Kon de Base DN niet vaststellen",
-    "Please specify the port" : "Geef de poort op",
-    "Configuration OK" : "Configuratie OK",
     "Configuration incorrect" : "Configuratie onjuist",
     "Configuration incomplete" : "Configuratie incompleet",
+    "Configuration OK" : "Configuratie OK",
     "Select groups" : "Selecteer groepen",
     "Select object classes" : "Selecteer objectklasse",
-    "Select attributes" : "Selecteer attributen",
-    "Connection test succeeded" : "Verbindingstest geslaagd",
-    "Connection test failed" : "Verbindingstest mislukt",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
     "Confirm Deletion" : "Bevestig verwijderen",
+    "Select attributes" : "Selecteer attributen",
     "_%s group found_::_%s groups found_" : ["%s groep gevonden","%s groepen gevonden"],
     "_%s user found_::_%s users found_" : ["%s gebruiker gevonden","%s gebruikers gevonden"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kon het weergavenaam attribuut van de gebruiker niet vinden. Geef het zelf op in de geavanceerde ldap instellingen.",
     "Could not find the desired feature" : "Kon de gewenste functie niet vinden",
     "Invalid Host" : "Ongeldige server",
     "Server" : "Server",
-    "User Filter" : "Gebruikersfilter",
-    "Login Filter" : "Inlogfilter",
-    "Group Filter" : "Groep Filter",
-    "Save" : "Bewaren",
+    "Users" : "Gebruikers",
+    "Groups" : "Groepen",
     "Test Configuration" : "Test configuratie",
     "Help" : "Help",
     "Groups meeting these criteria are available in %s:" : "Groepsafspraken die voldoen aan deze criteria zijn beschikbaar in %s:",
-    "only those object classes:" : "alleen deze objectklassen",
-    "only from those groups:" : "alleen van deze groepen:",
-    "Edit raw filter instead" : "Bewerk raw filter",
-    "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Dit filter geeft aan welke LDAP groepen toegang hebben tot %s.",
     "Test Filter" : "Testfilter",
-    "groups found" : "groepen gevonden",
-    "Users login with this attribute:" : "Gebruikers loggen in met dit attribuut:",
-    "LDAP Username:" : "LDAP Username:",
-    "LDAP Email Address:" : "LDAP e-mailadres:",
     "Other Attributes:" : "Overige attributen:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definiëert het toe te passen filter als er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam bij het inloggen. Bijvoorbeeld: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Toevoegen serverconfiguratie",
-    "Delete Configuration" : "Verwijder configuratie",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://",
     "Port" : "Poort",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Handmatig invoeren LDAP filters (aanbevolen voor grote directories)",
     "Limit %s access to users meeting these criteria:" : "Beperk %s toegang tot gebruikers die voldoen aan deze criteria:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Dit filter geeft aan welke LDAP gebruikers toegang hebben tot %s.",
-    "users found" : "gebruikers gevonden",
     "Saving" : "Opslaan",
     "Back" : "Terug",
     "Continue" : "Verder",
diff --git a/apps/user_ldap/l10n/nn_NO.js b/apps/user_ldap/l10n/nn_NO.js
index 787eb6a0165..c14fc8b78b9 100644
--- a/apps/user_ldap/l10n/nn_NO.js
+++ b/apps/user_ldap/l10n/nn_NO.js
@@ -1,10 +1,9 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Feil ved sletting",
-    "Error" : "Feil",
     "Select groups" : "Vel grupper",
-    "Save" : "Lagra",
+    "Users" : "Brukarar",
+    "Groups" : "Grupper",
     "Help" : "Hjelp",
     "Host" : "Tenar",
     "Password" : "Passord",
diff --git a/apps/user_ldap/l10n/nn_NO.json b/apps/user_ldap/l10n/nn_NO.json
index 12a21a0a198..4cd54c39e08 100644
--- a/apps/user_ldap/l10n/nn_NO.json
+++ b/apps/user_ldap/l10n/nn_NO.json
@@ -1,8 +1,7 @@
 { "translations": {
-    "Deletion failed" : "Feil ved sletting",
-    "Error" : "Feil",
     "Select groups" : "Vel grupper",
-    "Save" : "Lagra",
+    "Users" : "Brukarar",
+    "Groups" : "Grupper",
     "Help" : "Hjelp",
     "Host" : "Tenar",
     "Password" : "Passord",
diff --git a/apps/user_ldap/l10n/oc.js b/apps/user_ldap/l10n/oc.js
index c08fc72758e..f077d0d7bc5 100644
--- a/apps/user_ldap/l10n/oc.js
+++ b/apps/user_ldap/l10n/oc.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Fracàs d'escafatge",
-    "Error" : "Error",
-    "Save" : "Enregistra",
+    "Users" : "Usancièrs",
+    "Groups" : "Grops",
     "Help" : "Ajuda",
     "Password" : "Senhal",
     "Advanced" : "Avançat"
diff --git a/apps/user_ldap/l10n/oc.json b/apps/user_ldap/l10n/oc.json
index 32efd1182e4..88cd771c1c6 100644
--- a/apps/user_ldap/l10n/oc.json
+++ b/apps/user_ldap/l10n/oc.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Fracàs d'escafatge",
-    "Error" : "Error",
-    "Save" : "Enregistra",
+    "Users" : "Usancièrs",
+    "Groups" : "Grops",
     "Help" : "Ajuda",
     "Password" : "Senhal",
     "Advanced" : "Avançat"
diff --git a/apps/user_ldap/l10n/pa.js b/apps/user_ldap/l10n/pa.js
index 3bfa18de3fc..ea1d1cce4e7 100644
--- a/apps/user_ldap/l10n/pa.js
+++ b/apps/user_ldap/l10n/pa.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "ਗਲਤੀ",
+    "Groups" : "ਗਰੁੱਪ",
     "Password" : "ਪਾਸਵਰ"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/pa.json b/apps/user_ldap/l10n/pa.json
index efe484f8658..d1943cb1ae1 100644
--- a/apps/user_ldap/l10n/pa.json
+++ b/apps/user_ldap/l10n/pa.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Error" : "ਗਲਤੀ",
+    "Groups" : "ਗਰੁੱਪ",
     "Password" : "ਪਾਸਵਰ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/pl.js b/apps/user_ldap/l10n/pl.js
index d60927ce913..1c8a4d17e7b 100644
--- a/apps/user_ldap/l10n/pl.js
+++ b/apps/user_ldap/l10n/pl.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Nie określono konfiguracji",
     "No data specified" : "Nie określono danych",
     " Could not set configuration %s" : "Nie można ustawić konfiguracji %s",
-    "Deletion failed" : "Usunięcie nie powiodło się",
-    "Take over settings from recent server configuration?" : "Przejmij ustawienia z ostatnich konfiguracji serwera?",
-    "Keep settings?" : "Zachować ustawienia?",
-    "{nthServer}. Server" : "{nthServer}. Serwer",
-    "Cannot add server configuration" : "Nie można dodać konfiguracji serwera",
-    "mappings cleared" : "Mapoanie wyczyszczone",
-    "Success" : "Sukces",
-    "Error" : "Błąd",
-    "Please specify a Base DN" : "Proszę podać bazowy DN",
-    "Could not determine Base DN" : "Nie można ustalić bazowego DN",
-    "Please specify the port" : "Proszę podać port",
-    "Configuration OK" : "Konfiguracja poprawna",
     "Configuration incorrect" : "Konfiguracja niepoprawna",
     "Configuration incomplete" : "Konfiguracja niekompletna",
+    "Configuration OK" : "Konfiguracja poprawna",
     "Select groups" : "Wybierz grupy",
     "Select object classes" : "Wybierz obiekty klas",
-    "Select attributes" : "Wybierz atrybuty",
-    "Connection test succeeded" : "Test połączenia udany",
-    "Connection test failed" : "Test połączenia nie udany",
+    "{nthServer}. Server" : "{nthServer}. Serwer",
     "Do you really want to delete the current Server Configuration?" : "Czy chcesz usunąć bieżącą konfigurację serwera?",
     "Confirm Deletion" : "Potwierdź usunięcie",
+    "Select attributes" : "Wybierz atrybuty",
     "_%s group found_::_%s groups found_" : ["%s znaleziona grupa","%s znalezionych grup","%s znalezionych grup"],
     "_%s user found_::_%s users found_" : ["%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nie udało się wykryć atrybutu wyświetlanej nazwy użytkownika. Określ ją w zaawansowanych ustawieniach LDAP.",
     "Could not find the desired feature" : "Nie można znaleźć żądanej funkcji",
     "Invalid Host" : "Niepoprawny Host",
     "Server" : "Serwer",
-    "User Filter" : "Filtr użytkownika",
-    "Login Filter" : "Filtr logowania",
-    "Group Filter" : "Grupa filtrów",
-    "Save" : "Zapisz",
+    "Users" : "Użytkownicy",
+    "Groups" : "Grupy",
     "Test Configuration" : "Konfiguracja testowa",
     "Help" : "Pomoc",
     "Groups meeting these criteria are available in %s:" : "Przyłączenie do grupy z tymi ustawieniami dostępne jest w %s:",
-    "only those object classes:" : "tylko te klasy obiektów:",
-    "only from those groups:" : "tylko z tych grup:",
-    "Edit raw filter instead" : "Edytuj zamiast tego czysty filtr",
-    "Raw LDAP filter" : "Czysty filtr LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.",
     "Test Filter" : "Testuj filtr",
-    "groups found" : "grup znaleziono",
-    "Users login with this attribute:" : "Użytkownicy zalogowani z tymi ustawieniami:",
-    "LDAP Username:" : "Nazwa użytkownika LDAP:",
-    "LDAP Email Address:" : "LDAP Adres Email:",
     "Other Attributes:" : "Inne atrybuty:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"",
     "1. Server" : "1. Serwer",
     "%s. Server:" : "%s. Serwer:",
-    "Add Server Configuration" : "Dodaj konfigurację servera",
-    "Delete Configuration" : "Usuń konfigurację",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ręcznie wprowadzaj filtry LDAP (zalecane dla dużych katalogów)",
     "Limit %s access to users meeting these criteria:" : "Limit %s dostępu do podłączania użytkowników z tymi ustawieniami:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr określa, którzy użytkownicy LDAP powinni mieć dostęp do instancji %s.",
-    "users found" : "użytkownicy znalezieni",
     "Saving" : "Zapisuję",
     "Back" : "Wróć",
     "Continue" : "Kontynuuj ",
diff --git a/apps/user_ldap/l10n/pl.json b/apps/user_ldap/l10n/pl.json
index a778c5c68ca..28fba352023 100644
--- a/apps/user_ldap/l10n/pl.json
+++ b/apps/user_ldap/l10n/pl.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Nie określono konfiguracji",
     "No data specified" : "Nie określono danych",
     " Could not set configuration %s" : "Nie można ustawić konfiguracji %s",
-    "Deletion failed" : "Usunięcie nie powiodło się",
-    "Take over settings from recent server configuration?" : "Przejmij ustawienia z ostatnich konfiguracji serwera?",
-    "Keep settings?" : "Zachować ustawienia?",
-    "{nthServer}. Server" : "{nthServer}. Serwer",
-    "Cannot add server configuration" : "Nie można dodać konfiguracji serwera",
-    "mappings cleared" : "Mapoanie wyczyszczone",
-    "Success" : "Sukces",
-    "Error" : "Błąd",
-    "Please specify a Base DN" : "Proszę podać bazowy DN",
-    "Could not determine Base DN" : "Nie można ustalić bazowego DN",
-    "Please specify the port" : "Proszę podać port",
-    "Configuration OK" : "Konfiguracja poprawna",
     "Configuration incorrect" : "Konfiguracja niepoprawna",
     "Configuration incomplete" : "Konfiguracja niekompletna",
+    "Configuration OK" : "Konfiguracja poprawna",
     "Select groups" : "Wybierz grupy",
     "Select object classes" : "Wybierz obiekty klas",
-    "Select attributes" : "Wybierz atrybuty",
-    "Connection test succeeded" : "Test połączenia udany",
-    "Connection test failed" : "Test połączenia nie udany",
+    "{nthServer}. Server" : "{nthServer}. Serwer",
     "Do you really want to delete the current Server Configuration?" : "Czy chcesz usunąć bieżącą konfigurację serwera?",
     "Confirm Deletion" : "Potwierdź usunięcie",
+    "Select attributes" : "Wybierz atrybuty",
     "_%s group found_::_%s groups found_" : ["%s znaleziona grupa","%s znalezionych grup","%s znalezionych grup"],
     "_%s user found_::_%s users found_" : ["%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nie udało się wykryć atrybutu wyświetlanej nazwy użytkownika. Określ ją w zaawansowanych ustawieniach LDAP.",
     "Could not find the desired feature" : "Nie można znaleźć żądanej funkcji",
     "Invalid Host" : "Niepoprawny Host",
     "Server" : "Serwer",
-    "User Filter" : "Filtr użytkownika",
-    "Login Filter" : "Filtr logowania",
-    "Group Filter" : "Grupa filtrów",
-    "Save" : "Zapisz",
+    "Users" : "Użytkownicy",
+    "Groups" : "Grupy",
     "Test Configuration" : "Konfiguracja testowa",
     "Help" : "Pomoc",
     "Groups meeting these criteria are available in %s:" : "Przyłączenie do grupy z tymi ustawieniami dostępne jest w %s:",
-    "only those object classes:" : "tylko te klasy obiektów:",
-    "only from those groups:" : "tylko z tych grup:",
-    "Edit raw filter instead" : "Edytuj zamiast tego czysty filtr",
-    "Raw LDAP filter" : "Czysty filtr LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.",
     "Test Filter" : "Testuj filtr",
-    "groups found" : "grup znaleziono",
-    "Users login with this attribute:" : "Użytkownicy zalogowani z tymi ustawieniami:",
-    "LDAP Username:" : "Nazwa użytkownika LDAP:",
-    "LDAP Email Address:" : "LDAP Adres Email:",
     "Other Attributes:" : "Inne atrybuty:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"",
     "1. Server" : "1. Serwer",
     "%s. Server:" : "%s. Serwer:",
-    "Add Server Configuration" : "Dodaj konfigurację servera",
-    "Delete Configuration" : "Usuń konfigurację",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ręcznie wprowadzaj filtry LDAP (zalecane dla dużych katalogów)",
     "Limit %s access to users meeting these criteria:" : "Limit %s dostępu do podłączania użytkowników z tymi ustawieniami:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr określa, którzy użytkownicy LDAP powinni mieć dostęp do instancji %s.",
-    "users found" : "użytkownicy znalezieni",
     "Saving" : "Zapisuję",
     "Back" : "Wróć",
     "Continue" : "Kontynuuj ",
diff --git a/apps/user_ldap/l10n/pt_BR.js b/apps/user_ldap/l10n/pt_BR.js
index 2dc6a22f56a..32f73bd2d44 100644
--- a/apps/user_ldap/l10n/pt_BR.js
+++ b/apps/user_ldap/l10n/pt_BR.js
@@ -10,56 +10,54 @@ OC.L10N.register(
     "No configuration specified" : "Nenhuma configuração especificada",
     "No data specified" : "Não há dados especificados",
     " Could not set configuration %s" : "Não foi possível definir a configuração %s",
-    "Deletion failed" : "Remoção falhou",
-    "Take over settings from recent server configuration?" : "Tomar parámetros de recente configuração de servidor?",
-    "Keep settings?" : "Manter configurações?",
-    "{nthServer}. Server" : "Servidor {nthServer}.",
-    "Cannot add server configuration" : "Impossível adicionar a configuração do servidor",
-    "mappings cleared" : "mapeamentos limpos",
-    "Success" : "Sucesso",
-    "Error" : "Erro",
-    "Please specify a Base DN" : "Por favor, especifique a Base DN",
-    "Could not determine Base DN" : "Não foi possível determinar a Base DN",
-    "Please specify the port" : "Por favor, especifique a porta",
-    "Configuration OK" : "Configuração OK",
+    "Action does not exist" : "A ação não existe",
     "Configuration incorrect" : "Configuração incorreta",
     "Configuration incomplete" : "Configuração incompleta",
+    "Configuration OK" : "Configuração OK",
     "Select groups" : "Selecionar grupos",
     "Select object classes" : "Selecione classes de objetos",
-    "Select attributes" : "Selecione os atributos",
-    "Connection test succeeded" : "Teste de conexão bem sucedida",
-    "Connection test failed" : "Teste de conexão falhou",
+    "Please check the credentials, they seem to be wrong." : "Por favor verifique as credenciais, elas parecem estar erradas.",
+    "Please specify the port, it could not be auto-detected." : "Por favor especifique uma porta, ela não pode ser detectada automaticamente.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "A Base DN não pode ser detectada automaticamente, por favor revise as credenciais, host e porta.",
+    "Could not detect Base DN, please enter it manually." : "Não foi possível detectar a Base DN, por favor entre manualmente.",
+    "{nthServer}. Server" : "Servidor {nthServer}.",
+    "No object found in the given Base DN. Please revise." : "Nenhum objeto encontrado ba Base DN informada. Por favor revise.",
+    "More then 1.000 directory entries available." : "Mais de 1.000 entradas de diretórios disponíveis.",
+    " entries available within the provided Base DN" : "entradas disponíveis na Base DN disponibilizada",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Um erro ocorreu. Por favor verifique a Base DN, e também a conexção e credenciais.",
     "Do you really want to delete the current Server Configuration?" : "Você quer realmente deletar as atuais Configurações de Servidor?",
     "Confirm Deletion" : "Confirmar Exclusão",
+    "Mappings cleared successfully!" : "Limpeza do mapeamento feita com sucesso!",
+    "Error while clearing the mappings." : "Erro enquanto limpava os mapeamentos.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Falha ao gravar. Por favor, verifique se o banco de dados está em operação. Atualize antes de continuar.",
+    "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?" : "Mudar o modo irá permitir consultas LDAP automáticas. Dependendo do tamanho do LDAP isso pode demorar um pouco. Você ainda quer mudar o modo?",
+    "Mode switch" : "Troca de modo",
+    "Select attributes" : "Selecione os atributos",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Usuário não encontrado. Por favor verifique os seus atributos de login e nome de usuário. Filtro eficaz (para copiar-e-colar para validação de linha de comando): <br/>",
+    "User found and settings verified." : "Usuário encontrado e configurações verificadas.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Configurações verificadas, mas um usuário encontrado. Apenas o primeiro será capaz de fazer login. Considere um filtro mais apurado.",
+    "An unspecified error occurred. Please check the settings and the log." : "SetAn Ocorreu um erro não especificado. Por favor, verifique as configurações e os log.tings verificadas, mas um usuário encontrado. Apenas o primeiro será capaz de login. Considere um filtro mais apurado.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "O filtro de pesquisa é inválido, provavelmente devido a questões de sintaxe, como número ímpar de colchetes abertos e fechados. Por favor, revise.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Um erro de conexão para LDAP / AD ocorreu, por favor, verifique host, a porta e as credenciais.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "O espaço reservado %uid está faltando. Ele será substituído pelo nome de login ao consultar LDAP / AD.",
+    "Please provide a login name to test against" : "Por favor, forneça um nome de login para testar",
     "_%s group found_::_%s groups found_" : ["grupo% s encontrado","grupos% s encontrado"],
     "_%s user found_::_%s users found_" : ["usuário %s encontrado","usuários %s encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detectar o nome de exibição do atributo do usuário. Por favor, indique-o você mesmo em configurações avançadas do LDAP.",
     "Could not find the desired feature" : "Não foi possível encontrar a função desejada",
     "Invalid Host" : "Host Inválido",
     "Server" : "Servidor",
-    "User Filter" : "Filtro de Usuário",
-    "Login Filter" : "Filtro de Login",
-    "Group Filter" : "Filtro de Grupo",
-    "Save" : "Salvar",
+    "Users" : "Usuários",
+    "Groups" : "Grupos",
     "Test Configuration" : "Teste de Configuração",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Grupos que satisfazem estes critérios estão disponíveis em %s:",
-    "only those object classes:" : "apenas essas classes de objetos:",
-    "only from those groups:" : "apenas desses grupos:",
-    "Edit raw filter instead" : "Editar filtro raw ao invéz",
-    "Raw LDAP filter" : "Filtro LDAP Raw",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância do %s.",
     "Test Filter" : "Filtro Teste",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Usuários entrar com este atributo:",
-    "LDAP Username:" : "Usuário LDAP:",
-    "LDAP Email Address:" : "LDAP Endereço de E-mail:",
     "Other Attributes:" : "Outros Atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a ser aplicado, quando o login for feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Adicionar Configuração de Servidor",
-    "Delete Configuration" : "Excluir Configuração",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://",
     "Port" : "Porta",
@@ -73,7 +71,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Inserir manualmente filtros LDAP (recomendado para grandes diretórios)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acesso %s para usuários que satisfazem esses critérios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais usuários LDAP devem ter acesso à instância do %s.",
-    "users found" : "usuários encontrados",
     "Saving" : "Salvando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/pt_BR.json b/apps/user_ldap/l10n/pt_BR.json
index 4453f0bb0c3..d2fe39bcea1 100644
--- a/apps/user_ldap/l10n/pt_BR.json
+++ b/apps/user_ldap/l10n/pt_BR.json
@@ -8,56 +8,54 @@
     "No configuration specified" : "Nenhuma configuração especificada",
     "No data specified" : "Não há dados especificados",
     " Could not set configuration %s" : "Não foi possível definir a configuração %s",
-    "Deletion failed" : "Remoção falhou",
-    "Take over settings from recent server configuration?" : "Tomar parámetros de recente configuração de servidor?",
-    "Keep settings?" : "Manter configurações?",
-    "{nthServer}. Server" : "Servidor {nthServer}.",
-    "Cannot add server configuration" : "Impossível adicionar a configuração do servidor",
-    "mappings cleared" : "mapeamentos limpos",
-    "Success" : "Sucesso",
-    "Error" : "Erro",
-    "Please specify a Base DN" : "Por favor, especifique a Base DN",
-    "Could not determine Base DN" : "Não foi possível determinar a Base DN",
-    "Please specify the port" : "Por favor, especifique a porta",
-    "Configuration OK" : "Configuração OK",
+    "Action does not exist" : "A ação não existe",
     "Configuration incorrect" : "Configuração incorreta",
     "Configuration incomplete" : "Configuração incompleta",
+    "Configuration OK" : "Configuração OK",
     "Select groups" : "Selecionar grupos",
     "Select object classes" : "Selecione classes de objetos",
-    "Select attributes" : "Selecione os atributos",
-    "Connection test succeeded" : "Teste de conexão bem sucedida",
-    "Connection test failed" : "Teste de conexão falhou",
+    "Please check the credentials, they seem to be wrong." : "Por favor verifique as credenciais, elas parecem estar erradas.",
+    "Please specify the port, it could not be auto-detected." : "Por favor especifique uma porta, ela não pode ser detectada automaticamente.",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "A Base DN não pode ser detectada automaticamente, por favor revise as credenciais, host e porta.",
+    "Could not detect Base DN, please enter it manually." : "Não foi possível detectar a Base DN, por favor entre manualmente.",
+    "{nthServer}. Server" : "Servidor {nthServer}.",
+    "No object found in the given Base DN. Please revise." : "Nenhum objeto encontrado ba Base DN informada. Por favor revise.",
+    "More then 1.000 directory entries available." : "Mais de 1.000 entradas de diretórios disponíveis.",
+    " entries available within the provided Base DN" : "entradas disponíveis na Base DN disponibilizada",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Um erro ocorreu. Por favor verifique a Base DN, e também a conexção e credenciais.",
     "Do you really want to delete the current Server Configuration?" : "Você quer realmente deletar as atuais Configurações de Servidor?",
     "Confirm Deletion" : "Confirmar Exclusão",
+    "Mappings cleared successfully!" : "Limpeza do mapeamento feita com sucesso!",
+    "Error while clearing the mappings." : "Erro enquanto limpava os mapeamentos.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Falha ao gravar. Por favor, verifique se o banco de dados está em operação. Atualize antes de continuar.",
+    "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?" : "Mudar o modo irá permitir consultas LDAP automáticas. Dependendo do tamanho do LDAP isso pode demorar um pouco. Você ainda quer mudar o modo?",
+    "Mode switch" : "Troca de modo",
+    "Select attributes" : "Selecione os atributos",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Usuário não encontrado. Por favor verifique os seus atributos de login e nome de usuário. Filtro eficaz (para copiar-e-colar para validação de linha de comando): <br/>",
+    "User found and settings verified." : "Usuário encontrado e configurações verificadas.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Configurações verificadas, mas um usuário encontrado. Apenas o primeiro será capaz de fazer login. Considere um filtro mais apurado.",
+    "An unspecified error occurred. Please check the settings and the log." : "SetAn Ocorreu um erro não especificado. Por favor, verifique as configurações e os log.tings verificadas, mas um usuário encontrado. Apenas o primeiro será capaz de login. Considere um filtro mais apurado.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "O filtro de pesquisa é inválido, provavelmente devido a questões de sintaxe, como número ímpar de colchetes abertos e fechados. Por favor, revise.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Um erro de conexão para LDAP / AD ocorreu, por favor, verifique host, a porta e as credenciais.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "O espaço reservado %uid está faltando. Ele será substituído pelo nome de login ao consultar LDAP / AD.",
+    "Please provide a login name to test against" : "Por favor, forneça um nome de login para testar",
     "_%s group found_::_%s groups found_" : ["grupo% s encontrado","grupos% s encontrado"],
     "_%s user found_::_%s users found_" : ["usuário %s encontrado","usuários %s encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detectar o nome de exibição do atributo do usuário. Por favor, indique-o você mesmo em configurações avançadas do LDAP.",
     "Could not find the desired feature" : "Não foi possível encontrar a função desejada",
     "Invalid Host" : "Host Inválido",
     "Server" : "Servidor",
-    "User Filter" : "Filtro de Usuário",
-    "Login Filter" : "Filtro de Login",
-    "Group Filter" : "Filtro de Grupo",
-    "Save" : "Salvar",
+    "Users" : "Usuários",
+    "Groups" : "Grupos",
     "Test Configuration" : "Teste de Configuração",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Grupos que satisfazem estes critérios estão disponíveis em %s:",
-    "only those object classes:" : "apenas essas classes de objetos:",
-    "only from those groups:" : "apenas desses grupos:",
-    "Edit raw filter instead" : "Editar filtro raw ao invéz",
-    "Raw LDAP filter" : "Filtro LDAP Raw",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância do %s.",
     "Test Filter" : "Filtro Teste",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Usuários entrar com este atributo:",
-    "LDAP Username:" : "Usuário LDAP:",
-    "LDAP Email Address:" : "LDAP Endereço de E-mail:",
     "Other Attributes:" : "Outros Atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a ser aplicado, quando o login for feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servidor:",
-    "Add Server Configuration" : "Adicionar Configuração de Servidor",
-    "Delete Configuration" : "Excluir Configuração",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://",
     "Port" : "Porta",
@@ -71,7 +69,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Inserir manualmente filtros LDAP (recomendado para grandes diretórios)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acesso %s para usuários que satisfazem esses critérios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais usuários LDAP devem ter acesso à instância do %s.",
-    "users found" : "usuários encontrados",
     "Saving" : "Salvando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js
index 4a740ff1d1e..2b275908770 100644
--- a/apps/user_ldap/l10n/pt_PT.js
+++ b/apps/user_ldap/l10n/pt_PT.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Nenhuma configuração especificada",
     "No data specified" : "Nenhuma data especificada",
     " Could not set configuration %s" : "Não foi possível definir a configuração %s",
-    "Deletion failed" : "Erro ao apagar",
-    "Take over settings from recent server configuration?" : "Assumir as configurações da configuração do servidor mais recente?",
-    "Keep settings?" : "Manter as definições?",
-    "{nthServer}. Server" : "{nthServer}. Servidor",
-    "Cannot add server configuration" : "Não foi possível adicionar as configurações do servidor.",
-    "mappings cleared" : "Mapas limpos",
-    "Success" : "Sucesso",
-    "Error" : "Erro",
-    "Please specify a Base DN" : "Por favor indique a Base DN",
-    "Could not determine Base DN" : "Não foi possível determinar a Base DN",
-    "Please specify the port" : "Por favor indique a porta",
-    "Configuration OK" : "Configuração OK",
     "Configuration incorrect" : "Configuração incorreta",
     "Configuration incomplete" : "Configuração incompleta",
+    "Configuration OK" : "Configuração OK",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Selecionar classes de objetos",
-    "Select attributes" : "Selecionar atributos",
-    "Connection test succeeded" : "Teste de ligação com sucesso.",
-    "Connection test failed" : "Erro no teste de ligação.",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
     "Do you really want to delete the current Server Configuration?" : "Deseja realmente apagar as configurações de servidor actuais?",
     "Confirm Deletion" : "Confirmar a operação de apagar",
+    "Select attributes" : "Selecionar atributos",
     "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
     "_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detetar o atributo do nome do utilizador. Por favor especifique-o nas configurações ldap avançadas.",
     "Could not find the desired feature" : "Não se encontrou a função desejada",
     "Invalid Host" : "Hospedeiro Inválido",
     "Server" : "Servidor",
-    "User Filter" : "Filtro de utilizadores",
-    "Login Filter" : "Filtro de Login",
-    "Group Filter" : "Filtrar por grupo",
-    "Save" : "Guardar",
+    "Users" : "Utilizadores",
+    "Groups" : "Grupos",
     "Test Configuration" : "Testar a configuração",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Grupos que satisfazerem estes critérios estão disponíveis em %s:",
-    "only those object classes:" : "apenas essas classes de objetos:",
-    "only from those groups:" : "apenas desses grupos:",
-    "Edit raw filter instead" : "Editar filtro raw em vez disso",
-    "Raw LDAP filter" : "Filtro LDAP Raw",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância %s.",
     "Test Filter" : "Testar Filtro",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Utilizadores entrar com este atributo:",
-    "LDAP Username:" : "Nome de utilizador LDAP:",
-    "LDAP Email Address:" : "Endereço de correio eletrónico LDAP:",
     "Other Attributes:" : "Outros Atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de início de sessão. Exemplo: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servvidor",
-    "Add Server Configuration" : "Adicionar configurações do servidor",
-    "Delete Configuration" : "Apagar Configuração",
     "Host" : "Anfitrião",
     "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://",
     "Port" : "Porto",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Introduzir filtros LDAP manualmente (recomendado para directórios grandes)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acesso a %s de utilizadores com estes critérios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais utilizadores do LDAP devem ter acesso  à instância %s.",
-    "users found" : "utilizadores encontrados",
     "Saving" : "Guardando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json
index 81071aec577..9d94106818e 100644
--- a/apps/user_ldap/l10n/pt_PT.json
+++ b/apps/user_ldap/l10n/pt_PT.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Nenhuma configuração especificada",
     "No data specified" : "Nenhuma data especificada",
     " Could not set configuration %s" : "Não foi possível definir a configuração %s",
-    "Deletion failed" : "Erro ao apagar",
-    "Take over settings from recent server configuration?" : "Assumir as configurações da configuração do servidor mais recente?",
-    "Keep settings?" : "Manter as definições?",
-    "{nthServer}. Server" : "{nthServer}. Servidor",
-    "Cannot add server configuration" : "Não foi possível adicionar as configurações do servidor.",
-    "mappings cleared" : "Mapas limpos",
-    "Success" : "Sucesso",
-    "Error" : "Erro",
-    "Please specify a Base DN" : "Por favor indique a Base DN",
-    "Could not determine Base DN" : "Não foi possível determinar a Base DN",
-    "Please specify the port" : "Por favor indique a porta",
-    "Configuration OK" : "Configuração OK",
     "Configuration incorrect" : "Configuração incorreta",
     "Configuration incomplete" : "Configuração incompleta",
+    "Configuration OK" : "Configuração OK",
     "Select groups" : "Seleccionar grupos",
     "Select object classes" : "Selecionar classes de objetos",
-    "Select attributes" : "Selecionar atributos",
-    "Connection test succeeded" : "Teste de ligação com sucesso.",
-    "Connection test failed" : "Erro no teste de ligação.",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
     "Do you really want to delete the current Server Configuration?" : "Deseja realmente apagar as configurações de servidor actuais?",
     "Confirm Deletion" : "Confirmar a operação de apagar",
+    "Select attributes" : "Selecionar atributos",
     "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
     "_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detetar o atributo do nome do utilizador. Por favor especifique-o nas configurações ldap avançadas.",
     "Could not find the desired feature" : "Não se encontrou a função desejada",
     "Invalid Host" : "Hospedeiro Inválido",
     "Server" : "Servidor",
-    "User Filter" : "Filtro de utilizadores",
-    "Login Filter" : "Filtro de Login",
-    "Group Filter" : "Filtrar por grupo",
-    "Save" : "Guardar",
+    "Users" : "Utilizadores",
+    "Groups" : "Grupos",
     "Test Configuration" : "Testar a configuração",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Grupos que satisfazerem estes critérios estão disponíveis em %s:",
-    "only those object classes:" : "apenas essas classes de objetos:",
-    "only from those groups:" : "apenas desses grupos:",
-    "Edit raw filter instead" : "Editar filtro raw em vez disso",
-    "Raw LDAP filter" : "Filtro LDAP Raw",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância %s.",
     "Test Filter" : "Testar Filtro",
-    "groups found" : "grupos encontrados",
-    "Users login with this attribute:" : "Utilizadores entrar com este atributo:",
-    "LDAP Username:" : "Nome de utilizador LDAP:",
-    "LDAP Email Address:" : "Endereço de correio eletrónico LDAP:",
     "Other Attributes:" : "Outros Atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de início de sessão. Exemplo: \"uid=%%uid\"",
     "1. Server" : "1. Servidor",
     "%s. Server:" : "%s. Servvidor",
-    "Add Server Configuration" : "Adicionar configurações do servidor",
-    "Delete Configuration" : "Apagar Configuração",
     "Host" : "Anfitrião",
     "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://",
     "Port" : "Porto",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Introduzir filtros LDAP manualmente (recomendado para directórios grandes)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acesso a %s de utilizadores com estes critérios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais utilizadores do LDAP devem ter acesso  à instância %s.",
-    "users found" : "utilizadores encontrados",
     "Saving" : "Guardando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/ro.js b/apps/user_ldap/l10n/ro.js
index 31966e0507e..c36b232f185 100644
--- a/apps/user_ldap/l10n/ro.js
+++ b/apps/user_ldap/l10n/ro.js
@@ -4,26 +4,18 @@ OC.L10N.register(
     "The configuration is valid and the connection could be established!" : "Configuraţia este valida şi s-a stabilit conectarea",
     "No action specified" : "Nu este specificata nici o acţiune ",
     "No configuration specified" : "Nu este specificata nici o configurare ",
-    "Deletion failed" : "Ștergerea a eșuat",
-    "Keep settings?" : "Păstraţi setările ?",
-    "Cannot add server configuration" : "Nu se poate adăuga configuraţia serverului ",
-    "Success" : "Succes",
-    "Error" : "Eroare",
-    "Configuration OK" : "Configuraţie valida",
     "Configuration incorrect" : "Configuraţie incorecta ",
     "Configuration incomplete" : "Configuraţie incompleta ",
+    "Configuration OK" : "Configuraţie valida",
     "Select groups" : "Selectaţi grupuri ",
-    "Select attributes" : "Selectaţi caracteristici",
-    "Connection test succeeded" : "Testul de conectare a reuşit ",
-    "Connection test failed" : "Testul de conectare a eşuat ",
     "Do you really want to delete the current Server Configuration?" : "Sunteţi sigur ca vreţi sa ştergeţi configuraţia actuala a serverului ?",
     "Confirm Deletion" : "Confirmaţi Ştergerea ",
-    "Group Filter" : "Fitrare Grup",
-    "Save" : "Salvează",
+    "Select attributes" : "Selectaţi caracteristici",
+    "Users" : "Utilizatori",
+    "Groups" : "Grupuri",
     "Test Configuration" : "Configurare test",
     "Help" : "Ajutor",
     "Other Attributes:" : "Alte caracteristici :",
-    "Add Server Configuration" : "Adăugaţi Configuraţia Serverului",
     "Host" : "Gazdă",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://",
     "Port" : "Portul",
@@ -33,7 +25,6 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "Pentru acces anonim, lăsați DN și Parolă libere.",
     "One Base DN per line" : "Un Base DN pe linie",
     "You can specify Base DN for users and groups in the Advanced tab" : "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat",
-    "users found" : "Utilizatori găsiţi ",
     "Back" : "Înapoi",
     "Continue" : "Continuă",
     "Advanced" : "Avansat",
diff --git a/apps/user_ldap/l10n/ro.json b/apps/user_ldap/l10n/ro.json
index 0eda7131c5d..44cc6680e64 100644
--- a/apps/user_ldap/l10n/ro.json
+++ b/apps/user_ldap/l10n/ro.json
@@ -2,26 +2,18 @@
     "The configuration is valid and the connection could be established!" : "Configuraţia este valida şi s-a stabilit conectarea",
     "No action specified" : "Nu este specificata nici o acţiune ",
     "No configuration specified" : "Nu este specificata nici o configurare ",
-    "Deletion failed" : "Ștergerea a eșuat",
-    "Keep settings?" : "Păstraţi setările ?",
-    "Cannot add server configuration" : "Nu se poate adăuga configuraţia serverului ",
-    "Success" : "Succes",
-    "Error" : "Eroare",
-    "Configuration OK" : "Configuraţie valida",
     "Configuration incorrect" : "Configuraţie incorecta ",
     "Configuration incomplete" : "Configuraţie incompleta ",
+    "Configuration OK" : "Configuraţie valida",
     "Select groups" : "Selectaţi grupuri ",
-    "Select attributes" : "Selectaţi caracteristici",
-    "Connection test succeeded" : "Testul de conectare a reuşit ",
-    "Connection test failed" : "Testul de conectare a eşuat ",
     "Do you really want to delete the current Server Configuration?" : "Sunteţi sigur ca vreţi sa ştergeţi configuraţia actuala a serverului ?",
     "Confirm Deletion" : "Confirmaţi Ştergerea ",
-    "Group Filter" : "Fitrare Grup",
-    "Save" : "Salvează",
+    "Select attributes" : "Selectaţi caracteristici",
+    "Users" : "Utilizatori",
+    "Groups" : "Grupuri",
     "Test Configuration" : "Configurare test",
     "Help" : "Ajutor",
     "Other Attributes:" : "Alte caracteristici :",
-    "Add Server Configuration" : "Adăugaţi Configuraţia Serverului",
     "Host" : "Gazdă",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://",
     "Port" : "Portul",
@@ -31,7 +23,6 @@
     "For anonymous access, leave DN and Password empty." : "Pentru acces anonim, lăsați DN și Parolă libere.",
     "One Base DN per line" : "Un Base DN pe linie",
     "You can specify Base DN for users and groups in the Advanced tab" : "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat",
-    "users found" : "Utilizatori găsiţi ",
     "Back" : "Înapoi",
     "Continue" : "Continuă",
     "Advanced" : "Avansat",
diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js
index f21c98e121c..04e788b5777 100644
--- a/apps/user_ldap/l10n/ru.js
+++ b/apps/user_ldap/l10n/ru.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Конфигурация не создана",
     "No data specified" : "Нет данных",
     " Could not set configuration %s" : "Невозможно создать конфигурацию %s",
-    "Deletion failed" : "Удаление не удалось",
-    "Take over settings from recent server configuration?" : "Принять настройки из последней конфигурации сервера?",
-    "Keep settings?" : "Сохранить настройки?",
-    "{nthServer}. Server" : "Сервер {nthServer}.",
-    "Cannot add server configuration" : "Не удалось добавить конфигурацию сервера",
-    "mappings cleared" : "соответствия очищены",
-    "Success" : "Успешно",
-    "Error" : "Ошибка",
-    "Please specify a Base DN" : "Необходимо указать Base DN",
-    "Could not determine Base DN" : "Невозможно определить Base DN",
-    "Please specify the port" : "Укажите порт",
-    "Configuration OK" : "Конфигурация в порядке",
     "Configuration incorrect" : "Конфигурация некорректна",
     "Configuration incomplete" : "Конфигурация не завершена",
+    "Configuration OK" : "Конфигурация в порядке",
     "Select groups" : "Выберите группы",
     "Select object classes" : "Выберите объектные классы",
-    "Select attributes" : "Выберите атрибуты",
-    "Connection test succeeded" : "Проверка соединения удалась",
-    "Connection test failed" : "Проверка соединения не удалась",
+    "{nthServer}. Server" : "Сервер {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "Вы действительно хотите удалить существующую конфигурацию сервера?",
     "Confirm Deletion" : "Подтверждение удаления",
+    "Select attributes" : "Выберите атрибуты",
     "_%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" : "Некорректный адрес сервера",
     "Server" : "Сервер",
-    "User Filter" : "Фильтр пользователей",
-    "Login Filter" : "Фильтр логинов",
-    "Group Filter" : "Фильтр группы",
-    "Save" : "Сохранить",
+    "Users" : "Пользователи",
+    "Groups" : "Группы",
     "Test Configuration" : "Проверить конфигурацию",
     "Help" : "Помощь",
     "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:",
-    "only those object classes:" : "только эти объектные классы:",
-    "only from those groups:" : "только из этих групп:",
-    "Edit raw filter instead" : "Редактировать исходный фильтр",
-    "Raw LDAP filter" : "Исходный LDAP фильтр",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет какие LDAP группы должны иметь доступ к экземпляру %s.",
     "Test Filter" : "Проверить фильтр",
-    "groups found" : "групп найдено",
-    "Users login with this attribute:" : "Логин пользователей с этим атрибутом:",
-    "LDAP Username:" : "Имя пользователя LDAP",
-    "LDAP Email Address:" : "Адрес email LDAP:",
     "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\"",
     "1. Server" : "Сервер 1.",
     "%s. Server:" : "Сервер %s:",
-    "Add Server Configuration" : "Добавить конфигурацию сервера",
-    "Delete Configuration" : "Удалить конфигурацию",
     "Host" : "Сервер",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно пренебречь протоколом, за исключением использования SSL. В этом случае укажите ldaps://",
     "Port" : "Порт",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)",
     "Limit %s access to users meeting these criteria:" : "Ограничить доступ пользователям к %s, удовлетворяющим этому критерию:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.",
-    "users found" : "пользователей найдено",
     "Saving" : "Сохраняется",
     "Back" : "Назад",
     "Continue" : "Продолжить",
diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json
index 354381760bf..999c2e01bc3 100644
--- a/apps/user_ldap/l10n/ru.json
+++ b/apps/user_ldap/l10n/ru.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Конфигурация не создана",
     "No data specified" : "Нет данных",
     " Could not set configuration %s" : "Невозможно создать конфигурацию %s",
-    "Deletion failed" : "Удаление не удалось",
-    "Take over settings from recent server configuration?" : "Принять настройки из последней конфигурации сервера?",
-    "Keep settings?" : "Сохранить настройки?",
-    "{nthServer}. Server" : "Сервер {nthServer}.",
-    "Cannot add server configuration" : "Не удалось добавить конфигурацию сервера",
-    "mappings cleared" : "соответствия очищены",
-    "Success" : "Успешно",
-    "Error" : "Ошибка",
-    "Please specify a Base DN" : "Необходимо указать Base DN",
-    "Could not determine Base DN" : "Невозможно определить Base DN",
-    "Please specify the port" : "Укажите порт",
-    "Configuration OK" : "Конфигурация в порядке",
     "Configuration incorrect" : "Конфигурация некорректна",
     "Configuration incomplete" : "Конфигурация не завершена",
+    "Configuration OK" : "Конфигурация в порядке",
     "Select groups" : "Выберите группы",
     "Select object classes" : "Выберите объектные классы",
-    "Select attributes" : "Выберите атрибуты",
-    "Connection test succeeded" : "Проверка соединения удалась",
-    "Connection test failed" : "Проверка соединения не удалась",
+    "{nthServer}. Server" : "Сервер {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "Вы действительно хотите удалить существующую конфигурацию сервера?",
     "Confirm Deletion" : "Подтверждение удаления",
+    "Select attributes" : "Выберите атрибуты",
     "_%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" : "Некорректный адрес сервера",
     "Server" : "Сервер",
-    "User Filter" : "Фильтр пользователей",
-    "Login Filter" : "Фильтр логинов",
-    "Group Filter" : "Фильтр группы",
-    "Save" : "Сохранить",
+    "Users" : "Пользователи",
+    "Groups" : "Группы",
     "Test Configuration" : "Проверить конфигурацию",
     "Help" : "Помощь",
     "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в %s:",
-    "only those object classes:" : "только эти объектные классы:",
-    "only from those groups:" : "только из этих групп:",
-    "Edit raw filter instead" : "Редактировать исходный фильтр",
-    "Raw LDAP filter" : "Исходный LDAP фильтр",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет какие LDAP группы должны иметь доступ к экземпляру %s.",
     "Test Filter" : "Проверить фильтр",
-    "groups found" : "групп найдено",
-    "Users login with this attribute:" : "Логин пользователей с этим атрибутом:",
-    "LDAP Username:" : "Имя пользователя LDAP",
-    "LDAP Email Address:" : "Адрес email LDAP:",
     "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\"",
     "1. Server" : "Сервер 1.",
     "%s. Server:" : "Сервер %s:",
-    "Add Server Configuration" : "Добавить конфигурацию сервера",
-    "Delete Configuration" : "Удалить конфигурацию",
     "Host" : "Сервер",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно пренебречь протоколом, за исключением использования SSL. В этом случае укажите ldaps://",
     "Port" : "Порт",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)",
     "Limit %s access to users meeting these criteria:" : "Ограничить доступ пользователям к %s, удовлетворяющим этому критерию:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к экземпляру %s.",
-    "users found" : "пользователей найдено",
     "Saving" : "Сохраняется",
     "Back" : "Назад",
     "Continue" : "Продолжить",
diff --git a/apps/user_ldap/l10n/si_LK.js b/apps/user_ldap/l10n/si_LK.js
index b99cf0bd3f3..f8f0eaecfd8 100644
--- a/apps/user_ldap/l10n/si_LK.js
+++ b/apps/user_ldap/l10n/si_LK.js
@@ -1,11 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "මකාදැමීම අසාර්ථකයි",
-    "Success" : "සාර්ථකයි",
-    "Error" : "දෝෂයක්",
-    "Group Filter" : "කණ්ඩායම් පෙරහන",
-    "Save" : "සුරකින්න",
+    "Users" : "පරිශීලකයන්",
+    "Groups" : "කණ්ඩායම්",
     "Help" : "උදව්",
     "Host" : "සත්කාරකය",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
diff --git a/apps/user_ldap/l10n/si_LK.json b/apps/user_ldap/l10n/si_LK.json
index 716d4fc9491..7a886df99ab 100644
--- a/apps/user_ldap/l10n/si_LK.json
+++ b/apps/user_ldap/l10n/si_LK.json
@@ -1,9 +1,6 @@
 { "translations": {
-    "Deletion failed" : "මකාදැමීම අසාර්ථකයි",
-    "Success" : "සාර්ථකයි",
-    "Error" : "දෝෂයක්",
-    "Group Filter" : "කණ්ඩායම් පෙරහන",
-    "Save" : "සුරකින්න",
+    "Users" : "පරිශීලකයන්",
+    "Groups" : "කණ්ඩායම්",
     "Help" : "උදව්",
     "Host" : "සත්කාරකය",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
diff --git a/apps/user_ldap/l10n/sk_SK.js b/apps/user_ldap/l10n/sk_SK.js
index 3f41750a5b9..24e1da2bcda 100644
--- a/apps/user_ldap/l10n/sk_SK.js
+++ b/apps/user_ldap/l10n/sk_SK.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Nie je určená konfigurácia",
     "No data specified" : "Nie sú vybraté dáta",
     " Could not set configuration %s" : "Nemôžem nastaviť konfiguráciu %s",
-    "Deletion failed" : "Odstránenie zlyhalo",
-    "Take over settings from recent server configuration?" : "Prebrať nastavenia z nedávneho nastavenia servera?",
-    "Keep settings?" : "Ponechať nastavenia?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Nemožno pridať nastavenie servera",
-    "mappings cleared" : "mapovanie vymazané",
-    "Success" : "Úspešné",
-    "Error" : "Chyba",
-    "Please specify a Base DN" : "Prosím, zadajte základnú DN",
-    "Could not determine Base DN" : "Nemožno určiť základnú DN",
-    "Please specify the port" : "Prosím, zadajte port",
-    "Configuration OK" : "Konfigurácia je v poriadku",
     "Configuration incorrect" : "Nesprávna konfigurácia",
     "Configuration incomplete" : "Nekompletná konfigurácia",
+    "Configuration OK" : "Konfigurácia je v poriadku",
     "Select groups" : "Vybrať skupinu",
     "Select object classes" : "Vyberte triedy objektov",
-    "Select attributes" : "Vyberte atribúty",
-    "Connection test succeeded" : "Test pripojenia bol úspešný",
-    "Connection test failed" : "Test pripojenia zlyhal",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Naozaj chcete zmazať súčasné nastavenie servera?",
     "Confirm Deletion" : "Potvrdiť vymazanie",
+    "Select attributes" : "Vyberte atribúty",
     "_%s group found_::_%s groups found_" : ["%s nájdená skupina","%s nájdené skupiny","%s nájdených skupín"],
     "_%s user found_::_%s users found_" : ["%s nájdený používateľ","%s nájdení používatelia","%s nájdených používateľov"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nemožno zistiť používateľský atribút pre zobrazenie používateľského mena. Prosím, zadajte ho sami v pokročilých nastaveniach LDAP.",
     "Could not find the desired feature" : "Nemožno nájsť požadovanú funkciu",
     "Invalid Host" : "Neplatný hostiteľ",
     "Server" : "Server",
-    "User Filter" : "Filter používateľov",
-    "Login Filter" : "Filter prihlasovania",
-    "Group Filter" : "Filter skupiny",
-    "Save" : "Uložiť",
+    "Users" : "Používatelia",
+    "Groups" : "Skupiny",
     "Test Configuration" : "Test nastavenia",
     "Help" : "Pomoc",
     "Groups meeting these criteria are available in %s:" : "Skupiny spĺňajúce tieto kritériá sú k dispozícii v %s:",
-    "only those object classes:" : "len tieto triedy objektov:",
-    "only from those groups:" : "len z týchto skupín:",
-    "Edit raw filter instead" : "Miesto pre úpravu raw filtra",
-    "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Tento filter LDAP určuje, ktoré skupiny budú mať prístup k %s inštancii.",
     "Test Filter" : "Otestovať filter",
-    "groups found" : "nájdené skupiny",
-    "Users login with this attribute:" : "Používatelia sa budú prihlasovať pomocou tohto atribútu:",
-    "LDAP Username:" : "LDAP používateľské meno:",
-    "LDAP Email Address:" : "LDAP emailová adresa:",
     "Other Attributes:" : "Iné atribúty:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahrádza používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Pridať nastavenia servera.",
-    "Delete Configuration" : "Zmazať nastavenia",
     "Host" : "Hostiteľ",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Môžete vynechať protokol, okrem prípadu, kedy sa vyžaduje SSL. Vtedy začnite s ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ručné vloženie LDAP filtrov (odporúčané pre rozsiahle adresáre)",
     "Limit %s access to users meeting these criteria:" : "Obmedziť %s prístup na používateľov spĺňajúcich tieto kritériá:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.",
-    "users found" : "nájdení používatelia",
     "Saving" : "Ukladá sa",
     "Back" : "Späť",
     "Continue" : "Pokračovať",
diff --git a/apps/user_ldap/l10n/sk_SK.json b/apps/user_ldap/l10n/sk_SK.json
index 62a010f3f53..3b0e067cdc6 100644
--- a/apps/user_ldap/l10n/sk_SK.json
+++ b/apps/user_ldap/l10n/sk_SK.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Nie je určená konfigurácia",
     "No data specified" : "Nie sú vybraté dáta",
     " Could not set configuration %s" : "Nemôžem nastaviť konfiguráciu %s",
-    "Deletion failed" : "Odstránenie zlyhalo",
-    "Take over settings from recent server configuration?" : "Prebrať nastavenia z nedávneho nastavenia servera?",
-    "Keep settings?" : "Ponechať nastavenia?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Nemožno pridať nastavenie servera",
-    "mappings cleared" : "mapovanie vymazané",
-    "Success" : "Úspešné",
-    "Error" : "Chyba",
-    "Please specify a Base DN" : "Prosím, zadajte základnú DN",
-    "Could not determine Base DN" : "Nemožno určiť základnú DN",
-    "Please specify the port" : "Prosím, zadajte port",
-    "Configuration OK" : "Konfigurácia je v poriadku",
     "Configuration incorrect" : "Nesprávna konfigurácia",
     "Configuration incomplete" : "Nekompletná konfigurácia",
+    "Configuration OK" : "Konfigurácia je v poriadku",
     "Select groups" : "Vybrať skupinu",
     "Select object classes" : "Vyberte triedy objektov",
-    "Select attributes" : "Vyberte atribúty",
-    "Connection test succeeded" : "Test pripojenia bol úspešný",
-    "Connection test failed" : "Test pripojenia zlyhal",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Naozaj chcete zmazať súčasné nastavenie servera?",
     "Confirm Deletion" : "Potvrdiť vymazanie",
+    "Select attributes" : "Vyberte atribúty",
     "_%s group found_::_%s groups found_" : ["%s nájdená skupina","%s nájdené skupiny","%s nájdených skupín"],
     "_%s user found_::_%s users found_" : ["%s nájdený používateľ","%s nájdení používatelia","%s nájdených používateľov"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nemožno zistiť používateľský atribút pre zobrazenie používateľského mena. Prosím, zadajte ho sami v pokročilých nastaveniach LDAP.",
     "Could not find the desired feature" : "Nemožno nájsť požadovanú funkciu",
     "Invalid Host" : "Neplatný hostiteľ",
     "Server" : "Server",
-    "User Filter" : "Filter používateľov",
-    "Login Filter" : "Filter prihlasovania",
-    "Group Filter" : "Filter skupiny",
-    "Save" : "Uložiť",
+    "Users" : "Používatelia",
+    "Groups" : "Skupiny",
     "Test Configuration" : "Test nastavenia",
     "Help" : "Pomoc",
     "Groups meeting these criteria are available in %s:" : "Skupiny spĺňajúce tieto kritériá sú k dispozícii v %s:",
-    "only those object classes:" : "len tieto triedy objektov:",
-    "only from those groups:" : "len z týchto skupín:",
-    "Edit raw filter instead" : "Miesto pre úpravu raw filtra",
-    "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Tento filter LDAP určuje, ktoré skupiny budú mať prístup k %s inštancii.",
     "Test Filter" : "Otestovať filter",
-    "groups found" : "nájdené skupiny",
-    "Users login with this attribute:" : "Používatelia sa budú prihlasovať pomocou tohto atribútu:",
-    "LDAP Username:" : "LDAP používateľské meno:",
-    "LDAP Email Address:" : "LDAP emailová adresa:",
     "Other Attributes:" : "Iné atribúty:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahrádza používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Pridať nastavenia servera.",
-    "Delete Configuration" : "Zmazať nastavenia",
     "Host" : "Hostiteľ",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Môžete vynechať protokol, okrem prípadu, kedy sa vyžaduje SSL. Vtedy začnite s ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ručné vloženie LDAP filtrov (odporúčané pre rozsiahle adresáre)",
     "Limit %s access to users meeting these criteria:" : "Obmedziť %s prístup na používateľov spĺňajúcich tieto kritériá:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.",
-    "users found" : "nájdení používatelia",
     "Saving" : "Ukladá sa",
     "Back" : "Späť",
     "Continue" : "Pokračovať",
diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js
index 8e6e5ed261f..12ae0632005 100644
--- a/apps/user_ldap/l10n/sl.js
+++ b/apps/user_ldap/l10n/sl.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Ni določenih nastavitev",
     "No data specified" : "Ni navedenih podatkov",
     " Could not set configuration %s" : "Ni mogoče uveljaviti nastavitev %s",
-    "Deletion failed" : "Brisanje je spodletelo.",
-    "Take over settings from recent server configuration?" : "Ali naj bodo prevzete nedavne nastavitve strežnika?",
-    "Keep settings?" : "Ali naj se nastavitve ohranijo?",
-    "{nthServer}. Server" : "{nthServer}. strežnik",
-    "Cannot add server configuration" : "Ni mogoče dodati nastavitev strežnika",
-    "mappings cleared" : "preslikave so izbrisane",
-    "Success" : "Uspešno končano.",
-    "Error" : "Napaka",
-    "Please specify a Base DN" : "Določite osnovno enolično ime (base DN)",
-    "Could not determine Base DN" : "Ni mogoče določiti osnovnega enoličnega imena (base DN)",
-    "Please specify the port" : "Določiti je treba vrata",
-    "Configuration OK" : "Nastavitev je ustrezna",
     "Configuration incorrect" : "Nastavitev ni ustrezna",
     "Configuration incomplete" : "Nastavitev je nepopolna",
+    "Configuration OK" : "Nastavitev je ustrezna",
     "Select groups" : "Izberi skupine",
     "Select object classes" : "Izbor razredov predmeta",
-    "Select attributes" : "Izbor atributov",
-    "Connection test succeeded" : "Preizkus povezave je uspešno končan.",
-    "Connection test failed" : "Preizkus povezave je spodletel.",
+    "{nthServer}. Server" : "{nthServer}. strežnik",
     "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?",
     "Confirm Deletion" : "Potrdi brisanje",
+    "Select attributes" : "Izbor atributov",
     "_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"],
     "_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ni mogoče prebrati atributa prikaznega imena. Določiti ga je treba ročno med nastavitvami LDAP.",
     "Could not find the desired feature" : "Želene zmožnosti ni mogoče najti",
     "Invalid Host" : "Neveljaven gostitelj",
     "Server" : "Strežnik",
-    "User Filter" : "Uporabniški filter",
-    "Login Filter" : "Filter prijave",
-    "Group Filter" : "Filter skupin",
-    "Save" : "Shrani",
+    "Users" : "Uporabniki",
+    "Groups" : "Skupine",
     "Test Configuration" : "Preizkusne nastavitve",
     "Help" : "Pomoč",
     "Groups meeting these criteria are available in %s:" : "Skupine, ki so skladne s kriterijem, so na voljo v %s:",
-    "only those object classes:" : "le razredi predmeta:",
-    "only from those groups:" : "le iz skupin:",
-    "Edit raw filter instead" : "Uredi surov filter",
-    "Raw LDAP filter" : "Surovi filter LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.",
     "Test Filter" : "Preizkusi filter",
-    "groups found" : "najdenih skupin",
-    "Users login with this attribute:" : "Uporabniki se prijavijo z atributom:",
-    "LDAP Username:" : "Uporabniško ime LDAP:",
-    "LDAP Email Address:" : "Elektronski naslov LDAP:",
     "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\"",
     "1. Server" : "1. strežnik",
     "%s. Server:" : "%s. strežnik:",
-    "Add Server Configuration" : "Dodaj nastavitve strežnika",
-    "Delete Configuration" : "Izbriši nastavitve",
     "Host" : "Gostitelj",
     "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://",
     "Port" : "Vrata",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ročno vstavi filtre za LDAP (priporočljivo za obsežnejše mape).",
     "Limit %s access to users meeting these criteria:" : "Omeji dostop do %s za uporabnike, ki zadostijo kriterijem:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.",
-    "users found" : "najdenih uporabnikov",
     "Saving" : "Poteka shranjevanje ...",
     "Back" : "Nazaj",
     "Continue" : "Nadaljuj",
diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json
index 3370556c6a4..2025e381d90 100644
--- a/apps/user_ldap/l10n/sl.json
+++ b/apps/user_ldap/l10n/sl.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Ni določenih nastavitev",
     "No data specified" : "Ni navedenih podatkov",
     " Could not set configuration %s" : "Ni mogoče uveljaviti nastavitev %s",
-    "Deletion failed" : "Brisanje je spodletelo.",
-    "Take over settings from recent server configuration?" : "Ali naj bodo prevzete nedavne nastavitve strežnika?",
-    "Keep settings?" : "Ali naj se nastavitve ohranijo?",
-    "{nthServer}. Server" : "{nthServer}. strežnik",
-    "Cannot add server configuration" : "Ni mogoče dodati nastavitev strežnika",
-    "mappings cleared" : "preslikave so izbrisane",
-    "Success" : "Uspešno končano.",
-    "Error" : "Napaka",
-    "Please specify a Base DN" : "Določite osnovno enolično ime (base DN)",
-    "Could not determine Base DN" : "Ni mogoče določiti osnovnega enoličnega imena (base DN)",
-    "Please specify the port" : "Določiti je treba vrata",
-    "Configuration OK" : "Nastavitev je ustrezna",
     "Configuration incorrect" : "Nastavitev ni ustrezna",
     "Configuration incomplete" : "Nastavitev je nepopolna",
+    "Configuration OK" : "Nastavitev je ustrezna",
     "Select groups" : "Izberi skupine",
     "Select object classes" : "Izbor razredov predmeta",
-    "Select attributes" : "Izbor atributov",
-    "Connection test succeeded" : "Preizkus povezave je uspešno končan.",
-    "Connection test failed" : "Preizkus povezave je spodletel.",
+    "{nthServer}. Server" : "{nthServer}. strežnik",
     "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?",
     "Confirm Deletion" : "Potrdi brisanje",
+    "Select attributes" : "Izbor atributov",
     "_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"],
     "_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ni mogoče prebrati atributa prikaznega imena. Določiti ga je treba ročno med nastavitvami LDAP.",
     "Could not find the desired feature" : "Želene zmožnosti ni mogoče najti",
     "Invalid Host" : "Neveljaven gostitelj",
     "Server" : "Strežnik",
-    "User Filter" : "Uporabniški filter",
-    "Login Filter" : "Filter prijave",
-    "Group Filter" : "Filter skupin",
-    "Save" : "Shrani",
+    "Users" : "Uporabniki",
+    "Groups" : "Skupine",
     "Test Configuration" : "Preizkusne nastavitve",
     "Help" : "Pomoč",
     "Groups meeting these criteria are available in %s:" : "Skupine, ki so skladne s kriterijem, so na voljo v %s:",
-    "only those object classes:" : "le razredi predmeta:",
-    "only from those groups:" : "le iz skupin:",
-    "Edit raw filter instead" : "Uredi surov filter",
-    "Raw LDAP filter" : "Surovi filter LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.",
     "Test Filter" : "Preizkusi filter",
-    "groups found" : "najdenih skupin",
-    "Users login with this attribute:" : "Uporabniki se prijavijo z atributom:",
-    "LDAP Username:" : "Uporabniško ime LDAP:",
-    "LDAP Email Address:" : "Elektronski naslov LDAP:",
     "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\"",
     "1. Server" : "1. strežnik",
     "%s. Server:" : "%s. strežnik:",
-    "Add Server Configuration" : "Dodaj nastavitve strežnika",
-    "Delete Configuration" : "Izbriši nastavitve",
     "Host" : "Gostitelj",
     "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://",
     "Port" : "Vrata",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ročno vstavi filtre za LDAP (priporočljivo za obsežnejše mape).",
     "Limit %s access to users meeting these criteria:" : "Omeji dostop do %s za uporabnike, ki zadostijo kriterijem:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.",
-    "users found" : "najdenih uporabnikov",
     "Saving" : "Poteka shranjevanje ...",
     "Back" : "Nazaj",
     "Continue" : "Nadaljuj",
diff --git a/apps/user_ldap/l10n/sq.js b/apps/user_ldap/l10n/sq.js
index b45c3fd7e01..48ec0616b0e 100644
--- a/apps/user_ldap/l10n/sq.js
+++ b/apps/user_ldap/l10n/sq.js
@@ -5,22 +5,12 @@ OC.L10N.register(
     "Failed to delete the server configuration" : "dështoi fshirjen e konfigurimit të serverit",
     "The configuration is valid and the connection could be established!" : "Konfigurimi është i vlefshem dhe lidhja mund të kryhet",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurimi është i saktë por lidhja dështoi. Kontrolloni konfigurimete serverit dhe kredencialet.",
-    "Deletion failed" : "Fshirja dështoi",
-    "Take over settings from recent server configuration?" : "Doni të rivini konfigurmet më të fundit të serverit?",
-    "Keep settings?" : "Doni të mbani konfigurimet?",
-    "Cannot add server configuration" : "E pamundur të shtohen konfigurimet në server",
-    "mappings cleared" : "planifikimi u fshi",
-    "Success" : "Sukses",
-    "Error" : "Gabim",
-    "Connection test succeeded" : "Prova e lidhjes përfundoi me sukses",
-    "Connection test failed" : "Prova e lidhjes dështoi",
     "Do you really want to delete the current Server Configuration?" : "Jeni vërtetë të sigurt të fshini konfigurimet aktuale të serverit?",
     "Confirm Deletion" : "Konfirmoni Fshirjen",
-    "Group Filter" : "Filtri i grupeve",
-    "Save" : "Ruaj",
+    "Users" : "Përdoruesit",
+    "Groups" : "Grupet",
     "Test Configuration" : "Provoni konfigurimet",
     "Help" : "Ndihmë",
-    "Add Server Configuration" : "Shtoni konfigurimet e serverit",
     "Host" : "Pritësi",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Ju mund të mos vendosni protokollin ,vetëm nëse ju nevojitet SSL. atherë filloni me ldaps://",
     "Port" : "Porta",
diff --git a/apps/user_ldap/l10n/sq.json b/apps/user_ldap/l10n/sq.json
index 4075ece437b..595aee41fad 100644
--- a/apps/user_ldap/l10n/sq.json
+++ b/apps/user_ldap/l10n/sq.json
@@ -3,22 +3,12 @@
     "Failed to delete the server configuration" : "dështoi fshirjen e konfigurimit të serverit",
     "The configuration is valid and the connection could be established!" : "Konfigurimi është i vlefshem dhe lidhja mund të kryhet",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurimi është i saktë por lidhja dështoi. Kontrolloni konfigurimete serverit dhe kredencialet.",
-    "Deletion failed" : "Fshirja dështoi",
-    "Take over settings from recent server configuration?" : "Doni të rivini konfigurmet më të fundit të serverit?",
-    "Keep settings?" : "Doni të mbani konfigurimet?",
-    "Cannot add server configuration" : "E pamundur të shtohen konfigurimet në server",
-    "mappings cleared" : "planifikimi u fshi",
-    "Success" : "Sukses",
-    "Error" : "Gabim",
-    "Connection test succeeded" : "Prova e lidhjes përfundoi me sukses",
-    "Connection test failed" : "Prova e lidhjes dështoi",
     "Do you really want to delete the current Server Configuration?" : "Jeni vërtetë të sigurt të fshini konfigurimet aktuale të serverit?",
     "Confirm Deletion" : "Konfirmoni Fshirjen",
-    "Group Filter" : "Filtri i grupeve",
-    "Save" : "Ruaj",
+    "Users" : "Përdoruesit",
+    "Groups" : "Grupet",
     "Test Configuration" : "Provoni konfigurimet",
     "Help" : "Ndihmë",
-    "Add Server Configuration" : "Shtoni konfigurimet e serverit",
     "Host" : "Pritësi",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Ju mund të mos vendosni protokollin ,vetëm nëse ju nevojitet SSL. atherë filloni me ldaps://",
     "Port" : "Porta",
diff --git a/apps/user_ldap/l10n/sr.js b/apps/user_ldap/l10n/sr.js
index 02b992361ab..c8b8f9fed95 100644
--- a/apps/user_ldap/l10n/sr.js
+++ b/apps/user_ldap/l10n/sr.js
@@ -2,64 +2,40 @@ OC.L10N.register(
     "user_ldap",
     {
     "Failed to clear the mappings." : "Неуспело чишћење мапирања.",
-    "Failed to delete the server configuration" : "Неуспело брисање серверске конфугирације",
+    "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." : "Конфигурација је важећа, али Bind није успео. Проверите подешавања сервера и акредитиве.",
     "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурација није важећа. Погледајте у дневнику записа за додатне детаље.",
-    "No action specified" : "Није наведена акција",
-    "No configuration specified" : "Није наведена конфигурација",
+    "No action specified" : "Није наведена радња",
+    "No configuration specified" : "Није наведена постава",
     "No data specified" : "Нису наведени подаци",
     " Could not set configuration %s" : "Нисам могао да подесим конфигурацију %s",
-    "Deletion failed" : "Брисање није успело",
-    "Take over settings from recent server configuration?" : "Преузми подешавања са недавних конфигурација сервера?",
-    "Keep settings?" : "Задржати поставке?",
-    "{nthServer}. Server" : "{nthServer}. Сервер",
-    "Cannot add server configuration" : "Не могу да додам конфигурацију сервера",
-    "mappings cleared" : "мапирања су очишћена",
-    "Success" : "Успешно",
-    "Error" : "Грешка",
-    "Please specify a Base DN" : "Наведите Base DN",
-    "Could not determine Base DN" : "Не могу да одредим Base DN",
-    "Please specify the port" : "Наведите порт",
-    "Configuration OK" : "Конфигурација је у реду",
     "Configuration incorrect" : "Конфигурација је неисправна",
     "Configuration incomplete" : "Конфигурација није комплетна",
+    "Configuration OK" : "Конфигурација је у реду",
     "Select groups" : "Изаберите групе",
     "Select object classes" : "Изаберите класе објеката",
-    "Select attributes" : "Изаберите атрибуте",
-    "Connection test succeeded" : "Тест повезивања је успешан",
-    "Connection test failed" : "Тест повезивања није успешан",
+    "{nthServer}. Server" : "{nthServer}. Сервер",
     "Do you really want to delete the current Server Configuration?" : "Да ли стварно желите да обришете тренутну конфигурацију сервера?",
     "Confirm Deletion" : "Потврдa брисањa",
+    "Select attributes" : "Изаберите атрибуте",
     "_%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-a",
     "Could not find the desired feature" : "Не могу да пронађем жељену особину",
     "Invalid Host" : "Неважећи домаћин",
     "Server" : "Сервер",
-    "User Filter" : "Филтер корисника",
-    "Login Filter" : "Филтер пријављивања",
-    "Group Filter" : "Филтер групе",
-    "Save" : "Сачувај",
+    "Users" : "Корисници",
+    "Groups" : "Групе",
     "Test Configuration" : "Тестирај конфигурацију",
     "Help" : "Помоћ",
     "Groups meeting these criteria are available in %s:" : "Групе које испуњавају ове критеријуме су доступне у %s:",
-    "only those object classes:" : "само ове класе објеката:",
-    "only from those groups:" : "само из ових група:",
-    "Edit raw filter instead" : "Уреди сирови филтер",
-    "Raw LDAP filter" : "Сирови LDAP филтер",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтер прецизира које ће LDAP групе требају имати приступ %s случају.",
     "Test Filter" : "Тестни филтер",
-    "groups found" : "пронађене групе",
-    "Users login with this attribute:" : "Корисници се логују са овим параметром:",
-    "LDAP Username:" : "LDAP корисничко име:",
-    "LDAP Email Address:" : "LDAP адреса е-поште",
     "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\"",
     "1. Server" : "1. сервер",
     "%s. Server:" : "%s. Сервер:",
-    "Add Server Configuration" : "Додај конфигурацију сервера",
-    "Delete Configuration" : "Обриши конфигурацију",
     "Host" : "Домаћин",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можете да изоставите протокол, осим ако захтевате ССЛ. У том случају почните са ldaps://",
     "Port" : "Порт",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Унесите ручно LDAP филтере (препоручено за велике директоријуме)",
     "Limit %s access to users meeting these criteria:" : "Ограничи %s приступа за кориснике који испуњавају ове критеријуме:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Филтер одређује који ЛДАП корисници ће имати приступ на %s.",
-    "users found" : "пронађених корисника",
     "Saving" : "Чувам",
     "Back" : "Назад",
     "Continue" : "Настави",
@@ -110,6 +85,8 @@ OC.L10N.register(
     "Group-Member association" : "Придруживање чланова у групу",
     "Nested Groups" : "Угнеждене групе",
     "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Када је укључено, подржане су групе унутар групе. (Ради само ако особина члана групе садржи DN-ове.)",
+    "Paging chunksize" : "Величина делића странице",
+    "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.)" : "Величина делића се користи за страничење ЛДАП претрага које могу вратити гомилу резултата попут набрајања корисника или група. (постављање на 0 у таквим ситуацијама искључује приказ претраге по страницама)",
     "Special Attributes" : "Посебни параметри",
     "Quota Field" : "Поље квоте",
     "Quota Default" : "Подразумевана квота",
diff --git a/apps/user_ldap/l10n/sr.json b/apps/user_ldap/l10n/sr.json
index 4c5d20c72bb..2d401c62927 100644
--- a/apps/user_ldap/l10n/sr.json
+++ b/apps/user_ldap/l10n/sr.json
@@ -1,63 +1,39 @@
 { "translations": {
     "Failed to clear the mappings." : "Неуспело чишћење мапирања.",
-    "Failed to delete the server configuration" : "Неуспело брисање серверске конфугирације",
+    "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." : "Конфигурација је важећа, али Bind није успео. Проверите подешавања сервера и акредитиве.",
     "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурација није важећа. Погледајте у дневнику записа за додатне детаље.",
-    "No action specified" : "Није наведена акција",
-    "No configuration specified" : "Није наведена конфигурација",
+    "No action specified" : "Није наведена радња",
+    "No configuration specified" : "Није наведена постава",
     "No data specified" : "Нису наведени подаци",
     " Could not set configuration %s" : "Нисам могао да подесим конфигурацију %s",
-    "Deletion failed" : "Брисање није успело",
-    "Take over settings from recent server configuration?" : "Преузми подешавања са недавних конфигурација сервера?",
-    "Keep settings?" : "Задржати поставке?",
-    "{nthServer}. Server" : "{nthServer}. Сервер",
-    "Cannot add server configuration" : "Не могу да додам конфигурацију сервера",
-    "mappings cleared" : "мапирања су очишћена",
-    "Success" : "Успешно",
-    "Error" : "Грешка",
-    "Please specify a Base DN" : "Наведите Base DN",
-    "Could not determine Base DN" : "Не могу да одредим Base DN",
-    "Please specify the port" : "Наведите порт",
-    "Configuration OK" : "Конфигурација је у реду",
     "Configuration incorrect" : "Конфигурација је неисправна",
     "Configuration incomplete" : "Конфигурација није комплетна",
+    "Configuration OK" : "Конфигурација је у реду",
     "Select groups" : "Изаберите групе",
     "Select object classes" : "Изаберите класе објеката",
-    "Select attributes" : "Изаберите атрибуте",
-    "Connection test succeeded" : "Тест повезивања је успешан",
-    "Connection test failed" : "Тест повезивања није успешан",
+    "{nthServer}. Server" : "{nthServer}. Сервер",
     "Do you really want to delete the current Server Configuration?" : "Да ли стварно желите да обришете тренутну конфигурацију сервера?",
     "Confirm Deletion" : "Потврдa брисањa",
+    "Select attributes" : "Изаберите атрибуте",
     "_%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-a",
     "Could not find the desired feature" : "Не могу да пронађем жељену особину",
     "Invalid Host" : "Неважећи домаћин",
     "Server" : "Сервер",
-    "User Filter" : "Филтер корисника",
-    "Login Filter" : "Филтер пријављивања",
-    "Group Filter" : "Филтер групе",
-    "Save" : "Сачувај",
+    "Users" : "Корисници",
+    "Groups" : "Групе",
     "Test Configuration" : "Тестирај конфигурацију",
     "Help" : "Помоћ",
     "Groups meeting these criteria are available in %s:" : "Групе које испуњавају ове критеријуме су доступне у %s:",
-    "only those object classes:" : "само ове класе објеката:",
-    "only from those groups:" : "само из ових група:",
-    "Edit raw filter instead" : "Уреди сирови филтер",
-    "Raw LDAP filter" : "Сирови LDAP филтер",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтер прецизира које ће LDAP групе требају имати приступ %s случају.",
     "Test Filter" : "Тестни филтер",
-    "groups found" : "пронађене групе",
-    "Users login with this attribute:" : "Корисници се логују са овим параметром:",
-    "LDAP Username:" : "LDAP корисничко име:",
-    "LDAP Email Address:" : "LDAP адреса е-поште",
     "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\"",
     "1. Server" : "1. сервер",
     "%s. Server:" : "%s. Сервер:",
-    "Add Server Configuration" : "Додај конфигурацију сервера",
-    "Delete Configuration" : "Обриши конфигурацију",
     "Host" : "Домаћин",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можете да изоставите протокол, осим ако захтевате ССЛ. У том случају почните са ldaps://",
     "Port" : "Порт",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Унесите ручно LDAP филтере (препоручено за велике директоријуме)",
     "Limit %s access to users meeting these criteria:" : "Ограничи %s приступа за кориснике који испуњавају ове критеријуме:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Филтер одређује који ЛДАП корисници ће имати приступ на %s.",
-    "users found" : "пронађених корисника",
     "Saving" : "Чувам",
     "Back" : "Назад",
     "Continue" : "Настави",
@@ -108,6 +83,8 @@
     "Group-Member association" : "Придруживање чланова у групу",
     "Nested Groups" : "Угнеждене групе",
     "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Када је укључено, подржане су групе унутар групе. (Ради само ако особина члана групе садржи DN-ове.)",
+    "Paging chunksize" : "Величина делића странице",
+    "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.)" : "Величина делића се користи за страничење ЛДАП претрага које могу вратити гомилу резултата попут набрајања корисника или група. (постављање на 0 у таквим ситуацијама искључује приказ претраге по страницама)",
     "Special Attributes" : "Посебни параметри",
     "Quota Field" : "Поље квоте",
     "Quota Default" : "Подразумевана квота",
diff --git a/apps/user_ldap/l10n/sr@latin.js b/apps/user_ldap/l10n/sr@latin.js
index fe5ead9186f..4a2f45db5c7 100644
--- a/apps/user_ldap/l10n/sr@latin.js
+++ b/apps/user_ldap/l10n/sr@latin.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "Brisanje neuspelo",
-    "Error" : "Greška",
-    "Save" : "Snimi",
+    "Users" : "Korisnici",
+    "Groups" : "Grupe",
     "Help" : "Pomoć",
     "Host" : "Računar",
     "Port" : "Port",
diff --git a/apps/user_ldap/l10n/sr@latin.json b/apps/user_ldap/l10n/sr@latin.json
index da7acb64d2e..8cf62805869 100644
--- a/apps/user_ldap/l10n/sr@latin.json
+++ b/apps/user_ldap/l10n/sr@latin.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "Brisanje neuspelo",
-    "Error" : "Greška",
-    "Save" : "Snimi",
+    "Users" : "Korisnici",
+    "Groups" : "Grupe",
     "Help" : "Pomoć",
     "Host" : "Računar",
     "Port" : "Port",
diff --git a/apps/user_ldap/l10n/sv.js b/apps/user_ldap/l10n/sv.js
index f0fd5615867..f9920f6ca7d 100644
--- a/apps/user_ldap/l10n/sv.js
+++ b/apps/user_ldap/l10n/sv.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Ingen konfiguration har angetts",
     "No data specified" : "Ingen data har angetts",
     " Could not set configuration %s" : "Kunde inte sätta inställning %s",
-    "Deletion failed" : "Raderingen misslyckades",
-    "Take over settings from recent server configuration?" : "Ta över inställningar från tidigare serverkonfiguration?",
-    "Keep settings?" : "Behåll inställningarna?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Kunde inte lägga till serverinställning",
-    "mappings cleared" : "mappningar rensade",
-    "Success" : "Lyckat",
-    "Error" : "Fel",
-    "Please specify a Base DN" : "Vänligen ange en Base DN",
-    "Could not determine Base DN" : "Det gick inte att avgöra Base DN",
-    "Please specify the port" : "Specificera en port",
-    "Configuration OK" : "Konfigurationen är OK",
     "Configuration incorrect" : "Felaktig konfiguration",
     "Configuration incomplete" : "Konfigurationen är ej komplett",
+    "Configuration OK" : "Konfigurationen är OK",
     "Select groups" : "Välj grupper",
     "Select object classes" : "Välj objekt-klasser",
-    "Select attributes" : "Välj attribut",
-    "Connection test succeeded" : "Anslutningstestet lyckades",
-    "Connection test failed" : "Anslutningstestet misslyckades",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Vill du verkligen radera den nuvarande serverinställningen?",
     "Confirm Deletion" : "Bekräfta radering",
+    "Select attributes" : "Välj attribut",
     "_%s group found_::_%s groups found_" : ["%s grupp hittad","%s grupper hittade"],
     "_%s user found_::_%s users found_" : ["%s användare hittad","%s användare hittade"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunde inte upptäcka attributet användarvisningsnamn. Vänligen ange det själv i de avancerade LDAP-inställningarna.",
     "Could not find the desired feature" : "Det gick inte hitta den önskade funktionen",
     "Invalid Host" : "Felaktig värd",
     "Server" : "Server",
-    "User Filter" : "Användarfilter",
-    "Login Filter" : "Inloggningsfilter",
-    "Group Filter" : "Gruppfilter",
-    "Save" : "Spara",
+    "Users" : "Användare",
+    "Groups" : "Grupper",
     "Test Configuration" : "Testa konfigurationen",
     "Help" : "Hjälp",
     "Groups meeting these criteria are available in %s:" : "Grupper som uppfyller dessa kriterier finns i %s:",
-    "only those object classes:" : "Endast de objekt-klasserna:",
-    "only from those groups:" : "endast ifrån de här grupperna:",
-    "Edit raw filter instead" : "Redigera rått filter istället",
-    "Raw LDAP filter" : "Rått LDAP-filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtret specifierar vilka LDAD-grupper som ska ha åtkomst till %s instans",
     "Test Filter" : "Testfilter",
-    "groups found" : "grupper hittade",
-    "Users login with this attribute:" : "Användare loggar in med detta attribut:",
-    "LDAP Username:" : "LDAP användarnamn:",
-    "LDAP Email Address:" : "LDAP e-postadress:",
     "Other Attributes:" : "Övriga attribut:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Lägg till serverinställning",
-    "Delete Configuration" : "Radera konfiguration",
     "Host" : "Server",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Ange LDAP-filter manuellt (rekommenderat för stora kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begränsa %s tillgång till användare som uppfyller dessa kriterier:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtret specifierar vilka LDAP-användare som skall ha åtkomst till %s instans",
-    "users found" : "användare funna",
     "Saving" : "Sparar",
     "Back" : "Tillbaka",
     "Continue" : "Fortsätt",
diff --git a/apps/user_ldap/l10n/sv.json b/apps/user_ldap/l10n/sv.json
index 4f416eac3ea..53155976d98 100644
--- a/apps/user_ldap/l10n/sv.json
+++ b/apps/user_ldap/l10n/sv.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Ingen konfiguration har angetts",
     "No data specified" : "Ingen data har angetts",
     " Could not set configuration %s" : "Kunde inte sätta inställning %s",
-    "Deletion failed" : "Raderingen misslyckades",
-    "Take over settings from recent server configuration?" : "Ta över inställningar från tidigare serverkonfiguration?",
-    "Keep settings?" : "Behåll inställningarna?",
-    "{nthServer}. Server" : "{nthServer}. Server",
-    "Cannot add server configuration" : "Kunde inte lägga till serverinställning",
-    "mappings cleared" : "mappningar rensade",
-    "Success" : "Lyckat",
-    "Error" : "Fel",
-    "Please specify a Base DN" : "Vänligen ange en Base DN",
-    "Could not determine Base DN" : "Det gick inte att avgöra Base DN",
-    "Please specify the port" : "Specificera en port",
-    "Configuration OK" : "Konfigurationen är OK",
     "Configuration incorrect" : "Felaktig konfiguration",
     "Configuration incomplete" : "Konfigurationen är ej komplett",
+    "Configuration OK" : "Konfigurationen är OK",
     "Select groups" : "Välj grupper",
     "Select object classes" : "Välj objekt-klasser",
-    "Select attributes" : "Välj attribut",
-    "Connection test succeeded" : "Anslutningstestet lyckades",
-    "Connection test failed" : "Anslutningstestet misslyckades",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Do you really want to delete the current Server Configuration?" : "Vill du verkligen radera den nuvarande serverinställningen?",
     "Confirm Deletion" : "Bekräfta radering",
+    "Select attributes" : "Välj attribut",
     "_%s group found_::_%s groups found_" : ["%s grupp hittad","%s grupper hittade"],
     "_%s user found_::_%s users found_" : ["%s användare hittad","%s användare hittade"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunde inte upptäcka attributet användarvisningsnamn. Vänligen ange det själv i de avancerade LDAP-inställningarna.",
     "Could not find the desired feature" : "Det gick inte hitta den önskade funktionen",
     "Invalid Host" : "Felaktig värd",
     "Server" : "Server",
-    "User Filter" : "Användarfilter",
-    "Login Filter" : "Inloggningsfilter",
-    "Group Filter" : "Gruppfilter",
-    "Save" : "Spara",
+    "Users" : "Användare",
+    "Groups" : "Grupper",
     "Test Configuration" : "Testa konfigurationen",
     "Help" : "Hjälp",
     "Groups meeting these criteria are available in %s:" : "Grupper som uppfyller dessa kriterier finns i %s:",
-    "only those object classes:" : "Endast de objekt-klasserna:",
-    "only from those groups:" : "endast ifrån de här grupperna:",
-    "Edit raw filter instead" : "Redigera rått filter istället",
-    "Raw LDAP filter" : "Rått LDAP-filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtret specifierar vilka LDAD-grupper som ska ha åtkomst till %s instans",
     "Test Filter" : "Testfilter",
-    "groups found" : "grupper hittade",
-    "Users login with this attribute:" : "Användare loggar in med detta attribut:",
-    "LDAP Username:" : "LDAP användarnamn:",
-    "LDAP Email Address:" : "LDAP e-postadress:",
     "Other Attributes:" : "Övriga attribut:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
-    "Add Server Configuration" : "Lägg till serverinställning",
-    "Delete Configuration" : "Radera konfiguration",
     "Host" : "Server",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Ange LDAP-filter manuellt (rekommenderat för stora kataloger)",
     "Limit %s access to users meeting these criteria:" : "Begränsa %s tillgång till användare som uppfyller dessa kriterier:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtret specifierar vilka LDAP-användare som skall ha åtkomst till %s instans",
-    "users found" : "användare funna",
     "Saving" : "Sparar",
     "Back" : "Tillbaka",
     "Continue" : "Fortsätt",
diff --git a/apps/user_ldap/l10n/ta_LK.js b/apps/user_ldap/l10n/ta_LK.js
index 9aac33d72c8..51b6fd44fe0 100644
--- a/apps/user_ldap/l10n/ta_LK.js
+++ b/apps/user_ldap/l10n/ta_LK.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "நீக்கம் தோல்வியடைந்தது",
-    "Error" : "வழு",
-    "Save" : "சேமிக்க ",
+    "Users" : "பயனாளர்",
+    "Groups" : "குழுக்கள்",
     "Help" : "உதவி",
     "Host" : "ஓம்புனர்",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்",
diff --git a/apps/user_ldap/l10n/ta_LK.json b/apps/user_ldap/l10n/ta_LK.json
index 76b21ad70d9..496dbcc6a31 100644
--- a/apps/user_ldap/l10n/ta_LK.json
+++ b/apps/user_ldap/l10n/ta_LK.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Deletion failed" : "நீக்கம் தோல்வியடைந்தது",
-    "Error" : "வழு",
-    "Save" : "சேமிக்க ",
+    "Users" : "பயனாளர்",
+    "Groups" : "குழுக்கள்",
     "Help" : "உதவி",
     "Host" : "ஓம்புனர்",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்",
diff --git a/apps/user_ldap/l10n/te.js b/apps/user_ldap/l10n/te.js
index dfb4f4af3d7..7be587b12af 100644
--- a/apps/user_ldap/l10n/te.js
+++ b/apps/user_ldap/l10n/te.js
@@ -1,8 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "పొరపాటు",
-    "Save" : "భద్రపరచు",
+    "Users" : "వాడుకరులు",
     "Help" : "సహాయం",
     "Password" : "సంకేతపదం",
     "Continue" : "కొనసాగించు",
diff --git a/apps/user_ldap/l10n/te.json b/apps/user_ldap/l10n/te.json
index 82952a0593f..89d2f4d7337 100644
--- a/apps/user_ldap/l10n/te.json
+++ b/apps/user_ldap/l10n/te.json
@@ -1,6 +1,5 @@
 { "translations": {
-    "Error" : "పొరపాటు",
-    "Save" : "భద్రపరచు",
+    "Users" : "వాడుకరులు",
     "Help" : "సహాయం",
     "Password" : "సంకేతపదం",
     "Continue" : "కొనసాగించు",
diff --git a/apps/user_ldap/l10n/th_TH.js b/apps/user_ldap/l10n/th_TH.js
index e746f5e9853..4aa92c2ec8c 100644
--- a/apps/user_ldap/l10n/th_TH.js
+++ b/apps/user_ldap/l10n/th_TH.js
@@ -4,20 +4,12 @@ OC.L10N.register(
     "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." : "การกำหนดค่าถูกต้อง, แต่การผูกข้อมูลล้มเหลว, กรุณาตรวจสอบการตั้งค่าเซิร์ฟเวอร์และข้อมูลการเข้าใช้งาน",
-    "Deletion failed" : "การลบทิ้งล้มเหลว",
-    "Keep settings?" : "รักษาการตั้งค่าไว้?",
-    "Cannot add server configuration" : "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้",
-    "Success" : "เสร็จสิ้น",
-    "Error" : "ข้อผิดพลาด",
     "Select groups" : "เลือกกลุ่ม",
-    "Connection test succeeded" : "ทดสอบการเชื่อมต่อสำเร็จ",
-    "Connection test failed" : "ทดสอบการเชื่อมต่อล้มเหลว",
     "Do you really want to delete the current Server Configuration?" : "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?",
     "Confirm Deletion" : "ยืนยันการลบทิ้ง",
-    "Group Filter" : "ตัวกรองข้อมูลกลุ่ม",
-    "Save" : "บันทึก",
+    "Users" : "ผู้ใช้งาน",
+    "Groups" : "กลุ่ม",
     "Help" : "ช่วยเหลือ",
-    "Add Server Configuration" : "เพิ่มการกำหนดค่าเซิร์ฟเวอร์",
     "Host" : "โฮสต์",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://",
     "Port" : "พอร์ต",
diff --git a/apps/user_ldap/l10n/th_TH.json b/apps/user_ldap/l10n/th_TH.json
index f7e44a61c33..130b90657e9 100644
--- a/apps/user_ldap/l10n/th_TH.json
+++ b/apps/user_ldap/l10n/th_TH.json
@@ -2,20 +2,12 @@
     "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." : "การกำหนดค่าถูกต้อง, แต่การผูกข้อมูลล้มเหลว, กรุณาตรวจสอบการตั้งค่าเซิร์ฟเวอร์และข้อมูลการเข้าใช้งาน",
-    "Deletion failed" : "การลบทิ้งล้มเหลว",
-    "Keep settings?" : "รักษาการตั้งค่าไว้?",
-    "Cannot add server configuration" : "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้",
-    "Success" : "เสร็จสิ้น",
-    "Error" : "ข้อผิดพลาด",
     "Select groups" : "เลือกกลุ่ม",
-    "Connection test succeeded" : "ทดสอบการเชื่อมต่อสำเร็จ",
-    "Connection test failed" : "ทดสอบการเชื่อมต่อล้มเหลว",
     "Do you really want to delete the current Server Configuration?" : "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?",
     "Confirm Deletion" : "ยืนยันการลบทิ้ง",
-    "Group Filter" : "ตัวกรองข้อมูลกลุ่ม",
-    "Save" : "บันทึก",
+    "Users" : "ผู้ใช้งาน",
+    "Groups" : "กลุ่ม",
     "Help" : "ช่วยเหลือ",
-    "Add Server Configuration" : "เพิ่มการกำหนดค่าเซิร์ฟเวอร์",
     "Host" : "โฮสต์",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://",
     "Port" : "พอร์ต",
diff --git a/apps/user_ldap/l10n/tr.js b/apps/user_ldap/l10n/tr.js
index 41e6d03bfa8..15b474a5225 100644
--- a/apps/user_ldap/l10n/tr.js
+++ b/apps/user_ldap/l10n/tr.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Yapılandırma belirtilmemiş",
     "No data specified" : "Veri belirtilmemiş",
     " Could not set configuration %s" : "%s yapılandırması ayarlanamadı",
-    "Deletion failed" : "Silme başarısız oldu",
-    "Take over settings from recent server configuration?" : "Ayarlar son sunucu yapılandırmalarından devralınsın mı?",
-    "Keep settings?" : "Ayarlar korunsun mu?",
-    "{nthServer}. Server" : "{nthServer}. Sunucu",
-    "Cannot add server configuration" : "Sunucu yapılandırması eklenemedi",
-    "mappings cleared" : "eşleştirmeler temizlendi",
-    "Success" : "Başarılı",
-    "Error" : "Hata",
-    "Please specify a Base DN" : "Lütfen bir Base DN belirtin",
-    "Could not determine Base DN" : "Base DN belirlenemedi",
-    "Please specify the port" : "Lütfen bağlantı noktasını belirtin",
-    "Configuration OK" : "Yapılandırma tamam",
     "Configuration incorrect" : "Yapılandırma geçersiz",
     "Configuration incomplete" : "Yapılandırma tamamlanmamış",
+    "Configuration OK" : "Yapılandırma tamam",
     "Select groups" : "Grupları seç",
     "Select object classes" : "Nesne sınıflarını seç",
-    "Select attributes" : "Nitelikleri seç",
-    "Connection test succeeded" : "Bağlantı testi başarılı oldu",
-    "Connection test failed" : "Bağlantı testi başarısız oldu",
+    "{nthServer}. Server" : "{nthServer}. Sunucu",
     "Do you really want to delete the current Server Configuration?" : "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?",
     "Confirm Deletion" : "Silmeyi onayla",
+    "Select attributes" : "Nitelikleri seç",
     "_%s group found_::_%s groups found_" : ["%s grup bulundu","%s grup bulundu"],
     "_%s user found_::_%s users found_" : ["%s kullanıcı bulundu","%s kullanıcı bulundu"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Görüntülenecek kullanıcı adı özelliği algılanamadı. Lütfen gelişmiş ldap ayarlarına girerek kendiniz belirleyin.",
     "Could not find the desired feature" : "İstenen özellik bulunamadı",
     "Invalid Host" : "Geçersiz Makine",
     "Server" : "Sunucu",
-    "User Filter" : "Kullanıcı Süzgeci",
-    "Login Filter" : "Oturum Süzgeci",
-    "Group Filter" : "Grup Süzgeci",
-    "Save" : "Kaydet",
+    "Users" : "Kullanıcılar",
+    "Groups" : "Gruplar",
     "Test Configuration" : "Yapılandırmayı Sına",
     "Help" : "Yardım",
     "Groups meeting these criteria are available in %s:" : "Bu kriterlerle eşleşen gruplar %s içinde mevcut:",
-    "only those object classes:" : "sadece bu nesne sınıflarına:",
-    "only from those groups:" : "sadece bu gruplardan:",
-    "Edit raw filter instead" : "Bunun yerine ham filtreyi düzenle",
-    "Raw LDAP filter" : "Ham LDAP filtresi",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.",
     "Test Filter" : "Filtreyi Test Et",
-    "groups found" : "grup bulundu",
-    "Users login with this attribute:" : "Kullanıcılar şu öznitelikle oturum açarlar:",
-    "LDAP Username:" : "LDAP Kullanıcı Adı:",
-    "LDAP Email Address:" : "LDAP E-posta Adresi:",
     "Other Attributes:" : "Diğer Nitelikler:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\"",
     "1. Server" : "1. Sunucu",
     "%s. Server:" : "%s. Sunucu:",
-    "Add Server Configuration" : "Sunucu Yapılandırması Ekle",
-    "Delete Configuration" : "Yapılandırmayı Sil",
     "Host" : "Sunucu",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL gerekmediği takdirde protokol belirtmeyebilirsiniz. Gerekiyorsa ldaps:// ile başlayın",
     "Port" : "Port",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP filtrelerini el ile girin (büyük dizinler için önerilir)",
     "Limit %s access to users meeting these criteria:" : "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.",
-    "users found" : "kullanıcı bulundu",
     "Saving" : "Kaydediliyor",
     "Back" : "Geri",
     "Continue" : "Devam et",
diff --git a/apps/user_ldap/l10n/tr.json b/apps/user_ldap/l10n/tr.json
index 678eb81a141..f4a3e37cde9 100644
--- a/apps/user_ldap/l10n/tr.json
+++ b/apps/user_ldap/l10n/tr.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Yapılandırma belirtilmemiş",
     "No data specified" : "Veri belirtilmemiş",
     " Could not set configuration %s" : "%s yapılandırması ayarlanamadı",
-    "Deletion failed" : "Silme başarısız oldu",
-    "Take over settings from recent server configuration?" : "Ayarlar son sunucu yapılandırmalarından devralınsın mı?",
-    "Keep settings?" : "Ayarlar korunsun mu?",
-    "{nthServer}. Server" : "{nthServer}. Sunucu",
-    "Cannot add server configuration" : "Sunucu yapılandırması eklenemedi",
-    "mappings cleared" : "eşleştirmeler temizlendi",
-    "Success" : "Başarılı",
-    "Error" : "Hata",
-    "Please specify a Base DN" : "Lütfen bir Base DN belirtin",
-    "Could not determine Base DN" : "Base DN belirlenemedi",
-    "Please specify the port" : "Lütfen bağlantı noktasını belirtin",
-    "Configuration OK" : "Yapılandırma tamam",
     "Configuration incorrect" : "Yapılandırma geçersiz",
     "Configuration incomplete" : "Yapılandırma tamamlanmamış",
+    "Configuration OK" : "Yapılandırma tamam",
     "Select groups" : "Grupları seç",
     "Select object classes" : "Nesne sınıflarını seç",
-    "Select attributes" : "Nitelikleri seç",
-    "Connection test succeeded" : "Bağlantı testi başarılı oldu",
-    "Connection test failed" : "Bağlantı testi başarısız oldu",
+    "{nthServer}. Server" : "{nthServer}. Sunucu",
     "Do you really want to delete the current Server Configuration?" : "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?",
     "Confirm Deletion" : "Silmeyi onayla",
+    "Select attributes" : "Nitelikleri seç",
     "_%s group found_::_%s groups found_" : ["%s grup bulundu","%s grup bulundu"],
     "_%s user found_::_%s users found_" : ["%s kullanıcı bulundu","%s kullanıcı bulundu"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Görüntülenecek kullanıcı adı özelliği algılanamadı. Lütfen gelişmiş ldap ayarlarına girerek kendiniz belirleyin.",
     "Could not find the desired feature" : "İstenen özellik bulunamadı",
     "Invalid Host" : "Geçersiz Makine",
     "Server" : "Sunucu",
-    "User Filter" : "Kullanıcı Süzgeci",
-    "Login Filter" : "Oturum Süzgeci",
-    "Group Filter" : "Grup Süzgeci",
-    "Save" : "Kaydet",
+    "Users" : "Kullanıcılar",
+    "Groups" : "Gruplar",
     "Test Configuration" : "Yapılandırmayı Sına",
     "Help" : "Yardım",
     "Groups meeting these criteria are available in %s:" : "Bu kriterlerle eşleşen gruplar %s içinde mevcut:",
-    "only those object classes:" : "sadece bu nesne sınıflarına:",
-    "only from those groups:" : "sadece bu gruplardan:",
-    "Edit raw filter instead" : "Bunun yerine ham filtreyi düzenle",
-    "Raw LDAP filter" : "Ham LDAP filtresi",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.",
     "Test Filter" : "Filtreyi Test Et",
-    "groups found" : "grup bulundu",
-    "Users login with this attribute:" : "Kullanıcılar şu öznitelikle oturum açarlar:",
-    "LDAP Username:" : "LDAP Kullanıcı Adı:",
-    "LDAP Email Address:" : "LDAP E-posta Adresi:",
     "Other Attributes:" : "Diğer Nitelikler:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\"",
     "1. Server" : "1. Sunucu",
     "%s. Server:" : "%s. Sunucu:",
-    "Add Server Configuration" : "Sunucu Yapılandırması Ekle",
-    "Delete Configuration" : "Yapılandırmayı Sil",
     "Host" : "Sunucu",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL gerekmediği takdirde protokol belirtmeyebilirsiniz. Gerekiyorsa ldaps:// ile başlayın",
     "Port" : "Port",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "LDAP filtrelerini el ile girin (büyük dizinler için önerilir)",
     "Limit %s access to users meeting these criteria:" : "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.",
-    "users found" : "kullanıcı bulundu",
     "Saving" : "Kaydediliyor",
     "Back" : "Geri",
     "Continue" : "Devam et",
diff --git a/apps/user_ldap/l10n/ug.js b/apps/user_ldap/l10n/ug.js
index efdb474f381..c1020b1c32b 100644
--- a/apps/user_ldap/l10n/ug.js
+++ b/apps/user_ldap/l10n/ug.js
@@ -1,10 +1,8 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Deletion failed" : "ئۆچۈرۈش مەغلۇپ بولدى",
-    "Error" : "خاتالىق",
-    "Group Filter" : "گۇرۇپپا سۈزگۈچ",
-    "Save" : "ساقلا",
+    "Users" : "ئىشلەتكۈچىلەر",
+    "Groups" : "گۇرۇپپا",
     "Help" : "ياردەم",
     "Host" : "باش ئاپپارات",
     "Port" : "ئېغىز",
diff --git a/apps/user_ldap/l10n/ug.json b/apps/user_ldap/l10n/ug.json
index 59b6d5206a7..adecc82972d 100644
--- a/apps/user_ldap/l10n/ug.json
+++ b/apps/user_ldap/l10n/ug.json
@@ -1,8 +1,6 @@
 { "translations": {
-    "Deletion failed" : "ئۆچۈرۈش مەغلۇپ بولدى",
-    "Error" : "خاتالىق",
-    "Group Filter" : "گۇرۇپپا سۈزگۈچ",
-    "Save" : "ساقلا",
+    "Users" : "ئىشلەتكۈچىلەر",
+    "Groups" : "گۇرۇپپا",
     "Help" : "ياردەم",
     "Host" : "باش ئاپپارات",
     "Port" : "ئېغىز",
diff --git a/apps/user_ldap/l10n/uk.js b/apps/user_ldap/l10n/uk.js
index c231a4a5553..5aa7c217c60 100644
--- a/apps/user_ldap/l10n/uk.js
+++ b/apps/user_ldap/l10n/uk.js
@@ -10,56 +10,32 @@ OC.L10N.register(
     "No configuration specified" : "Немає конфігурації",
     "No data specified" : "Немає даних",
     " Could not set configuration %s" : "Не вдалося встановити конфігурацію %s",
-    "Deletion failed" : "Видалення не було виконано",
-    "Take over settings from recent server configuration?" : "Застосувати налаштування  з останньої конфігурації сервера ?",
-    "Keep settings?" : "Зберегти налаштування ?",
-    "{nthServer}. Server" : "{nthServer}. Сервер",
-    "Cannot add server configuration" : "Неможливо додати конфігурацію сервера",
-    "mappings cleared" : "відображення очищається",
-    "Success" : "Успіх",
-    "Error" : "Помилка",
-    "Please specify a Base DN" : "Введіть Base DN",
-    "Could not determine Base DN" : "Не вдалося визначити Base DN",
-    "Please specify the port" : "Будь ласка, вкажіть порт",
-    "Configuration OK" : "Конфігурація OK",
     "Configuration incorrect" : "Невірна конфігурація",
     "Configuration incomplete" : "Конфігурація неповна",
+    "Configuration OK" : "Конфігурація OK",
     "Select groups" : "Оберіть групи",
     "Select object classes" : "Виберіть класи об'єктів",
-    "Select attributes" : "Виберіть атрибути",
-    "Connection test succeeded" : "Перевірка з'єднання пройшла успішно",
-    "Connection test failed" : "Перевірка з'єднання завершилась неуспішно",
+    "{nthServer}. Server" : "{nthServer}. Сервер",
     "Do you really want to delete the current Server Configuration?" : "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?",
     "Confirm Deletion" : "Підтвердіть Видалення",
+    "Select attributes" : "Виберіть атрибути",
     "_%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" : "Сервер",
-    "User Filter" : "Користувацький Фільтр",
-    "Login Filter" : "Фільтр Входу",
-    "Group Filter" : "Фільтр Груп",
-    "Save" : "Зберегти",
+    "Users" : "Користувачі",
+    "Groups" : "Групи",
     "Test Configuration" : "Тестове налаштування",
     "Help" : "Допомога",
     "Groups meeting these criteria are available in %s:" : "Групи, що відповідають цим критеріям доступні в %s:",
-    "only those object classes:" : "тільки ці об'єктні класи:",
-    "only from those groups:" : "тільки з цих груп:",
-    "Edit raw filter instead" : "Редагувати початковий фільтр",
-    "Raw LDAP filter" : "Початковий LDAP фільтр",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Фільтр визначає, які LDAP групи повинні мати доступ до %s примірника.",
     "Test Filter" : "Тест Фільтр",
-    "groups found" : "знайдені групи",
-    "Users login with this attribute:" : "Вхід користувачів з цим атрибутом:",
-    "LDAP Username:" : "LDAP Ім’я користувача:",
-    "LDAP Email Address:" : "LDAP E-mail адрес:",
     "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. Сервер:",
-    "Add Server Configuration" : "Додати налаштування Сервера",
-    "Delete Configuration" : "Видалити Конфігурацію",
     "Host" : "Хост",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
     "Port" : "Порт",
@@ -73,7 +49,6 @@ OC.L10N.register(
     "Manually enter LDAP filters (recommended for large directories)" : "Вручну введіть LDAP фільтри (рекомендується для великих каталогів)",
     "Limit %s access to users meeting these criteria:" : "Обмежити %s доступ до користувачів, що відповідають цим критеріям:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Фільтр визначає, які користувачі LDAP повині мати доступ до примірника %s.",
-    "users found" : "користувачів знайдено",
     "Saving" : "Збереження",
     "Back" : "Назад",
     "Continue" : "Продовжити",
diff --git a/apps/user_ldap/l10n/uk.json b/apps/user_ldap/l10n/uk.json
index 597c15170d6..16fd5b66343 100644
--- a/apps/user_ldap/l10n/uk.json
+++ b/apps/user_ldap/l10n/uk.json
@@ -8,56 +8,32 @@
     "No configuration specified" : "Немає конфігурації",
     "No data specified" : "Немає даних",
     " Could not set configuration %s" : "Не вдалося встановити конфігурацію %s",
-    "Deletion failed" : "Видалення не було виконано",
-    "Take over settings from recent server configuration?" : "Застосувати налаштування  з останньої конфігурації сервера ?",
-    "Keep settings?" : "Зберегти налаштування ?",
-    "{nthServer}. Server" : "{nthServer}. Сервер",
-    "Cannot add server configuration" : "Неможливо додати конфігурацію сервера",
-    "mappings cleared" : "відображення очищається",
-    "Success" : "Успіх",
-    "Error" : "Помилка",
-    "Please specify a Base DN" : "Введіть Base DN",
-    "Could not determine Base DN" : "Не вдалося визначити Base DN",
-    "Please specify the port" : "Будь ласка, вкажіть порт",
-    "Configuration OK" : "Конфігурація OK",
     "Configuration incorrect" : "Невірна конфігурація",
     "Configuration incomplete" : "Конфігурація неповна",
+    "Configuration OK" : "Конфігурація OK",
     "Select groups" : "Оберіть групи",
     "Select object classes" : "Виберіть класи об'єктів",
-    "Select attributes" : "Виберіть атрибути",
-    "Connection test succeeded" : "Перевірка з'єднання пройшла успішно",
-    "Connection test failed" : "Перевірка з'єднання завершилась неуспішно",
+    "{nthServer}. Server" : "{nthServer}. Сервер",
     "Do you really want to delete the current Server Configuration?" : "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?",
     "Confirm Deletion" : "Підтвердіть Видалення",
+    "Select attributes" : "Виберіть атрибути",
     "_%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" : "Сервер",
-    "User Filter" : "Користувацький Фільтр",
-    "Login Filter" : "Фільтр Входу",
-    "Group Filter" : "Фільтр Груп",
-    "Save" : "Зберегти",
+    "Users" : "Користувачі",
+    "Groups" : "Групи",
     "Test Configuration" : "Тестове налаштування",
     "Help" : "Допомога",
     "Groups meeting these criteria are available in %s:" : "Групи, що відповідають цим критеріям доступні в %s:",
-    "only those object classes:" : "тільки ці об'єктні класи:",
-    "only from those groups:" : "тільки з цих груп:",
-    "Edit raw filter instead" : "Редагувати початковий фільтр",
-    "Raw LDAP filter" : "Початковий LDAP фільтр",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Фільтр визначає, які LDAP групи повинні мати доступ до %s примірника.",
     "Test Filter" : "Тест Фільтр",
-    "groups found" : "знайдені групи",
-    "Users login with this attribute:" : "Вхід користувачів з цим атрибутом:",
-    "LDAP Username:" : "LDAP Ім’я користувача:",
-    "LDAP Email Address:" : "LDAP E-mail адрес:",
     "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. Сервер:",
-    "Add Server Configuration" : "Додати налаштування Сервера",
-    "Delete Configuration" : "Видалити Конфігурацію",
     "Host" : "Хост",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
     "Port" : "Порт",
@@ -71,7 +47,6 @@
     "Manually enter LDAP filters (recommended for large directories)" : "Вручну введіть LDAP фільтри (рекомендується для великих каталогів)",
     "Limit %s access to users meeting these criteria:" : "Обмежити %s доступ до користувачів, що відповідають цим критеріям:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Фільтр визначає, які користувачі LDAP повині мати доступ до примірника %s.",
-    "users found" : "користувачів знайдено",
     "Saving" : "Збереження",
     "Back" : "Назад",
     "Continue" : "Продовжити",
diff --git a/apps/user_ldap/l10n/ur_PK.js b/apps/user_ldap/l10n/ur_PK.js
index 9ddd79ea349..26ff7ae3d84 100644
--- a/apps/user_ldap/l10n/ur_PK.js
+++ b/apps/user_ldap/l10n/ur_PK.js
@@ -1,8 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Error" : "ایرر",
-    "Save" : "حفظ",
+    "Users" : "صارفین",
     "Help" : "مدد",
     "Password" : "پاسورڈ",
     "Continue" : "جاری",
diff --git a/apps/user_ldap/l10n/ur_PK.json b/apps/user_ldap/l10n/ur_PK.json
index d15b84d049b..738ebc145c8 100644
--- a/apps/user_ldap/l10n/ur_PK.json
+++ b/apps/user_ldap/l10n/ur_PK.json
@@ -1,6 +1,5 @@
 { "translations": {
-    "Error" : "ایرر",
-    "Save" : "حفظ",
+    "Users" : "صارفین",
     "Help" : "مدد",
     "Password" : "پاسورڈ",
     "Continue" : "جاری",
diff --git a/apps/user_ldap/l10n/vi.js b/apps/user_ldap/l10n/vi.js
index cd9f720287c..e20feb8abba 100644
--- a/apps/user_ldap/l10n/vi.js
+++ b/apps/user_ldap/l10n/vi.js
@@ -3,16 +3,11 @@ OC.L10N.register(
     {
     "Failed to clear the mappings." : "Lỗi khi xóa ánh xạ.",
     "Failed to delete the server configuration" : "Lỗi khi xóa cấu hình máy chủ",
-    "Deletion failed" : "Xóa thất bại",
-    "Success" : "Thành công",
-    "Error" : "Lỗi",
     "Select groups" : "Chọn nhóm",
     "Invalid Host" : "Host không hợp lệ",
     "Server" : "Máy chủ",
-    "User Filter" : "Bộ lọc người dùng",
-    "Login Filter" : "Bộ lọc đăng nhập",
-    "Group Filter" : "Bộ lọc nhóm",
-    "Save" : "Lưu",
+    "Users" : "Người dùng",
+    "Groups" : "Nhóm",
     "Test Configuration" : "Kiểm tra cấu hình",
     "Help" : "Giúp đỡ",
     "Other Attributes:" : "Thuộc tính khác",
diff --git a/apps/user_ldap/l10n/vi.json b/apps/user_ldap/l10n/vi.json
index f964781b5b4..ffbeff90189 100644
--- a/apps/user_ldap/l10n/vi.json
+++ b/apps/user_ldap/l10n/vi.json
@@ -1,16 +1,11 @@
 { "translations": {
     "Failed to clear the mappings." : "Lỗi khi xóa ánh xạ.",
     "Failed to delete the server configuration" : "Lỗi khi xóa cấu hình máy chủ",
-    "Deletion failed" : "Xóa thất bại",
-    "Success" : "Thành công",
-    "Error" : "Lỗi",
     "Select groups" : "Chọn nhóm",
     "Invalid Host" : "Host không hợp lệ",
     "Server" : "Máy chủ",
-    "User Filter" : "Bộ lọc người dùng",
-    "Login Filter" : "Bộ lọc đăng nhập",
-    "Group Filter" : "Bộ lọc nhóm",
-    "Save" : "Lưu",
+    "Users" : "Người dùng",
+    "Groups" : "Nhóm",
     "Test Configuration" : "Kiểm tra cấu hình",
     "Help" : "Giúp đỡ",
     "Other Attributes:" : "Thuộc tính khác",
diff --git a/apps/user_ldap/l10n/zh_CN.js b/apps/user_ldap/l10n/zh_CN.js
index 481ed4dda7a..e341c393865 100644
--- a/apps/user_ldap/l10n/zh_CN.js
+++ b/apps/user_ldap/l10n/zh_CN.js
@@ -5,25 +5,14 @@ OC.L10N.register(
     "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." : "配置有效但绑定失败。请检查服务器设置和认证信息。",
-    "Deletion failed" : "删除失败",
-    "Take over settings from recent server configuration?" : "从近期的服务器配置中导入设置？",
-    "Keep settings?" : "保留设置吗？",
-    "Cannot add server configuration" : "无法增加服务器配置",
-    "mappings cleared" : "清除映射",
-    "Success" : "成功",
-    "Error" : "错误",
     "Select groups" : "选择分组",
-    "Connection test succeeded" : "连接测试成功",
-    "Connection test failed" : "连接测试失败",
     "Do you really want to delete the current Server Configuration?" : "您真的想要删除当前服务器配置吗？",
     "Confirm Deletion" : "确认删除",
     "Invalid Host" : "无效的主机",
-    "Group Filter" : "组过滤",
-    "Save" : "保存",
+    "Users" : "用户",
+    "Groups" : "群组",
     "Test Configuration" : "测试配置",
     "Help" : "帮助",
-    "groups found" : "找到组",
-    "Add Server Configuration" : "增加服务器配置",
     "Host" : "主机",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "可以忽略协议，但如要使用SSL，则需以ldaps://开头",
     "Port" : "端口",
@@ -33,7 +22,6 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "启用匿名访问，将DN和密码保留为空",
     "One Base DN per line" : "每行一个基本判别名",
     "You can specify Base DN for users and groups in the Advanced tab" : "您可以在高级选项卡里为用户和组指定Base DN",
-    "users found" : "找到用户",
     "Back" : "返回",
     "Continue" : "继续",
     "Advanced" : "高级",
diff --git a/apps/user_ldap/l10n/zh_CN.json b/apps/user_ldap/l10n/zh_CN.json
index d79a6f73f9a..24cd71d6941 100644
--- a/apps/user_ldap/l10n/zh_CN.json
+++ b/apps/user_ldap/l10n/zh_CN.json
@@ -3,25 +3,14 @@
     "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." : "配置有效但绑定失败。请检查服务器设置和认证信息。",
-    "Deletion failed" : "删除失败",
-    "Take over settings from recent server configuration?" : "从近期的服务器配置中导入设置？",
-    "Keep settings?" : "保留设置吗？",
-    "Cannot add server configuration" : "无法增加服务器配置",
-    "mappings cleared" : "清除映射",
-    "Success" : "成功",
-    "Error" : "错误",
     "Select groups" : "选择分组",
-    "Connection test succeeded" : "连接测试成功",
-    "Connection test failed" : "连接测试失败",
     "Do you really want to delete the current Server Configuration?" : "您真的想要删除当前服务器配置吗？",
     "Confirm Deletion" : "确认删除",
     "Invalid Host" : "无效的主机",
-    "Group Filter" : "组过滤",
-    "Save" : "保存",
+    "Users" : "用户",
+    "Groups" : "群组",
     "Test Configuration" : "测试配置",
     "Help" : "帮助",
-    "groups found" : "找到组",
-    "Add Server Configuration" : "增加服务器配置",
     "Host" : "主机",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "可以忽略协议，但如要使用SSL，则需以ldaps://开头",
     "Port" : "端口",
@@ -31,7 +20,6 @@
     "For anonymous access, leave DN and Password empty." : "启用匿名访问，将DN和密码保留为空",
     "One Base DN per line" : "每行一个基本判别名",
     "You can specify Base DN for users and groups in the Advanced tab" : "您可以在高级选项卡里为用户和组指定Base DN",
-    "users found" : "找到用户",
     "Back" : "返回",
     "Continue" : "继续",
     "Advanced" : "高级",
diff --git a/apps/user_ldap/l10n/zh_HK.js b/apps/user_ldap/l10n/zh_HK.js
index 2bd0061ab7a..918e84c1c13 100644
--- a/apps/user_ldap/l10n/zh_HK.js
+++ b/apps/user_ldap/l10n/zh_HK.js
@@ -1,15 +1,13 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Keep settings?" : "儲存設定？",
-    "{nthServer}. Server" : "{nthServer}. 伺服器",
-    "Success" : "成功",
-    "Error" : "錯誤",
     "Select groups" : "選擇群組",
+    "{nthServer}. Server" : "{nthServer}. 伺服器",
     "_%s group found_::_%s groups found_" : ["找到 %s 群組"],
     "_%s user found_::_%s users found_" : ["找到 %s 用戶"],
     "Server" : "伺服器",
-    "Save" : "儲存",
+    "Users" : "用戶",
+    "Groups" : "群組",
     "Test Configuration" : "測試配置",
     "Help" : "幫助",
     "1. Server" : "1. 伺服器",
diff --git a/apps/user_ldap/l10n/zh_HK.json b/apps/user_ldap/l10n/zh_HK.json
index 5e350517a36..eec1e9ed3aa 100644
--- a/apps/user_ldap/l10n/zh_HK.json
+++ b/apps/user_ldap/l10n/zh_HK.json
@@ -1,13 +1,11 @@
 { "translations": {
-    "Keep settings?" : "儲存設定？",
-    "{nthServer}. Server" : "{nthServer}. 伺服器",
-    "Success" : "成功",
-    "Error" : "錯誤",
     "Select groups" : "選擇群組",
+    "{nthServer}. Server" : "{nthServer}. 伺服器",
     "_%s group found_::_%s groups found_" : ["找到 %s 群組"],
     "_%s user found_::_%s users found_" : ["找到 %s 用戶"],
     "Server" : "伺服器",
-    "Save" : "儲存",
+    "Users" : "用戶",
+    "Groups" : "群組",
     "Test Configuration" : "測試配置",
     "Help" : "幫助",
     "1. Server" : "1. 伺服器",
diff --git a/apps/user_ldap/l10n/zh_TW.js b/apps/user_ldap/l10n/zh_TW.js
index 7bd21791c1d..5eeddd06ccf 100644
--- a/apps/user_ldap/l10n/zh_TW.js
+++ b/apps/user_ldap/l10n/zh_TW.js
@@ -5,24 +5,14 @@ OC.L10N.register(
     "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." : "設定有效但連線無法建立，請檢查伺服器設定與認證資料。",
-    "Deletion failed" : "移除失敗",
-    "Take over settings from recent server configuration?" : "要使用最近一次的伺服器設定嗎？",
-    "Keep settings?" : "維持設定嗎？",
-    "Cannot add server configuration" : "無法新增伺服器設定",
-    "mappings cleared" : "映射已清除",
-    "Success" : "成功",
-    "Error" : "錯誤",
     "Select groups" : "選擇群組",
-    "Connection test succeeded" : "連線測試成功",
-    "Connection test failed" : "連線測試失敗",
     "Do you really want to delete the current Server Configuration?" : "您真的要刪除現在的伺服器設定嗎？",
     "Confirm Deletion" : "確認刪除",
     "Server" : "伺服器",
-    "Group Filter" : "Group Filter",
-    "Save" : "儲存",
+    "Users" : "使用者",
+    "Groups" : "群組",
     "Test Configuration" : "測試此設定",
     "Help" : "說明",
-    "Add Server Configuration" : "新增伺服器設定",
     "Host" : "主機",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "若您不需要 SSL 加密連線則不需輸入通訊協定，反之請輸入 ldaps://",
     "Port" : "連接埠",
diff --git a/apps/user_ldap/l10n/zh_TW.json b/apps/user_ldap/l10n/zh_TW.json
index 96d76193ba7..60403875d29 100644
--- a/apps/user_ldap/l10n/zh_TW.json
+++ b/apps/user_ldap/l10n/zh_TW.json
@@ -3,24 +3,14 @@
     "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." : "設定有效但連線無法建立，請檢查伺服器設定與認證資料。",
-    "Deletion failed" : "移除失敗",
-    "Take over settings from recent server configuration?" : "要使用最近一次的伺服器設定嗎？",
-    "Keep settings?" : "維持設定嗎？",
-    "Cannot add server configuration" : "無法新增伺服器設定",
-    "mappings cleared" : "映射已清除",
-    "Success" : "成功",
-    "Error" : "錯誤",
     "Select groups" : "選擇群組",
-    "Connection test succeeded" : "連線測試成功",
-    "Connection test failed" : "連線測試失敗",
     "Do you really want to delete the current Server Configuration?" : "您真的要刪除現在的伺服器設定嗎？",
     "Confirm Deletion" : "確認刪除",
     "Server" : "伺服器",
-    "Group Filter" : "Group Filter",
-    "Save" : "儲存",
+    "Users" : "使用者",
+    "Groups" : "群組",
     "Test Configuration" : "測試此設定",
     "Help" : "說明",
-    "Add Server Configuration" : "新增伺服器設定",
     "Host" : "主機",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "若您不需要 SSL 加密連線則不需輸入通訊協定，反之請輸入 ldaps://",
     "Port" : "連接埠",