Merge branch 'master' into files_encryption

87 files changed, 364 insertions, 155 deletions

diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 6da312ae75b..f34c9f59cf5 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} carpetes",
 "1 file" => "1 fitxer",
 "{count} files" => "{count} fitxers",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud",
 "Unable to rename file" => "No es pot canviar el nom del fitxer",
 "Upload" => "Puja",
 "File handling" => "Gestió de fitxers",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 626af36c2b6..3c06c1ac83d 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} Ordner",
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.",
 "Unable to rename file" => "Konnte Datei nicht umbenennen",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 2aee432b10b..b11adfabeb3 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} carpetas",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para ownCloud",
 "Unable to rename file" => "No se puede renombrar el archivo",
 "Upload" => "Subir",
 "File handling" => "Tratamiento de archivos",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 2214c4d3370..d3fab4b0bd1 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -3,7 +3,7 @@
 "Could not move %s" => "%s liigutamine ebaõnnestus",
 "No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga",
 "There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud",
 "The uploaded file was only partially uploaded" => "Fail laeti üles ainult osaliselt",
 "No file was uploaded" => "Ühtegi faili ei laetud üles",
@@ -24,18 +24,18 @@
 "replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
 "undo" => "tagasi",
 "perform delete operation" => "teosta kustutamine",
-"1 file uploading" => "1 faili üleslaadimisel",
-"files uploading" => "failide üleslaadimine",
+"1 file uploading" => "1 fail üleslaadimisel",
+"files uploading" => "faili üleslaadimisel",
 "'.' is an invalid file name." => "'.' on vigane failinimi.",
 "File name cannot be empty." => "Faili nimi ei saa olla tühi.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
-"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ja sünkroniseerimist ei toimu!",
+"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega kui on tegu suurte failidega. ",
+"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti",
 "Not enough space available" => "Pole piisavalt ruumi",
 "Upload cancelled." => "Üleslaadimine tühistati.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös.  Lehelt lahkumine katkestab selle üleslaadimise.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
 "URL cannot be empty." => "URL ei saa olla tühi.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.",
 "Error" => "Viga",
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} kausta",
 "1 file" => "1 fail",
 "{count} files" => "{count} faili",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.",
 "Unable to rename file" => "Faili ümbernimetamine ebaõnnestus",
 "Upload" => "Lae üles",
 "File handling" => "Failide käsitlemine",
@@ -68,7 +69,7 @@
 "Unshare" => "Lõpeta jagamine",
 "Upload too large" => "Üleslaadimine on liiga suur",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
-"Files are being scanned, please wait." => "Faile skannitakse, palun oota",
+"Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
 "Current scanning" => "Praegune skannimine",
-"Upgrading filesystem cache..." => "Uuendan failisüsteemi puhvrit..."
+"Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..."
 );
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 5620d86e48d..39c697396c9 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} dossiers",
 "1 file" => "1 fichier",
 "{count} files" => "{count} fichiers",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud",
 "Unable to rename file" => "Impossible de renommer le fichier",
 "Upload" => "Envoyer",
 "File handling" => "Gestion des fichiers",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 2352d9e15c4..d22ed4b8721 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} cartafoles",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod",
 "Unable to rename file" => "Non é posíbel renomear o ficheiro",
 "Upload" => "Enviar",
 "File handling" => "Manexo de ficheiro",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index d5eca524d8a..c588285aaca 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} cartelle",
 "1 file" => "1 file",
 "{count} files" => "{count} file",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud",
 "Unable to rename file" => "Impossibile rinominare il file",
 "Upload" => "Carica",
 "File handling" => "Gestione file",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 021a2104870..55dcf3640e7 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} フォルダ",
 "1 file" => "1 ファイル",
 "{count} files" => "{count} ファイル",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです",
 "Unable to rename file" => "ファイル名の変更ができません",
 "Upload" => "アップロード",
 "File handling" => "ファイル操作",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 430af50072f..bc4158df3b3 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} mappen",
 "1 file" => "1 bestand",
 "{count} files" => "{count} bestanden",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf",
 "Unable to rename file" => "Kan bestand niet hernoemen",
 "Upload" => "Uploaden",
 "File handling" => "Bestand",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 6d5c4c56425..2b7c5cf89bd 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Klarte ikkje å flytta %s – det finst allereie ei fil med dette namnet",
-"Could not move %s" => "Klarte ikkje å flytta %s",
+"Could not move %s - File with this name already exists" => "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet",
+"Could not move %s" => "Klarte ikkje flytta %s",
 "No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil",
 "There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: ",
@@ -8,7 +8,7 @@
 "The uploaded file was only partially uploaded" => "Fila vart berre delvis lasta opp",
 "No file was uploaded" => "Ingen filer vart lasta opp",
 "Missing a temporary folder" => "Manglar ei mellombels mappe",
-"Failed to write to disk" => "Klarte ikkje å skriva til disk",
+"Failed to write to disk" => "Klarte ikkje skriva til disk",
 "Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg",
 "Invalid directory." => "Ugyldig mappe.",
 "Files" => "Filer",
@@ -32,11 +32,11 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)",
 "Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje å lasta opp fila sidan ho er ei mappe eller er på 0 byte",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte",
 "Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg",
 "Upload cancelled." => "Opplasting avbroten.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga bli avbroten.",
-"URL cannot be empty." => "URL-en kan ikkje vera tom.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
+"URL cannot be empty." => "Nettadressa kan ikkje vera tom.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
 "Error" => "Feil",
 "Name" => "Namn",
@@ -46,13 +46,13 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
-"Unable to rename file" => "Klarte ikkje å endra filnamnet",
+"Unable to rename file" => "Klarte ikkje endra filnamnet",
 "Upload" => "Last opp",
 "File handling" => "Filhandtering",
 "Maximum upload size" => "Maksimal opplastingsstorleik",
 "max. possible: " => "maks. moglege:",
-"Needed for multi-file and folder downloads." => "Naudsynt for fleirfils- og mappenedlastingar.",
-"Enable ZIP-download" => "Skru på ZIP-nedlasting",
+"Needed for multi-file and folder downloads." => "Nødvendig for fleirfils- og mappenedlastingar.",
+"Enable ZIP-download" => "Slå på ZIP-nedlasting",
 "0 is unlimited" => "0 er ubegrensa",
 "Maximum input size for ZIP files" => "Maksimal storleik for ZIP-filer",
 "Save" => "Lagre",
@@ -67,7 +67,7 @@
 "Download" => "Last ned",
 "Unshare" => "Udel",
 "Upload too large" => "For stor opplasting",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren.",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.",
 "Files are being scanned, please wait." => "Skannar filer, ver venleg og vent.",
 "Current scanning" => "Køyrande skanning",
 "Upgrading filesystem cache..." => "Oppgraderer mellomlageret av filsystemet …"
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 65d9a4e4be2..4bdac055781 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -46,6 +46,7 @@
 "{count} folders" => "Ilość folderów: {count}",
 "1 file" => "1 plik",
 "{count} files" => "Ilość plików: {count}",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud",
 "Unable to rename file" => "Nie można zmienić nazwy pliku",
 "Upload" => "Wyślij",
 "File handling" => "Zarządzanie plikami",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 7c68987652c..0f349b69481 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 arquivo",
 "{count} files" => "{count} arquivos",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud",
 "Unable to rename file" => "Impossível renomear arquivo",
 "Upload" => "Upload",
 "File handling" => "Tratamento de Arquivo",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 400a0dc8de7..1ef163d48f3 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -1,71 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Неполучается перенести %s - Файл с таким именем уже существует",
-"Could not move %s" => "Неполучается перенести %s ",
-"Unable to rename file" => "Невозможно переименовать файл",
-"No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка",
-"There is no error, the file uploaded with success" => "Ошибка отсутствует, файл загружен успешно.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загруженного",
-"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен частично",
-"No file was uploaded" => "Файл не был загружен",
-"Missing a temporary folder" => "Отсутствует временная папка",
-"Failed to write to disk" => "Не удалось записать на диск",
-"Not enough storage available" => "Недостаточно места в хранилище",
-"Invalid directory." => "Неверный каталог.",
-"Files" => "Файлы",
-"Share" => "Сделать общим",
-"Delete permanently" => "Удалить навсегда",
-"Delete" => "Удалить",
-"Rename" => "Переименовать",
-"Pending" => "Ожидающий решения",
-"{new_name} already exists" => "{новое_имя} уже существует",
-"replace" => "отмена",
-"suggest name" => "подобрать название",
-"cancel" => "отменить",
-"replaced {new_name} with {old_name}" => "заменено {новое_имя} с {старое_имя}",
-"undo" => "отменить действие",
-"perform delete operation" => "выполняется процесс удаления",
-"1 file uploading" => "загрузка 1 файла",
-"'.' is an invalid file name." => "'.' является неверным именем файла.",
-"File name cannot be empty." => "Имя файла не может быть пустым.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ваше хранилище переполнено, фалы больше не могут быть обновлены или синхронизированы!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти полно ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Идёт подготовка к скачке Вашего файла. Это может занять некоторое время, если фалы большие.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией",
-"Not enough space available" => "Не достаточно свободного места",
-"Upload cancelled." => "Загрузка отменена",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена.",
-"URL cannot be empty." => "URL не должен быть пустым.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неверное имя папки. Использование наименования 'Опубликовано' зарезервировано Owncloud",
-"Error" => "Ошибка",
-"Name" => "Имя",
-"Size" => "Размер",
-"Modified" => "Изменен",
-"1 folder" => "1 папка",
-"{count} folders" => "{количество} папок",
-"1 file" => "1 файл",
-"{count} files" => "{количество} файлов",
-"Upload" => "Загрузить ",
-"File handling" => "Работа с файлами",
-"Maximum upload size" => "Максимальный размер загружаемого файла",
-"max. possible: " => "Максимально возможный",
-"Needed for multi-file and folder downloads." => "Необходимо для множественной загрузки.",
-"Enable ZIP-download" => "Включение ZIP-загрузки",
-"0 is unlimited" => "0 без ограничений",
-"Maximum input size for ZIP files" => "Максимальный размер входящих ZIP-файлов ",
-"Save" => "Сохранить",
-"New" => "Новый",
-"Text file" => "Текстовый файл",
-"Folder" => "Папка",
-"From link" => "По ссылке",
-"Cancel upload" => "Отмена загрузки",
-"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
-"Download" => "Загрузить",
-"Unshare" => "Скрыть",
-"Upload too large" => "Загрузка слишком велика",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер.",
-"Files are being scanned, please wait." => "Файлы сканируются, пожалуйста, подождите.",
-"Current scanning" => "Текущее сканирование",
-"Upgrading filesystem cache..." => "Обновление кэша файловой системы... "
+"Error" => "Ошибка"
 );
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index d5d2b84d123..c883670e848 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} 个文件夹",
 "1 file" => "1 个文件",
 "{count} files" => "{count} 个文件",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹",
 "Unable to rename file" => "无法重命名文件",
 "Upload" => "上传",
 "File handling" => "文件处理",
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
index 178eb531077..1ef163d48f3 100644
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ b/apps/files_trashbin/l10n/ru_RU.php
@@ -1,18 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s не может быть удалён навсегда",
-"Couldn't restore %s" => "%s не может быть восстановлен",
-"perform restore operation" => "выполнить операцию восстановления",
-"Error" => "Ошибка",
-"delete file permanently" => "удалить файл навсегда",
-"Delete permanently" => "Удалить навсегда",
-"Name" => "Имя",
-"Deleted" => "Удалён",
-"1 folder" => "1 папка",
-"{count} folders" => "{количество} папок",
-"1 file" => "1 файл",
-"{count} files" => "{количество} файлов",
-"Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
-"Restore" => "Восстановить",
-"Delete" => "Удалить",
-"Deleted Files" => "Удаленные файлы"
+"Error" => "Ошибка"
 );
diff --git a/apps/user_ldap/ajax/clearMappings.php b/apps/user_ldap/ajax/clearMappings.php
new file mode 100644
index 00000000000..5dab39839b6
--- /dev/null
+++ b/apps/user_ldap/ajax/clearMappings.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * ownCloud - user_ldap
+ *
+ * @author Arthur Schiwon
+ * @copyright 2013 Arthur Schiwon blizzz@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Check user and app status
+OCP\JSON::checkAdminUser();
+OCP\JSON::checkAppEnabled('user_ldap');
+OCP\JSON::callCheck();
+
+$subject = $_POST['ldap_clear_mapping'];
+if(\OCA\user_ldap\lib\Helper::clearMapping($subject)) {
+	OCP\JSON::success();
+} else {
+	$l=OC_L10N::get('user_ldap');
+	OCP\JSON::error(array('message' => $l->t('Failed to clear the mappings.')));
+}
\ No newline at end of file
diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 84ada0832ab..185952e14bb 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -11,6 +11,10 @@
 	display: inline-block;
 }
 
+.ldapIndent {
+	margin-left: 50px;
+}
+
 .ldapwarning {
 	margin-left: 1.4em;
 	color: #FF3B3B;
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 9279dc0203b..f47d49cf222 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -99,6 +99,26 @@ var LdapConfiguration = {
 				}
 			}
 		);
+	},
+
+	clearMappings: function(mappingSubject) {
+		$.post(
+			OC.filePath('user_ldap','ajax','clearMappings.php'),
+			'ldap_clear_mapping='+mappingSubject,
+			function(result) {
+				if(result.status == 'success') {
+					OC.dialogs.info(
+						t('user_ldap', 'mappings cleared'),
+						t('user_ldap', 'Success')
+					);
+				} else {
+					OC.dialogs.alert(
+						result.message,
+						t('user_ldap', 'Error')
+					);
+				}
+			}
+		);
 	}
 }
 
@@ -166,6 +186,16 @@ $(document).ready(function() {
 		);
 	});
 
+	$('#ldap_action_clear_user_mappings').click(function(event) {
+		event.preventDefault();
+		LdapConfiguration.clearMappings('user');
+	});
+
+	$('#ldap_action_clear_group_mappings').click(function(event) {
+		event.preventDefault();
+		LdapConfiguration.clearMappings('group');
+	});
+
 	$('#ldap_serverconfig_chooser').change(function(event) {
 		value = $('#ldap_serverconfig_chooser option:selected:first').attr('value');
 		if(value === 'NEW') {
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index 4d7b7ac4ade..5f8b6b81455 100644
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "فشل الحذف",
+"Error" => "خطأ",
 "Password" => "كلمة المرور",
 "Help" => "المساعدة"
 );
diff --git a/apps/user_ldap/l10n/bg_BG.php b/apps/user_ldap/l10n/bg_BG.php
index c064534a6b8..0330046d80e 100644
--- a/apps/user_ldap/l10n/bg_BG.php
+++ b/apps/user_ldap/l10n/bg_BG.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Грешка",
 "Password" => "Парола",
 "Help" => "Помощ"
 );
diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php
index 69dfc896179..4cee35777df 100644
--- a/apps/user_ldap/l10n/bn_BD.php
+++ b/apps/user_ldap/l10n/bn_BD.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "সমস্যা",
 "Host" => "হোস্ট",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL আবশ্যক  না হলে  আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://",
 "Base DN" => "ভিত্তি  DN",
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 8f2799b6e68..7f0849b2382 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Ha fallat en eliminar els mapatges",
 "Failed to delete the server configuration" => "Ha fallat en eliminar la configuració del servidor",
 "The configuration is valid and the connection could be established!" => "La configuració és vàlida i s'ha pogut establir la comunicació!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuració és vàlida, però ha fallat el Bind. Comproveu les credencials i l'arranjament del servidor.",
@@ -7,6 +8,9 @@
 "Take over settings from recent server configuration?" => "Voleu prendre l'arranjament de la configuració actual del servidor?",
 "Keep settings?" => "Voleu mantenir la configuració?",
 "Cannot add server configuration" => "No es pot afegir la configuració del servidor",
+"mappings cleared" => "s'han eliminat els mapatges",
+"Success" => "Èxit",
+"Error" => "Error",
 "Connection test succeeded" => "La prova de connexió ha reeixit",
 "Connection test failed" => "La prova de connexió ha fallat",
 "Do you really want to delete the current Server Configuration?" => "Voleu eliminar la configuració actual del servidor?",
@@ -70,6 +74,16 @@
 "Email Field" => "Camp de correu electrònic",
 "User Home Folder Naming Rule" => "Norma per anomenar la carpeta arrel d'usuari",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD.",
+"Internal Username" => "Nom d'usuari intern",
+"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 in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Per defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els caràcters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els caràcters: [ a-zA-Z0-9_.@- ]. Els altres caràcters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home a ownCloud. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits).",
+"Internal Username Attribute:" => "Atribut nom d'usuari intern:",
+"Override UUID detection" => "Sobrescriu la detecció UUID",
+"By default, ownCloud autodetects the UUID attribute. 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 behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran en els usuaris i grups LDAP mapats de nou (afegits).",
+"UUID Attribute:" => "Atribut UUID:",
+"Username-LDAP User Mapping" => "Mapatge d'usuari Nom d'usuari-LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilitza els noms d'usuari per emmagatzemar i assignar (meta)dades. per tal d'identificar usuaris de forma precisa, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix un mapatge del nom d'usuari ownCloud a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. Addicionalment, la DN es desa a la memòria de cau per reduïr la interacció LDAP, però no s'usa per a identificació. Si la DN canvia, els canvis són detectats per ownCloud. El nom d'usuari intern ownCloud s'utilitza internament arreu de ownCloud. Eliminar els mapatges tindrà efectues per tot arreu. L'eliminació dels mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No elimineu mai els mapatges en un entorn de producció. Elimineu-los només en un estadi experimental o de prova.",
+"Clear Username-LDAP User Mapping" => "Elimina el mapatge d'usuari Nom d'usuari-LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Elimina el mapatge de grup Nom de grup-LDAP",
 "Test Configuration" => "Comprovació de la configuració",
 "Help" => "Ajuda"
 );
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index c5d77026b9e..dd7373eb690 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Převzít nastavení z nedávného nastavení serveru?",
 "Keep settings?" => "Ponechat nastavení?",
 "Cannot add server configuration" => "Nelze přidat nastavení serveru",
+"Success" => "Úspěch",
+"Error" => "Chyba",
 "Connection test succeeded" => "Test spojení byl úspěšný",
 "Connection test failed" => "Test spojení selhal",
 "Do you really want to delete the current Server Configuration?" => "Opravdu si přejete smazat současné nastavení serveru?",
diff --git a/apps/user_ldap/l10n/cy_GB.php b/apps/user_ldap/l10n/cy_GB.php
index 335e2109c2d..abe2336b2ba 100644
--- a/apps/user_ldap/l10n/cy_GB.php
+++ b/apps/user_ldap/l10n/cy_GB.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Methwyd dileu",
+"Error" => "Gwall",
 "Password" => "Cyfrinair",
 "Help" => "Cymorth"
 );
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index 9329c4e8a24..0a77f466479 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Fejl ved sletning",
+"Success" => "Succes",
+"Error" => "Fejl",
 "Host" => "Host",
 "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://",
 "Base DN" => "Base DN",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 27f5adb8b6c..f0010818421 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
 "Keep settings?" => "Einstellungen beibehalten?",
 "Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"Success" => "Erfolgreich",
+"Error" => "Fehler",
 "Connection test succeeded" => "Verbindungstest erfolgreich",
 "Connection test failed" => "Verbindungstest fehlgeschlagen",
 "Do you really want to delete the current Server Configuration?" => "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 488d8aad7c8..de2dd118e59 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
 "Keep settings?" => "Einstellungen beibehalten?",
 "Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"Success" => "Erfolg",
+"Error" => "Fehler",
 "Connection test succeeded" => "Verbindungstest erfolgreich",
 "Connection test failed" => "Verbindungstest fehlgeschlagen",
 "Do you really want to delete the current Server Configuration?" => "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?",
@@ -70,6 +72,7 @@
 "Email Field" => "E-Mail-Feld",
 "User Home Folder Naming Rule" => "Benennungsregel für das Home-Verzeichnis des Benutzers",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
+"Internal Username" => "Interner Benutzername",
 "Test Configuration" => "Testkonfiguration",
 "Help" => "Hilfe"
 );
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index e5fe6b6da7e..acecf27125f 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?",
 "Keep settings?" => "Διατήρηση ρυθμίσεων;",
 "Cannot add server configuration" => "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
+"Success" => "Επιτυχία",
+"Error" => "Σφάλμα",
 "Connection test succeeded" => "Επιτυχημένη δοκιμαστική σύνδεση",
 "Connection test failed" => "Αποτυχημένη δοκιμαστική σύνδεσης.",
 "Do you really want to delete the current Server Configuration?" => "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index 3ffcbddb3e3..c9a9ba130c6 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Forigo malsukcesis",
+"Success" => "Sukceso",
+"Error" => "Eraro",
 "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://",
 "Base DN" => "Bazo-DN",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 098e16a5d13..c90d8fe712d 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Hacerse cargo de los ajustes de configuración del servidor reciente?",
 "Keep settings?" => "Mantener la configuración?",
 "Cannot add server configuration" => "No se puede añadir la configuración del servidor",
+"Success" => "Éxito",
+"Error" => "Error",
 "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?",
@@ -70,6 +72,7 @@
 "Email Field" => "E-mail",
 "User Home Folder Naming Rule" => "Regla para la carpeta Home de usuario",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utiliza nombre de usuarios para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché más bien para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Eliminando las asignaciones tendrá restos por todas partes. Eliminando las asignaciones no es sensible a la configuración, que afecta a todas las configuraciones de LDAP! No limpiar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental.",
 "Test Configuration" => "Configuración de prueba",
 "Help" => "Ayuda"
 );
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index c8aec0cd41b..98fb32b1d26 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -7,6 +7,8 @@
 "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",
+"Success" => "Éxito",
+"Error" => "Error",
 "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?",
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 9a65455ed23..5f7e048e719 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -5,10 +5,12 @@
 "The configuration is invalid. Please look in the ownCloud log for further details." => "Seadistus on vigane. Palun vaata ownCloud logist täpsemalt.",
 "Deletion failed" => "Kustutamine ebaõnnestus",
 "Take over settings from recent server configuration?" => "Võta sätted viimasest serveri seadistusest?",
-"Keep settings?" => "Säilitada seadistus?",
+"Keep settings?" => "Säilitada seadistused?",
 "Cannot add server configuration" => "Ei suuda lisada serveri seadistust",
-"Connection test succeeded" => "Test ühendus õnnestus",
-"Connection test failed" => "Test ühendus ebaõnnestus",
+"Success" => "Korras",
+"Error" => "Viga",
+"Connection test succeeded" => "Ühenduse testimine õnnestus",
+"Connection test failed" => "Ühenduse testimine ebaõnnestus",
 "Do you really want to delete the current Server Configuration?" => "Oled kindel, et tahad kustutada praegust serveri seadistust?",
 "Confirm Deletion" => "Kinnita kustutamine",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.",
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 5e9fd014c64..42f184e5390 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?",
 "Keep settings?" => "Mantendu ezarpenak?",
 "Cannot add server configuration" => "Ezin da zerbitzariaren konfigurazioa gehitu",
+"Success" => "Arrakasta",
+"Error" => "Errorea",
 "Connection test succeeded" => "Konexio froga ongi burutu da",
 "Connection test failed" => "Konexio frogak huts egin du",
 "Do you really want to delete the current Server Configuration?" => "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index 89fc40af4f1..bef13457adb 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -3,6 +3,7 @@
 "The configuration is valid and the connection could be established!" => "پیکربندی معتبر است و ارتباط می تواند برقرار شود",
 "Deletion failed" => "حذف کردن انجام نشد",
 "Keep settings?" => "آیا تنظیمات ذخیره شود ؟",
+"Error" => "خطا",
 "Connection test succeeded" => "تست اتصال با موفقیت انجام گردید",
 "Connection test failed" => "تست اتصال ناموفق بود",
 "Do you really want to delete the current Server Configuration?" => "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟",
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 38ecb5d82a8..38a8b99cf7e 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -2,6 +2,8 @@
 "Deletion failed" => "Poisto epäonnistui",
 "Keep settings?" => "Säilytetäänkö asetukset?",
 "Cannot add server configuration" => "Palvelinasetusten lisäys epäonnistui",
+"Success" => "Onnistui!",
+"Error" => "Virhe",
 "Connection test succeeded" => "Yhteystesti onnistui",
 "Connection test failed" => "Yhteystesti epäonnistui",
 "Confirm Deletion" => "Vahvista poisto",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index ea07bd4a11c..11f8fbaaf44 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Erreur lors de la suppression des associations.",
 "Failed to delete the server configuration" => "Échec de la suppression de la configuration du serveur",
 "The configuration is valid and the connection could be established!" => "La configuration est valide et la connexion peut être établie !",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuration est valide, mais le lien ne peut être établi. Veuillez vérifier les paramètres du serveur ainsi que vos identifiants de connexion.",
@@ -6,9 +7,12 @@
 "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 ?",
-"Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur.",
+"Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur",
+"mappings cleared" => "associations supprimées",
+"Success" => "Succès",
+"Error" => "Erreur",
 "Connection test succeeded" => "Test de connexion réussi",
-"Connection test failed" => "Le test de connexion a échoué",
+"Connection test failed" => "Test de connexion échoué",
 "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",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
@@ -17,13 +21,13 @@
 "Add Server Configuration" => "Ajouter une configuration du serveur",
 "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://",
-"Base DN" => "DN Racine",
+"Base DN" => "DN racine",
 "One Base DN per line" => "Un DN racine par ligne",
 "You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé",
 "User DN" => "DN Utilisateur (Autorisé à consulter l'annuaire)",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN de l'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides.",
 "Password" => "Mot de passe",
-"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides.",
+"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
 "User Login Filter" => "Modèle d'authentification utilisateurs",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\"",
@@ -66,10 +70,20 @@
 "Special Attributes" => "Attributs spéciaux",
 "Quota Field" => "Champ du quota",
 "Quota Default" => "Quota par défaut",
-"in bytes" => "en octets",
+"in bytes" => "en bytes",
 "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 ",
+"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 in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. 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 convertion. Le nom d'utilisateur interne doit contenir seulement 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 le nombre est incrémenté/décré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. C'est aussi le port d'URLs distants, 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",
+"By default, ownCloud autodetects the UUID attribute. 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 behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Par défaut, ownCloud détecte automatiquement l'attribut UUID. L'attribut UUID est utilisé pour identifier les utilisateurs et groupes de façon prédictive. De plus, le nom d'utilisateur interne sera créé basé sur l'UUID s'il n'est pas explicité 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:" => "Attribut UUID :",
+"Username-LDAP User Mapping" => "Association Nom d'utilisateur-Utilisateur LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilise les noms d'utilisateurs pour le stockage et l'assignation de (meta) data. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. ownCloud détectera le changement de DN, le cas échéant. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION. Le faire seulement sur les environnements de tests et d'expérimentation.",
+"Clear Username-LDAP User Mapping" => "Supprimer l'association utilisateur interne-utilisateur LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Supprimer l'association nom de groupe-groupe LDAP",
 "Test Configuration" => "Tester la configuration",
 "Help" => "Aide"
 );
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index 215d518e7a5..3f44ccd9bd1 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Non foi posíbel limpar as asignacións.",
 "Failed to delete the server configuration" => "Non foi posíbel eliminar a configuración do servidor",
 "The configuration is valid and the connection could be established!" => "A configuración é correcta e pode estabelecerse a conexión.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais.",
@@ -7,6 +8,9 @@
 "Take over settings from recent server configuration?" => "Tomar os recentes axustes de configuración do servidor?",
 "Keep settings?" => "Manter os axustes?",
 "Cannot add server configuration" => "Non é posíbel engadir a configuración do servidor",
+"mappings cleared" => "limpadas as asignacións",
+"Success" => "Correcto",
+"Error" => "Erro",
 "Connection test succeeded" => "A proba de conexión foi satisfactoria",
 "Connection test failed" => "A proba de conexión fracasou",
 "Do you really want to delete the current Server Configuration?" => "Confirma que quere eliminar a configuración actual do servidor?",
@@ -70,6 +74,16 @@
 "Email Field" => "Campo do correo",
 "User Home Folder Naming Rule" => "Regra de nomeado do cartafol do usuario",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD.",
+"Internal Username" => "Nome de usuario interno",
+"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 in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ].  Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omítense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario en ownCloud. Tamén é un porto de URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+"Internal Username Attribute:" => "Atributo do nome de usuario interno:",
+"Override UUID detection" => "Ignorar a detección do UUID",
+"By default, ownCloud autodetects the UUID attribute. 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 behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "De xeito predeterminado, ownCloud detecta automaticamente o atributo UUID. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+"UUID Attribute:" => "Atributo do UUID:",
+"Username-LDAP User Mapping" => "Asignación do usuario ao «nome de usuario LDAP»",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utiliza os nomes de usuario para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais.",
+"Clear Username-LDAP User Mapping" => "Limpar a asignación do usuario ao «nome de usuario LDAP»",
+"Clear Groupname-LDAP Group Mapping" => "Limpar a asignación do grupo ao «nome de grupo LDAP»",
 "Test Configuration" => "Probar a configuración",
 "Help" => "Axuda"
 );
diff --git a/apps/user_ldap/l10n/he.php b/apps/user_ldap/l10n/he.php
index 97259a0ddd5..0d60768dcfc 100644
--- a/apps/user_ldap/l10n/he.php
+++ b/apps/user_ldap/l10n/he.php
@@ -2,6 +2,7 @@
 "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?" => "האם אכן למחוק את הגדרות השרת הנוכחיות?",
diff --git a/apps/user_ldap/l10n/hr.php b/apps/user_ldap/l10n/hr.php
index 005a76d4bbc..cc8918301f5 100644
--- a/apps/user_ldap/l10n/hr.php
+++ b/apps/user_ldap/l10n/hr.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Greška",
 "Password" => "Lozinka",
 "Help" => "Pomoć"
 );
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index a82a64ab32f..cbbcc69edeb 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -7,6 +7,7 @@
 "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?",
 "Cannot add server configuration" => "Az új  kiszolgáló konfigurációja nem hozható létre",
+"Error" => "Hiba",
 "Connection test succeeded" => "A kapcsolatellenőrzés eredménye: sikerült",
 "Connection test failed" => "A kapcsolatellenőrzés eredménye: nem sikerült",
 "Do you really want to delete the current Server Configuration?" => "Tényleg törölni szeretné a kiszolgáló beállításait?",
diff --git a/apps/user_ldap/l10n/ia.php b/apps/user_ldap/l10n/ia.php
index 38374abda7f..624fd4fa0eb 100644
--- a/apps/user_ldap/l10n/ia.php
+++ b/apps/user_ldap/l10n/ia.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Error",
 "Password" => "Contrasigno",
 "Help" => "Adjuta"
 );
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index 5f76d6b99fb..c04d09fc671 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Ambil alih pengaturan dari konfigurasi server saat ini?",
 "Keep settings?" => "Biarkan pengaturan?",
 "Cannot add server configuration" => "Gagal menambah konfigurasi server",
+"Success" => "Sukses",
+"Error" => "Galat",
 "Connection test succeeded" => "Tes koneksi sukses",
 "Connection test failed" => "Tes koneksi gagal",
 "Do you really want to delete the current Server Configuration?" => "Anda ingin menghapus Konfigurasi Server saat ini?",
diff --git a/apps/user_ldap/l10n/is.php b/apps/user_ldap/l10n/is.php
index 29bc7692795..dadac9eedaa 100644
--- a/apps/user_ldap/l10n/is.php
+++ b/apps/user_ldap/l10n/is.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Villa",
 "Host" => "Netþjónn",
 "Password" => "Lykilorð",
 "Help" => "Hjálp"
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index a2790fd1dec..4027cb8851d 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Cancellazione delle associazioni non riuscita.",
 "Failed to delete the server configuration" => "Eliminazione della configurazione del server non riuscita",
 "The configuration is valid and the connection could be established!" => "La configurazione è valida e la connessione può essere stabilita.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configurazione è valida, ma il Bind non è riuscito. Controlla le impostazioni del server e le credenziali.",
@@ -7,6 +8,9 @@
 "Take over settings from recent server configuration?" => "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
 "Keep settings?" => "Vuoi mantenere le impostazioni?",
 "Cannot add server configuration" => "Impossibile aggiungere la configurazione del server",
+"mappings cleared" => "associazioni cancellate",
+"Success" => "Riuscito",
+"Error" => "Errore",
 "Connection test succeeded" => "Prova di connessione riuscita",
 "Connection test failed" => "Prova di connessione non riuscita",
 "Do you really want to delete the current Server Configuration?" => "Vuoi davvero eliminare la configurazione attuale del server?",
@@ -70,6 +74,14 @@
 "Email Field" => "Campo Email",
 "User Home Folder Naming Rule" => "Regola di assegnazione del nome della cartella utente",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD.",
+"Internal Username" => "Nome utente interno",
+"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 in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri:  [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà incrementato/decrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una porta di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti).",
+"Internal Username Attribute:" => "Attributo nome utente interno:",
+"Override UUID detection" => "Ignora rilevamento UUID",
+"UUID Attribute:" => "Attributo UUID:",
+"Username-LDAP User Mapping" => "Associazione Nome utente-Utente LDAP",
+"Clear Username-LDAP User Mapping" => "Cancella associazione Nome utente-Utente LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Cancella associazione Nome gruppo-Gruppo LDAP",
 "Test Configuration" => "Prova configurazione",
 "Help" => "Aiuto"
 );
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index 8239ecf3cc9..6d5008b65b7 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "マッピングのクリアに失敗しました。",
 "Failed to delete the server configuration" => "サーバ設定の削除に失敗しました",
 "The configuration is valid and the connection could be established!" => "設定は有効であり、接続を確立しました！",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定は有効ですが、接続に失敗しました。サーバ設定と資格情報を確認して下さい。",
@@ -7,6 +8,9 @@
 "Take over settings from recent server configuration?" => "最近のサーバ設定から設定を引き継ぎますか？",
 "Keep settings?" => "設定を保持しますか？",
 "Cannot add server configuration" => "サーバ設定を追加できません",
+"mappings cleared" => "マッピングをクリアしました",
+"Success" => "成功",
+"Error" => "エラー",
 "Connection test succeeded" => "接続テストに成功しました",
 "Connection test failed" => "接続テストに失敗しました",
 "Do you really want to delete the current Server Configuration?" => "現在のサーバ設定を本当に削除してもよろしいですか？",
@@ -70,6 +74,15 @@
 "Email Field" => "メールフィールド",
 "User Home Folder Naming Rule" => "ユーザのホームフォルダ命名規則",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください。",
+"Internal Username" => "内部ユーザ名",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "デフォルトでは、内部ユーザ名はUUID属性から作成されます。これにより、ユーザ名がユニークであり、かつ文字の変換が必要ないことを保証します。内部ユーザ名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザ名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダ名としても用いられます。例えば*DAVサービスのように、リモートURLのポートでもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザ表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザにおいてのみ有効となります。",
+"Internal Username Attribute:" => "内部ユーザ名属性:",
+"Override UUID detection" => "UUID検出を再定義する",
+"By default, ownCloud autodetects the UUID attribute. 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 behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "デフォルトでは、ownCloud は UUID 属性を自動的に検出します。UUID属性は、LDAPユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザとLDAPグループに対してのみ有効となります。",
+"UUID Attribute:" => "UUID属性:",
+"Username-LDAP User Mapping" => "ユーザ名とLDAPユーザのマッピング",
+"Clear Username-LDAP User Mapping" => "ユーザ名とLDAPユーザのマッピングをクリアする",
+"Clear Groupname-LDAP Group Mapping" => "グループ名とLDAPグループのマッピングをクリアする",
 "Test Configuration" => "設定をテスト",
 "Help" => "ヘルプ"
 );
diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
index b3f6058a0ca..8057f7c8455 100644
--- a/apps/user_ldap/l10n/ka_GE.php
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "დაბრუნდებით სერვერის წინა კონფიგურაციაში?",
 "Keep settings?" => "დავტოვოთ პარამეტრები?",
 "Cannot add server configuration" => "სერვერის პარამეტრების დამატება ვერ მოხერხდა",
+"Success" => "დასრულდა",
+"Error" => "შეცდომა",
 "Connection test succeeded" => "კავშირის ტესტირება მოხერხდა",
 "Connection test failed" => "კავშირის ტესტირება ვერ მოხერხდა",
 "Do you really want to delete the current Server Configuration?" => "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?",
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 8aa9fe74b3d..b8196e09d09 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "삭제 실패",
 "Keep settings?" => "설정을 유지합니까?",
+"Error" => "오류",
 "Connection test succeeded" => "연결 시험 성공",
 "Connection test failed" => "연결 시험 실패",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>경고:</b> user_ldap 앱과 user_webdavauth 앱은 호환되지 않습니다. 오동작을 일으킬 수 있으므로, 시스템 관리자에게 요청하여 둘 중 하나만 사용하도록 하십시오.",
diff --git a/apps/user_ldap/l10n/ku_IQ.php b/apps/user_ldap/l10n/ku_IQ.php
index f8f893834b1..00602ae5d79 100644
--- a/apps/user_ldap/l10n/ku_IQ.php
+++ b/apps/user_ldap/l10n/ku_IQ.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"Success" => "سه‌رکه‌وتن",
+"Error" => "هه‌ڵه",
 "Password" => "وشەی تێپەربو",
 "Help" => "یارمەتی"
 );
diff --git a/apps/user_ldap/l10n/lb.php b/apps/user_ldap/l10n/lb.php
index 39ed627ce2c..cf58c9ec5be 100644
--- a/apps/user_ldap/l10n/lb.php
+++ b/apps/user_ldap/l10n/lb.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Konnt net läschen",
+"Error" => "Fehler",
 "Password" => "Passwuert",
 "Help" => "Hëllef"
 );
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index aa21dd2d3c1..6f396847b8e 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Ištrinti nepavyko",
+"Error" => "Klaida",
 "Password" => "Slaptažodis",
 "Group Filter" => "Grupės filtras",
 "Port" => "Prievadas",
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
index 50126664e5b..73ffedcb134 100644
--- a/apps/user_ldap/l10n/lv.php
+++ b/apps/user_ldap/l10n/lv.php
@@ -7,6 +7,7 @@
 "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",
 "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?",
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
index 7d34ff49492..6a060aca415 100644
--- a/apps/user_ldap/l10n/mk.php
+++ b/apps/user_ldap/l10n/mk.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Бришењето е неуспешно",
+"Error" => "Грешка",
 "Host" => "Домаќин",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://",
 "Password" => "Лозинка",
diff --git a/apps/user_ldap/l10n/ms_MY.php b/apps/user_ldap/l10n/ms_MY.php
index 88ed18346ca..b3004028c58 100644
--- a/apps/user_ldap/l10n/ms_MY.php
+++ b/apps/user_ldap/l10n/ms_MY.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Pemadaman gagal",
+"Error" => "Ralat",
 "Password" => "Kata laluan",
 "Help" => "Bantuan"
 );
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index c4700245f24..f8cdf694ff6 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Hent innstillinger fra tidligere tjener-konfigurasjon?",
 "Keep settings?" => "Behold innstillinger?",
 "Cannot add server configuration" => "Kan ikke legge til tjener-konfigurasjon",
+"Success" => "Suksess",
+"Error" => "Feil",
 "Connection test succeeded" => "Tilkoblingstest lyktes",
 "Connection test failed" => "Tilkoblingstest mislyktes",
 "Do you really want to delete the current Server Configuration?" => "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 7973c66cd10..c935d387ccc 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Niet gelukt de vertalingen leeg te maken.",
 "Failed to delete the server configuration" => "Verwijderen serverconfiguratie mislukt",
 "The configuration is valid and the connection could be established!" => "De configuratie is geldig en de verbinding is geslaagd!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "De configuratie is geldig, maar Bind mislukte. Controleer de serverinstellingen en inloggegevens.",
@@ -7,6 +8,9 @@
 "Take over settings from recent server configuration?" => "Overnemen instellingen van de recente serverconfiguratie?",
 "Keep settings?" => "Instellingen bewaren?",
 "Cannot add server configuration" => "Kon de serverconfiguratie niet toevoegen",
+"mappings cleared" => "vertaaltabel leeggemaakt",
+"Success" => "Succes",
+"Error" => "Fout",
 "Connection test succeeded" => "Verbindingstest geslaagd",
 "Connection test failed" => "Verbindingstest mislukt",
 "Do you really want to delete the current Server Configuration?" => "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
@@ -70,6 +74,13 @@
 "Email Field" => "E-mailveld",
 "User Home Folder Naming Rule" => "Gebruikers Home map naamgevingsregel",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
+"Internal Username" => "Interne gebruikersnaam",
+"Internal Username Attribute:" => "Interne gebruikersnaam attribuut:",
+"Override UUID detection" => "Negeren UUID detectie",
+"UUID Attribute:" => "UUID Attribuut:",
+"Username-LDAP User Mapping" => "Gebruikersnaam-LDAP gebruikers vertaling",
+"Clear Username-LDAP User Mapping" => "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
+"Clear Groupname-LDAP Group Mapping" => "Leegmaken Groepsnaam-LDAP groep vertaling",
 "Test Configuration" => "Test configuratie",
 "Help" => "Help"
 );
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
index 9f84258c56d..45910022803 100644
--- a/apps/user_ldap/l10n/nn_NO.php
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Feil ved sletting",
+"Error" => "Feil",
 "Password" => "Passord",
 "Help" => "Hjelp"
 );
diff --git a/apps/user_ldap/l10n/oc.php b/apps/user_ldap/l10n/oc.php
index 49b6c5970cc..95ab51caadd 100644
--- a/apps/user_ldap/l10n/oc.php
+++ b/apps/user_ldap/l10n/oc.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Fracàs d'escafatge",
+"Error" => "Error",
 "Password" => "Senhal",
 "Help" => "Ajuda"
 );
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index a5b620e48ba..a7a831e3e57 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Przejmij ustawienia z ostatnich konfiguracji serwera?",
 "Keep settings?" => "Zachować ustawienia?",
 "Cannot add server configuration" => "Nie można dodać konfiguracji serwera",
+"Success" => "Sukces",
+"Error" => "Błąd",
 "Connection test succeeded" => "Test połączenia udany",
 "Connection test failed" => "Test połączenia nie udany",
 "Do you really want to delete the current Server Configuration?" => "Czy chcesz usunąć bieżącą konfigurację serwera?",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index a728ea15fde..22247b81005 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Falha ao limpar os mapeamentos.",
 "Failed to delete the server configuration" => "Falha ao deletar a configuração do servidor",
 "The configuration is valid and the connection could be established!" => "A configuração é válida e a conexão foi estabelecida!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.",
@@ -7,6 +8,9 @@
 "Take over settings from recent server configuration?" => "Tomar parámetros de recente configuração de servidor?",
 "Keep settings?" => "Manter ajustes?",
 "Cannot add server configuration" => "Impossível adicionar a configuração do servidor",
+"mappings cleared" => "mapeamentos limpos",
+"Success" => "Sucesso",
+"Error" => "Erro",
 "Connection test succeeded" => "Teste de conexão bem sucedida",
 "Connection test failed" => "Teste de conexão falhou",
 "Do you really want to delete the current Server Configuration?" => "Você quer realmente deletar as atuais Configurações de Servidor?",
@@ -70,6 +74,16 @@
 "Email Field" => "Campo de Email",
 "User Home Folder Naming Rule" => "Regra para Nome da Pasta Pessoal do Usuário",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD.",
+"Internal Username" => "Nome de usuário interno",
+"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 in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é única e personagens não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_ @ -.]. Outros caracteres são substituídas por seu correspondente ASCII ou simplesmente serão omitidos. Em colisões um número será adicionado/aumentado. O nome de utilizador interna é usada para identificar um utilizador internamente. É também o nome padrão para a pasta home do usuário em ownCloud. É também um porto de URLs remoto, por exemplo, para todos os serviços de *DAV. Com esta definição, o comportamento padrão pode ser anulado. Para conseguir um comportamento semelhante como antes ownCloud 5 entrar na tela atributo nome de usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários LDAP. ",
+"Internal Username Attribute:" => "Atributo Interno de Nome de Usuário:",
+"Override UUID detection" => "Substituir detecção UUID",
+"By default, ownCloud autodetects the UUID attribute. 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 behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por padrão, ownCloud detecta automaticamente o atributo UUID. O atributo UUID é usado para identificar, sem dúvida, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificada acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser obtida tanto para usuários e grupos e é único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários e grupos LDAP.",
+"UUID Attribute:" => "Atributo UUID:",
+"Username-LDAP User Mapping" => "Usuário-LDAP Mapeamento de Usuário",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud usa nomes de usuários para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento de ownCloud do nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Além disso, o DN está em cache, assim como para reduzir a interação LDAP, mas que não é utilizado para a identificação. Se a DN muda, as mudanças serão encontradas pelo ownCloud. O nome ownCloud interno é utilizado em todo ownCloud. Limpando os mapeamentos terá sobras em todos os lugares. Limpeza dos mapeamentos não são sensíveis a configuração, isso afeta todas as configurações LDAP! Nunca limpar os mapeamentos em um ambiente de produção. Somente limpe os mapeamentos em uma fase de testes ou experimental.",
+"Clear Username-LDAP User Mapping" => "Limpar Mapeamento de Usuário Nome de Usuário-LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Limpar NomedoGrupo-LDAP Mapeamento do Grupo",
 "Test Configuration" => "Teste de Configuração",
 "Help" => "Ajuda"
 );
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 02b03d5a752..ed1e0f376db 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Assumir as configurações da configuração do servidor mais recente?",
 "Keep settings?" => "Manter as definições?",
 "Cannot add server configuration" => "Não foi possível adicionar as configurações do servidor.",
+"Success" => "Sucesso",
+"Error" => "Erro",
 "Connection test succeeded" => "Teste de conecção passado com sucesso.",
 "Connection test failed" => "Erro no teste de conecção.",
 "Do you really want to delete the current Server Configuration?" => "Deseja realmente apagar as configurações de servidor actuais?",
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index 8f55a35b491..260ee610639 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Ștergerea a eșuat",
+"Success" => "Succes",
+"Error" => "Eroare",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. Vă rugăm să întrebați administratorul de sistem pentru a dezactiva una dintre ele.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala.",
 "Host" => "Gazdă",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index 0746e1e8929..eed6d373b9f 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Принять настройки из последней конфигурации сервера?",
 "Keep settings?" => "Сохранить настройки?",
 "Cannot add server configuration" => "Не получилось добавить конфигурацию сервера",
+"Success" => "Успешно",
+"Error" => "Ошибка",
 "Connection test succeeded" => "Проверка соединения удалась",
 "Connection test failed" => "Проверка соединения не удалась",
 "Do you really want to delete the current Server Configuration?" => "Вы действительно хотите удалить существующую конфигурацию сервера?",
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
index a4ed503b1d1..7b6833ebf8c 100644
--- a/apps/user_ldap/l10n/ru_RU.php
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -1,42 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Deletion failed" => "Удаление не удалось",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением системы. Пожалуйста, обратитесь к системному администратору для отключения одного из них.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Предупреждение:</b> Модуль PHP LDAP не установлен, бэкэнд не будет работать. Пожалуйста, обратитесь к Вашему системному администратору, чтобы установить его.",
-"Host" => "Хост",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://",
-"Base DN" => "База DN",
-"One Base DN per line" => "Одно базовое DN на линию",
-"You can specify Base DN for users and groups in the Advanced tab" => "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»",
-"User DN" => "DN пользователя",
-"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN клиентского пользователя, с которого должна осуществляться привязка, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте поля DN и Пароль пустыми.",
-"Password" => "Пароль",
-"For anonymous access, leave DN and Password empty." => "Для анонимного доступа оставьте поля DN и пароль пустыми.",
-"User Login Filter" => "Фильтр имен пользователей",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Задает фильтр, применяемый при загрузке пользователя. %%uid заменяет имя пользователя при входе.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "используйте %%uid заполнитель, например, \"uid=%%uid\"",
-"User List Filter" => "Фильтр списка пользователей",
-"Defines the filter to apply, when retrieving users." => "Задает фильтр, применяемый при получении пользователей.",
-"without any placeholder, e.g. \"objectClass=person\"." => "без каких-либо заполнителей, например, \"objectClass=person\".",
-"Group Filter" => "Групповой фильтр",
-"Defines the filter to apply, when retrieving groups." => "Задает фильтр, применяемый при получении групп.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без каких-либо заполнителей, например, \"objectClass=posixGroup\".",
-"Port" => "Порт",
-"Use TLS" => "Использовать TLS",
-"Case insensitve LDAP server (Windows)" => "Нечувствительный к регистру LDAP-сервер (Windows)",
-"Turn off SSL certificate validation." => "Выключить проверку сертификата SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер.",
-"Not recommended, use for testing only." => "Не рекомендовано, используйте только для тестирования.",
-"in seconds. A change empties the cache." => "в секундах. Изменение очищает кэш.",
-"User Display Name Field" => "Поле, отображаемое как имя пользователя",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Атрибут LDAP, используемый для создания имени пользователя в ownCloud.",
-"Base User Tree" => "Базовое дерево пользователей",
-"One User Base DN per line" => "Одно пользовательское базовое DN на линию",
-"Group Display Name Field" => "Поле, отображаемое как имя группы",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Атрибут LDAP, используемый для создания группового имени в ownCloud.",
-"Base Group Tree" => "Базовое дерево групп",
-"One Group Base DN per line" => "Одно групповое базовое DN на линию",
-"Group-Member association" => "Связь член-группа",
-"in bytes" => "в байтах",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут.",
-"Help" => "Помощь"
+"Success" => "Успех",
+"Error" => "Ошибка"
 );
diff --git a/apps/user_ldap/l10n/si_LK.php b/apps/user_ldap/l10n/si_LK.php
index 50124e4d54f..1d81b341b46 100644
--- a/apps/user_ldap/l10n/si_LK.php
+++ b/apps/user_ldap/l10n/si_LK.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "මකාදැමීම අසාර්ථකයි",
+"Success" => "සාර්ථකයි",
+"Error" => "දෝෂයක්",
 "Host" => "සත්කාරකය",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
 "Password" => "මුර පදය",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index cb55762e64f..b31fe377563 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Prebrať nastavenia z nedávneho nastavenia servera?",
 "Keep settings?" => "Ponechať nastavenia?",
 "Cannot add server configuration" => "Nemožno pridať nastavenie servera",
+"Success" => "Úspešné",
+"Error" => "Chyba",
 "Connection test succeeded" => "Test pripojenia bol úspešný",
 "Connection test failed" => "Test pripojenia zlyhal",
 "Do you really want to delete the current Server Configuration?" => "Naozaj chcete zmazať súčasné nastavenie servera?",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 8ff1fd53440..1ade5d9b733 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Ali naj se prevzame nastavitve nedavne nastavitve strežnika?",
 "Keep settings?" => "Ali nas se nastavitve ohranijo?",
 "Cannot add server configuration" => "Ni mogoče dodati nastavitev strežnika",
+"Success" => "Uspešno končano.",
+"Error" => "Napaka",
 "Connection test succeeded" => "Preizkus povezave je uspešno končan.",
 "Connection test failed" => "Preizkus povezave je spodletel.",
 "Do you really want to delete the current Server Configuration?" => "Ali res želite izbrisati trenutne nastavitve strežnika?",
diff --git a/apps/user_ldap/l10n/sq.php b/apps/user_ldap/l10n/sq.php
index 24fd869057d..12324b9f966 100644
--- a/apps/user_ldap/l10n/sq.php
+++ b/apps/user_ldap/l10n/sq.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Veprim i gabuar",
 "Password" => "Kodi",
 "Help" => "Ndihmë"
 );
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
index 52569a08ef8..b94bc83e1e4 100644
--- a/apps/user_ldap/l10n/sr.php
+++ b/apps/user_ldap/l10n/sr.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Брисање није успело",
+"Error" => "Грешка",
 "Host" => "Домаћин",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://.",
 "Base DN" => "База DN",
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 1bb4d9dc0b1..eb30bd22f01 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Ta över inställningar från tidigare serverkonfiguration?",
 "Keep settings?" => "Behåll inställningarna?",
 "Cannot add server configuration" => "Kunde inte lägga till serverinställning",
+"Success" => "Lyckat",
+"Error" => "Fel",
 "Connection test succeeded" => "Anslutningstestet lyckades",
 "Connection test failed" => "Anslutningstestet misslyckades",
 "Do you really want to delete the current Server Configuration?" => "Vill du verkligen radera den nuvarande serverinställningen?",
diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php
index f6beb3c4863..997f09ca877 100644
--- a/apps/user_ldap/l10n/ta_LK.php
+++ b/apps/user_ldap/l10n/ta_LK.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "நீக்கம் தோல்வியடைந்தது",
+"Error" => "வழு",
 "Host" => "ஓம்புனர்",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்",
 "Base DN" => "தள DN",
diff --git a/apps/user_ldap/l10n/te.php b/apps/user_ldap/l10n/te.php
index d9a3e713f03..3f047631cf7 100644
--- a/apps/user_ldap/l10n/te.php
+++ b/apps/user_ldap/l10n/te.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "పొరపాటు",
 "Password" => "సంకేతపదం",
 "Help" => "సహాయం"
 );
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index 802badb2f03..ec279ba01e5 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -6,6 +6,8 @@
 "Deletion failed" => "การลบทิ้งล้มเหลว",
 "Keep settings?" => "รักษาการตั้งค่าไว้?",
 "Cannot add server configuration" => "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้",
+"Success" => "เสร็จสิ้น",
+"Error" => "ข้อผิดพลาด",
 "Connection test succeeded" => "ทดสอบการเชื่อมต่อสำเร็จ",
 "Connection test failed" => "ทดสอบการเชื่อมต่อล้มเหลว",
 "Do you really want to delete the current Server Configuration?" => "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index 6f75f4371db..c001fa99cec 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -7,6 +7,7 @@
 "Take over settings from recent server configuration?" => "Parametri sonadan uyunlama cikarmak mi?",
 "Keep settings?" => "Ayarları kalsınmı?",
 "Cannot add server configuration" => "Sunucu uyunlama birlemek edemen. ",
+"Error" => "Hata",
 "Connection test succeeded" => "Bağlantı testi başarılı oldu",
 "Connection test failed" => "Bağlantı testi başarısız oldu",
 "Do you really want to delete the current Server Configuration?" => "Hakikatten, Sonuncu Funksyon durmak istiyor mi?",
diff --git a/apps/user_ldap/l10n/ug.php b/apps/user_ldap/l10n/ug.php
index 05a7a3f9a06..8634cdbe1be 100644
--- a/apps/user_ldap/l10n/ug.php
+++ b/apps/user_ldap/l10n/ug.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "ئۆچۈرۈش مەغلۇپ بولدى",
+"Error" => "خاتالىق",
 "Host" => "باش ئاپپارات",
 "Password" => "ئىم",
 "User Login Filter" => "ئىشلەتكۈچى تىزىمغا كىرىش سۈزگۈچى",
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index 623d34c98e6..f92c6d5894e 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Застосувати налаштування  з останньої конфігурації сервера ?",
 "Keep settings?" => "Зберегти налаштування ?",
 "Cannot add server configuration" => "Неможливо додати конфігурацію сервера",
+"Success" => "Успіх",
+"Error" => "Помилка",
 "Connection test succeeded" => "Перевірка з'єднання пройшла успішно",
 "Connection test failed" => "Перевірка з'єднання завершилась неуспішно",
 "Do you really want to delete the current Server Configuration?" => "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?",
diff --git a/apps/user_ldap/l10n/ur_PK.php b/apps/user_ldap/l10n/ur_PK.php
index 4c606a13808..83570a596a2 100644
--- a/apps/user_ldap/l10n/ur_PK.php
+++ b/apps/user_ldap/l10n/ur_PK.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "ایرر",
 "Password" => "پاسورڈ",
 "Help" => "مدد"
 );
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
index 4bbb977f363..7e598225926 100644
--- a/apps/user_ldap/l10n/vi.php
+++ b/apps/user_ldap/l10n/vi.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Xóa thất bại",
+"Success" => "Thành công",
+"Error" => "Lỗi",
 "Host" => "Máy chủ",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://",
 "Base DN" => "DN cơ bản",
diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php
index f5bc41fd46b..6c60ec64e27 100644
--- a/apps/user_ldap/l10n/zh_CN.GB2312.php
+++ b/apps/user_ldap/l10n/zh_CN.GB2312.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "删除失败",
+"Success" => "成功",
+"Error" => "出错",
 "Host" => "主机",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "您可以忽略协议，除非您需要 SSL。然后用 ldaps:// 开头",
 "Base DN" => "基本判别名",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index 1911734805f..7b8389227ae 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "从近期的服务器配置中导入设置？",
 "Keep settings?" => "保留设置吗？",
 "Cannot add server configuration" => "无法添加服务器配置",
+"Success" => "成功",
+"Error" => "错误",
 "Connection test succeeded" => "连接测试成功",
 "Connection test failed" => "连接测试失败",
 "Do you really want to delete the current Server Configuration?" => "您真的想要删除当前服务器配置吗？",
diff --git a/apps/user_ldap/l10n/zh_HK.php b/apps/user_ldap/l10n/zh_HK.php
index 190e4eba798..ba55c414790 100644
--- a/apps/user_ldap/l10n/zh_HK.php
+++ b/apps/user_ldap/l10n/zh_HK.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"Success" => "成功",
+"Error" => "錯誤",
 "Password" => "密碼",
 "Port" => "連接埠",
 "Help" => "幫助"
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index 9a12bad0747..d01e75356c0 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "移除失敗",
+"Success" => "成功",
+"Error" => "錯誤",
 "Host" => "主機",
 "Password" => "密碼",
 "Port" => "連接阜",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index ad355ce5e24..a7611eb3e84 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -317,7 +317,19 @@ abstract class Access {
 			}
 			$ldapname = $ldapname[0];
 		}
-		$intname = $isUser ? $this->sanitizeUsername($uuid) : $ldapname;
+
+		if($isUser) {
+			$usernameAttribute = $this->connection->ldapExpertUsernameAttr;
+			if(!emptY($usernameAttribute)) {
+				$username = $this->readAttribute($dn, $usernameAttribute);
+				$username = $username[0];
+			} else {
+				$username = $uuid;
+			}
+			$intname = $this->sanitizeUsername($username);
+		} else {
+			$intname = $ldapname;
+		}
 
 		//a new user/group! Add it only if it doesn't conflict with other backend's users or existing groups
 		//disabling Cache is required to avoid that the new user is cached as not-existing in fooExists check
@@ -897,6 +909,12 @@ abstract class Access {
 			return true;
 		}
 
+		$fixedAttribute = $this->connection->ldapExpertUUIDAttr;
+		if(!empty($fixedAttribute)) {
+			$this->connection->ldapUuidAttribute = $fixedAttribute;
+			return true;
+		}
+
 		//for now, supported (known) attributes are entryUUID, nsuniqueid, objectGUID
 		$testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid');
 
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 88ff318586a..ba4de135341 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -65,6 +65,8 @@ class Connection {
 		'ldapAttributesForGroupSearch' => null,
 		'homeFolderNamingRule' => null,
 		'hasPagedResultSupport' => false,
+		'ldapExpertUsernameAttr' => null,
+		'ldapExpertUUIDAttr' => null,
 	);
 
 	/**
@@ -265,6 +267,10 @@ class Connection {
 				= preg_split('/\r\n|\r|\n/', $this->$v('ldap_attributes_for_user_search'));
 			$this->config['ldapAttributesForGroupSearch']
 				= preg_split('/\r\n|\r|\n/', $this->$v('ldap_attributes_for_group_search'));
+			$this->config['ldapExpertUsernameAttr']
+				= $this->$v('ldap_expert_username_attr');
+			$this->config['ldapExpertUUIDAttr']
+				= $this->$v('ldap_expert_uuid_attr');
 
 			$this->configured = $this->validateConfiguration();
 		}
@@ -290,7 +296,6 @@ class Connection {
 			'ldap_group_filter'=>'ldapGroupFilter',
 			'ldap_display_name'=>'ldapUserDisplayName',
 			'ldap_group_display_name'=>'ldapGroupDisplayName',
-
 			'ldap_tls'=>'ldapTLS',
 			'ldap_nocase'=>'ldapNoCase',
 			'ldap_quota_def'=>'ldapQuotaDefault',
@@ -302,7 +307,9 @@ class Connection {
 			'ldap_turn_off_cert_check' => 'turnOffCertCheck',
 			'ldap_configuration_active' => 'ldapConfigurationActive',
 			'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch',
-			'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch'
+			'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch',
+			'ldap_expert_username_attr' => 'ldapExpertUsernameAttr',
+			'ldap_expert_uuid_attr' => 'ldapExpertUUIDAttr',
 		);
 		return $array;
 	}
@@ -505,6 +512,10 @@ class Connection {
 			$configurationOK = false;
 		}
 
+		if(!empty($this->config['ldapExpertUUIDAttr'])) {
+			$this->config['ldapUuidAttribute'] = $this->config['ldapExpertUUIDAttr'];
+		}
+
 		return $configurationOK;
 	}
 
@@ -543,6 +554,8 @@ class Connection {
 			'ldap_configuration_active'			=> 1,
 			'ldap_attributes_for_user_search'	=> '',
 			'ldap_attributes_for_group_search'	=> '',
+			'ldap_expert_username_attr'              => '',
+			'ldap_expert_uuid_attr'             => '',
 		);
 	}
 
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index 8bebd84c12e..07d13a806a6 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -102,4 +102,29 @@ class Helper {
 
 		return true;
 	}
+
+	/**
+	 * Truncate's the given mapping table
+	 *
+	 * @param string $mapping either 'user' or 'group'
+	 * @return boolean true on success, false otherwise
+	 */
+	static public function clearMapping($mapping) {
+		if($mapping === 'user') {
+			$table = '`*PREFIX*ldap_user_mapping`';
+		} else if ($mapping === 'group') {
+			$table = '`*PREFIX*ldap_group_mapping`';
+		} else {
+			return false;
+		}
+
+		$query = \OCP\DB::prepare('TRUNCATE '.$table);
+		$res = $query->execute();
+
+		if(\OCP\DB::isError($res)) {
+			return false;
+		}
+
+		return true;
+	}
 }
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 05497ae8a33..22e2dac6d26 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -4,7 +4,9 @@
  * ownCloud - user_ldap
  *
  * @author Dominik Schmidt
+ * @author Arthur Schiwon
  * @copyright 2011 Dominik Schmidt dev@dominik-schmidt.de
+ * @copyright 2012-2013 Arthur Schiwon blizzz@owncloud.com
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index f0ee8c6b08a..972970aa3ef 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -3,6 +3,7 @@
 	<ul>
 		<li><a href="#ldapSettings-1">LDAP Basic</a></li>
 		<li><a href="#ldapSettings-2">Advanced</a></li>
+		<li><a href="#ldapSettings-3">Expert</a></li>
 	</ul>
 		<?php if(OCP\App::isEnabled('user_webdavauth')) {
 			print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them.').'</p>');
@@ -96,6 +97,17 @@
 			</div>
 		</div>
 	</fieldset>
+	<fieldset id="ldapSettings-3">
+		<p><strong><?php p($l->t('Internal Username'));?></strong></p>
+		<p class="ldapIndent"><?php p($l->t('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 in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users.'));?></p>
+		<p class="ldapIndent"><label for="ldap_expert_username_attr"><?php p($l->t('Internal Username Attribute:'));?></label><input type="text" id="ldap_expert_username_attr" name="ldap_expert_username_attr" data-default="<?php p($_['ldap_expert_username_attr_default']); ?>" /></p>
+		<p><strong><?php p($l->t('Override UUID detection'));?></strong></p>
+		<p class="ldapIndent"><?php p($l->t('By default, ownCloud autodetects the UUID attribute. 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 behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups.'));?></p>
+		<p class="ldapIndent"><label for="ldap_expert_uuid_attr"><?php p($l->t('UUID Attribute:'));?></label><input type="text" id="ldap_expert_uuid_attr" name="ldap_expert_uuid_attr" data-default="<?php p($_['ldap_expert_uuid_attr_default']); ?>" /></p>
+		<p><strong><?php p($l->t('Username-LDAP User Mapping'));?></strong></p>
+		<p class="ldapIndent"><?php p($l->t('ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage.'));?></p>
+		<p class="ldapIndent"><button id="ldap_action_clear_user_mappings" name="ldap_action_clear_user_mappings"><?php p($l->t('Clear Username-LDAP User Mapping'));?></button><br/><button id="ldap_action_clear_group_mappings" name="ldap_action_clear_group_mappings"><?php p($l->t('Clear Groupname-LDAP Group Mapping'));?></button></p>
+	</fieldset>
 	<input id="ldap_submit" type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection"><?php p($l->t('Test Configuration'));?></button> <a href="http://doc.owncloud.org/server/5.0/admin_manual/auth_ldap.html" target="_blank"><img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>" style="height:1.75ex" /> <?php p($l->t('Help'));?></a>
 	</div>
 
diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php
index 7e5b9045df3..73cc0963182 100644
--- a/apps/user_ldap/user_proxy.php
+++ b/apps/user_ldap/user_proxy.php
@@ -174,7 +174,7 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 		foreach($this->backends as $backend) {
 			$backendUsers = $backend->getDisplayNames($search, $limit, $offset);
 			if (is_array($backendUsers)) {
-				$users = array_merge($users, $backendUsers);
+				$users = $users + $backendUsers;
 			}
 		}
 		return $users;