diff --git a/.htaccess b/.htaccess
index 201e0d605b72dc893a5680df1f89328a31912386..08e2a82facbfc2a80ef95eb21a3533de1136bc3f 100755
--- a/.htaccess
+++ b/.htaccess
@@ -12,6 +12,7 @@ ErrorDocument 404 /core/templates/404.php
 php_value upload_max_filesize 513M
 php_value post_max_size 513M
 php_value memory_limit 512M
+php_value mbstring.func_overload 0
 <IfModule env_module>
   SetEnv htaccessWorking true
 </IfModule>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3f3cf20e9a59c7bd44db857abae8bba8adf74bb2..fd87513ec2a86c870ace782ab9ec8282a1017307 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,11 +12,12 @@ If you have questions about how to use ownCloud, please direct these to the [mai
   - Apps:
       - [Bookmarks](https://github.com/owncloud/bookmarks/issues)
       - [Calendar](https://github.com/owncloud/calendar/issues)
+      - [Contacts](https://github.com/owncloud/contacts/issues)
       - [Mail](https://github.com/owncloud/mail/issues)
       - [News](https://github.com/owncloud/news/issues)
       - [Notes](https://github.com/owncloud/notes/issues)
       - [Shorty](https://github.com/owncloud/shorty/issues)
-      - [other apps](https://github.com/owncloud/apps/issues) (e.g. Contacts, Pictures, Music, ...)
+      - [other apps](https://github.com/owncloud/apps/issues) (e.g. Pictures, Music, Tasks, ...)
 
 If your issue appears to be a bug, and hasn't been reported, open a new issue.
 
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 38714f34a639fa5bc8a9aa4a00c69833b23e20ad..8548fc95ddf963d6ef131b8b94fa808a5d547e21 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -85,7 +85,7 @@ if($source) {
 	}elseif(\OC\Files\Filesystem::touch($dir . '/' . $filename)) {
 		$meta = \OC\Files\Filesystem::getFileInfo($dir.'/'.$filename);
 		$id = $meta['fileid'];
-		OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id)));
+		OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id, 'mime' => $meta['mimetype'])));
 		exit();
 	}
 }
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
index 9fd2ce3ad4bc6d548aeb3a609e45863707ea7df7..f4551858283a21adb152160339bea773dc938113 100644
--- a/apps/files/ajax/rename.php
+++ b/apps/files/ajax/rename.php
@@ -1,26 +1,41 @@
 <?php
 
-// Init owncloud
-
+/**
+ * ownCloud - Core
+ *
+ * @author Morris Jobke
+ * @copyright 2013 Morris Jobke morris.jobke@gmail.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/>.
+ *
+ */
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
-// Get data
-$dir = stripslashes($_GET["dir"]);
-$file = stripslashes($_GET["file"]);
-$newname = stripslashes($_GET["newname"]);
-
-$l = OC_L10N::get('files');
+$files = new \OCA\Files\App(
+	\OC\Files\Filesystem::getView(),
+	\OC_L10n::get('files')
+);
+$result = $files->rename(
+	$_GET["dir"],
+	$_GET["file"],
+	$_GET["newname"]
+);
 
-if ( $newname !== '.' and ($dir != '' || $file != 'Shared') and $newname !== '.') {
-	$targetFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $newname);
-	$sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file);
-	if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) {
-		OCP\JSON::success(array("data" => array( "dir" => $dir, "file" => $file, "newname" => $newname )));
-	} else {
-		OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to rename file") )));
-	}
-}else{
-	OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to rename file") )));
-}
+if($result['success'] === true){
+	OCP\JSON::success(array('data' => $result['data']));
+} else {
+	OCP\JSON::error(array('data' => $result['data']));
+}
\ No newline at end of file
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 703b1c7cb6cd3c235010c6707336f7f83dabfcde..05ab1722b3e4f5411bb32671bb69dd03582ecd86 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -18,4 +18,6 @@ OC_Search::registerProvider('OC_Search_Provider_File');
 \OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
 \OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook');
 \OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
-\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
\ No newline at end of file
+\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
+
+\OC_BackgroundJob_RegularTask::register('\OC\Files\Cache\BackgroundWatcher', 'checkNext');
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index ec323915b4431a6b67b979f0f2b863a39fc61557..f788949b1b62feb82a07a8d6eb3f733f2a0f846e 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -5,7 +5,8 @@
 /* FILE MENU */
 .actions { padding:.3em; height:2em; width: 100%; }
 .actions input, .actions button, .actions .button { margin:0; float:left; }
-
+.actions .button a { color: #555; }
+.actions .button a:hover, .actions .button a:active { color: #333; }
 #new {
 	height:17px;  margin:0 0 0 1em; z-index:1010; float:left;
 }
@@ -34,6 +35,7 @@
 	background-image:url('%webroot%/core/img/actions/upload.svg');
 	background-repeat:no-repeat;
 	background-position:7px 6px;
+	opacity:0.65;
 }
 .file_upload_target { display:none; }
 .file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; }
@@ -148,7 +150,7 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
 
-div.crumb a{ padding:0.9em 0 0.7em 0; }
+div.crumb a{ padding:0.9em 0 0.7em 0; color:#555; }
 
 table.dragshadow {
 	width:auto;
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index b1e9a885063e735d1f394a0750c4922bce4ebbb7..c24d1fd8244dd124d781e41f140cae700b6bb528 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -191,6 +191,13 @@ var FileList={
 		td.children('a.name').hide();
 		td.append(form);
 		input.focus();
+		//preselect input
+		var len = input.val().lastIndexOf('.');
+		if (len === -1) {
+			len = input.val().length;
+		}
+		input.selectRange(0,len);
+		
 		form.submit(function(event){
 			event.stopPropagation();
 			event.preventDefault();
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 296e54e3568b0fb7d97eea1c6033b93189f5025c..a15f0588f9f3cec5ac8e589772e0809b132f7341 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -511,9 +511,9 @@ $(document).ready(function() {
 								var date=new Date();
 								FileList.addFile(name,0,date,false,hidden);
 								var tr=$('tr').filterAttr('data-file',name);
-								tr.attr('data-mime','text/plain');
+								tr.attr('data-mime',result.data.mime);
 								tr.attr('data-id', result.data.id);
-								getMimeIcon('text/plain',function(path){
+								getMimeIcon(result.data.mime,function(path){
 									tr.find('td.filename').attr('style','background-image:url('+path+')');
 								});
 							} else {
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index bc01a3406228e3d6c563b6828035d85de65bda1d..ca198b7efe95a31501f411f6f7d644addd3c0b54 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -1,7 +1,6 @@
 <?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 ",
@@ -45,6 +44,7 @@
 "{count} folders" => "{count} مجلدات",
 "1 file" => "ملف واحد",
 "{count} files" => "{count} ملفات",
+"Unable to rename file" => "فشل في اعادة تسمية الملف",
 "Upload" => "رفع",
 "File handling" => "التعامل مع الملف",
 "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 42c78ab3470e640234dcc780308319e567a34f13..83dd4dc36dc2a73e84bb1aad4a0013953e4a6e34 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -1,7 +1,6 @@
 <?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: " => "আপলোড করা  ফাইলটি php.ini তে বর্ণিত  upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ",
@@ -40,6 +39,7 @@
 "{count} folders" => "{count} টি ফোল্ডার",
 "1 file" => "১টি ফাইল",
 "{count} files" => "{count} টি ফাইল",
+"Unable to rename file" => "ফাইলের নাম পরিবর্তন করা সম্ভব হলো না",
 "Upload" => "আপলোড",
 "File handling" => "ফাইল হ্যার্ডলিং",
 "Maximum upload size" => "আপলোডের সর্বোচ্চ আকার",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index ff9572ad99eac6d0e33df0fa2bc3889ffd2ff87f..f34c9f59cf54b3cd7885b83b4d7fa9a2c7383a87 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom",
 "Could not move %s" => " No s'ha pogut moure %s",
-"Unable to rename file" => "No es pot canviar el nom del fitxer",
 "No file was uploaded. Unknown error" => "No s'ha carregat cap fitxer. Error desconegut",
 "There is no error, the file uploaded with success" => "No hi ha errors, el fitxer s'ha carregat correctament",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "L’arxiu que voleu carregar supera el màxim definit en la directiva upload_max_filesize del php.ini:",
@@ -47,6 +46,8 @@
 "{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",
 "Maximum upload size" => "Mida màxima de pujada",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index f28c6dad7e25553b3062635e9881d6bd074c0971..de6a15424212d891a01bf270a991c85ceedb9461 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nelze přesunout %s - existuje soubor se stejným názvem",
 "Could not move %s" => "Nelze přesunout %s",
-"Unable to rename file" => "Nelze přejmenovat soubor",
 "No file was uploaded. Unknown error" => "Soubor nebyl odeslán. Neznámá chyba",
 "There is no error, the file uploaded with success" => "Soubor byl odeslán úspěšně",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} složky",
 "1 file" => "1 soubor",
 "{count} files" => "{count} soubory",
+"Unable to rename file" => "Nelze přejmenovat soubor",
 "Upload" => "Odeslat",
 "File handling" => "Zacházení se soubory",
 "Maximum upload size" => "Maximální velikost pro odesílání",
diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
index 6ec0e7f914f85805bdd8f99e6423d3e48b98031f..ae3394889109c7c433750946b7d7c856e793ec89 100644
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli",
 "Could not move %s" => "Methwyd symud %s",
-"Unable to rename file" => "Methu ailenwi ffeil",
 "No file was uploaded. Unknown error" => "Ni lwythwyd ffeil i fyny. Gwall anhysbys.",
 "There is no error, the file uploaded with success" => "Does dim gwall, llwythodd y ffeil i fyny'n llwyddiannus",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb upload_max_filesize yn php.ini:",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} plygell",
 "1 file" => "1 ffeil",
 "{count} files" => "{count} ffeil",
+"Unable to rename file" => "Methu ailenwi ffeil",
 "Upload" => "Llwytho i fyny",
 "File handling" => "Trafod ffeiliau",
 "Maximum upload size" => "Maint mwyaf llwytho i fyny",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index ff590aa9a3a2b54f0216b50448ab10b95c0db1b6..879fbc8451fcbb0ba17e2acae0609c4adb22f00d 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kunne ikke flytte %s - der findes allerede en fil med dette navn",
 "Could not move %s" => "Kunne ikke flytte %s",
-"Unable to rename file" => "Kunne ikke omdøbe fil",
 "No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
 "There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"Unable to rename file" => "Kunne ikke omdøbe fil",
 "Upload" => "Upload",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimal upload-størrelse",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index f8ad5993af6b0ce3470a10967e040633a9268e80..bcc3a4c6c9da269ffdc8e8bf943bf4eaaa0f3b7a 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -1,16 +1,15 @@
 <?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "%s konnte nicht verschoben werden - eine Datei mit diesem Namen existiert bereits.",
-"Could not move %s" => "%s konnte nicht verschoben werden",
-"Unable to rename file" => "Die Datei konnte nicht umbenannt werden",
+"Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
+"Could not move %s" => "Konnte %s nicht verschieben",
 "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
-"There is no error, the file uploaded with success" => "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich übertragen.",
+"There is no error, the file uploaded with success" => "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist",
 "The uploaded file was only partially uploaded" => "Die Datei konnte nur teilweise übertragen werden",
 "No file was uploaded" => "Keine Datei konnte übertragen werden.",
 "Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
-"Not enough storage available" => "Nicht genug Speicherplatz verfügbar",
+"Not enough storage available" => "Nicht genug Speicher vorhanden.",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
 "Share" => "Teilen",
@@ -20,20 +19,20 @@
 "Pending" => "Ausstehend",
 "{new_name} already exists" => "{new_name} existiert bereits",
 "replace" => "ersetzen",
-"suggest name" => "Name vorschlagen",
+"suggest name" => "Namen vorschlagen",
 "cancel" => "abbrechen",
 "replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
 "undo" => "rückgängig machen",
 "perform delete operation" => "Löschvorgang ausführen",
-"1 file uploading" => "Eine Datei wird hoch geladen",
+"1 file uploading" => "1 Datei wird hochgeladen",
 "files uploading" => "Dateien werden hoch geladen",
 "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
 "File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicherplatz ist voll, Dateien können nicht mehr aktualisiert oder synchronisiert werden!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicherplatz ist fast aufgebraucht ({usedSpacePercent}%)",
+"Your storage is full, files can not be updated or synced anymore!" => "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Dein Speicher ist fast voll ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
 "Not enough space available" => "Nicht genug Speicherplatz verfügbar",
 "Upload cancelled." => "Upload abgebrochen.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} Ordner",
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
+"Unable to rename file" => "Konnte Datei nicht umbenennen",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
 "Maximum upload size" => "Maximale Upload-Größe",
@@ -62,9 +62,9 @@
 "From link" => "Von einem Link",
 "Deleted files" => "Gelöschte Dateien",
 "Cancel upload" => "Upload abbrechen",
-"You don’t have write permissions here." => "Du besitzt hier keine Schreib-Berechtigung.",
+"You don’t have write permissions here." => "Du hast hier keine Schreib-Berechtigung.",
 "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
-"Download" => "Download",
+"Download" => "Herunterladen",
 "Unshare" => "Freigabe aufheben",
 "Upload too large" => "Der Upload ist zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 8a977710a2a34c3146f3e41da59c617a930f9833..3c06c1ac83de1c42c3b3bf7be0dff05761723656 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -1,14 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
 "Could not move %s" => "Konnte %s nicht verschieben",
-"Unable to rename file" => "Konnte Datei nicht umbenennen",
 "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
-"There is no error, the file uploaded with success" => "Es sind keine Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in der php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist",
+"There is no error, the file uploaded with success" => "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Datei ist größer, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist",
 "The uploaded file was only partially uploaded" => "Die Datei konnte nur teilweise übertragen werden",
 "No file was uploaded" => "Keine Datei konnte übertragen werden.",
-"Missing a temporary folder" => "Der temporäre Ordner fehlt.",
+"Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
 "Not enough storage available" => "Nicht genug Speicher vorhanden.",
 "Invalid directory." => "Ungültiges Verzeichnis.",
@@ -20,33 +19,35 @@
 "Pending" => "Ausstehend",
 "{new_name} already exists" => "{new_name} existiert bereits",
 "replace" => "ersetzen",
-"suggest name" => "Einen Namen vorschlagen",
+"suggest name" => "Namen vorschlagen",
 "cancel" => "abbrechen",
 "replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
 "undo" => "rückgängig machen",
-"perform delete operation" => "führe das Löschen aus",
+"perform delete operation" => "Löschvorgang ausführen",
 "1 file uploading" => "1 Datei wird hochgeladen",
 "files uploading" => "Dateien werden hoch geladen",
 "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
 "File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name! Die Zeichen '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll. Daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
+"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien einen Moment dauern.",
+"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
 "Not enough space available" => "Nicht genügend Speicherplatz verfügbar",
 "Upload cancelled." => "Upload abgebrochen.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
 "URL cannot be empty." => "Die URL darf nicht leer sein.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten",
 "Error" => "Fehler",
 "Name" => "Name",
 "Size" => "Größe",
-"Modified" => "Bearbeitet",
+"Modified" => "Geändert",
 "1 folder" => "1 Ordner",
 "{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",
 "Maximum upload size" => "Maximale Upload-Größe",
@@ -63,12 +64,12 @@
 "Deleted files" => "Gelöschte Dateien",
 "Cancel upload" => "Upload abbrechen",
 "You don’t have write permissions here." => "Sie haben hier keine Schreib-Berechtigungen.",
-"Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!",
+"Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
 "Download" => "Herunterladen",
 "Unshare" => "Freigabe aufheben",
 "Upload too large" => "Der Upload ist zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
 "Current scanning" => "Scanne",
-"Upgrading filesystem cache..." => "Aktualisiere den Dateisystem-Cache..."
+"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
 );
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index d67a2fce36ceb49a2c875ab1a114120e5d27f582..a8bb96cdfc8cf818b84784c65d776746c98222af 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -1,7 +1,6 @@
 <?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",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} φάκελοι",
 "1 file" => "1 αρχείο",
 "{count} files" => "{count} αρχεία",
+"Unable to rename file" => "Αδυναμία μετονομασίας αρχείου",
 "Upload" => "Μεταφόρτωση",
 "File handling" => "Διαχείριση αρχείων",
 "Maximum upload size" => "Μέγιστο μέγεθος αποστολής",
diff --git a/apps/files/l10n/en@pirate.php b/apps/files/l10n/en@pirate.php
new file mode 100644
index 0000000000000000000000000000000000000000..fdd1850da900c44cc2536ae2082becbf96f51e66
--- /dev/null
+++ b/apps/files/l10n/en@pirate.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Download" => "Download"
+);
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 936c9aef19daffe0f3e7929cd3cd29c8f17641c9..3eeb88754c75fdde2d0082fa205e8d2038210059 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas",
 "Could not move %s" => "Ne eblis movi %s",
-"Unable to rename file" => "Ne eblis alinomigi dosieron",
 "No file was uploaded. Unknown error" => "Neniu dosiero alŝutiĝis. Nekonata eraro.",
 "There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: ",
@@ -42,6 +41,7 @@
 "{count} folders" => "{count} dosierujoj",
 "1 file" => "1 dosiero",
 "{count} files" => "{count} dosierujoj",
+"Unable to rename file" => "Ne eblis alinomigi dosieron",
 "Upload" => "Alŝuti",
 "File handling" => "Dosieradministro",
 "Maximum upload size" => "Maksimuma alŝutogrando",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index c9bc5ed6293ab68de738752cb4051edd512b157b..b11adfabeb3e0b67204d02f38ac274bd54f2adf0 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No se puede mover %s - Ya existe un archivo con ese nombre",
 "Could not move %s" => "No se puede mover %s",
-"Unable to rename file" => "No se puede renombrar el archivo",
 "No file was uploaded. Unknown error" => "No se subió ningún archivo. Error desconocido",
 "There is no error, the file uploaded with success" => "No hay ningún error, el archivo se ha subido con éxito",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentas subir sobrepasa el tamaño definido por la variable upload_max_filesize en php.ini",
@@ -27,18 +26,18 @@
 "perform delete operation" => "Eliminar",
 "1 file uploading" => "subiendo 1 archivo",
 "files uploading" => "subiendo archivos",
-"'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
+"'.' is an invalid file name." => "'.' no es un nombre de archivo válido.",
 "File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
-"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento esta lleno, los archivos no pueden ser mas actualizados o sincronizados!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento esta lleno en un  ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes.",
+"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡no se pueden actualizar ni sincronizar archivos!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son muy grandes.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Imposible subir su archivo, es un directorio o tiene 0 bytes",
 "Not enough space available" => "No hay suficiente espacio disponible",
 "Upload cancelled." => "Subida cancelada.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale de la página ahora, se cancelará la subida.",
 "URL cannot be empty." => "La URL no puede estar vacía.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "El nombre de carpeta no es válido. El uso de \"Shared\" está reservado para Owncloud",
 "Error" => "Error",
 "Name" => "Nombre",
 "Size" => "Tamaño",
@@ -47,6 +46,8 @@
 "{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",
 "Maximum upload size" => "Tamaño máximo de subida",
@@ -65,10 +66,10 @@
 "You don’t have write permissions here." => "No tienes permisos para escribir aquí.",
 "Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
 "Download" => "Descargar",
-"Unshare" => "No compartir",
-"Upload too large" => "bida demasido grande",
+"Unshare" => "Dejar de compartir",
+"Upload too large" => "Subida demasido grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor.",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor espere.",
-"Current scanning" => "Ahora escaneando",
-"Upgrading filesystem cache..." => "Actualizando cache de archivos de sistema"
+"Current scanning" => "Escaneo actual",
+"Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos"
 );
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 3b6a1f431e104f0a0d7de6321b1184f29989db84..0ae47302edf7f020ab8e603e88178b5ff7bf602d 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No se pudo mover %s - Un archivo con este nombre ya existe",
 "Could not move %s" => "No se pudo mover %s ",
-"Unable to rename file" => "No fue posible cambiar el nombre al archivo",
 "No file was uploaded. Unknown error" => "El archivo no fue subido. Error desconocido",
 "There is no error, the file uploaded with success" => "No hay errores, el archivo fue subido con éxito",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:",
@@ -47,6 +46,8 @@
 "{count} folders" => "{count} directorios",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud",
+"Unable to rename file" => "No fue posible cambiar el nombre al archivo",
 "Upload" => "Subir",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 133f461a1242be26ab11a55024546be101eb27e9..d3fab4b0bd167e59a03f3f9e0f1f620a155b850c 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -1,10 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ei saa liigutada faili %s - samanimeline fail on juba olemas",
 "Could not move %s" => "%s liigutamine ebaõnnestus",
-"Unable to rename file" => "Faili ümbernimetamine 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",
@@ -25,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",
@@ -47,6 +46,8 @@
 "{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",
 "Maximum upload size" => "Maksimaalne üleslaadimise suurus",
@@ -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/eu.php b/apps/files/l10n/eu.php
index 74c096e196550fa0dbb1530196297c9de94b621e..a4afc2e8ca801c335c9f7970a0ea0b9ffdf22db3 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
 "Could not move %s" => "Ezin dira fitxategiak mugitu %s",
-"Unable to rename file" => "Ezin izan da fitxategia berrizendatu",
 "No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
 "There is no error, the file uploaded with success" => "Ez da errorerik egon, fitxategia ongi igo da",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} karpeta",
 "1 file" => "fitxategi bat",
 "{count} files" => "{count} fitxategi",
+"Unable to rename file" => "Ezin izan da fitxategia berrizendatu",
 "Upload" => "Igo",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 10132fdf9e31286d34b54e6facfab16ecdaa1a87..b97067ac19314eb9fc3d694ff8f638faffc48b22 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -1,7 +1,6 @@
 <?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: " => "پرونده آپلود شده بیش ازدستور  ماکزیمم_حجم فایل_برای آپلود در   php.ini استفاده کرده است.",
@@ -47,6 +46,7 @@
 "{count} folders" => "{ شمار} پوشه ها",
 "1 file" => "1 پرونده",
 "{count} files" => "{ شمار } فایل ها",
+"Unable to rename file" => "قادر به تغییر نام پرونده نیست.",
 "Upload" => "بارگزاری",
 "File handling" => "اداره پرونده ها",
 "Maximum upload size" => "حداکثر اندازه بارگزاری",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 08a071832380f2e388d7da205fbdf20fdc47d07c..3d0d724578144d9776db2c9d8d7752a27138aa54 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemassa",
 "Could not move %s" => "Kohteen %s siirto ei onnistunut",
-"Unable to rename file" => "Tiedoston nimeäminen uudelleen ei onnistunut",
 "No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
 "There is no error, the file uploaded with success" => "Ei virheitä, tiedosto lähetettiin onnistuneesti",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:",
@@ -43,6 +42,7 @@
 "{count} folders" => "{count} kansiota",
 "1 file" => "1 tiedosto",
 "{count} files" => "{count} tiedostoa",
+"Unable to rename file" => "Tiedoston nimeäminen uudelleen ei onnistunut",
 "Upload" => "Lähetä",
 "File handling" => "Tiedostonhallinta",
 "Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 3e2bdd4db02e564bc07cb8b14aacd1d65bf87611..39c697396c919c69a6349ae94f44b2f47c8f2882 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -1,12 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà",
 "Could not move %s" => "Impossible de déplacer %s",
-"Unable to rename file" => "Impossible de renommer le fichier",
-"No file was uploaded. Unknown error" => "Aucun fichier n'a été chargé. Erreur inconnue",
-"There is no error, the file uploaded with success" => "Il n'y a pas d'erreur, le fichier a été envoyé avec succes.",
+"No file was uploaded. Unknown error" => "Aucun fichier n'a été envoyé. Erreur inconnue",
+"There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été envoyé avec succès.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
-"The uploaded file was only partially uploaded" => "Le fichier envoyé n'a été que partiellement envoyé.",
+"The uploaded file was only partially uploaded" => "Le fichier n'a été que partiellement envoyé.",
 "No file was uploaded" => "Pas de fichier envoyé.",
 "Missing a temporary folder" => "Absence de dossier temporaire.",
 "Failed to write to disk" => "Erreur d'écriture sur le disque",
@@ -25,17 +24,17 @@
 "replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
 "undo" => "annuler",
 "perform delete operation" => "effectuer l'opération de suppression",
-"1 file uploading" => "1 fichier en cours de téléchargement",
-"files uploading" => "fichiers en cours de téléchargement",
+"1 file uploading" => "1 fichier en cours d'envoi",
+"files uploading" => "fichiers en cours d'envoi",
 "'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.",
 "File name cannot be empty." => "Le nom de fichier ne peut être vide.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
 "Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
 "Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de téléverser votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle",
 "Not enough space available" => "Espace disponible insuffisant",
-"Upload cancelled." => "Chargement annulé.",
+"Upload cancelled." => "Envoi annulé.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
 "URL cannot be empty." => "L'URL ne peut-être vide",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud",
@@ -47,6 +46,8 @@
 "{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",
 "Maximum upload size" => "Taille max. d'envoi",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index e04940e2b48ed8a014908adb61bfde2b7308f710..d22ed4b87215d156509866f3a81ac712d2c9b02f 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Non se moveu %s - Xa existe un ficheiro con ese nome.",
 "Could not move %s" => "Non foi posíbel mover %s",
-"Unable to rename file" => "Non é posíbel renomear o ficheiro",
 "No file was uploaded. Unknown error" => "Non se enviou ningún ficheiro. Produciuse un erro descoñecido.",
 "There is no error, the file uploaded with success" => "Non houbo erros, o ficheiro enviouse correctamente",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede a directiva indicada por upload_max_filesize de php.ini:",
@@ -47,12 +46,14 @@
 "{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",
 "Maximum upload size" => "Tamaño máximo do envío",
 "max. possible: " => "máx. posíbel: ",
 "Needed for multi-file and folder downloads." => "Precísase para a descarga de varios ficheiros e cartafoles.",
-"Enable ZIP-download" => "Habilitar a descarga-ZIP",
+"Enable ZIP-download" => "Activar a descarga ZIP",
 "0 is unlimited" => "0 significa ilimitado",
 "Maximum input size for ZIP files" => "Tamaño máximo de descarga para os ficheiros ZIP",
 "Save" => "Gardar",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index cd5154fcd856906908856b8b96f040a3b1cc8914..4520bfdd085dd934fee131f490e5e3a19ebaf5c9 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel",
 "Could not move %s" => "Nem sikerült %s áthelyezése",
-"Unable to rename file" => "Nem lehet átnevezni a fájlt",
 "No file was uploaded. Unknown error" => "Nem történt feltöltés. Ismeretlen hiba",
 "There is no error, the file uploaded with success" => "A fájlt sikerült feltölteni",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét.",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} mappa",
 "1 file" => "1 fájl",
 "{count} files" => "{count} fájl",
+"Unable to rename file" => "Nem lehet átnevezni a fájlt",
 "Upload" => "Feltöltés",
 "File handling" => "Fájlkezelés",
 "Maximum upload size" => "Maximális feltölthető fájlméret",
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 74aad4df389434c56cb8e83c23468ee7a6b11507..886922d954687866367c1e806a5f7d50a62430c2 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -5,6 +5,7 @@
 "Files" => "Files",
 "Share" => "Compartir",
 "Delete" => "Deler",
+"Error" => "Error",
 "Name" => "Nomine",
 "Size" => "Dimension",
 "Modified" => "Modificate",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 7cba9ae66eb932707039f2511ece087979c1bdc0..58cc0ea7fd953e2c086f45a3983d593012151b19 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada",
 "Could not move %s" => "Tidak dapat memindahkan %s",
-"Unable to rename file" => "Tidak dapat mengubah nama berkas",
 "No file was uploaded. Unknown error" => "Tidak ada berkas yang diunggah. Galat tidak dikenal.",
 "There is no error, the file uploaded with success" => "Tidak ada galat, berkas sukses diunggah",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Berkas yang diunggah melampaui direktif upload_max_filesize pada php.ini",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} folder",
 "1 file" => "1 berkas",
 "{count} files" => "{count} berkas",
+"Unable to rename file" => "Tidak dapat mengubah nama berkas",
 "Upload" => "Unggah",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran pengunggahan maksimum",
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index f0a4aa81efa1b6d90a2821a30cd1b5861211cfc2..aa10c838c1d71a945c8b8e9cc5358085fdc71213 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Gat ekki fært %s - Skrá með þessu nafni er þegar til",
 "Could not move %s" => "Gat ekki fært %s",
-"Unable to rename file" => "Gat ekki endurskýrt skrá",
 "No file was uploaded. Unknown error" => "Engin skrá var send inn. Óþekkt villa.",
 "There is no error, the file uploaded with success" => "Engin villa, innsending heppnaðist",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Innsend skrá er stærri en upload_max stillingin í php.ini:",
@@ -40,6 +39,7 @@
 "{count} folders" => "{count} möppur",
 "1 file" => "1 skrá",
 "{count} files" => "{count} skrár",
+"Unable to rename file" => "Gat ekki endurskýrt skrá",
 "Upload" => "Senda inn",
 "File handling" => "Meðhöndlun skrár",
 "Maximum upload size" => "Hámarks stærð innsendingar",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 77725b6770dfacaa62647cbdaa413b4772f29853..c588285aacabab0d61dc185d882b4017fd224af2 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossibile spostare %s - un file con questo nome esiste già",
 "Could not move %s" => "Impossibile spostare %s",
-"Unable to rename file" => "Impossibile rinominare il file",
 "No file was uploaded. Unknown error" => "Nessun file è stato inviato. Errore sconosciuto",
 "There is no error, the file uploaded with success" => "Non ci sono errori, il file è stato caricato correttamente",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Il file caricato supera la direttiva upload_max_filesize in php.ini:",
@@ -47,6 +46,8 @@
 "{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",
 "Maximum upload size" => "Dimensione massima upload",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index bff9fa5b519a103ce6898111572d9ca29f29b309..55dcf3640e7746d8d23a7cd00873474604fa32e9 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -1,7 +1,6 @@
 <?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: " => "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:",
@@ -47,6 +46,8 @@
 "{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" => "ファイル操作",
 "Maximum upload size" => "最大アップロードサイズ",
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index d237a81856a8d6f73b6800c376b1deac8135fb87..c50ca2594b6db137143b18a48ba7cd8077544176 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -1,7 +1,6 @@
 <?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 ფაილში",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} საქაღალდე",
 "1 file" => "1 ფაილი",
 "{count} files" => "{count} ფაილი",
+"Unable to rename file" => "ფაილის სახელის გადარქმევა ვერ მოხერხდა",
 "Upload" => "ატვირთვა",
 "File handling" => "ფაილის დამუშავება",
 "Maximum upload size" => "მაქსიმუმ ატვირთის ზომა",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 711c53ee49f377f15cfe76726f428dc71304e6e1..c78f58542e460d27b5b9cab6acb249a4e2b15580 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -1,7 +1,6 @@
 <?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: " => "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:",
@@ -10,9 +9,11 @@
 "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" => "대기 중",
@@ -22,7 +23,9 @@
 "cancel" => "취소",
 "replaced {new_name} with {old_name}" => "{old_name}이(가) {new_name}(으)로 대체됨",
 "undo" => "되돌리기",
+"perform delete operation" => "삭제 작업중",
 "1 file uploading" => "파일 1개 업로드 중",
+"files uploading" => "파일 업로드중",
 "'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.",
 "File name cannot be empty." => "파일 이름이 비어 있을 수 없습니다.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.",
@@ -43,6 +46,7 @@
 "{count} folders" => "폴더 {count}개",
 "1 file" => "파일 1개",
 "{count} files" => "파일 {count}개",
+"Unable to rename file" => "파일 이름바꾸기 할 수 없음",
 "Upload" => "업로드",
 "File handling" => "파일 처리",
 "Maximum upload size" => "최대 업로드 크기",
@@ -56,7 +60,9 @@
 "Text file" => "텍스트 파일",
 "Folder" => "폴더",
 "From link" => "링크에서",
+"Deleted files" => "파일 삭제됨",
 "Cancel upload" => "업로드 취소",
+"You don’t have write permissions here." => "당신은 여기에 쓰기를 할 수 있는 권한이 없습니다.",
 "Nothing in here. Upload something!" => "내용이 없습니다. 업로드할 수 있습니다!",
 "Download" => "다운로드",
 "Unshare" => "공유 해제",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 1e7e8657074acfdd81919ce2405db43b9237dbb7..f62bdd2d49226306ebaaa5870d6f532fe6f688d5 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu",
 "Could not move %s" => "Nevarēja pārvietot %s",
-"Unable to rename file" => "Nevarēja pārsaukt datni",
 "No file was uploaded. Unknown error" => "Netika augšupielādēta neviena datne. Nezināma kļūda",
 "There is no error, the file uploaded with success" => "Viss kārtībā, datne augšupielādēta veiksmīga",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Augšupielādētā datne pārsniedz upload_max_filesize norādījumu php.ini datnē:",
@@ -46,6 +45,7 @@
 "{count} folders" => "{count} mapes",
 "1 file" => "1 datne",
 "{count} files" => "{count} datnes",
+"Unable to rename file" => "Nevarēja pārsaukt datni",
 "Upload" => "Augšupielādēt",
 "File handling" => "Datņu pārvaldība",
 "Maximum upload size" => "Maksimālais datņu augšupielādes apjoms",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 1ff21b1f0e23faf454b7759f120bc657de52fd7a..d5710a4927a07f438afa6531298606fdbd8a3593 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -1,11 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Kan ikke flytte %s - En fil med samme navn finnes allerede",
+"Could not move %s" => "Kunne ikke flytte %s",
 "No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
 "There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.",
 "The uploaded file was only partially uploaded" => "Filen du prøvde å laste opp ble kun delvis lastet opp",
 "No file was uploaded" => "Ingen filer ble lastet opp",
 "Missing a temporary folder" => "Mangler midlertidig mappe",
 "Failed to write to disk" => "Klarte ikke å skrive til disk",
+"Not enough storage available" => "Ikke nok lagringsplass",
+"Invalid directory." => "Ugyldig katalog.",
 "Files" => "Filer",
 "Share" => "Del",
 "Delete permanently" => "Slett permanent",
@@ -18,13 +23,21 @@
 "cancel" => "avbryt",
 "replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
 "undo" => "angre",
+"perform delete operation" => "utfør sletting",
 "1 file uploading" => "1 fil lastes opp",
 "files uploading" => "filer lastes opp",
+"'.' is an invalid file name." => "'.' er et ugyldig filnavn.",
+"File name cannot be empty." => "Filnavn kan ikke være tomt.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
+"Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
+"Not enough space available" => "Ikke nok lagringsplass",
 "Upload cancelled." => "Opplasting avbrutt.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
 "URL cannot be empty." => "URL-en kan ikke være tom.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
 "Error" => "Feil",
 "Name" => "Navn",
 "Size" => "Størrelse",
@@ -33,6 +46,8 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
+"Unable to rename file" => "Kan ikke gi nytt navn",
 "Upload" => "Last opp",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimum opplastingsstørrelse",
@@ -46,12 +61,15 @@
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
 "From link" => "Fra link",
+"Deleted files" => "Slettet filer",
 "Cancel upload" => "Avbryt opplasting",
+"You don’t have write permissions here." => "Du har ikke skrivetilgang her.",
 "Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
 "Download" => "Last ned",
 "Unshare" => "Avslutt deling",
 "Upload too large" => "Filen er for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
 "Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
-"Current scanning" => "Pågående skanning"
+"Current scanning" => "Pågående skanning",
+"Upgrading filesystem cache..." => "Oppgraderer filsystemets  mellomlager..."
 );
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index aea25779dbcf6958ea0009e5789e74e70b3dffca..bc4158df3b3928befe482bbd8d5692f677d7de0a 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam",
 "Could not move %s" => "Kon %s niet verplaatsen",
-"Unable to rename file" => "Kan bestand niet hernoemen",
 "No file was uploaded. Unknown error" => "Er was geen bestand geladen.  Onbekende fout",
 "There is no error, the file uploaded with success" => "De upload van het bestand is goedgegaan.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:",
@@ -47,6 +46,8 @@
 "{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",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 2042e7bf8adea4c90fee6fa7b5151860ef17ffd2..29593b6f2def50a7d86a473355100ec45ba099ad 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -1,7 +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",
-"Unable to rename file" => "Klarte ikkje å endra filnamnet",
+"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: ",
@@ -9,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",
@@ -33,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",
@@ -47,12 +46,14 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
+"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 +68,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 ef0fd52577877769a383da039a87c682f3d24d40..4bdac05578189551de8da55cd84b5631ed25256c 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nie można było przenieść %s - Plik o takiej nazwie już istnieje",
 "Could not move %s" => "Nie można było przenieść %s",
-"Unable to rename file" => "Nie można zmienić nazwy pliku",
 "No file was uploaded. Unknown error" => "Żaden plik nie został załadowany. Nieznany błąd",
 "There is no error, the file uploaded with success" => "Nie było błędów, plik wysłano poprawnie.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: ",
@@ -47,6 +46,8 @@
 "{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",
 "Maximum upload size" => "Maksymalny rozmiar wysyłanego pliku",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index f61084105deb1ab075b1fb4cfad52559075ae2a1..0f349b694812830acc2dec8a4a813cccfc419443 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossível mover %s - Um arquivo com este nome já existe",
 "Could not move %s" => "Impossível mover %s",
-"Unable to rename file" => "Impossível renomear arquivo",
 "No file was uploaded. Unknown error" => "Nenhum arquivo foi enviado. Erro desconhecido",
 "There is no error, the file uploaded with success" => "Sem erros, o arquivo foi enviado com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: ",
@@ -47,6 +46,8 @@
 "{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",
 "Maximum upload size" => "Tamanho máximo para carregar",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index a5de64cc1db66538a0491bb3e49ef8b8c68dad71..15d6fc80bd36cec03e9c89bb6b5cd83653f1ebfb 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Não foi possível mover o ficheiro %s - Já existe um ficheiro com esse nome",
 "Could not move %s" => "Não foi possível move o ficheiro %s",
-"Unable to rename file" => "Não foi possível renomear o ficheiro",
 "No file was uploaded. Unknown error" => "Nenhum ficheiro foi carregado. Erro desconhecido",
 "There is no error, the file uploaded with success" => "Não ocorreram erros, o ficheiro foi submetido com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede o limite permitido na directiva do php.ini upload_max_filesize",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
+"Unable to rename file" => "Não foi possível renomear o ficheiro",
 "Upload" => "Carregar",
 "File handling" => "Manuseamento de ficheiros",
 "Maximum upload size" => "Tamanho máximo de envio",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index b2b6ee4963f1765661b70201d1190484efa47ca4..8fdf62aeb32b1aab7004642d0287eb0c0142c930 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nu se poate de mutat %s - Fișier cu acest nume deja există",
 "Could not move %s" => "Nu s-a putut muta %s",
-"Unable to rename file" => "Nu s-a putut redenumi fișierul",
 "No file was uploaded. Unknown error" => "Nici un fișier nu a fost încărcat. Eroare necunoscută",
 "There is no error, the file uploaded with success" => "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: ",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} foldare",
 "1 file" => "1 fisier",
 "{count} files" => "{count} fisiere",
+"Unable to rename file" => "Nu s-a putut redenumi fișierul",
 "Upload" => "Încărcare",
 "File handling" => "Manipulare fișiere",
 "Maximum upload size" => "Dimensiune maximă admisă la încărcare",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 54d6780c3d17296a92f1da79be91158562928b8e..83412bf2be80060232d6f0eece793056fc640832 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -1,7 +1,6 @@
 <?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:",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} папок",
 "1 file" => "1 файл",
 "{count} files" => "{count} файлов",
+"Unable to rename file" => "Невозможно переименовать файл",
 "Upload" => "Загрузка",
 "File handling" => "Управление файлами",
 "Maximum upload size" => "Максимальный размер загружаемого файла",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 400a0dc8de710ee60b14f6e718b45c97719ee2e3..1ef163d48f33d1aa62018a4d5ee96a95cfb06d73 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/sk_SK.php b/apps/files/l10n/sk_SK.php
index 86f01bfb0edf4bc8bc3bf59fba04b8e0e0c4762a..b7f329c3626dbfc59603487210cf1ec1668c3eaa 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nie je možné presunúť %s - súbor s týmto menom už existuje",
 "Could not move %s" => "Nie je možné presunúť %s",
-"Unable to rename file" => "Nemožno premenovať súbor",
 "No file was uploaded. Unknown error" => "Žiaden súbor nebol odoslaný. Neznáma chyba",
 "There is no error, the file uploaded with success" => "Nenastala žiadna chyba, súbor bol úspešne nahraný",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Nahraný súbor predčil  konfiguračnú direktívu upload_max_filesize v súbore php.ini:",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} priečinkov",
 "1 file" => "1 súbor",
 "{count} files" => "{count} súborov",
+"Unable to rename file" => "Nemožno premenovať súbor",
 "Upload" => "Odoslať",
 "File handling" => "Nastavenie správania sa k súborom",
 "Maximum upload size" => "Maximálna veľkosť odosielaného súboru",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 44c33d62fbe340657d26292d1f321be9204479de..6902d311ab76327b93b19abe746e635283e7df21 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ni mogoče premakniti %s - datoteka s tem imenom že obstaja",
 "Could not move %s" => "Ni mogoče premakniti %s",
-"Unable to rename file" => "Ni mogoče preimenovati datoteke",
 "No file was uploaded. Unknown error" => "Ni poslane datoteke. Neznana napaka.",
 "There is no error, the file uploaded with success" => "Datoteka je uspešno naložena.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} map",
 "1 file" => "1 datoteka",
 "{count} files" => "{count} datotek",
+"Unable to rename file" => "Ni mogoče preimenovati datoteke",
 "Upload" => "Pošlji",
 "File handling" => "Upravljanje z datotekami",
 "Maximum upload size" => "Največja velikost za pošiljanja",
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index fe3ae9e7a96491e5d53fb0d5ded6658a4bb4a4a9..63c95f692e26842b4b33785d8b02e002a81a2ac5 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s nuk u spostua - Aty ekziston një skedar me të njëjtin emër",
 "Could not move %s" => "%s nuk u spostua",
-"Unable to rename file" => "Nuk është i mundur riemërtimi i skedarit",
 "No file was uploaded. Unknown error" => "Nuk u ngarkua asnjë skedar. Veprim i gabuar i panjohur",
 "There is no error, the file uploaded with success" => "Nuk pati veprime të gabuara, skedari u ngarkua me sukses",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Skedari i ngarkuar tejkalon udhëzimin upload_max_filesize tek php.ini:",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} dosje",
 "1 file" => "1 skedar",
 "{count} files" => "{count} skedarë",
+"Unable to rename file" => "Nuk është i mundur riemërtimi i skedarit",
 "Upload" => "Ngarko",
 "File handling" => "Trajtimi i skedarit",
 "Maximum upload size" => "Dimensioni maksimal i ngarkimit",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index a10bd82b4ccabc03bb12b5627897123b17a38ed1..3be6dde91a7ed6c1256187bbacca416aee34c1ee 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -1,7 +1,6 @@
 <?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:",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} фасцикле/и",
 "1 file" => "1 датотека",
 "{count} files" => "{count} датотеке/а",
+"Unable to rename file" => "Не могу да преименујем датотеку",
 "Upload" => "Отпреми",
 "File handling" => "Управљање датотекама",
 "Maximum upload size" => "Највећа величина датотеке",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index c342db37538bfcabb17a043a73e33d79950a7735..82d169d569c0acbe23b24c29d47a81caedafe535 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kunde inte flytta %s - Det finns redan en fil med detta namn",
 "Could not move %s" => "Kan inte flytta %s",
-"Unable to rename file" => "Kan inte byta namn på filen",
 "No file was uploaded. Unknown error" => "Ingen fil uppladdad. Okänt fel",
 "There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini:",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} mappar",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"Unable to rename file" => "Kan inte byta namn på filen",
 "Upload" => "Ladda upp",
 "File handling" => "Filhantering",
 "Maximum upload size" => "Maximal storlek att ladda upp",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index a707edb6283abe493c8426e43776a6c463ea4fed..06d26edfec8ea21f483427c4de13b8a062fe38da 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -1,7 +1,6 @@
 <?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",
@@ -46,6 +45,7 @@
 "{count} folders" => "{count} โฟลเดอร์",
 "1 file" => "1 ไฟล์",
 "{count} files" => "{count} ไฟล์",
+"Unable to rename file" => "ไม่สามารถเปลี่ยนชื่อไฟล์ได้",
 "Upload" => "อัพโหลด",
 "File handling" => "การจัดกาไฟล์",
 "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 1df062c994c4fc8555c5d1f3f6ebaf71f6bbfbca..fd5c6bc6f09faccf190e7c14b25c215aaeb303f5 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten var.",
 "Could not move %s" => "%s taşınamadı",
-"Unable to rename file" => "Dosya adı değiştirilemedi",
 "No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
 "There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı.",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} dizin",
 "1 file" => "1 dosya",
 "{count} files" => "{count} dosya",
+"Unable to rename file" => "Dosya adı değiştirilemedi",
 "Upload" => "Yükle",
 "File handling" => "Dosya taşıma",
 "Maximum upload size" => "Maksimum yükleme boyutu",
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..fb8f187adef2623055b1ffaa168aac115cb419eb
--- /dev/null
+++ b/apps/files/l10n/ug.php
@@ -0,0 +1,44 @@
+<?php $TRANSLATIONS = array(
+"Could not move %s" => "%s يۆتكىيەلمەيدۇ",
+"No file was uploaded. Unknown error" => "ھېچقانداق ھۆججەت يۈكلەنمىدى. يوچۇن خاتالىق",
+"No file was uploaded" => "ھېچقانداق ھۆججەت يۈكلەنمىدى",
+"Missing a temporary folder" => "ۋاقىتلىق قىسقۇچ كەم.",
+"Failed to write to disk" => "دىسكىغا يازالمىدى",
+"Not enough storage available" => "يېتەرلىك ساقلاش بوشلۇقى يوق",
+"Files" => "ھۆججەتلەر",
+"Share" => "ھەمبەھىر",
+"Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
+"Delete" => "ئۆچۈر",
+"Rename" => "ئات ئۆزگەرت",
+"Pending" => "كۈتۈۋاتىدۇ",
+"{new_name} already exists" => "{new_name} مەۋجۇت",
+"replace" => "ئالماشتۇر",
+"suggest name" => "تەۋسىيە ئات",
+"cancel" => "ۋاز كەچ",
+"undo" => "يېنىۋال",
+"1 file uploading" => "1 ھۆججەت يۈكلىنىۋاتىدۇ",
+"files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ",
+"Not enough space available" => "يېتەرلىك بوشلۇق يوق",
+"Upload cancelled." => "يۈكلەشتىن ۋاز كەچتى.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.",
+"Error" => "خاتالىق",
+"Name" => "ئاتى",
+"Size" => "چوڭلۇقى",
+"Modified" => "ئۆزگەرتكەن",
+"1 folder" => "1 قىسقۇچ",
+"1 file" => "1 ھۆججەت",
+"{count} files" => "{count} ھۆججەت",
+"Unable to rename file" => "ھۆججەت ئاتىنى ئۆزگەرتكىلى بولمايدۇ",
+"Upload" => "يۈكلە",
+"Save" => "ساقلا",
+"New" => "يېڭى",
+"Text file" => "تېكىست ھۆججەت",
+"Folder" => "قىسقۇچ",
+"Deleted files" => "ئۆچۈرۈلگەن ھۆججەتلەر",
+"Cancel upload" => "يۈكلەشتىن ۋاز كەچ",
+"Nothing in here. Upload something!" => "بۇ جايدا ھېچنېمە يوق. Upload something!",
+"Download" => "چۈشۈر",
+"Unshare" => "ھەمبەھىرلىمە",
+"Upload too large" => "يۈكلەندىغىنى بەك چوڭ",
+"Upgrading filesystem cache..." => "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…"
+);
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 72915630caebdde032de9c538d67d315c82df728..324b28936e75c5f3e2f8d9ddc29d5c8a0f18ee27 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -1,7 +1,6 @@
 <?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: ",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} папок",
 "1 file" => "1 файл",
 "{count} files" => "{count} файлів",
+"Unable to rename file" => "Не вдалося перейменувати файл",
 "Upload" => "Вивантажити",
 "File handling" => "Робота з файлами",
 "Maximum upload size" => "Максимальний розмір відвантажень",
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index fe172996c7c2b73e2d4190b39ecd2d4b332612fd..c8aa11295c89a53b250178fec387a46db8af0b38 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Không thể di chuyển %s - Đã có tên file này trên hệ thống",
+"Could not move %s - File with this name already exists" => "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống",
 "Could not move %s" => "Không thể di chuyển %s",
-"Unable to rename file" => "Không thể đổi tên file",
 "No file was uploaded. Unknown error" => "Không có tập tin nào được tải lên. Lỗi không xác định",
 "There is no error, the file uploaded with success" => "Không có lỗi, các tập tin đã được tải lên thành công",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
@@ -34,6 +33,7 @@
 "Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "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" => "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte",
+"Not enough space available" => "Không đủ chỗ trống cần thiết",
 "Upload cancelled." => "Hủy tải lên",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
 "URL cannot be empty." => "URL không được để trống.",
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} thư mục",
 "1 file" => "1 tập tin",
 "{count} files" => "{count} tập tin",
+"Unable to rename file" => "Không thể đổi tên file",
 "Upload" => "Tải lên",
 "File handling" => "Xử lý tập tin",
 "Maximum upload size" => "Kích thước tối đa ",
@@ -61,6 +62,7 @@
 "From link" => "Từ liên kết",
 "Deleted files" => "File đã bị xóa",
 "Cancel upload" => "Hủy upload",
+"You don’t have write permissions here." => "Bạn không có quyền ghi vào đây.",
 "Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
 "Download" => "Tải về",
 "Unshare" => "Bỏ chia sẻ",
@@ -68,5 +70,5 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
 "Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.",
 "Current scanning" => "Hiện tại đang quét",
-"Upgrading filesystem cache..." => "Upgrading filesystem cache..."
+"Upgrading filesystem cache..." => "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
 );
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 8d4d8b2c37cd7147c240daf1fad5bea1ab3a3755..c883670e8485f22440438ae3580e36512d4b231c 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -1,7 +1,6 @@
 <?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: " => "上传文件大小已超过php.ini中upload_max_filesize所规定的值",
@@ -47,6 +46,8 @@
 "{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" => "文件处理",
 "Maximum upload size" => "最大上传大小",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 5cc7e358f029c012827c2cf3e00413476a070563..600048a321c41172531177aa52360b9e1d11957e 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -1,7 +1,6 @@
 <?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: " => "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定：",
@@ -47,6 +46,7 @@
 "{count} folders" => "{count} 個資料夾",
 "1 file" => "1 個檔案",
 "{count} files" => "{count} 個檔案",
+"Unable to rename file" => "無法重新命名檔案",
 "Upload" => "上傳",
 "File handling" => "檔案處理",
 "Maximum upload size" => "最大上傳檔案大小",
diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php
new file mode 100644
index 0000000000000000000000000000000000000000..c2a4b9c2675dcc3bfe2f510916b7abb322ad5b72
--- /dev/null
+++ b/apps/files/lib/app.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * ownCloud - Core
+ *
+ * @author Morris Jobke
+ * @copyright 2013 Morris Jobke morris.jobke@gmail.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/>.
+ *
+ */
+
+
+namespace OCA\Files;
+
+class App {
+	private $l10n;
+	private $view;
+
+	public function __construct($view, $l10n) {
+		$this->view = $view;
+		$this->l10n = $l10n;
+	}
+
+	/**
+	 * rename a file
+	 *
+	 * @param string $dir
+	 * @param string $oldname
+	 * @param string $newname
+	 * @return array
+	 */
+	public function rename($dir, $oldname, $newname) {
+		$result = array(
+			'success' 	=> false,
+			'data'		=> NULL
+		);
+
+		// rename to "/Shared" is denied
+		if( $dir === '/' and $newname === 'Shared' ) {
+			$result['data'] = array(
+				'message'	=> $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved by ownCloud")
+			);
+		} elseif(
+			// rename to "." is denied
+			$newname !== '.' and
+			// rename of  "/Shared" is denied
+			!($dir === '/' and $oldname === 'Shared') and
+			// THEN try to rename
+			$this->view->rename($dir . '/' . $oldname, $dir . '/' . $newname)
+		) {
+			// successful rename
+			$result['success'] = true;
+			$result['data'] = array(
+				'dir'		=> $dir,
+				'file'		=> $oldname,
+				'newname'	=> $newname
+			);
+		} else {
+			// rename failed
+			$result['data'] = array(
+				'message'	=> $this->l10n->t('Unable to rename file')
+			);
+		}
+		return $result;
+	}
+
+}
\ No newline at end of file
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
new file mode 100644
index 0000000000000000000000000000000000000000..23e5761ddda44869855bc22a7f13b59caa29ab95
--- /dev/null
+++ b/apps/files/tests/ajax_rename.php
@@ -0,0 +1,117 @@
+<?php
+
+/**
+ * ownCloud - Core
+ *
+ * @author Morris Jobke
+ * @copyright 2013 Morris Jobke morris.jobke@gmail.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/>.
+ *
+ */
+
+class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
+
+	function setUp() {
+		// mock OC_L10n
+		$l10nMock = $this->getMock('\OC_L10N', array('t'), array(), '', false);
+		$l10nMock->expects($this->any())
+			->method('t')
+			->will($this->returnArgument(0));
+		$viewMock = $this->getMock('\OC\Files\View', array('rename', 'normalizePath'), array(), '', false);
+		$viewMock->expects($this->any())
+			->method('normalizePath')
+			->will($this->returnArgument(0));
+		$viewMock->expects($this->any())
+			->method('rename')
+			->will($this->returnValue(true));
+		$this->files = new \OCA\Files\App($viewMock, $l10nMock);
+	}
+
+	/**
+	 * @brief test rename of file/folder named "Shared"
+	 */
+	function testRenameSharedFolder() {
+		$dir = '/';
+		$oldname = 'Shared';
+		$newname = 'new_name';
+
+		$result = $this->files->rename($dir, $oldname, $newname);
+		$expected = array(
+			'success'	=> false,
+			'data'		=> array('message' => 'Unable to rename file')
+		);
+
+		$this->assertEquals($expected, $result);
+	}
+
+	/**
+	 * @brief test rename of file/folder named "Shared"
+	 */
+	function testRenameSharedFolderInSubdirectory() {
+		$dir = '/test';
+		$oldname = 'Shared';
+		$newname = 'new_name';
+
+		$result = $this->files->rename($dir, $oldname, $newname);
+		$expected = array(
+			'success'	=> true,
+			'data'		=> array(
+				'dir'		=> $dir,
+				'file'		=> $oldname,
+				'newname'	=> $newname
+			)
+		);
+
+		$this->assertEquals($expected, $result);
+	}
+
+	/**
+	 * @brief test rename of file/folder to "Shared"
+	 */
+	function testRenameFolderToShared() {
+		$dir = '/';
+		$oldname = 'oldname';
+		$newname = 'Shared';
+
+		$result = $this->files->rename($dir, $oldname, $newname);
+		$expected = array(
+			'success'	=> false,
+			'data'		=> array('message' => "Invalid folder name. Usage of 'Shared' is reserved by ownCloud")
+		);
+
+		$this->assertEquals($expected, $result);
+	}
+
+	/**
+	 * @brief test rename of file/folder
+	 */
+	function testRenameFolder() {
+		$dir = '/';
+		$oldname = 'oldname';
+		$newname = 'newname';
+
+		$result = $this->files->rename($dir, $oldname, $newname);
+		$expected = array(
+			'success'	=> true,
+			'data'		=> array(
+				'dir'		=> $dir,
+				'file'		=> $oldname,
+				'newname'	=> $newname
+			)
+		);
+
+		$this->assertEquals($expected, $result);
+	}
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ug.php b/apps/files_encryption/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..34eeb373b3e2bf4b98576c78d1b402562f6ef9ce
--- /dev/null
+++ b/apps/files_encryption/l10n/ug.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "شىفىرلاش",
+"File encryption is enabled." => "ھۆججەت شىفىرلاش قوزغىتىلدى.",
+"The following file types will not be encrypted:" => "تۆۋەندىكى ھۆججەت تىپلىرى شىفىرلانمايدۇ:",
+"Exclude the following file types from encryption:" => "تۆۋەندىكى ھۆججەت تىپلىرى شىفىرلاشنىڭ سىرتىدا:",
+"None" => "يوق"
+);
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index 8a8ae37ffd2b6936ddcd68172dc0376d256f7425..9b7ab4d53ca80523d2dee4b7f998aa83e14c14f7 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -20,7 +20,7 @@
 "Users" => "Benutzer",
 "Delete" => "Löschen",
 "Enable User External Storage" => "Externen Speicher für Benutzer aktivieren",
-"Allow users to mount their own external storage" => "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden",
+"Allow users to mount their own external storage" => "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden",
 "SSL root certificates" => "SSL-Root-Zertifikate",
 "Import Root Certificate" => "Root-Zertifikate importieren"
 );
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
index 961ef2b1046bb8833751b47be4a337f77c761371..ea8648303d1be23bec5c75f626e4f1f5ccaf63ec 100644
--- a/apps/files_external/l10n/nb_NO.php
+++ b/apps/files_external/l10n/nb_NO.php
@@ -2,6 +2,11 @@
 "Access granted" => "Tilgang innvilget",
 "Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring",
 "Grant access" => "Gi tilgang",
+"Please provide a valid Dropbox app key and secret." => "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet.",
+"Error configuring Google Drive storage" => "Feil med konfigurering av Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Advarsel:</b> \"smbclient\" er ikke installert. Kan ikke montere CIFS/SMB mapper. Ta kontakt med din systemadministrator for å installere det.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Advarsel:</b> FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere FTP mapper. Ta kontakt med din systemadministrator for å innstallere det.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Advarsel:</b> Curl støtte i PHP er ikke aktivert eller innstallert. Kan ikke montere owncloud/WebDAV eller Googledrive. Ta kontakt med din systemadministrator for å innstallerer det.",
 "External Storage" => "Ekstern lagring",
 "Folder name" => "Mappenavn",
 "External storage" => "Ekstern lagringsplass",
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index aac3c1c2ca0779e1ca00f13a17a6d3fd986e82e0..0a05d1f8825fb3654dae7470c8b54616aa82dcf6 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Atenção:</b> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Atenção:<br> O suporte PHP para o Curl não está activado ou instalado. A montagem do ownCloud/WebDav ou GoolgeDriver não é possível. Por favor contacte o administrador para o instalar.",
 "External Storage" => "Armazenamento Externo",
 "Folder name" => "Nome da pasta",
 "External storage" => "Armazenamento Externo",
diff --git a/apps/files_external/l10n/ug.php b/apps/files_external/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..2d1dea989063c0cc93a38882d4c7303f60e6ae1e
--- /dev/null
+++ b/apps/files_external/l10n/ug.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Folder name" => "قىسقۇچ ئاتى",
+"External storage" => "سىرتقى ساقلىغۇچ",
+"Configuration" => "سەپلىمە",
+"Options" => "تاللانما",
+"Groups" => "گۇرۇپپا",
+"Users" => "ئىشلەتكۈچىلەر",
+"Delete" => "ئۆچۈر"
+);
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
index 84f31e88924a8fafd610a0e98f68077b778406ad..769f9e2a0976aa443ffda271da4e10fe6de52959 100644
--- a/apps/files_external/l10n/vi.php
+++ b/apps/files_external/l10n/vi.php
@@ -6,11 +6,14 @@
 "Error configuring Google Drive storage" => "Lỗi cấu hình lưu trữ Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Cảnh báo:</b> \"smbclient\" chưa được cài đặt. Mount CIFS/SMB shares là không thể thực hiện được. Hãy hỏi người quản trị hệ thống để cài đặt nó.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Cảnh báo:</b> FTP trong PHP chưa được cài đặt hoặc chưa được  mở. Mount FTP shares là không thể. Xin hãy yêu cầu quản trị hệ thống của bạn cài đặt nó.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Cảnh báo:</b> Tính năng Curl trong PHP chưa được kích hoạt hoặc cài đặt. Việc gắn kết ownCloud / WebDAV hay GoogleDrive không thực hiện được. Vui lòng liên hệ người quản trị để cài đặt nó.",
 "External Storage" => "Lưu trữ ngoài",
 "Folder name" => "Tên thư mục",
+"External storage" => "Lưu trữ ngoài",
 "Configuration" => "Cấu hình",
 "Options" => "Tùy chọn",
 "Applicable" => "Áp dụng",
+"Add storage" => "Thêm bộ nhớ",
 "None set" => "không",
 "All Users" => "Tất cả người dùng",
 "Groups" => "Nhóm",
diff --git a/apps/files_sharing/l10n/en@pirate.php b/apps/files_sharing/l10n/en@pirate.php
index eb667142ab4ee191f1bde218b8a9a64bded9c48b..02ee8440487e6729fc9f21207d797bc07a4e4b53 100644
--- a/apps/files_sharing/l10n/en@pirate.php
+++ b/apps/files_sharing/l10n/en@pirate.php
@@ -1,3 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Password" => "Secret Code"
+"Password" => "Secret Code",
+"Submit" => "Submit",
+"%s shared the folder %s with you" => "%s shared the folder %s with you",
+"%s shared the file %s with you" => "%s shared the file %s with you",
+"Download" => "Download",
+"No preview available for" => "No preview available for",
+"web services under your control" => "web services under your control"
 );
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index abd1ee394bc55546c67653de36306dd1058c881c..aeba545dabc1d1a634b989fbbe5274ef680e7b4e 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -1,6 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Passord",
 "Submit" => "Send",
+"%s shared the folder %s with you" => "%s delte mappa %s med deg",
+"%s shared the file %s with you" => "%s delte fila %s med deg",
 "Download" => "Last ned",
+"No preview available for" => "Inga førehandsvising tilgjengeleg for",
 "web services under your control" => "Vev tjenester under din kontroll"
 );
diff --git a/apps/files_sharing/l10n/ug.php b/apps/files_sharing/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..348acc4a898fda96c9ccde1479343933d95c37a6
--- /dev/null
+++ b/apps/files_sharing/l10n/ug.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Password" => "ئىم",
+"Submit" => "تاپشۇر",
+"Download" => "چۈشۈر"
+);
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 1cb457cb987d79bdfd9975391689471a8188d5ea..2160fe9a393bb366a1e4fd0c6d3bf415684e2a1a 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -45,8 +45,8 @@ class Shared_Cache extends Cache {
 		if (isset($source['path']) && isset($source['fileOwner'])) {
 			\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
 			$mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
-			if ($mount) {
-				$fullPath = $mount->getMountPoint().$source['path'];
+			if (is_array($mount)) {
+				$fullPath = $mount[key($mount)]->getMountPoint().$source['path'];
 				list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($fullPath);
 				if ($storage) {
 					$this->files[$target] = $internalPath;
@@ -60,6 +60,14 @@ class Shared_Cache extends Cache {
 		return false;
 	}
 
+	public function getNumericStorageId() {
+		if (isset($this->numericId)) {
+			return $this->numericId;
+		} else {
+			return false;
+		}
+	}
+
 	/**
 	 * get the stored metadata of a file or folder
 	 *
@@ -267,4 +275,17 @@ class Shared_Cache extends Cache {
 		return \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_GET_ALL);
 	}
 
-}
+	/**
+	 * find a folder in the cache which has not been fully scanned
+	 *
+	 * If multiply incomplete folders are in the cache, the one with the highest id will be returned,
+	 * use the one with the highest id gives the best result with the background scanner, since that is most
+	 * likely the folder where we stopped scanning previously
+	 *
+	 * @return string|bool the path of the folder or false when no folder matched
+	 */
+	public function getIncomplete() {
+		return false;
+	}
+
+}
\ No newline at end of file
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 2facad0f7e2fe6c34e1a04e4b1a6eb0ea646861e..5c23a9eb0d0a69a0c1001786538c624790a718c6 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -72,8 +72,8 @@ class Shared extends \OC\Files\Storage\Common {
 			if (!isset($source['fullPath'])) {
 				\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
 				$mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
-				if ($mount) {
-					$this->files[$target]['fullPath'] = $mount->getMountPoint().$source['path'];
+				if (is_array($mount)) {
+					$this->files[$target]['fullPath'] = $mount[key($mount)]->getMountPoint().$source['path'];
 				} else {
 					$this->files[$target]['fullPath'] = false;
 				}
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 8a5875b9ce605214fcf65c2d34c27d52dcf5d779..a32b7414ac6a1b5a9a14c56d9753853ce38fb270 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -21,8 +21,7 @@ $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
 $result = array();
 if ($dir) {
 	$dirlisting = true;
-	$fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir);
-	$dirContent = opendir($fullpath);
+	$dirContent = $view->opendir($dir);
 	$i = 0;
 	while($entryName = readdir($dirContent)) {
 		if ( $entryName != '.' && $entryName != '..' ) {
diff --git a/apps/files_trashbin/l10n/ia.php b/apps/files_trashbin/l10n/ia.php
index 0a51752312f37a994aeda4b736d693241143e46a..dea25b30ba45adc3b79a7625bed071f62e29890f 100644
--- a/apps/files_trashbin/l10n/ia.php
+++ b/apps/files_trashbin/l10n/ia.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Error",
 "Name" => "Nomine",
 "Delete" => "Deler"
 );
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
index f06c90962eaed68b56d0b60f642679822e443673..42ad87e98d2247283f347a1df1e85f5de1e4f83e 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Error" => "오류",
+"Delete permanently" => "영원히 삭제",
 "Name" => "이름",
 "1 folder" => "폴더 1개",
 "{count} folders" => "폴더 {count}개",
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index e1dce4b399525bf2fb3672a8595958393b7d65b7..43ad018049447a8d0a1b6c1bcf98a031bf498680 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -13,5 +13,6 @@
 "{count} files" => "{count} filer",
 "Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
 "Restore" => "Gjenopprett",
-"Delete" => "Slett"
+"Delete" => "Slett",
+"Deleted Files" => "Slettet filer"
 );
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 8166a024e58de6b593dc849c70ad736f466fee7b..454ea2b05753198172040752659ff7bc99149290 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -1,10 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Klarte ikkje sletta %s for godt",
+"Couldn't restore %s" => "Klarte ikkje gjenoppretta %s",
+"perform restore operation" => "utfør gjenoppretting",
 "Error" => "Feil",
+"delete file permanently" => "slett fila for godt",
 "Delete permanently" => "Slett for godt",
 "Name" => "Namn",
+"Deleted" => "Sletta",
 "1 folder" => "1 mappe",
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
-"Delete" => "Slett"
+"Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
+"Restore" => "Gjenopprett",
+"Delete" => "Slett",
+"Deleted Files" => "Sletta filer"
 );
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
index 178eb531077ceb3e661ff107f9480da8b9fdb31d..1ef163d48f33d1aa62018a4d5ee96a95cfb06d73 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/files_trashbin/l10n/ug.php b/apps/files_trashbin/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..c369e385f740c1950fd7a105c8901054eecb10fd
--- /dev/null
+++ b/apps/files_trashbin/l10n/ug.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Error" => "خاتالىق",
+"Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
+"Name" => "ئاتى",
+"Deleted" => "ئۆچۈرۈلدى",
+"1 folder" => "1 قىسقۇچ",
+"1 file" => "1 ھۆججەت",
+"{count} files" => "{count} ھۆججەت",
+"Nothing in here. Your trash bin is empty!" => "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!",
+"Delete" => "ئۆچۈر"
+);
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 88c71a75ab0b4e843b79497e551567ff0fb07840..7fda855d0c2c2765192a73f71c85e6052da388b7 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -266,7 +266,10 @@ class Trashbin {
 
         // handle the restore result
         if( $restoreResult ) {
-        	$view->touch($target.$ext, $mtime);
+			$fakeRoot = $view->getRoot();
+			$view->chroot('/'.$user.'/files');
+			$view->touch('/'.$location.'/'.$filename.$ext, $mtime);
+			$view->chroot($fakeRoot);
 			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', 
 					array('filePath' => \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext),
 							'trashPath' => \OC\Files\Filesystem::normalizePath($file)));
diff --git a/apps/files_versions/l10n/nn_NO.php b/apps/files_versions/l10n/nn_NO.php
new file mode 100644
index 0000000000000000000000000000000000000000..940cc2371a107918df31404f5cd3d4504eaa9e71
--- /dev/null
+++ b/apps/files_versions/l10n/nn_NO.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Could not revert: %s" => "Klarte ikkje å tilbakestilla: %s",
+"success" => "vellukka",
+"File %s was reverted to version %s" => "Tilbakestilte fila %s til utgåva %s",
+"failure" => "feil",
+"File %s could not be reverted to version %s" => "Klarte ikkje tilbakestilla fila %s til utgåva %s",
+"No old versions available" => "Ingen eldre utgåver tilgjengelege",
+"No path specified" => "Ingen sti gjeve",
+"Versions" => "Utgåver",
+"Revert a file to a previous version by clicking on its revert button" => "Tilbakestill ei fil til ei tidlegare utgåve ved å klikka tilbakestill-knappen"
+);
diff --git a/apps/files_versions/l10n/ug.php b/apps/files_versions/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..024f326b032a9574b864cdda14d9a70df2298aaf
--- /dev/null
+++ b/apps/files_versions/l10n/ug.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Could not revert: %s" => "ئەسلىگە قايتۇرالمايدۇ: %s",
+"success" => "مۇۋەپپەقىيەتلىك",
+"File %s was reverted to version %s" => "ھۆججەت %s نى %s نەشرىگە ئەسلىگە قايتۇردى",
+"failure" => "مەغلۇپ بولدى",
+"No old versions available" => "كونا نەشرى يوق",
+"No path specified" => "يول بەلگىلەنمىگەن",
+"Versions" => "نەشرى"
+);
diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php
index a191d5945237d18d9cbb54852a0ff7b9eb8a2640..2ae9ce657ceec2d379c69eaab4ef5933900367c6 100644
--- a/apps/files_versions/l10n/zh_TW.php
+++ b/apps/files_versions/l10n/zh_TW.php
@@ -5,7 +5,7 @@
 "failure" => "失敗",
 "File %s could not be reverted to version %s" => "檔案 %s 無法復原至版本 %s",
 "No old versions available" => "沒有舊的版本",
-"No path specified" => "沒有指定路線",
+"No path specified" => "沒有指定路徑",
 "Versions" => "版本",
-"Revert a file to a previous version by clicking on its revert button" => "按一按復原的按鈕，就能把一個檔案復原至以前的版本"
+"Revert a file to a previous version by clicking on its revert button" => "按一下復原的按鈕即可把檔案復原至以前的版本"
 );
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index c38ba688fe086e4e8e0d72011b04a84d90d5ca5c..5fdbef27743b8f719ef4971104e69be6fb72670e 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -184,11 +184,12 @@ class Storage {
 	/**
 	 * rollback to an old version of a file.
 	 */
-	public static function rollback($filename, $revision) {
+	public static function rollback($file, $revision) {
 
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			list($uid, $filename) = self::getUidAndFilename($filename);
+			list($uid, $filename) = self::getUidAndFilename($file);
 			$users_view = new \OC\Files\View('/'.$uid);
+			$files_view = new \OC\Files\View('/'.\OCP\User::getUser().'/files');
 			$versionCreated = false;
 
 			//first create a new version
@@ -199,9 +200,9 @@ class Storage {
 			}
 
 			// rollback
-			if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
-				$users_view->touch('files'.$filename, $revision);
-				Storage::expire($filename);
+			if( @$users_view->rename('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
+				$files_view->touch($file, $revision);
+				Storage::expire($file);
 				return true;
 
 			}else if ( $versionCreated ) {
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index f7284439041e7762f50723fc87bbf5a7d77ae12b..3a6d5f0c9e7baaae22bf7d94be22553ff10546fe 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -5,18 +5,18 @@
 if( isset( $_['message'] ) ) {
 
 
-	if( isset($_['path'] ) ) print_unescaped('<strong>File: '.OC_Util::sanitizeHTML($_['path'])).'</strong><br>';
-	print_unescaped('<strong>'.OC_Util::sanitizeHTML($_['message']) ).'</strong><br>';
+	if( isset($_['path'] ) ) print_unescaped('<strong>File: '.OC_Util::sanitizeHTML($_['path']).'</strong><br>');
+	print_unescaped('<strong>'.OC_Util::sanitizeHTML($_['message']) .'</strong><br>');
 
 }else{
 
 	if( isset( $_['outcome_stat'] ) ) {
 
-		print_unescaped( '<div id="feedback-messages" class="'.OC_Util::sanitizeHTML($_['outcome_stat']).'"><h3>'.OC_Util::sanitizeHTML($_['outcome_msg']) ).'</h3></div><br>';
+		print_unescaped( '<div id="feedback-messages" class="'.OC_Util::sanitizeHTML($_['outcome_stat']).'"><h3>'.OC_Util::sanitizeHTML($_['outcome_msg']).'</h3></div><br>');
 
 	}
 
-	print_unescaped( '<strong>Versions of '.OC_Util::sanitizeHTML($_['path']) ).'</strong><br>';
+	print_unescaped( '<strong>Versions of '.OC_Util::sanitizeHTML($_['path']).'</strong><br>');
 	print_unescaped('<p><em>'.OC_Util::sanitizeHTML($l->t('Revert a file to a previous version by clicking on its revert button')).'</em></p><br />');
 
 	foreach ( $_['versions'] as $v ) {
diff --git a/apps/user_ldap/ajax/clearMappings.php b/apps/user_ldap/ajax/clearMappings.php
new file mode 100644
index 0000000000000000000000000000000000000000..5dab39839b63327b1219dc18b0d97391c13698fa
--- /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/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 89410b5ef07e821cae7046c55197c98bda73a409..81eaa0404b759dbef6be6590521b08b47493ef52 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -24,7 +24,7 @@
 OCP\App::registerAdmin('user_ldap', 'settings');
 
 $configPrefixes = OCA\user_ldap\lib\Helper::getServerConfigurationPrefixes(true);
-if(count($configPrefixes) == 1) {
+if(count($configPrefixes) === 1) {
 	$connector = new OCA\user_ldap\lib\Connection($configPrefixes[0]);
 	$userBackend  = new OCA\user_ldap\USER_LDAP();
 	$userBackend->setConnector($connector);
diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php
index 378957ec4095dba8968f4301d4bbe65860f3c8cb..c0c33a25c75f3b835cfe2697382b7608f65b0a8c 100644
--- a/apps/user_ldap/appinfo/install.php
+++ b/apps/user_ldap/appinfo/install.php
@@ -1,6 +1,6 @@
 <?php
 
 $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet');
-if($state == 'doSet') {
+if($state === 'doSet') {
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
 }
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index 2fcbf1902ac54b9c65479047b4457ff10c2ee0aa..179451dad69e48cd5ab24b4f12994c69720c58b6 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -18,7 +18,7 @@ if(!is_null($pw)) {
 //detect if we can switch on naming guidelines. We won't do it on conflicts.
 //it's a bit spaghetti, but hey.
 $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'unset');
-if($state == 'unset') {
+if($state === 'unset') {
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
 }
 
@@ -48,7 +48,7 @@ foreach($objects as $object) {
 		$newDN = escapeDN(mb_strtolower($dn['ldap_dn'], 'UTF-8'));
 		if(!empty($dn['directory_uuid'])) {
 			$uuid = $dn['directory_uuid'];
-		} elseif($object == 'user') {
+		} elseif($object === 'user') {
 			$uuid = $userBE->getUUID($newDN);
 			//fix home folder to avoid new ones depending on the configuration
 			$userBE->getHome($dn['owncloud_name']);
diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 84ada0832ab52f5ac263a65aaf93dde25e22fa71..185952e14bbdda762f427eee7e42084ed9a9badd 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/group_ldap.php b/apps/user_ldap/group_ldap.php
index 432ddd215db6e1d4dcaeaccfefb70fa66c9c4c34..04ff392f9205ab88f692e4994abc47a19b080a6d 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -66,7 +66,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 
 		//extra work if we don't get back user DNs
 		//TODO: this can be done with one LDAP query
-		if(strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid') {
+		if(strtolower($this->connection->ldapGroupMemberAssocAttr) === 'memberuid') {
 			$dns = array();
 			foreach($members as $mid) {
 				$filter = str_replace('%uid', $mid, $this->connection->ldapLoginFilter);
@@ -108,11 +108,11 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		}
 
 		//uniqueMember takes DN, memberuid the uid, so we need to distinguish
-		if((strtolower($this->connection->ldapGroupMemberAssocAttr) == 'uniquemember')
-			|| (strtolower($this->connection->ldapGroupMemberAssocAttr) == 'member')
+		if((strtolower($this->connection->ldapGroupMemberAssocAttr) === 'uniquemember')
+			|| (strtolower($this->connection->ldapGroupMemberAssocAttr) === 'member')
 		) {
 			$uid = $userDN;
-		} else if(strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid') {
+		} else if(strtolower($this->connection->ldapGroupMemberAssocAttr) === 'memberuid') {
 			$result = $this->readAttribute($userDN, 'uid');
 			$uid = $result[0];
 		} else {
@@ -157,7 +157,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			return $groupUsers;
 		}
 
-		if($limit == -1) {
+		if($limit === -1) {
 			$limit = null;
 		}
 		$groupDN = $this->groupname2dn($gid);
@@ -175,7 +175,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		}
 
 		$groupUsers = array();
-		$isMemberUid = (strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid');
+		$isMemberUid = (strtolower($this->connection->ldapGroupMemberAssocAttr) === 'memberuid');
 		foreach($members as $member) {
 			if($isMemberUid) {
 				//we got uids, need to get their DNs to 'tranlsate' them to usernames
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index e34849ec8878e394b23e90e01acd4996a13d5a74..f47d49cf222a9142b433b55c9a58966b27f75dab 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -8,13 +8,13 @@ var LdapConfiguration = {
 			OC.filePath('user_ldap','ajax','getConfiguration.php'),
 			$('#ldap_serverconfig_chooser').serialize(),
 			function (result) {
-				if(result.status == 'success') {
+				if(result.status === 'success') {
 					$.each(result.configuration, function(configkey, configvalue) {
 						elementID = '#'+configkey;
 
 						//deal with Checkboxes
 						if($(elementID).is('input[type=checkbox]')) {
-							if(configvalue == 1) {
+							if(configvalue === 1) {
 								$(elementID).attr('checked', 'checked');
 							} else {
 								$(elementID).removeAttr('checked');
@@ -37,13 +37,13 @@ var LdapConfiguration = {
 
 	resetDefaults: function() {
 		$('#ldap').find('input[type=text], input[type=number], input[type=password], textarea, select').each(function() {
-			if($(this).attr('id') == 'ldap_serverconfig_chooser') {
+			if($(this).attr('id') === 'ldap_serverconfig_chooser') {
 				return;
 			}
 			$(this).val($(this).attr('data-default'));
 		});
 		$('#ldap').find('input[type=checkbox]').each(function() {
-			if($(this).attr('data-default') == 1) {
+			if($(this).attr('data-default') === 1) {
 				$(this).attr('checked', 'checked');
 			} else {
 				$(this).removeAttr('checked');
@@ -56,7 +56,7 @@ var LdapConfiguration = {
 			OC.filePath('user_ldap','ajax','deleteConfiguration.php'),
 			$('#ldap_serverconfig_chooser').serialize(),
 			function (result) {
-				if(result.status == 'success') {
+				if(result.status === 'success') {
 					$('#ldap_serverconfig_chooser option:selected').remove();
 					$('#ldap_serverconfig_chooser option:first').select();
 					LdapConfiguration.refreshConfig();
@@ -74,7 +74,7 @@ var LdapConfiguration = {
 		$.post(
 			OC.filePath('user_ldap','ajax','getNewServerConfigPrefix.php'),
 			function (result) {
-				if(result.status == 'success') {
+				if(result.status === 'success') {
 					if(doNotAsk) {
 						LdapConfiguration.resetDefaults();
 					} else {
@@ -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')
+					);
+				}
+			}
+		);
 	}
 }
 
@@ -115,7 +135,7 @@ $(document).ready(function() {
 			OC.filePath('user_ldap','ajax','testConfiguration.php'),
 			$('#ldap').serialize(),
 			function (result) {
-				if (result.status == 'success') {
+				if (result.status === 'success') {
 					OC.dialogs.alert(
 						result.message,
 						t('user_ldap', 'Connection test succeeded')
@@ -150,7 +170,7 @@ $(document).ready(function() {
 			$('#ldap').serialize(),
 			function (result) {
 				bgcolor = $('#ldap_submit').css('background');
-				if (result.status == 'success') {
+				if (result.status === 'success') {
 					//the dealing with colors is a but ugly, but the jQuery version in use has issues with rgba colors
 					$('#ldap_submit').css('background', '#fff');
 					$('#ldap_submit').effect('highlight', {'color':'#A8FA87'}, 5000, function() {
@@ -166,9 +186,19 @@ $(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') {
+		if(value === 'NEW') {
 			LdapConfiguration.addConfiguration(false);
 		} else {
 			LdapConfiguration.refreshConfig();
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index 4d7b7ac4ade26c6a187b92dce01b2ad567e68f68..5f8b6b8145514e00aabda1c4908a04848c0c0544 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 c064534a6b8a16924045f7478c423f53d0d50ece..0330046d80e00c6018e5b427823472148acbc26f 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 69dfc8961792f1c28f914ec45f4b8907398869e6..4cee35777df353a724ad0ed574a27d7ede63f7ff 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 8f2799b6e6840c39149df5b6ec947cae17a1620e..7f0849b2382e3b5c9616c7e219652ea3a8d6bd3a 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 c5d77026b9e9b317dc7b6a1bbc46ef67d1ef298a..dd7373eb690a66b6d8dbb7bf81712c187b50007e 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 335e2109c2db7d79a7980b07cd1eb3f409db351d..abe2336b2ba8c9fdbd5e9ca74a0d95030b2746dc 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 9329c4e8a2416f1db1fd0993a1d6f28f76f62c0d..0a77f46647977050177d02cbb51c4977986611f4 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 e86d877ecd77271a6eeec19dc736072cfb0293aa..f00108184214f9c959315ec7100f66ce7316d276 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -1,31 +1,33 @@
 <?php $TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Löschen der Serverkonfiguration fehlgeschlagen",
-"The configuration is valid and the connection could be established!" => "Die Konfiguration war erfolgreich, die Verbindung konnte hergestellt werden!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig, bitte sehen Sie für weitere Details im ownCloud Log nach",
+"The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfe die Servereinstellungen und Anmeldeinformationen.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig, sieh für weitere Details bitte im ownCloud Log nach",
 "Deletion failed" => "Löschen fehlgeschlagen",
 "Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
 "Keep settings?" => "Einstellungen beibehalten?",
-"Cannot add server configuration" => "Serverkonfiguration konnte nicht hinzugefügt werden.",
+"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?" => "Wollen Sie die aktuelle Serverkonfiguration wirklich löschen?",
+"Do you really want to delete the current Server Configuration?" => "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?",
 "Confirm Deletion" => "Löschung bestätigen",
-"<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+"<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren.",
 "Server configuration" => "Serverkonfiguration",
 "Add Server Configuration" => "Serverkonfiguration hinzufügen",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://",
 "Base DN" => "Basis-DN",
-"One Base DN per line" => "Ein Base DN pro Zeile",
+"One Base DN per line" => "Ein Basis-DN pro Zeile",
 "You can specify Base DN for users and groups in the Advanced tab" => "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
 "User DN" => "Benutzer-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." => "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer.",
 "Password" => "Passwort",
-"For anonymous access, leave DN and Password empty." => "Lasse die Felder von DN und Passwort für anonymen Zugang leer.",
+"For anonymous access, leave DN and Password empty." => "Lasse die Felder DN und Passwort für anonymen Zugang leer.",
 "User Login Filter" => "Benutzer-Login-Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch.",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"",
 "User List Filter" => "Benutzer-Filter-Liste",
 "Defines the filter to apply, when retrieving users." => "Definiert den Filter für die Anfrage der Benutzer.",
@@ -54,13 +56,13 @@
 "User Display Name Field" => "Feld für den Anzeigenamen des Benutzers",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. ",
 "Base User Tree" => "Basis-Benutzerbaum",
-"One User Base DN per line" => "Ein Benutzer Base DN pro Zeile",
+"One User Base DN per line" => "Ein Benutzer Basis-DN pro Zeile",
 "User Search Attributes" => "Benutzersucheigenschaften",
-"Optional; one attribute per line" => "Optional; eine Eigenschaft pro Zeile",
+"Optional; one attribute per line" => "Optional; ein Attribut pro Zeile",
 "Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ",
 "Base Group Tree" => "Basis-Gruppenbaum",
-"One Group Base DN per line" => "Ein Gruppen Base DN pro Zeile",
+"One Group Base DN per line" => "Ein Gruppen Basis-DN pro Zeile",
 "Group Search Attributes" => "Gruppensucheigenschaften",
 "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
 "Special Attributes" => "Spezielle Eigenschaften",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 3b5d60387a6409754d2daf65064f5d290b749c8b..de2dd118e594e403e0f88245aaa016f521f290c4 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -1,31 +1,33 @@
 <?php $TRANSLATIONS = array(
-"Failed to delete the server configuration" => "Das Löschen der Server-Konfiguration schlug fehl",
+"Failed to delete the server configuration" => "Löschen der Serverkonfiguration fehlgeschlagen",
 "The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig, aber das Herstellen der Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate.",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig. Weitere Details können Sie im ownCloud-Log nachlesen.",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig, sehen Sie für weitere Details bitte im ownCloud Log nach",
 "Deletion failed" => "Löschen fehlgeschlagen",
-"Take over settings from recent server configuration?" => "Sollen die Einstellungen der letzten Serverkonfiguration übernommen werden?",
-"Keep settings?" => "Einstellungen behalten?",
+"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 Serverkonfiguration wirklich löschen?",
+"Do you really want to delete the current Server Configuration?" => "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?",
 "Confirm Deletion" => "Löschung bestätigen",
-"<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+"<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
 "Server configuration" => "Serverkonfiguration",
 "Add Server Configuration" => "Serverkonfiguration hinzufügen",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
 "Base DN" => "Basis-DN",
-"One Base DN per line" => "Ein Base DN pro Zeile",
+"One Base DN per line" => "Ein Basis-DN pro Zeile",
 "You can specify Base DN for users and groups in the Advanced tab" => "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
 "User DN" => "Benutzer-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." => "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.",
 "Password" => "Passwort",
-"For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder von DN und Passwort für einen anonymen Zugang leer.",
+"For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
 "User Login Filter" => "Benutzer-Login-Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch.",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\"",
 "User List Filter" => "Benutzer-Filter-Liste",
 "Defines the filter to apply, when retrieving users." => "Definiert den Filter für die Anfrage der Benutzer.",
@@ -37,12 +39,12 @@
 "Configuration Active" => "Konfiguration aktiv",
 "When unchecked, this configuration will be skipped." => "Wenn nicht angehakt, wird diese Konfiguration übersprungen.",
 "Port" => "Port",
-"Backup (Replica) Host" => "Back-Up (Replikation) Host",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Geben Sie einen optionalen Backup-Host an. Es muss ein Replikat des Haupt-LDAP/AD Servers sein.",
-"Backup (Replica) Port" => "Back-Up (Replikation) Port",
+"Backup (Replica) Host" => "Backup Host (Kopie)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.",
+"Backup (Replica) Port" => "Backup Port",
 "Disable Main Server" => "Hauptserver deaktivieren",
-"When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet, wird sich die ownCloud nur mit dem Replikat-Server verbinden.",
-"Use TLS" => "Benutze TLS",
+"When switched on, ownCloud will only connect to the replica server." => "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden.",
+"Use TLS" => "Nutze TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen.",
 "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
 "Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.",
@@ -50,26 +52,27 @@
 "Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
 "Cache Time-To-Live" => "Speichere Time-To-Live zwischen",
 "in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
-"Directory Settings" => "Verzeichniseinstellungen",
+"Directory Settings" => "Ordnereinstellungen",
 "User Display Name Field" => "Feld für den Anzeigenamen des Benutzers",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. ",
 "Base User Tree" => "Basis-Benutzerbaum",
-"One User Base DN per line" => "Ein Benutzer Base DN pro Zeile",
-"User Search Attributes" => "Eigenschaften der Benutzer-Suche",
+"One User Base DN per line" => "Ein Benutzer Basis-DN pro Zeile",
+"User Search Attributes" => "Benutzersucheigenschaften",
 "Optional; one attribute per line" => "Optional; ein Attribut pro Zeile",
 "Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ",
 "Base Group Tree" => "Basis-Gruppenbaum",
-"One Group Base DN per line" => "Ein Gruppen Base DN pro Zeile",
-"Group Search Attributes" => "Eigenschaften der Gruppen-Suche",
+"One Group Base DN per line" => "Ein Gruppen Basis-DN pro Zeile",
+"Group Search Attributes" => "Gruppensucheigenschaften",
 "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
-"Special Attributes" => "Besondere Eigenschaften",
+"Special Attributes" => "Spezielle Eigenschaften",
 "Quota Field" => "Kontingent-Feld",
 "Quota Default" => "Standard-Kontingent",
 "in bytes" => "in Bytes",
 "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 e5fe6b6da7e3f245b95b2fef5a3a56369c504be2..acecf27125f1a2287c37402ca570016dd5c68539 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 3ffcbddb3e3652e6d2696ed333520bef2b883414..c9a9ba130c6fbd2c9bcaa49127fb61f473c6b490 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 098e16a5d130034a571ed6316d16852859322540..7c72cc8e63237e10dc4401f9c956a8ff74401ba6 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,8 @@
 "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.",
+"Internal Username" => "Nombre de usuario interno",
+"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 c8aec0cd41ba2d901ffdb5920182e2bc03aa2a3b..98fb32b1d26e902e19b819bf0e4c2aa506ec2fdd 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 9a65455ed23ec12d6928d7f01a00e3c5d2a88e23..39346def039f056196426f3f0965df2cb217b9c1 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -1,14 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Vastendususte puhastamine ebaõnnestus.",
 "Failed to delete the server configuration" => "Serveri seadistuse kustutamine ebaõnnestus",
 "The configuration is valid and the connection could be established!" => "Seadistus on korrektne ning ühendus on olemas!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Seadistus on korrektne, kuid ühendus ebaõnnestus. Palun kontrolli serveri seadeid ja ühenduseks kasutatavaid kasutajatunnuseid.",
 "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",
+"mappings cleared" => "vastendused puhastatud",
+"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.",
@@ -70,6 +74,16 @@
 "Email Field" => "Email atribuut",
 "User Home Folder Naming Rule" => "Kasutaja kodukataloogi nimetamise reegel",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus.",
+"Internal Username" => "Sisemine kasutajanimi",
+"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." => "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URL pordiks, näiteks kõikidel *DAV teenustel.Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud).",
+"Internal Username Attribute:" => "Sisemise kasutajatunnuse atribuut:",
+"Override UUID detection" => "Tühista UUID tuvastus",
+"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." => "Vaikimis ownCloud tuvastab automaatlselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud).",
+"UUID Attribute:" => "UUID atribuut:",
+"Username-LDAP User Mapping" => "LDAP-Kasutajatunnus Kasutaja Vastendus",
+"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 kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, iga LDAP kasutaja peab omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas.",
+"Clear Username-LDAP User Mapping" => "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus",
+"Clear Groupname-LDAP Group Mapping" => "Puhasta LDAP-Grupinimi Grupp Vastendus",
 "Test Configuration" => "Testi seadistust",
 "Help" => "Abiinfo"
 );
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 5e9fd014c64f3a5875ea41d396007b1a078e0e67..42f184e53902efa1b5af5bec74247e2a255bf8ed 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 89fc40af4f18d96f59115924f4d870a641fba194..bef13457adb7cc80bae02c2464a5aa7a84aa7e71 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 38ecb5d82a882f55dfa576ca8305aa0793c222db..38a8b99cf7e5424a0fd82fba75cb240869b265a3 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 ea07bd4a11c19a9e870dd5b03f34c78d3974d905..11f8fbaaf4483ec1f1fb8507a81f8c0f946f7505 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 215d518e7a5f85e5402567bb74a1ef548752bc87..3f44ccd9bd1a0a95a2b87ec43f4dd1894f7a9897 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 97259a0ddd5f1df79be4f380b24c6b6858588389..0d60768dcfccc232f58642638c133aceed661bce 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 005a76d4bbc0ea523d4c973ffed057827f6d6536..cc8918301f5e955b179f81bc7e044cf75e0f304c 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 a82a64ab32f1387660ebfb3b93c38cf19f6db002..cbbcc69edebe75d7a494f60cbe6d3e8d4ff6665a 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 38374abda7f91fc001c9d0918a6ece10a183f3c6..624fd4fa0eb460d3e1053c539407864a390208ed 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 5f76d6b99fbd884eaac1a1a1c2789f725d8a8ce1..c04d09fc671b0f531b856845cf33e5f5f27480fc 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 29bc769279588e25bbe41e52870b0dd4c362851f..dadac9eedaafec867fc819fadf930a242865807a 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 a2790fd1dec60f2a6e4079930e25590b93878d89..48bcbdf589a17a16d42851bf96b822ef165a759e 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,16 @@
 "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",
+"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." => "In modo predefinito, ownCloud rileva automaticamente l'attributo UUID. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti).",
+"UUID Attribute:" => "Attributo UUID:",
+"Username-LDAP User Mapping" => "Associazione Nome utente-Utente 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 utilizza i nomi utente per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente di ownCloud e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate da ownCloud. Il nome utente interno di ownCloud è utilizzato dappertutto in ownCloud. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione. Procedere alla cancellazione delle associazioni solo in una fase sperimentale o di test.",
+"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 3ae7d2e639222326d4e24adcbbb9d434776845e4..53fa9ae697df3760b086c28d249b71168440f19f 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,16 @@
 "Email Field" => "メールフィールド",
 "User Home Folder Naming Rule" => "ユーザのホームフォルダ命名規則",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください。",
-"Test Configuration" => "テスト設定",
+"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ユーザのマッピング",
+"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は（メタ） データの保存と割り当てにユーザ名を使用します。ユーザを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ownCloudユーザ名とLDAPユーザ名の間のマッピングが必要であることを意味しています。生成されたユーザ名は、LDAPユーザのUUIDとマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更をownCloudが見つけます。内部のownCloud名はownCloud全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全ての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 b3f6058a0ca421e505ada2913fb52f93ce054f1d..8057f7c845550bdb99e486cf344c5dc9dca4b5c6 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 8aa9fe74b3d1f513c3c73de5c3b58f0930c2557e..b8196e09d09a93f9e4adf0915b35466de90718b2 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 f8f893834b1d66bfee073402899aa36ee46e9a39..00602ae5d79c4b80e14384f64f43c4499fa08486 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 39ed627ce2c92fc3d9a169b91f3d8bfcebcf34e3..cf58c9ec5be9c0ba08f0b2bf0898f229ae1037ff 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 aa21dd2d3c164aab23dd346d23ec69aee5f62389..6f396847b8efeb640890231ca1ad4c8b979b6407 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 50126664e5be9fc8205e6f80bfb3926551c9a948..73ffedcb134637416ea928d11bbc11911020824b 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 7d34ff49492ec982e3c420ff6561f1fb719c181b..6a060aca415cc55fd885e95b60da06258b2546fe 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 88ed18346ca68b2ba8868c0ba11ab9d8fea16eb3..b3004028c58a2c83fff365ee58520103376636cb 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 c4700245f24059f50b3be04e0bd8c061b40d3d5d..f8cdf694ff6f2d392f90dbcda07db766a0cee9aa 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 7973c66cd10d8cc3d5dee001a2a04d787aa6d63f..c935d387ccc51475f408cc117a7ed79521626926 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 9f84258c56df577c0b2187ab6290952de3a9fe7a..459100228035b1ecbc424f6fc9bb06e0613ca3a1 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 49b6c5970cc0427fff0d407ee4187fd3dc49b499..95ab51caadd798298171fce3ddd897a38e458115 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 a5b620e48badde8c338b4c35aa516f8f21e50038..a7a831e3e57489dc970c472b0e80fdf29448e61c 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 a728ea15fde20d9a9e366d70841a6a81f8b61261..22247b81005b43eb620917c4b2f4186963285777 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 02b03d5a752160fcf79d623457dd61e815e545fe..ed1e0f376db9b1daae01a2b2267b09aa278b6ee6 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 8f55a35b4916dccc41dc74146411ebcd3200d550..260ee610639b4b0066d0f5f6d76abd803763108a 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 0746e1e8929f33876af29823c6d528d77e626199..eed6d373b9f0cad67262378cfb8ddada1e1cf2f5 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 a4ed503b1d12d3646de81295be67ae5e718e9d5f..7b6833ebf8cd2d6827a929379fb7de529b0d18ee 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 50124e4d54f1f8f604b32dab2172dfe9b8b8cf13..1d81b341b46242d9567de7ef2b2ac2780f50d70e 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 cb55762e64f6beeea256f7a145d1dc5fdeed53dd..b31fe3775639988f304681a57f333769c6fa5bc1 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 8ff1fd53440eb2d77f168478e17683c3b1eb2e51..1ade5d9b733f3ef7e8dcc11e4d9d8e2d2e6b4a92 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 24fd869057ddd922bb0a53a40722bf15f0f2dbf2..12324b9f966cfe6fa5ea2caab20182dccafc39d4 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 52569a08ef831d37f4a082678d442192c8a1b414..b94bc83e1e477166237a64ae530da8eec4491de7 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 1bb4d9dc0b15b092e961bff2e83d1269701ce14b..eb30bd22f019b24fc08023cf062748f644aa44be 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 f6beb3c48630c51f702acdac786cfc320da4ef22..997f09ca8776bb98ad62959ef6df024f749a1dd8 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 d9a3e713f034d3bafd328301ad48b6925a02576e..3f047631cf70efdb246ea3fbd13df274b80d07b2 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 802badb2f0304e4352af8874496f64f328087cc4..ec279ba01e5e97dc355cf1642678b572d962129e 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 e6d450301e5d34a356fcecbcfb0359331f6308a0..c001fa99cecf8421a2be4274498c4509d6b87d71 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Sunucu uyunlama basarmadi ",
 "The configuration is valid and the connection could be established!" => "Uyunlama mantikli ve baglama yerlestirmek edebilmi.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Uyunlama gecerli, fakat Baglama yapamadi. Lutfen kontrol yapmak, eger bu iyi yerlertirdi. ",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "Uyunma mantikli degil. Lutfen log daha kontrol yapmak. ",
@@ -6,12 +7,15 @@
 "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?",
 "Confirm Deletion" => "Silmeyi onayla",
 "<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>Uyari </b> Apps kullanici_Idap ve user_webdavauth uyunmayan. Bu belki sik degil. Lutfen sistem yonetici sormak on aktif yapmaya. ",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ihbar <b> Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak  yuklemek icin.",
+"Server configuration" => "Sunucu uyunlama ",
+"Add Server Configuration" => "Sunucu Uyunlama birlemek ",
 "Host" => "Sunucu",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol atlamak edesin, sadece SSL istiyorsaniz. O zaman, idapsile baslamak. ",
 "Base DN" => "Ana DN",
@@ -31,19 +35,32 @@
 "Defines the filter to apply, when retrieving groups." => "Filter uyunmak icin tayin ediyor, ne zaman grubalari tekrar aliyor. ",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "siz bir yer tutucu, mes. 'objectClass=posixGroup ('posixGrubu''. ",
 "Connection Settings" => "Bağlantı ayarları",
+"When unchecked, this configuration will be skipped." => "Ne zaman iptal, bu uynnlama isletici ",
 "Port" => "Port",
+"Backup (Replica) Host" => "Sigorta Kopya Cephe ",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Bir kopya cevre vermek, kopya sunucu onemli olmali. ",
+"Backup (Replica) Port" => "Kopya Port ",
 "Disable Main Server" => "Ana sunucuyu devredışı birak",
+"When switched on, ownCloud will only connect to the replica server." => "Ne zaman acik, ownCloud sadece sunuce replikayin baglamis.",
 "Use TLS" => "TLS kullan",
+"Do not use it additionally for LDAPS connections, it will fail." => "Bu LDAPS baglama icin kullamaminiz, basamacak. ",
+"Case insensitve LDAP server (Windows)" => "Dusme sunucu LDAP zor degil. (Windows)",
 "Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Bagladiginda, bunla secene sadece calisiyor, sunucu LDAP SSL sunucun ithal etemek, dneyme sizine sunucu ownClouden. ",
 "Not recommended, use for testing only." => "Önerilmez, sadece test için kullanın.",
+"Cache Time-To-Live" => "Cache Time-To-Live ",
 "in seconds. A change empties the cache." => "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir.",
+"Directory Settings" => "Parametrar Listesin Adresinin ",
 "User Display Name Field" => "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP kategori kullanmaya adi ownCloud kullanicin uremek icin. ",
 "Base User Tree" => "Temel Kullanıcı Ağacı",
+"One User Base DN per line" => "Bir Temel Kullanici DN her dizgi ",
+"User Search Attributes" => "Kategorii Arama Kullanici ",
 "Group Display Name Field" => "Grub Ekrane Alani Adi",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP kullamayin grub adi ownCloud uremek icin. ",
 "Base Group Tree" => "Temel Grup Ağacı",
 "One Group Base DN per line" => "Bir Grubu Tabani DN her dizgi. ",
+"Group Search Attributes" => "Kategorii Arama Grubu",
 "Group-Member association" => "Grup-Ãœye iÅŸbirliÄŸi",
 "in bytes" => "byte cinsinden",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kullanıcı adı bölümünü boş bırakın (varsayılan). ",
diff --git a/apps/user_ldap/l10n/ug.php b/apps/user_ldap/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..8634cdbe1bec1b8ab32e3e0b0895a87eea006e0c
--- /dev/null
+++ b/apps/user_ldap/l10n/ug.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Deletion failed" => "ئۆچۈرۈش مەغلۇپ بولدى",
+"Error" => "خاتالىق",
+"Host" => "باش ئاپپارات",
+"Password" => "ئىم",
+"User Login Filter" => "ئىشلەتكۈچى تىزىمغا كىرىش سۈزگۈچى",
+"User List Filter" => "ئىشلەتكۈچى تىزىم سۈزگۈچى",
+"Group Filter" => "گۇرۇپپا سۈزگۈچ",
+"Connection Settings" => "باغلىنىش تەڭشىكى",
+"Configuration Active" => "سەپلىمە ئاكتىپ",
+"Port" => "ئېغىز",
+"Use TLS" => "TLS ئىشلەت",
+"Help" => "ياردەم"
+);
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index 623d34c98e6a5f3a26b8a8b58b4187a5e95c07d9..f92c6d5894ef6ffd87102c880a45c401f1ff9c90 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 4c606a138081f80fed2752ffeaba5a345108481a..83570a596a24b06d91371aed8ebf8206acc1ce02 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 4bbb977f36362ff85c5375811920f57e19b753ea..7e598225926a4eff92474a16eeb370f87b3adcca 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 f5bc41fd46b3df5cf756bc50d09df33f7a78036a..6c60ec64e270aadb8159b4b72f35364b8cabf380 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 1911734805fbba894a2c85335f55fc74282f2df5..7b8389227aec8bf927826bc2b722d104c97c3c2f 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 190e4eba798e9dafde81516fcd728426558ad291..ba55c4147905453e86c73a362a57fe7998dbe7a9 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 9a12bad07479e0f20cf24d60ad6a114cafbc410d..d01e75356c05efb2de994564d50f465664499367 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 6d32e9b2ab029cd619b2c7f45c8394f936ad8887..a7611eb3e846690c0a69b8f90756ae625dcbb5de 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -87,7 +87,7 @@ abstract class Access {
 			for($i=0;$i<$result[$attr]['count'];$i++) {
 				if($this->resemblesDN($attr)) {
 					$values[] = $this->sanitizeDN($result[$attr][$i]);
-				} elseif(strtolower($attr) == 'objectguid' || strtolower($attr) == 'guid') {
+				} elseif(strtolower($attr) === 'objectguid' || strtolower($attr) === 'guid') {
 					$values[] = $this->convertObjectGUID2Str($result[$attr][$i]);
 				} else {
 					$values[] = $result[$attr][$i];
@@ -317,7 +317,19 @@ abstract class Access {
 			}
 			$ldapname = $ldapname[0];
 		}
-		$intname = $isUser ? $this->sanitizeUsername($uuid) : $this->sanitizeUsername($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
@@ -462,7 +474,7 @@ abstract class Access {
 		while($row = $res->fetchRow()) {
 			$usedNames[] = $row['owncloud_name'];
 		}
-		if(!($usedNames) || count($usedNames) == 0) {
+		if(!($usedNames) || count($usedNames) === 0) {
 			$lastNo = 1; //will become name_2
 		} else {
 			natsort($usedNames);
@@ -550,7 +562,7 @@ abstract class Access {
 
 		$sqlAdjustment = '';
 		$dbtype = \OCP\Config::getSystemValue('dbtype');
-		if($dbtype == 'mysql') {
+		if($dbtype === 'mysql') {
 			$sqlAdjustment = 'FROM DUAL';
 		}
 
@@ -574,7 +586,7 @@ abstract class Access {
 
 		$insRows = $res->numRows();
 
-		if($insRows == 0) {
+		if($insRows === 0) {
 			return false;
 		}
 
@@ -656,7 +668,7 @@ abstract class Access {
 		$linkResources = array_pad(array(), count($base), $link_resource);
 		$sr = ldap_search($linkResources, $base, $filter, $attr);
 		$error = ldap_errno($link_resource);
-		if(!is_array($sr) || $error != 0) {
+		if(!is_array($sr) || $error !== 0) {
 			\OCP\Util::writeLog('user_ldap',
 				'Error when searching: '.ldap_error($link_resource).' code '.ldap_errno($link_resource),
 				\OCP\Util::ERROR);
@@ -724,7 +736,7 @@ abstract class Access {
 					foreach($attr as $key) {
 						$key = mb_strtolower($key, 'UTF-8');
 						if(isset($item[$key])) {
-							if($key != 'dn') {
+							if($key !== 'dn') {
 								$selection[$i][$key] = $this->resemblesDN($key) ?
 									$this->sanitizeDN($item[$key][0])
 									: $item[$key][0];
@@ -816,7 +828,7 @@ abstract class Access {
 	private function combineFilter($filters, $operator) {
 		$combinedFilter = '('.$operator;
 		foreach($filters as $filter) {
-		    if($filter[0] != '(') {
+		    if($filter[0] !== '(') {
 				$filter = '('.$filter.')';
 		    }
 		    $combinedFilter.=$filter;
@@ -857,7 +869,7 @@ abstract class Access {
 	private function getFilterPartForSearch($search, $searchAttributes, $fallbackAttribute) {
 		$filter = array();
 		$search = empty($search) ? '*' : '*'.$search.'*';
-		if(!is_array($searchAttributes) || count($searchAttributes) == 0) {
+		if(!is_array($searchAttributes) || count($searchAttributes) === 0) {
 			if(empty($fallbackAttribute)) {
 				return '';
 			}
@@ -867,7 +879,7 @@ abstract class Access {
 				$filter[] = $attribute . '=' . $search;
 			}
 		}
-		if(count($filter) == 1) {
+		if(count($filter) === 1) {
 			return '('.$filter[0].')';
 		}
 		return $this->combineFilterWithOr($filter);
@@ -893,7 +905,13 @@ abstract class Access {
 	 * @returns true on success, false otherwise
 	 */
 	private function detectUuidAttribute($dn, $force = false) {
-		if(($this->connection->ldapUuidAttribute != 'auto') && !$force) {
+		if(($this->connection->ldapUuidAttribute !== 'auto') && !$force) {
+			return true;
+		}
+
+		$fixedAttribute = $this->connection->ldapExpertUUIDAttr;
+		if(!empty($fixedAttribute)) {
+			$this->connection->ldapUuidAttribute = $fixedAttribute;
 			return true;
 		}
 
@@ -1007,7 +1025,7 @@ abstract class Access {
 	 * @returns string containing the key or empty if none is cached
 	 */
 	private function getPagedResultCookie($base, $filter, $limit, $offset) {
-		if($offset == 0) {
+		if($offset === 0) {
 			return '';
 		}
 		$offset -= $limit;
@@ -1031,7 +1049,7 @@ abstract class Access {
 	 */
 	private function setPagedResultCookie($base, $filter, $limit, $offset, $cookie) {
 		if(!empty($cookie)) {
-			$cachekey = 'lc' . dechex(crc32($base)) . '-' . dechex(crc32($filter)) . '-' .$limit . '-' . $offset;
+			$cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .$limit . '-' . $offset;
 			$cookie = $this->connection->writeToCache($cachekey, $cookie);
 		}
 	}
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 20784570e93925c47184faa51681bfd56c31fc68..ba4de1353412dbb6756a74f9de54d2cefaf4ea03 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,
 	);
 
 	/**
@@ -99,7 +101,7 @@ class Connection {
 	public function __set($name, $value) {
 		$changed = false;
 		//only few options are writable
-		if($name == 'ldapUuidAttribute') {
+		if($name === 'ldapUuidAttribute') {
 			\OCP\Util::writeLog('user_ldap', 'Set config ldapUuidAttribute to  '.$value, \OCP\Util::DEBUG);
 			$this->config[$name] = $value;
 			if(!empty($this->configID)) {
@@ -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;
 	}
@@ -321,9 +328,9 @@ class Connection {
 		$params = $this->getConfigTranslationArray();
 
 		foreach($config as $parameter => $value) {
-			if(($parameter == 'homeFolderNamingRule'
+			if(($parameter === 'homeFolderNamingRule'
 				|| (isset($params[$parameter])
-					&& $params[$parameter] == 'homeFolderNamingRule'))
+					&& $params[$parameter] === 'homeFolderNamingRule'))
 				&& !empty($value)) {
 				$value = 'attr:'.$value;
 			}
@@ -389,7 +396,7 @@ class Connection {
 		$trans = $this->getConfigTranslationArray();
 		$config = array();
 		foreach($trans as $dbKey => $classKey) {
-			if($classKey == 'homeFolderNamingRule') {
+			if($classKey === 'homeFolderNamingRule') {
 				if(strpos($this->config[$classKey], 'attr:') === 0) {
 					$config[$dbKey] = substr($this->config[$classKey], 5);
 				} else {
@@ -427,7 +434,9 @@ class Connection {
 				'No group filter is specified, LDAP group feature will not be used.',
 				\OCP\Util::INFO);
 		}
-		if(!in_array($this->config['ldapUuidAttribute'], array('auto', 'entryuuid', 'nsuniqueid', 'objectguid'))
+		$uuidAttributes = array(
+			'auto', 'entryuuid', 'nsuniqueid', 'objectguid', 'guid');
+		if(!in_array($this->config['ldapUuidAttribute'], $uuidAttributes)
 			&& (!is_null($this->configID))) {
 			\OCP\Config::setAppValue($this->configID, $this->configPrefix.'ldap_uuid_attribute', 'auto');
 			\OCP\Util::writeLog('user_ldap',
@@ -440,7 +449,7 @@ class Connection {
 		}
 		foreach(array('ldapAttributesForUserSearch', 'ldapAttributesForGroupSearch') as $key) {
 			if(is_array($this->config[$key])
-				&& count($this->config[$key]) == 1
+				&& count($this->config[$key]) === 1
 				&& empty($this->config[$key][0])) {
 				$this->config[$key] = array();
 			}
@@ -503,6 +512,10 @@ class Connection {
 			$configurationOK = false;
 		}
 
+		if(!empty($this->config['ldapExpertUUIDAttr'])) {
+			$this->config['ldapUuidAttribute'] = $this->config['ldapExpertUUIDAttr'];
+		}
+
 		return $configurationOK;
 	}
 
@@ -541,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'             => '',
 		);
 	}
 
@@ -588,12 +603,12 @@ class Connection {
 
 			$error = null;
 			//if LDAP server is not reachable, try the Backup (Replica!) Server
-			if((!$bindStatus && ($error == -1))
+			if((!$bindStatus && ($error === -1))
 				|| $this->config['ldapOverrideMainServer']
 				|| $this->getFromCache('overrideMainServer')) {
 					$this->doConnect($this->config['ldapBackupHost'], $this->config['ldapBackupPort']);
 					$bindStatus = $this->bind();
-					if($bindStatus && $error == -1) {
+					if($bindStatus && $error === -1) {
 						//when bind to backup server succeeded and failed to main server,
 						//skip contacting him until next cache refresh
 						$this->writeToCache('overrideMainServer', true);
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index 612a088269bec3382b8a659188ef4a2678aed6ea..07d13a806a624fcff9982d38cb508afca3d4da01 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -96,7 +96,32 @@ class Helper {
 			return false;
 		}
 
-		if($res->numRows() == 0) {
+		if($res->numRows() === 0) {
+			return false;
+		}
+
+		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;
 		}
 
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 05497ae8a3375790a9bd2530f3f46bc338a0fc27..22e2dac6d26bca29705fcb3a3f8bfdf4fe2104de 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 d3c2c298904305f72af82fc52ddf8e872987e6d7..972970aa3ef11445789bbb51390cffe5c35ec8f6 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>');
@@ -14,7 +15,7 @@
 	<fieldset id="ldapSettings-1">
 		<p><label for="ldap_serverconfig_chooser"><?php p($l->t('Server configuration'));?></label>
 		<select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
-		<?php if(count($_['serverConfigurationPrefixes']) == 0 ) {
+		<?php if(count($_['serverConfigurationPrefixes']) === 0 ) {
 			?>
 				<option value="" selected>1. Server</option>');
 			<?php
@@ -85,7 +86,7 @@
 				<p><label for="ldap_group_display_name"><?php p($l->t('Group Display Name Field'));?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" data-default="<?php p($_['ldap_group_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the groups`s ownCloud name.'));?>" /></p>
 				<p><label for="ldap_base_groups"><?php p($l->t('Base Group Tree'));?></label><textarea id="ldap_base_groups" name="ldap_base_groups" placeholder="<?php p($l->t('One Group Base DN per line'));?>" data-default="<?php p($_['ldap_base_groups_default']); ?>" title="<?php p($l->t('Base Group Tree'));?>"></textarea></p>
 				<p><label for="ldap_attributes_for_group_search"><?php p($l->t('Group Search Attributes'));?></label><textarea id="ldap_attributes_for_group_search" name="ldap_attributes_for_group_search" placeholder="<?php p($l->t('Optional; one attribute per line'));?>" data-default="<?php p($_['ldap_attributes_for_group_search_default']); ?>" title="<?php p($l->t('Group Search Attributes'));?>"></textarea></p>
-				<p><label for="ldap_group_member_assoc_attribute"><?php p($l->t('Group-Member association'));?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php p($_['ldap_group_member_assoc_attribute_default']); ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'uniqueMember')) p(' selected'); ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'memberUid')) p(' selected'); ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'member')) p(' selected'); ?>>member (AD)</option></select></p>
+				<p><label for="ldap_group_member_assoc_attribute"><?php p($l->t('Group-Member association'));?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php p($_['ldap_group_member_assoc_attribute_default']); ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'uniqueMember')) p(' selected'); ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'memberUid')) p(' selected'); ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'member')) p(' selected'); ?>>member (AD)</option></select></p>
 			</div>
 			<h3><?php p($l->t('Special Attributes'));?></h3>
 			<div>
@@ -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_ldap.php b/apps/user_ldap/user_ldap.php
index 1277e074714619b9fea87c232a475a8da17cc097..41e2926605e75f04af7702666485ade9ef696f34 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -197,9 +197,9 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 				//if attribute's value is an absolute path take this, otherwise append it to data dir
 				//check for / at the beginning or pattern c:\ resp. c:/
 				if(
-					'/' == $path[0]
+					'/' === $path[0]
 					|| (3 < strlen($path) && ctype_alpha($path[0])
-						&& $path[1] == ':' && ('\\' == $path[2] || '/' == $path[2]))
+						&& $path[1] === ':' && ('\\' === $path[2] || '/' === $path[2]))
 				) {
 					$homedir = $path;
 				} else {
diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php
index 7e5b9045df3f42064ef0e75a71ece3adc2a7c277..73cc0963182c454ef4d67c392654869b55956565 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;
diff --git a/apps/user_webdavauth/l10n/ug.php b/apps/user_webdavauth/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..03ced5f4aa27cb15be74c348234fe0e8ade77c06
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ug.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV سالاھىيەت دەلىللەش",
+"URL: http://" => "URL: http://"
+);
diff --git a/apps/user_webdavauth/l10n/zh_TW.php b/apps/user_webdavauth/l10n/zh_TW.php
index 7a9d767eec11d66605fe40cf9d642f5f080eb1cd..6f94b77ac5794f6a4eaba19d43b687e8b26643ca 100644
--- a/apps/user_webdavauth/l10n/zh_TW.php
+++ b/apps/user_webdavauth/l10n/zh_TW.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV 認證",
 "URL: http://" => "網址：http://",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud會將把用戶的證件發送到這個網址。這個插件會檢查回應，並把HTTP狀態代碼401和403視為無效證件和所有其他回應視為有效證件。"
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud 會將把用戶的登入資訊發送到這個網址以嘗試登入，並檢查回應， HTTP 狀態碼401和403視為登入失敗，所有其他回應視為登入成功。"
 );
diff --git a/autotest.sh b/autotest.sh
index fdf6d2fe098267dd414acd4b573f0b8fd5385d02..267815e96d82e147c86c6163791bfff5028db1dc 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -90,7 +90,12 @@ function execute_tests {
 	rm -rf coverage-html-$1
 	mkdir coverage-html-$1
 	php -f enable_all.php
-	phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1
+	if [ "$1" == "pgsql" ] ; then
+		# no coverage with pg - causes segfault on ci.tmit.eu - reason unknown
+		phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml
+	else
+		phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1
+	fi
 }
 
 #
diff --git a/core/js/compatibility.js b/core/js/compatibility.js
index cc37949409d3585e2acb3f1e49b38652ed053d60..b690803ca7727c9214b8bc788d480afb4afd551d 100644
--- a/core/js/compatibility.js
+++ b/core/js/compatibility.js
@@ -133,4 +133,18 @@ if(!String.prototype.trim) {
 	String.prototype.trim = function () {
 		return this.replace(/^\s+|\s+$/g,'');
 	};
-}
\ No newline at end of file
+}
+
+// Older Firefoxes doesn't support outerHTML
+// From http://stackoverflow.com/questions/1700870/how-do-i-do-outerhtml-in-firefox#answer-3819589
+function outerHTML(node){
+	// In newer browsers use the internal property otherwise build a wrapper.
+	return node.outerHTML || (
+	function(n){
+		var div = document.createElement('div'), h;
+		div.appendChild( n.cloneNode(true) );
+		h = div.innerHTML;
+		div = null;
+		return h;
+	})(node);
+}
diff --git a/core/js/config.php b/core/js/config.php
index 0aaa44822876b339d4b47c73ad8f6145069b6d0e..53a8fb96388601b1f8e57e387fbee1076892ae91 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -26,8 +26,8 @@ $array = array(
 	"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
 	"oc_webroot" => "\"".OC::$WEBROOT."\"",
 	"oc_appswebroots" =>  str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
-	"oc_current_user" =>  "\"".OC_User::getUser(). "\"",
-	"oc_requesttoken" =>  "\"".OC_Util::callRegister(). "\"",
+	"oc_current_user" => "document.getElementsByTagName('head')[0].getAttribute('data-user')",
+	"oc_requesttoken" => "document.getElementsByTagName('head')[0].getAttribute('data-requesttoken')",
 	"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
 	"dayNames" =>  json_encode(
 		array(
diff --git a/core/js/js.js b/core/js/js.js
index d85e6d88f8aed5529840b2a10875b98745596ab3..3cb4d3dd151582915626c2363dc106b4a7de1fc3 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -767,6 +767,26 @@ OC.set=function(name, value) {
 	context[tail]=value;
 };
 
+/**
+ * select a range in an input field
+ * @link http://stackoverflow.com/questions/499126/jquery-set-cursor-position-in-text-area
+ * @param {type} start
+ * @param {type} end
+ */
+$.fn.selectRange = function(start, end) {
+	return this.each(function() {
+		if (this.setSelectionRange) {
+			this.focus();
+			this.setSelectionRange(start, end);
+		} else if (this.createTextRange) {
+			var range = this.createTextRange();
+			range.collapse(true);
+			range.moveEnd('character', end);
+			range.moveStart('character', start);
+			range.select();
+		}
+	});
+};
 
 /**
  * Calls the server periodically every 15 mins to ensure that session doesnt
diff --git a/core/js/octemplate.js b/core/js/octemplate.js
index a5d56852a5754c6e40fb4e483ba8914c599f9092..e032506c0b1b3c93f5d3a116a868fe2d581d02bf 100644
--- a/core/js/octemplate.js
+++ b/core/js/octemplate.js
@@ -72,7 +72,7 @@
 		},
 		// From stackoverflow.com/questions/1408289/best-way-to-do-variable-interpolation-in-javascript
 		_build: function(o){
-			var data = this.elem.attr('type') === 'text/template' ? this.elem.html() : this.elem.get(0).outerHTML;
+			var data = this.elem.attr('type') === 'text/template' ? this.elem.html() : outerHTML(this.elem.get(0));
 			try {
 				return data.replace(/{([^{}]*)}/g,
 					function (a, b) {
diff --git a/core/l10n/de.php b/core/l10n/de.php
index c173e56c1f7accf22e9c21d17ce6be41057d017c..b53bda109ddaeeec9a47147572132e91440bdd8d 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -56,7 +56,7 @@
 "Shared" => "Geteilt",
 "Share" => "Teilen",
 "Error while sharing" => "Fehler beim Teilen",
-"Error while unsharing" => "Fehler beim Aufheben der Teilung",
+"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler beim Ändern der Rechte",
 "Shared with you and the group {group} by {owner}" => "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
 "Shared with you by {owner}" => "{owner} hat dies mit Dir geteilt",
@@ -80,15 +80,15 @@
 "delete" => "löschen",
 "share" => "teilen",
 "Password protected" => "Durch ein Passwort geschützt",
-"Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums",
+"Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
 "Sending ..." => "Sende ...",
 "Email sent" => "E-Mail wurde verschickt",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden.<br>Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist frage Deinen lokalen Administrator.",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden.<br>Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/Dein Benutzername korrekt war?",
 "You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
 "Username" => "Benutzername",
@@ -108,11 +108,11 @@
 "Add" => "Hinzufügen",
 "Security Warning" => "Sicherheitswarnung",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
-"Please update your PHP installation to use ownCloud securely." => "Bitte bringe deine PHP Installation auf den neuesten Stand, um ownCloud sicher nutzen zu können.",
+"Please update your PHP installation to use ownCloud securely." => "Bitte bringe Deine PHP Installation auf den neuesten Stand, um ownCloud sicher nutzen zu können.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktiviere die PHP-Erweiterung für OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Konten  zu übernehmen.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Sie Ihren Server konfigurieren.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Bitte ließ die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Du Deinen Server konfigurierst.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
@@ -125,6 +125,7 @@
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
 "web services under your control" => "Web-Services unter Deiner Kontrolle",
+"%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
 "Log out" => "Abmelden",
 "Automatic logon rejected!" => "Automatischer Login zurückgewiesen!",
 "If you did not change your password recently, your account may be compromised!" => "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index d0f2b3505d9d0b100cc39f4473c5a7acc0f987ed..7e9b64193c6f8809d62b10dc12cc1cc3d834ff96 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -43,7 +43,7 @@
 "{months} months ago" => "Vor {months} Monaten",
 "months ago" => "Vor Monaten",
 "last year" => "Letztes Jahr",
-"years ago" => "Vor  Jahren",
+"years ago" => "Vor Jahren",
 "Ok" => "OK",
 "Cancel" => "Abbrechen",
 "Choose" => "Auswählen",
@@ -56,7 +56,7 @@
 "Shared" => "Geteilt",
 "Share" => "Teilen",
 "Error while sharing" => "Fehler beim Teilen",
-"Error while unsharing" => "Fehler bei der Aufhebung der Teilung",
+"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler bei der Änderung der Rechte",
 "Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
 "Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
@@ -88,11 +88,11 @@
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer sinnvollen Zeitspanne erhalten prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist fragen Sie Ihren lokalen Administrator.",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
 "Username" => "Benutzername",
-"Request reset" => "Zurücksetzung beantragen",
+"Request reset" => "Zurücksetzung anfordern",
 "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
 "To login page" => "Zur Login-Seite",
 "New password" => "Neues Passwort",
@@ -125,9 +125,9 @@
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle",
-"%s is available. Get more information on how to update." => "%s ist nicht verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
+"%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
 "Log out" => "Abmelden",
-"Automatic logon rejected!" => "Automatische Anmeldung verweigert.",
+"Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
 "If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!",
 "Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
 "Lost your password?" => "Passwort vergessen?",
diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php
index 482632f3fdab19ae3bd7efb9a1ed366c0f00ac9c..981d9a1ca0f326481cfa383fd15b3a7696dfe001 100644
--- a/core/l10n/en@pirate.php
+++ b/core/l10n/en@pirate.php
@@ -1,3 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Password" => "Passcode"
+"User %s shared a file with you" => "User %s shared a file with you",
+"Password" => "Passcode",
+"web services under your control" => "web services under your control"
 );
diff --git a/core/l10n/es.php b/core/l10n/es.php
index e0ccfd059dec401334cf8c3e01c25e0d8d974a9a..d99ac861cea5fc0fef17f45eb05ca9e819695e75 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -3,11 +3,11 @@
 "User %s shared a folder with you" => "El usuario %s ha compartido una carpeta contigo.",
 "User %s shared the file \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquí: %s.",
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s.",
-"Category type not provided." => "Tipo de categoria no proporcionado.",
+"Category type not provided." => "Tipo de categoría no proporcionado.",
 "No category to add?" => "¿Ninguna categoría para añadir?",
-"This category already exists: %s" => "Esta categoria ya existe: %s",
-"Object type not provided." => "ipo de objeto no proporcionado.",
-"%s ID not provided." => "%s ID no proporcionado.",
+"This category already exists: %s" => "Ya existe esta categoría: %s",
+"Object type not provided." => "Tipo de objeto no proporcionado.",
+"%s ID not provided." => "ID de %s no proporcionado.",
 "Error adding %s to favorites." => "Error añadiendo %s a los favoritos.",
 "No categories selected for deletion." => "No hay categorías seleccionadas para borrar.",
 "Error removing %s from favorites." => "Error eliminando %s de los favoritos.",
@@ -39,20 +39,20 @@
 "today" => "hoy",
 "yesterday" => "ayer",
 "{days} days ago" => "hace {days} días",
-"last month" => "mes pasado",
+"last month" => "el mes pasado",
 "{months} months ago" => "Hace {months} meses",
 "months ago" => "hace meses",
-"last year" => "año pasado",
+"last year" => "el año pasado",
 "years ago" => "hace años",
 "Ok" => "Aceptar",
 "Cancel" => "Cancelar",
 "Choose" => "Seleccionar",
 "Yes" => "Sí",
 "No" => "No",
-"The object type is not specified." => "El tipo de objeto no se ha especificado.",
+"The object type is not specified." => "No se ha especificado el tipo de objeto",
 "Error" => "Error",
-"The app name is not specified." => "El nombre de la app no se ha especificado.",
-"The required file {file} is not installed!" => "El fichero  {file} requerido, no está instalado.",
+"The app name is not specified." => "No se ha especificado el nombre de la aplicación.",
+"The required file {file} is not installed!" => "¡El fichero requerido {file} no está instalado!",
 "Shared" => "Compartido",
 "Share" => "Compartir",
 "Error while sharing" => "Error compartiendo",
@@ -68,15 +68,15 @@
 "Send" => "Enviar",
 "Set expiration date" => "Establecer fecha de caducidad",
 "Expiration date" => "Fecha de caducidad",
-"Share via email:" => "compartido via e-mail:",
+"Share via email:" => "Compartido por correo electrónico:",
 "No people found" => "No se encontró gente",
 "Resharing is not allowed" => "No se permite compartir de nuevo",
 "Shared in {item} with {user}" => "Compartido en {item} con {user}",
-"Unshare" => "No compartir",
+"Unshare" => "Dejar de compartir",
 "can edit" => "puede editar",
 "access control" => "control de acceso",
 "create" => "crear",
-"update" => "modificar",
+"update" => "actualizar",
 "delete" => "eliminar",
 "share" => "compartir",
 "Password protected" => "Protegido por contraseña",
@@ -84,16 +84,16 @@
 "Error setting expiration date" => "Error estableciendo fecha de caducidad",
 "Sending ..." => "Enviando...",
 "Email sent" => "Correo electrónico enviado",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</ a>.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</ a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado correctamente. Redireccionando a ownCloud ahora.",
-"ownCloud password reset" => "Reiniciar contraseña de ownCloud",
+"ownCloud password reset" => "Restablecer contraseña de ownCloud",
 "Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su spam / carpetas no deseados. <br> Si no está allí pregunte a su administrador local.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Petición ha fallado! <br> ¿Usted asegúrese que su dirección de correo electrónico / nombre de usuario estaba justo?",
-"You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local.",
+"Request failed!<br>Did you make sure your email/username was right?" => "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?",
+"You will receive a link to reset your password via Email." => "Recibirá un enlace por correo electrónico para restablecer su contraseña",
 "Username" => "Nombre de usuario",
 "Request reset" => "Solicitar restablecimiento",
-"Your password was reset" => "Tu contraseña se ha restablecido",
+"Your password was reset" => "Su contraseña ha sido establecida",
 "To login page" => "A la página de inicio de sesión",
 "New password" => "Nueva contraseña",
 "Reset password" => "Restablecer contraseña",
@@ -108,12 +108,12 @@
 "Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Por favor, actualice su instalación de PHP para utilizar ownCloud en forma segura.",
+"Please update your PHP installation to use ownCloud securely." => "Por favor, actualice su instalación de PHP para utilizar ownCloud de manera segura.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No está disponible un generador de números aleatorios seguro, por favor habilite la extensión OpenSSL de PHP.",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de su contraseña y tomar control de su cuenta.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos están probablemente accesibles a través de internet ya que el archivo .htaccess no está funcionando.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro, un atacante podría predecir los tokens de restablecimiento de contraseñas y tomar el control de su cuenta.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Probablemente su directorio de datos y sus archivos sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
 "For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para información sobre cómo configurar adecuadamente su servidor, por favor vea la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentación</a>.",
-"Create an <strong>admin account</strong>" => "Crea una <strong>cuenta de administrador</strong>",
+"Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
 "Configure the database" => "Configurar la base de datos",
@@ -125,13 +125,13 @@
 "Database host" => "Host de la base de datos",
 "Finish setup" => "Completar la instalación",
 "web services under your control" => "Servicios web bajo su control",
-"%s is available. Get more information on how to update." => "%s esta disponible. Obtén mas información de como actualizar.",
+"%s is available. Get more information on how to update." => "%s esta disponible. Obtener mas información de como actualizar.",
 "Log out" => "Salir",
 "Automatic logon rejected!" => "¡Inicio de sesión automático rechazado!",
 "If you did not change your password recently, your account may be compromised!" => "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
 "Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.",
-"Lost your password?" => "¿Has perdido tu contraseña?",
-"remember" => "recuérdame",
+"Lost your password?" => "¿Ha perdido su contraseña?",
+"remember" => "recordarme",
 "Log in" => "Entrar",
 "Alternative Logins" => "Nombre de usuarios alternativos",
 "prev" => "anterior",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index c8f60a678f9efc24f151b65d51f8da06c2ecb461..84ea35abcf20f3dbd84d3480181527ade6834acb 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -125,6 +125,7 @@
 "Database host" => "Serveur de la base de données",
 "Finish setup" => "Terminer l'installation",
 "web services under your control" => "services web sous votre contrôle",
+"%s is available. Get more information on how to update." => "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour.",
 "Log out" => "Se déconnecter",
 "Automatic logon rejected!" => "Connexion automatique rejetée !",
 "If you did not change your password recently, your account may be compromised!" => "Si vous n'avez pas changé votre mot de passe récemment, votre compte risque d'être compromis !",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 8adc38f0bba595f065e6a630d4649b8e7ab6624c..b6bb75f2b3becfca76fcae938bff18303dcd03b4 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -20,8 +20,10 @@
 "December" => "Decembre",
 "Settings" => "Configurationes",
 "Cancel" => "Cancellar",
+"Error" => "Error",
 "Share" => "Compartir",
 "Password" => "Contrasigno",
+"Send" => "Invia",
 "ownCloud password reset" => "Reinitialisation del contrasigno de ownCLoud",
 "Username" => "Nomine de usator",
 "Request reset" => "Requestar reinitialisation",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 1e73aa5890875477145d09e8402baed11c979fb9..783fe288ba3be9c69d5bbb28a9a157dc97b0ced4 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -110,7 +110,7 @@
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。",
 "Please update your PHP installation to use ownCloud securely." => "ownCloud を安全に利用するに、PHPの更新を行なってください。",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にして下さい。",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "セキュアな乱数生成器が無い場合、攻撃者はパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "セキュアな乱数生成器が無い場合、攻撃者がパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess ファイルが動作していないため、おそらくあなたのデータディレクトリもしくはファイルはインターネットからアクセス可能です。",
 "For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "あなたのサーバの適切な設定に関する情報として、<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">ドキュメント</a>を参照して下さい。",
 "Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 05ae35cc3d13efd01db8c402cf552572b7a7855d..85b76fe6948c4fbad7c6c63d71295fb030792625 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Vartotojas %s pasidalino su jumis failu",
+"User %s shared a folder with you" => "Vartotojas %s su jumis pasidalino aplanku",
 "No category to add?" => "NepridÄ—site jokios kategorijos?",
 "No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.",
 "Sunday" => "Sekmadienis",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 2055be1b9a4e70c93adeb6a90e5fd4b5bdcf8060..d11ff92fa88a75016a1c982f8ed661f7932ddba8 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -8,9 +8,9 @@
 "This category already exists: %s" => "Denne kategorien finst alt: %s",
 "Object type not provided." => "Ingen objekttype.",
 "%s ID not provided." => "Ingen %s-ID.",
-"Error adding %s to favorites." => "Klarte ikkje å leggja til %s i favorittar.",
+"Error adding %s to favorites." => "Klarte ikkje leggja til %s i favorittar.",
 "No categories selected for deletion." => "Ingen kategoriar valt for sletting.",
-"Error removing %s from favorites." => "Klarte ikkje å fjerna %s frå favorittar.",
+"Error removing %s from favorites." => "Klarte ikkje fjerna %s frå favorittar.",
 "Sunday" => "Søndag",
 "Monday" => "MÃ¥ndag",
 "Tuesday" => "Tysdag",
@@ -40,8 +40,8 @@
 "yesterday" => "i går",
 "{days} days ago" => "{days} dagar sidan",
 "last month" => "førre månad",
-"{months} months ago" => "{months) månader sidan",
-"months ago" => "månader sidan",
+"{months} months ago" => "{months} månadar sidan",
+"months ago" => "månadar sidan",
 "last year" => "i fjor",
 "years ago" => "Ã¥r sidan",
 "Ok" => "Greitt",
@@ -51,7 +51,7 @@
 "No" => "Nei",
 "The object type is not specified." => "Objekttypen er ikkje spesifisert.",
 "Error" => "Feil",
-"The app name is not specified." => "App-namnet er ikkje spesifisert.",
+"The app name is not specified." => "Programnamnet er ikkje spesifisert.",
 "The required file {file} is not installed!" => "Den kravde fila {file} er ikkje installert!",
 "Shared" => "Delt",
 "Share" => "Del",
@@ -66,8 +66,8 @@
 "Password" => "Passord",
 "Email link to person" => "Send lenkja over e-post",
 "Send" => "Send",
-"Set expiration date" => "Set utlaupsdato",
-"Expiration date" => "Utlaupsdato",
+"Set expiration date" => "Set utløpsdato",
+"Expiration date" => "Utløpsdato",
 "Share via email:" => "Del over e-post:",
 "No people found" => "Fann ingen personar",
 "Resharing is not allowed" => "Vidaredeling er ikkje tillate",
@@ -80,8 +80,8 @@
 "delete" => "slett",
 "share" => "del",
 "Password protected" => "Passordverna",
-"Error unsetting expiration date" => "Klarte ikkje å fjerna utlaupsdato",
-"Error setting expiration date" => "Klarte ikkje å setja utlaupsdato",
+"Error unsetting expiration date" => "Klarte ikkje fjerna utløpsdato",
+"Error setting expiration date" => "Klarte ikkje setja utløpsdato",
 "Sending ..." => "Sender …",
 "Email sent" => "E-post sendt",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
@@ -99,7 +99,7 @@
 "Reset password" => "Nullstill passord",
 "Personal" => "Personleg",
 "Users" => "Brukarar",
-"Apps" => "Applikasjonar",
+"Apps" => "Program",
 "Admin" => "Admin",
 "Help" => "Hjelp",
 "Access forbidden" => "Tilgang forbudt",
@@ -116,8 +116,8 @@
 "Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
 "Advanced" => "Avansert",
 "Data folder" => "Datamappe",
-"Configure the database" => "Konfigurer databasen",
-"will be used" => "vil bli nytta",
+"Configure the database" => "Set opp databasen",
+"will be used" => "vil verta nytta",
 "Database user" => "Databasebrukar",
 "Database password" => "Databasepassord",
 "Database name" => "Databasenamn",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 22cc24cd5148fabc612201b7247ec52a5344935c..5c8434984cf7f9323e9e5d1ee2f6aa132afc5111 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -88,6 +88,7 @@
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
 "ownCloud password reset" => "restart hasła ownCloud",
 "Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {link}",
+"Request failed!<br>Did you make sure your email/username was right?" => "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?",
 "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
 "Username" => "Nazwa użytkownika",
 "Request reset" => "Żądanie resetowania",
@@ -123,6 +124,7 @@
 "Database host" => "Komputer bazy danych",
 "Finish setup" => "Zakończ konfigurowanie",
 "web services under your control" => "Kontrolowane serwisy",
+"%s is available. Get more information on how to update." => "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
 "Log out" => "Wyloguj",
 "Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
 "If you did not change your password recently, your account may be compromised!" => "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożone!",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 0b2af90d1d578e7547cb91786ac0068fe754dc8f..1084fc618f775d9f9e954b3ab3f3a6f39a80c4d5 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -88,6 +88,8 @@
 "The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
 "ownCloud password reset" => "Reposição da password ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
+"Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?",
 "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
 "Username" => "Nome de utilizador",
 "Request reset" => "Pedir reposição",
@@ -123,6 +125,7 @@
 "Database host" => "Anfitrião da base de dados",
 "Finish setup" => "Acabar instalação",
 "web services under your control" => "serviços web sob o seu controlo",
+"%s is available. Get more information on how to update." => "%s está disponível. Tenha mais informações como actualizar.",
 "Log out" => "Sair",
 "Automatic logon rejected!" => "Login automático rejeitado!",
 "If you did not change your password recently, your account may be compromised!" => "Se não mudou a sua palavra-passe recentemente, a sua conta pode ter sido comprometida!",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 8fb568aee7e274e415926675ddc7b4acdde660b0..d43ee8cf5425bc62e672bf1785137b73e5bc516b 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Settings" => "Настройки"
+"Settings" => "Настройки",
+"Error" => "Ошибка"
 );
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index d9f124b2b49ab0ae4863392eda583da8e386ad2f..6a2d0aa5eced5dfe8bb6bae81f79fe80d62abb64 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -125,6 +125,7 @@
 "Database host" => "Server databázy",
 "Finish setup" => "Dokončiť inštaláciu",
 "web services under your control" => "webové služby pod Vašou kontrolou",
+"%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií k postupu aktualizáce.",
 "Log out" => "Odhlásiť",
 "Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!",
 "If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kompromitovaný.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index db5583c61013a60c9d25e4b4902740da0c68f695..2854807130665f3862f5ea3731ae023481123846 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -125,6 +125,7 @@
 "Database host" => "Gostitelj podatkovne zbirke",
 "Finish setup" => "Končaj namestitev",
 "web services under your control" => "spletne storitve pod vašim nadzorom",
+"%s is available. Get more information on how to update." => "%s je na voljo. Pridobite več podrobnosti za posodobitev.",
 "Log out" => "Odjava",
 "Automatic logon rejected!" => "Samodejno prijavljanje je zavrnjeno!",
 "If you did not change your password recently, your account may be compromised!" => "V primeru, da gesla za dostop že nekaj časa niste spremenili, je račun lahko ogrožen!",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..4727e37debdcdf93a49590166207ac1243cb3fd5
--- /dev/null
+++ b/core/l10n/ug.php
@@ -0,0 +1,48 @@
+<?php $TRANSLATIONS = array(
+"Sunday" => "يەكشەنبە",
+"Monday" => "دۈشەنبە",
+"Tuesday" => "سەيشەنبە",
+"Wednesday" => "چارشەنبە",
+"Thursday" => "پەيشەنبە",
+"Friday" => "جۈمە",
+"Saturday" => "شەنبە",
+"January" => "قەھرىتان",
+"February" => "ھۇت",
+"March" => "نەۋرۇز",
+"April" => "ئۇمۇت",
+"May" => "باھار",
+"June" => "سەپەر",
+"July" => "چىللە",
+"August" => "تومۇز",
+"September" => "مىزان",
+"October" => "ئوغۇز",
+"November" => "ئوغلاق",
+"December" => "ÙƒÛ†Ù†Û•Ùƒ",
+"Settings" => "تەڭشەكلەر",
+"1 minute ago" => "1 مىنۇت ئىلگىرى",
+"1 hour ago" => "1 سائەت ئىلگىرى",
+"today" => "بۈگۈن",
+"yesterday" => "تۈنۈگۈن",
+"Ok" => "جەزملە",
+"Cancel" => "ۋاز كەچ",
+"Yes" => "ھەئە",
+"No" => "ياق",
+"Error" => "خاتالىق",
+"Share" => "ھەمبەھىر",
+"Share with" => "ھەمبەھىر",
+"Password" => "ئىم",
+"Send" => "يوللا",
+"Unshare" => "ھەمبەھىرلىمە",
+"delete" => "ئۆچۈر",
+"share" => "ھەمبەھىر",
+"Username" => "ئىشلەتكۈچى ئاتى",
+"New password" => "يېڭى ئىم",
+"Personal" => "شەخسىي",
+"Users" => "ئىشلەتكۈچىلەر",
+"Apps" => "ئەپلەر",
+"Help" => "ياردەم",
+"Add" => "قوش",
+"Advanced" => "ئالىي",
+"Finish setup" => "تەڭشەك تامام",
+"Log out" => "تىزىمدىن چىق"
+);
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 0b45fa69313e3d4b8f7870a6d138f477a5f87bcd..31c4a37545c03eec652ec40d01e9aa5e2d7b3213 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -88,6 +88,8 @@
 "The update was successful. Redirecting you to ownCloud now." => "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
 "ownCloud password reset" => "Khôi phục mật khẩu Owncloud ",
 "Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Liên kết tạo lại mật khẩu đã được gửi tới hộp thư của bạn.<br>Nếu bạn không thấy nó sau một khoảng thời gian, vui lòng kiểm tra trong thư mục Spam/Rác.<br>Nếu vẫn không thấy, vui lòng hỏi người quản trị hệ thống.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Yêu cầu thất bại!<br>Bạn có chắc là email/tên đăng nhập của bạn chính xác?",
 "You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
 "Username" => "Tên đăng nhập",
 "Request reset" => "Yêu cầu thiết lập lại ",
@@ -105,6 +107,8 @@
 "Edit categories" => "Sửa chuyên mục",
 "Add" => "Thêm",
 "Security Warning" => "Cảnh bảo bảo mật",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Vui lòng cập nhật bản cài đặt PHP để sử dụng ownCloud một cách an toàn.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Không an toàn ! chức năng random number generator đã có sẵn ,vui lòng bật  PHP OpenSSL extension.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Nếu không có random number generator , Hacker có thể  thiết lập lại mật khẩu và chiếm tài khoản của bạn.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
@@ -121,6 +125,7 @@
 "Database host" => "Database host",
 "Finish setup" => "Cài đặt hoàn tất",
 "web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn",
+"%s is available. Get more information on how to update." => "%s còn trống. Xem thêm thông tin cách cập nhật.",
 "Log out" => "Đăng xuất",
 "Automatic logon rejected!" => "Tự động đăng nhập đã bị từ chối !",
 "If you did not change your password recently, your account may be compromised!" => "Nếu bạn không thay đổi mật khẩu gần đây của bạn, tài khoản của bạn có thể gặp nguy hiểm!",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 0b6f0dfbdb5c8c9f5bb0a053029dfe7d6bfa0fb0..c37f7b2602b73419ab888211c77d1a0d9485ddb2 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -88,6 +88,8 @@
 "The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。",
 "ownCloud password reset" => "重置 ownCloud 密码",
 "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重置密码的链接已发送到您的邮箱。<br>如果您觉得在合理的时间内还未收到邮件，请查看 spam/junk 目录。<br>如果没有在那里，请询问您的本地管理员。",
+"Request failed!<br>Did you make sure your email/username was right?" => "请求失败<br>您确定您的邮箱/用户名是正确的？",
 "You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",
 "Username" => "用户名",
 "Request reset" => "请求重置",
@@ -123,6 +125,7 @@
 "Database host" => "数据库主机",
 "Finish setup" => "安装完成",
 "web services under your control" => "您控制的web服务",
+"%s is available. Get more information on how to update." => "%s 可用。获取更多关于如何升级的信息。",
 "Log out" => "注销",
 "Automatic logon rejected!" => "自动登录被拒绝！",
 "If you did not change your password recently, your account may be compromised!" => "如果您没有最近修改您的密码，您的帐户可能会受到影响！",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index cfc3a9fe3327f4e54c26b94b86916605445295ff..6537e6dff075d1460c9d11a49baab7793296b9e7 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -88,6 +88,8 @@
 "The update was successful. Redirecting you to ownCloud now." => "升級成功，正將您重新導向至 ownCloud 。",
 "ownCloud password reset" => "ownCloud 密碼重設",
 "Use the following link to reset your password: {link}" => "請至以下連結重設您的密碼： {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被放到垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。",
+"Request failed!<br>Did you make sure your email/username was right?" => "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？",
 "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱。",
 "Username" => "使用者名稱",
 "Request reset" => "請求重設",
@@ -123,6 +125,7 @@
 "Database host" => "資料庫主機",
 "Finish setup" => "完成設定",
 "web services under your control" => "由您控制的網路服務",
+"%s is available. Get more information on how to update." => "%s 已經釋出，瞭解更多資訊以進行更新。",
 "Log out" => "登出",
 "Automatic logon rejected!" => "自動登入被拒！",
 "If you did not change your password recently, your account may be compromised!" => "如果您最近並未更改密碼，您的帳號可能已經遭到入侵！",
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 04161925436ec4720ff9f474042dd246bb65b619..a3a8dc5f7ba0c7dd3013bbec3f18b7edadf7cb5d 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -5,7 +5,7 @@
 <!--[if IE 9]><html class="ng-csp ie ie9 lte9"><![endif]-->
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
-	<head>
+	<head data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<title>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="apple-itunes-app" content="app-id=543672169">
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 4dc4a2c7593e42c4af4aabb2afcb0c8d6ccf1e46..6e49149b0ae43491542c34336590bb989f92c3a2 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -5,7 +5,7 @@
 <!--[if IE 9]><html class="ng-csp ie ie9 lte9"><![endif]-->
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
-	<head>
+	<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<title><?php p(!empty($_['application'])?$_['application'].' | ':'') ?>ownCloud
 			<?php p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index e6549742d744f560cecd7cb06c1309252cb56624..a1b17ff718f0f191975c193f3e034da95211c144 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 21d7bba975243fb82a7fc90836f5c99bd0460d59..9c44d57d8fcb6952b9efb30eccde691ed09fb0f6 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Wagwoord"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hulp"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 9442b987a22fe742d220689c45bb183fdb96f6fa..06a57952442a0b22d528e51829efe9f53130547a 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 11080e1536f3de379c7c61c628b7419076689184..0136882b8728fae099564a31af6e39c85a616384 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "فشل في نقل الملف %s - يوجد ملف بنفس هذا ال
 msgid "Could not move %s"
 msgstr "فشل في نقل %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "فشل في اعادة تسمية الملف"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "لم يتم رفع أي ملف , خطأ غير معروف"
@@ -86,7 +82,7 @@ msgstr "شارك"
 msgid "Delete permanently"
 msgstr "حذف بشكل دائم"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "إلغاء"
 
@@ -94,43 +90,43 @@ msgstr "إلغاء"
 msgid "Rename"
 msgstr "إعادة تسميه"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "قيد الانتظار"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} موجود مسبقا"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "استبدال"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "اقترح إسم"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "إلغاء"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "استبدل {new_name}  بـ  {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "تراجع"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "جاري تنفيذ عملية الحذف"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "جاري رفع 1 ملف"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr "مساحتك التخزينية ممتلئة, لا يمكم تحديث 
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "مساحتك التخزينية امتلأت تقريبا "
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "فشل في رفع ملفاتك , إما أنها مجلد أو حجمها 0 بايت"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "تم إلغاء عملية رفع الملفات ."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "عنوان ال URL  لا يجوز أن يكون فارغا."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" محجوز للنظام"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "خطأ"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "اسم"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "مجلد عدد 1"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} مجلدات"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "ملف واحد"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} ملفات"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "فشل في اعادة تسمية الملف"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "رفع"
@@ -279,37 +283,37 @@ msgstr "حذف الملفات"
 msgid "Cancel upload"
 msgstr "إلغاء رفع الملفات"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "لا تملك صلاحيات الكتابة هنا."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "إلغاء مشاركة"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "حجم الترفيع أعلى من المسموح"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "يرجى الانتظار , جاري فحص الملفات ."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "الفحص الحالي"
 
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index 7687fcb5553341b2df4a8d2a581e89cfb42cc421..de67c217d33b3556dce2ab1a23880ff34fc62bc1 100644
--- a/l10n/ar/files_trashbin.po
+++ b/l10n/ar/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 4f9b7f9cb416be259d704e225f1bc53e92b923fa..e0f912c9bab6e7c074675573280ea3001ddc126b 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "تم التحديث بنجاح"
 msgid "Saving..."
 msgstr "جاري الحفظ..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "تم الحذف"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "تراجع"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "تعذر حذف المستخدم"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "مجموعات"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "مدير المجموعة"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "إلغاء"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "اضافة مجموعة"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "يجب ادخال اسم مستخدم صحيح"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "حصل خطأ اثناء انشاء مستخدم"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "يجب ادخال كلمة مرور صحيحة"
 
@@ -328,7 +328,7 @@ msgstr "أقل"
 msgid "Version"
 msgstr "إصدار"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index ede2881fa3a229783f6e824108dd18f39f3382cd..459d3c4da53bfa3ccaa273bd5f9f76a3fa59a7ed 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "خطأ"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "المساعدة"
diff --git a/l10n/be/files.po b/l10n/be/files.po
index a7815f9dfb2b671d5b16a47f8fc3d57a5c609bc5..de9d057f6ad8ca2e0351137561f271797b5ca6c3 100644
--- a/l10n/be/files.po
+++ b/l10n/be/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index b6630ab6f2fdbf22c269dd6f095946b5881ee403..b922f51102f49c601ea0839fcc795e632d011b54 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index eb678223979a198cfc6a63da551b48b91a12200c..7d6092b5f47cb278f35cbf9562473396b5e91b7f 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 6460328a0cea2bece2397fae77c5d45d4673e374..160de033ba5fb52dddf19666708e94d966f31e6b 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr "Споделяне"
 msgid "Delete permanently"
 msgstr "Изтриване завинаги"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -94,43 +90,43 @@ msgstr "Изтриване"
 msgid "Rename"
 msgstr "Преименуване"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Чакащо"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "препокриване"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "отказ"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "възтановяване"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Качването е спряно."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Грешка"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} файла"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Качване"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Спри качването"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Няма нищо тук. Качете нещо."
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Файлът който сте избрали за качване е прекалено голям"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файловете които се опитвате да качите са по-големи от позволеното за сървъра."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Файловете се претърсват, изчакайте."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index a2db650ea73dbc19f1f2eabbcd11f8603abab08e..76a4f6c92688d10bec5719a974f33e404dcfd2f6 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index e6571146d9bbdff2bb855de08878734d4c0e31af..e6d0abbf8598fd50f2409e0a3e5b49720d8e62c3 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Обновено"
 msgid "Saving..."
 msgstr "Записване..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "изтрито"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "възтановяване"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Групи"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Изтриване"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "нова група"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr "По-малко"
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 0c18cd66039a039798c69714bb9672129645511f..0859379edb34647066a9c9b7d3c2adf51abfbca1 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Грешка"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Парола"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Помощ"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 59b3c25b06d9bbb90416086d77a40945ed24231e..ffb1faa6bd9a883afc707686efd513ac60fd6ae2 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index e3b44fed1160fa12fe9d08035364231aff18e8b6..25a098953cf92e260064c85664954ee74d0d814f 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "%s কে স্থানান্তর করা সম্ভব হ
 msgid "Could not move %s"
 msgstr "%s  কে স্থানান্তর করা সম্ভব হলো না"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "ফাইলের নাম পরিবর্তন করা সম্ভব হলো না"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "কোন ফাইল আপলোড করা হয় নি। সমস্যার কারণটি অজ্ঞাত।"
@@ -86,7 +82,7 @@ msgstr "ভাগাভাগি কর"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "মুছে"
 
@@ -94,43 +90,43 @@ msgstr "মুছে"
 msgid "Rename"
 msgstr "পূনঃনামকরণ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "মুলতুবি"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} টি বিদ্যমান"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "প্রতিস্থাপন"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "নাম সুপারিশ করুন"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "বাতিল"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "ক্রিয়া প্রত্যাহার"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "১টি ফাইল আপলোড করা হচ্ছে"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "যথেষ্ঠ পরিমাণ স্থান নেই"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "আপলোড বাতিল করা হয়েছে।"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL ফাঁকা রাখা যাবে না।"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud  এর জন্য সংরক্ষিত।"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "সমস্যা"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "রাম"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "আকার"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "পরিবর্তিত"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "১টি ফোল্ডার"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} টি ফোল্ডার"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "১টি ফাইল"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} টি ফাইল"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "ফাইলের নাম পরিবর্তন করা সম্ভব হলো না"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "আপলোড"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "আপলোড বাতিল কর"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "এখানে কিছুই নেই। কিছু আপলোড করুন !"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "ডাউনলোড"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "ভাগাভাগি বাতিল "
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "আপলোডের আকারটি অনেক বড়"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন "
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "বর্তমান স্ক্যানিং"
 
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index effbaf5571385ac078b4c0ce6fc53a88447cd0e1..01a16157903317756301ac17b8cfcef0d78289e2 100644
--- a/l10n/bn_BD/files_trashbin.po
+++ b/l10n/bn_BD/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 3a1219324736708ac8bef814cf811e4a0be4816a..e0081ad76a21fd8ec4f392f6a145a916f4f3c910 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "সংরক্ষণ করা হচ্ছে.."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "ক্রিয়া প্রত্যাহার"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "গোষ্ঠীসমূহ"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "গোষ্ঠী প্রশাসক"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "মুছে"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr "কম"
 msgid "Version"
 msgstr "ভার্সন"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 782011bb13e7dd847d0abca51c811d69022baa07..470c3d630bbc91d0e7f34a298c5b9432f571daef 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "সমস্যা"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "হোস্ট"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL আবশ্যক  না হলে  আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "ভিত্তি  DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "ব্যবহারকারি  DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. পরিচয় গোপন রেখে অধিগমনের জন্য  DN এবং কূটশব্দটি ফাঁকা রাখুন।"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "কূটশব্দ"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "অজ্ঞাতকুলশীল অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "ব্যবহারকারির প্রবেশ ছাঁকনী"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "প্রবেশের  চেষ্টা করার সময় প্রযোজ্য ছাঁকনীটি নির্ধারণ করবে। প্রবেশের সময় ব্যবহারকারী নামটি %%uid  দিয়ে প্রতিস্থাপিত হবে।"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid স্থানধারক ব্যবহার করুন, উদাহরণঃ  \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "ব্যবহারকারী তালিকা ছাঁকনী"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "ব্যবহারকারী উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "কোন স্থানধারক ব্যতীত, যেমনঃ \"objectClass=person\"।"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "গোষ্ঠী ছাঁকনী"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "গোষ্ঠীসমূহ উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।"
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "কোন স্থান ধারক ব্যতীত, উদাহরণঃ\"objectClass=posixGroup\"।"
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "পোর্ট"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLS ব্যবহার কর"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "বর্ণ অসংবেদী LDAP  সার্ভার (উইন্ডোজ)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "শুধুমাত্র যদি এই বিকল্পটি ব্যবহার করেই সংযোগ কার্যকরী হয় তবে আপনার ownCloud সার্ভারে LDAP সার্ভারের SSL সনদপত্রটি আমদানি করুন।"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "অনুমোদিত নয়, শুধুমাত্র পরীক্ষামূলক ব্যবহারের জন্য।"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।"
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "ব্যবহারকারীর প্রদর্শিতব্য নামের ক্ষেত্র"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "ব্যবহারকারীর ownCloud নাম তৈরি করার জন্য ব্যভহৃত LDAP বৈশিষ্ট্য।"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "ভিত্তি ব্যবহারকারি বৃক্ষাকারে"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "গোষ্ঠীর প্রদর্শিতব্য নামের ক্ষেত্র"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "গোষ্ঠীর ownCloud নাম তৈরি করার জন্য ব্যভহৃত LDAP বৈশিষ্ট্য।"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "ভিত্তি গোষ্ঠী বৃক্ষাকারে"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "গোষ্ঠী-সদস্য সংস্থাপন"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "বাইটে"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "ব্যবহারকারী নামের জন্য ফাঁকা রাখুন (পূর্বনির্ধারিত)। অন্যথায়, LDAP/AD বৈশিষ্ট্য নির্ধারণ করুন।"
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "সহায়িকা"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 5eacd2f6a022bf1f7d896af008305d1cfb61a185..fe0bd380dad289493f24d90a4e81a07322cb99a3 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# rogerc <rcalvoi@yahoo.com>, 2013
+# rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 21:50+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 52940b62b98dd14072fab6a5d9bae61b7ab9d3c7..cf8af961c902da558bb76248c31579d3413068a9 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +28,6 @@ msgstr "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom"
 msgid "Could not move %s"
 msgstr " No s'ha pogut moure %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "No es pot canviar el nom del fitxer"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "No s'ha carregat cap fitxer. Error desconegut"
@@ -86,7 +83,7 @@ msgstr "Comparteix"
 msgid "Delete permanently"
 msgstr "Esborra permanentment"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Esborra"
 
@@ -94,43 +91,43 @@ msgstr "Esborra"
 msgid "Rename"
 msgstr "Reanomena"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pendent"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ja existeix"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "substitueix"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugereix un nom"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancel·la"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "s'ha substituït {old_name} per {new_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desfés"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "executa d'operació d'esborrar"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 fitxer pujant"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "fitxers pujant"
 
@@ -156,69 +153,77 @@ msgstr "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden ac
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "No hi ha prou espai disponible"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancel·lat."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "La URL no pot ser buida"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} carpetes"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} fitxers"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "No es pot canviar el nom del fitxer"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Puja"
@@ -279,37 +284,37 @@ msgstr "Fitxers esborrats"
 msgid "Cancel upload"
 msgstr "Cancel·la la pujada"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "No teniu permisos d'escriptura aquí."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Res per aquí. Pugeu alguna cosa!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "La pujada és massa gran"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "S'estan escanejant els fitxers, espereu"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Actualment escanejant"
 
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index b91a1a13b376497b00115db45e760b5a6bce2e4c..af988ccbae9dec150e115fca93c49b387e52e63d 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index d2c9ab2cd895b07af2ece995dcf24d97f73a4c52..0d6054fa5b6b50777bf47c6142d299b58f03eb97 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# rogerc <rcalvoi@yahoo.com>, 2013
+# rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 02:00+0200\n"
-"PO-Revision-Date: 2013-04-30 21:40+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,44 +125,44 @@ msgstr "Actualitzada"
 msgid "Saving..."
 msgstr "Desant..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "esborrat"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "desfés"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "No s'ha pogut eliminar l'usuari"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grups"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grup Admin"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Esborra"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "afegeix grup"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Heu de facilitar un nom d'usuari vàlid"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Error en crear l'usuari"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Heu de facilitar una contrasenya vàlida"
 
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 91d2f5617cb5362bb075d7a5cec548a5e514d93a..b664c8a830623e55d1f01c605766fa7d8c5d28da 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 11:00+0000\n"
+"Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,10 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Ha fallat en eliminar els mapatges"
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Ha fallat en eliminar la configuració del servidor"
@@ -53,281 +58,363 @@ msgstr "Voleu mantenir la configuració?"
 msgid "Cannot add server configuration"
 msgstr "No es pot afegir la configuració del servidor"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "s'han eliminat els mapatges"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Èxit"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "La prova de connexió ha reeixit"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "La prova de connexió ha fallat"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Voleu eliminar la configuració actual del servidor?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirma l'eliminació"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Avís:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configuració del servidor"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Afegeix la configuració del servidor"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Equip remot"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN Base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Una DN Base per línia"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN Usuari"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Per un accés anònim, deixeu la DN i la contrasenya en blanc."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtre d'inici de sessió d'usuari"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Llista de filtres d'usuari"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Defineix el filtre a aplicar quan es mostren usuaris"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=persona\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtre de grup"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Defineix el filtre a aplicar quan es mostren grups."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Arranjaments de connexió"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuració activa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Si està desmarcat, aquesta configuració s'ometrà."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Màquina de còpia de serguretat (rèplica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Afegiu una màquina de còpia de seguretat opcional. Ha de ser una rèplica del servidor LDAP/AD principal."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Port de la còpia de seguretat (rèplica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desactiva el servidor principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Quan està connectat, ownCloud només es connecta al servidor de la rèplica."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "No ho useu adicionalment per a conexions LDAPS, fallarà."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desactiva la validació de certificat SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "No recomanat, ús només per proves."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Memòria de cau Time-To-Live"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "en segons. Un canvi buidarà la memòria de cau."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Arranjaments de carpetes"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Camp per mostrar el nom d'usuari"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atribut LDAP a usar per generar el nom d'usuari ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Arbre base d'usuaris"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Una DN Base d'Usuari per línia"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributs de cerca d'usuari"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; Un atribut per línia"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Camp per mostrar el nom del grup"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atribut LDAP a usar per generar el nom de grup ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Arbre base de grups"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Una DN Base de Grup per línia"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributs de cerca de grup"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Associació membres-grup"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributs especials"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Camp de quota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota per defecte"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Camp de correu electrònic"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Norma per anomenar la carpeta arrel d'usuari"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nom d'usuari intern"
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr "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)."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Atribut nom d'usuari intern:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Sobrescriu la detecció UUID"
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr "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)."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Atribut UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Mapatge d'usuari Nom d'usuari-LDAP"
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr "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."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Elimina el mapatge d'usuari Nom d'usuari-LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Elimina el mapatge de grup Nom de grup-LDAP"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Comprovació de la configuració"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 275c6f62f9e8759ff8e0b0e00b1ad1fa6c811f5d..48fbe83a662e6b5b2ce26d71f295937f6fdcdeb4 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
-"PO-Revision-Date: 2013-05-02 06:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 4d8a59d8c7949528683509f3edfc32ebe432eaa6..f164d728365d6c1c3687008a5ba0bd5732f0c62f 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Nelze přesunout %s - existuje soubor se stejným názvem"
 msgid "Could not move %s"
 msgstr "Nelze přesunout %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nelze přejmenovat soubor"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Soubor nebyl odeslán. Neznámá chyba"
@@ -86,7 +82,7 @@ msgstr "Sdílet"
 msgid "Delete permanently"
 msgstr "Trvale odstranit"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Smazat"
 
@@ -94,43 +90,43 @@ msgstr "Smazat"
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Nevyřízené"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} již existuje"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "nahradit"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "navrhnout název"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "zrušit"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "nahrazeno {new_name} s {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "zpět"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "provést smazání"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "odesílá se 1 soubor"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "soubory se odesílají"
 
@@ -156,69 +152,77 @@ msgstr "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubo
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Vaše úložiště je téměř plné ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké může to chvíli trvat."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nelze odeslat Váš soubor, protože je to adresář, nebo je jeho velikost 0 bajtů"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nedostatek dostupného místa"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Odesílání zrušeno."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL nemůže být prázdná"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Neplatný název složky. Použití 'Shared' je rezervováno pro vnitřní potřeby Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Chyba"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Název"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Upraveno"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 složka"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} složky"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 soubor"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} soubory"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Nelze přejmenovat soubor"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Odeslat"
@@ -279,37 +283,37 @@ msgstr "Odstraněné soubory"
 msgid "Cancel upload"
 msgstr "Zrušit odesílání"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Nemáte zde práva zápisu."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Žádný obsah. Nahrajte něco."
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Zrušit sdílení"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Odesílaný soubor je příliš velký"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Soubory se prohledávají, prosím čekejte."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Aktuální prohledávání"
 
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index be29385223121fca7348510c9bfd72d21b03508f..ce5f4e645f190e15316a8deb0bbf390f57a48214 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index d0c227483ecf1a4d8b90d4de36e23a70ae0004ae..9af35dfb216e8d9616e6dda2d4956717cd329caf 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Aktualizováno"
 msgid "Saving..."
 msgstr "Ukládám..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "smazáno"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "zpět"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Nelze odebrat uživatele"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Skupiny"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Správa skupiny"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Smazat"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "přidat skupinu"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Musíte zadat platné uživatelské jméno"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Chyba při vytváření užiatele"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Musíte zadat platné heslo"
 
@@ -328,7 +328,7 @@ msgstr "Méně"
 msgid "Version"
 msgstr "Verze"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index ef1a936b3d155ace23d0fcedcdd3d2a7eb4f6ae6..70baa024a098015384176b2ce130aa9577d8bad2 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Selhalo smazání nastavení serveru"
@@ -53,281 +57,363 @@ msgstr "Ponechat nastavení?"
 msgid "Cannot add server configuration"
 msgstr "Nelze přidat nastavení serveru"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Úspěch"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Chyba"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Test spojení byl úspěšný"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Test spojení selhal"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Opravdu si přejete smazat současné nastavení serveru?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Potvrdit smazání"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Varování:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibilní. Může nastávat neočekávané chování. Požádejte, prosím, správce systému aby jednu z nich zakázal."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému aby jej nainstaloval."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Nastavení serveru"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Přidat nastavení serveru"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Počítač"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Základní DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Jedna základní DN na řádku"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Uživatelské DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "DN klentského uživatele ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte údaje DN and Heslo prázdné."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Pro anonymní přístup, ponechte údaje DN and heslo prázdné."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtr přihlášení uživatelů"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "použijte zástupný vzor %%uid, např. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtr uživatelských seznamů"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Určuje použitý filtr, pro získávaní uživatelů."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez zástupných znaků, např. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtr skupin"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Určuje použitý filtr, pro získávaní skupin."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez zástupných znaků, např. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Nastavení spojení"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Nastavení aktivní"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Pokud není zaškrtnuto, bude nastavení přeskočeno."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Záložní (kopie) hostitel"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Zadejte volitelného záložního hostitele. Musí to být kopie hlavního serveru LDAP/AD."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Záložní (kopie) port"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Zakázat hlavní serveru"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Při zapnutí se ownCloud připojí pouze k záložnímu serveru"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Použít TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Nepoužívejte pro spojení LDAP, selže."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server nerozlišující velikost znaků (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Vypnout ověřování SSL certifikátu."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Pokud připojení pracuje pouze s touto možností, tak importujte SSL certifikát SSL serveru do Vašeho serveru ownCloud"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Není doporučeno, pouze pro testovací účely."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "TTL vyrovnávací paměti"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "ve vteřinách. Změna vyprázdní vyrovnávací paměť."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Nastavení adresáře"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Pole pro zobrazované jméno uživatele"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atribut LDAP použitý k vytvoření jména uživatele ownCloud"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Základní uživatelský strom"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Jedna uživatelská základní DN na řádku"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributy vyhledávání uživatelů"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Volitelné, atribut na řádku"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Pole pro zobrazení jména skupiny"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atribut LDAP použitý k vytvoření jména skupiny ownCloud"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Základní skupinový strom"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Jedna skupinová základní DN na řádku"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributy vyhledávání skupin"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Asociace člena skupiny"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Speciální atributy"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Pole pro kvótu"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Výchozí kvóta"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "v bajtech"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Pole e-mailu"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Pravidlo pojmenování domovské složky uživatele"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Vyzkoušet nastavení"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Nápověda"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 2d3c304cc330330740d2b734674bf1bd0c99de64..2afb7a5ea8e8c7a5fc2255b3b905bf22cd0f7096 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 15:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 7fa36284862cadb9237dae17886dab88a855c443..32f11d2044621816e542f6d44f1736a4c05752ad 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 14:43+0000\n"
-"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +27,6 @@ msgstr "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli"
 msgid "Could not move %s"
 msgstr "Methwyd symud %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Methu ailenwi ffeil"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ni lwythwyd ffeil i fyny. Gwall anhysbys."
@@ -94,43 +90,43 @@ msgstr "Dileu"
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "I ddod"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} yn bodoli'n barod"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "amnewid"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "awgrymu enw"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "diddymu"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "newidiwyd {new_name} yn lle {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "dadwneud"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "cyflawni gweithred dileu"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 ffeil yn llwytho i fyny"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "ffeiliau'n llwytho i fyny"
 
@@ -219,6 +215,14 @@ msgstr "1 ffeil"
 msgid "{count} files"
 msgstr "{count} ffeil"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Methu ailenwi ffeil"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Llwytho i fyny"
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index 675605ebaf8438cd0b6d2957e1d3db6e435a588c..e1cc6bccb954455f199e1543cc0808d8c7369d86 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 14:48+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index bb6e0180eb05d7ebb3869f0dc1d71d850c8a8676..3d0b6fb4d4f54b9a22d5611356bf6fdbac62f446 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 02:00+0200\n"
-"PO-Revision-Date: 2013-04-30 15:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "Yn cadw..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "dadwneud"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grwpiau"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Dileu"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 2c054ee18927d5545db2004eded647f18036f313..193441f938a93310a92d06ff15479ebe80176723 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Gwall"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Cymorth"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 5d4fa6016a7a31cffc72ee80f20dff6893b22aaf..a7b1bd9925c16c6546f0cf501c0b78a66d1cc975 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 7c3fb5f5a276204d83213d0e148ee1662b309250..36c60585d27b8372225c43dfdcdd175fe8ce6575 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Kunne ikke flytte %s - der findes allerede en fil med dette navn"
 msgid "Could not move %s"
 msgstr "Kunne ikke flytte %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Kunne ikke omdøbe fil"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil blev uploadet. Ukendt fejl."
@@ -86,7 +82,7 @@ msgstr "Del"
 msgid "Delete permanently"
 msgstr "Slet permanent"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Slet"
 
@@ -94,43 +90,43 @@ msgstr "Slet"
 msgid "Rename"
 msgstr "Omdøb"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} eksisterer allerede"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "erstat"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "foreslå navn"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "fortryd"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstattede {new_name} med {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "fortryd"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "udfør slet operation"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 fil uploades"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "uploader filer"
 
@@ -156,69 +152,77 @@ msgstr "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkron
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "ikke nok tilgængelig ledig plads "
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URLen kan ikke være tom."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Fejl"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} filer"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Kunne ikke omdøbe fil"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Upload"
@@ -279,37 +283,37 @@ msgstr "Slettede filer"
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Du har ikke skriverettigheder her."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Her er tomt. Upload noget!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Upload er for stor"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Filerne bliver indlæst, vent venligst."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Indlæser"
 
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index cad9f8798d8463102f4def051e686605f30e3a62..05219a3d197831822e6c6479dd1ae1f4a8cf1a76 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index a81909c3c7c09e2b864ab5b3f2ead54bfe403830..0d668d9af378d4ae8ecf7bc955ea093c8084708f 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-05-01 13:50+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Opdateret"
 msgid "Saving..."
 msgstr "Gemmer..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "Slettet"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "fortryd"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Kan ikke fjerne bruger"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppe Administrator"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Slet"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "Tilføj gruppe"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Et gyldigt brugernavn skal angives"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Fejl ved oprettelse af bruger"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "En gyldig adgangskode skal angives"
 
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index ed3dbcd50a30f8861c80fa9d2df614896da83ea5..0d1223e9653659932a72b0d2b2559ab4bc8c9850 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Succes"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fejl"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "You can specify Base DN for users and groups in the Advanced tab"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Bruger DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "For anonym adgang, skal du lade DN og Adgangskode tomme."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Bruger Login Filter"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Brugerliste Filter"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definere filteret der bruges ved indlæsning af brugere."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Gruppe Filter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definere filteret der bruges når der indlæses grupper."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Brug TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Deaktiver SSL certifikat validering"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Anbefales ikke, brug kun for at teste."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "User Display Name Field"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Base Bruger Træ"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hjælp"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 2057a46835cefff2078ff8d9d61e3a5b761bace8..dbe7d0f5ad512fed0377f6498297767b1f9ccdb8 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -268,7 +270,7 @@ msgstr "Fehler beim Teilen"
 
 #: js/share.js:136
 msgid "Error while unsharing"
-msgstr "Fehler beim Aufheben der Teilung"
+msgstr "Fehler beim Aufheben der Freigabe"
 
 #: js/share.js:143
 msgid "Error while changing permissions"
@@ -364,7 +366,7 @@ msgstr "Durch ein Passwort geschützt"
 
 #: js/share.js:577
 msgid "Error unsetting expiration date"
-msgstr "Fehler beim entfernen des Ablaufdatums"
+msgstr "Fehler beim Entfernen des Ablaufdatums"
 
 #: js/share.js:589
 msgid "Error setting expiration date"
@@ -383,11 +385,11 @@ msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
+msgstr "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
+msgstr "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet."
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
@@ -402,7 +404,7 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden.<br>Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist frage Deinen lokalen Administrator."
+msgstr "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden.<br>Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
@@ -484,7 +486,7 @@ msgstr "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angrei
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Bitte bringe deine PHP Installation auf den neuesten Stand, um ownCloud sicher nutzen zu können."
+msgstr "Bitte bringe Deine PHP Installation auf den neuesten Stand, um ownCloud sicher nutzen zu können."
 
 #: templates/installation.php:32
 msgid ""
@@ -502,14 +504,14 @@ msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage di
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr "Dein Datenverzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
+msgstr "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
 
 #: templates/installation.php:40
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
 "target=\"_blank\">documentation</a>."
-msgstr "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Sie Ihren Server konfigurieren."
+msgstr "Bitte ließ die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Du Deinen Server konfigurierst."
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
@@ -564,7 +566,7 @@ msgstr "Web-Services unter Deiner Kontrolle"
 #: templates/layout.user.php:36
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
 
 #: templates/layout.user.php:61
 msgid "Log out"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 19a6349e68c46070be422743c03e42fdf374f775..2a33c07223709ffe0f03bdc55565ea6b7339fe84 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,16 +21,12 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "%s konnte nicht verschoben werden - eine Datei mit diesem Namen existiert bereits."
+msgstr "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr "%s konnte nicht verschoben werden"
-
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Die Datei konnte nicht umbenannt werden"
+msgstr "Konnte %s nicht verschieben"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
@@ -37,7 +34,7 @@ msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich übertragen."
+msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
 
 #: ajax/upload.php:27
 msgid ""
@@ -68,7 +65,7 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr "Nicht genug Speicherplatz verfügbar"
+msgstr "Nicht genug Speicher vorhanden."
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
@@ -86,7 +83,7 @@ msgstr "Teilen"
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Löschen"
 
@@ -94,43 +91,43 @@ msgstr "Löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr "Name vorschlagen"
+msgstr "Namen vorschlagen"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} ersetzt durch {new_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Löschvorgang ausführen"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
-msgstr "Eine Datei wird hoch geladen"
+msgstr "1 Datei wird hochgeladen"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -150,75 +147,83 @@ msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Ihr Speicherplatz ist voll, Dateien können nicht mehr aktualisiert oder synchronisiert werden!"
+msgstr "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Ihr Speicherplatz ist fast aufgebraucht ({usedSpacePercent}%)"
+msgstr "Dein Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist."
+msgstr "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nicht genug Speicherplatz verfügbar"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Fehler"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} Dateien"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Konnte Datei nicht umbenennen"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Hochladen"
@@ -279,37 +284,37 @@ msgstr "Gelöschte Dateien"
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr "Du besitzt hier keine Schreib-Berechtigung."
+msgstr "Du hast hier keine Schreib-Berechtigung."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lade etwas hoch!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
-msgstr "Download"
+msgstr "Herunterladen"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Scanne"
 
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index d3f07f05c78b997edb951958c4e282440199ff10..caaaa81d2b36575e20a96696cd7819478d4c7e4e 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 21:54+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index b6255cd3ef1acd0393938c9f1f13d92d9a50d904..aaa2995382cbb8fa8d8dffd97cbed44a2666c413 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 15:10+0000\n"
-"Last-Translator: arkascha <foss@christian-reiner.info>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 21:55+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 77148131a15dbcd314976fd352f44ce1f567e518..3b551c20312333770f296fb63b9b57316848405a 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-09 19:50+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index 3a8c59bd0223dc9674bafa9d167683f79d905dce..fb1fdac41420de74325502891698719d19484df2 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index e0fd8f7fa64d192652bc337f18ad42ac1bdb1d90..921aba68c41dc4a0a3e50d5f30c8439e6673cca2 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 21:59+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 4fc5815b165c2aada14962b0fb94fa574382269b..417ce173f3e59415b3d5f5c0eb34ab4029c94d31 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-12 02:02+0200\n"
+"PO-Revision-Date: 2013-05-06 22:00+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,19 +42,19 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Administration"
 
-#: files.php:209
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:210
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: files.php:241
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
 
@@ -181,7 +182,7 @@ msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil d
 #: setup.php:859
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
+msgstr "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>."
 
 #: template.php:113
 msgid "seconds ago"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 43ac32ddf2ec2f483ec97d22dadca8de785225a4..d161a392cc8c8012d1ed39b4375934e4768acd98 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 06:30+0000\n"
-"Last-Translator: arkascha <foss@christian-reiner.info>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,44 +126,44 @@ msgstr "Aktualisiert"
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "gelöscht"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "Gruppe hinzufügen"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Es muss ein gültiger Benutzername angegeben werden"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
@@ -232,7 +233,7 @@ msgid ""
 "remote and sending of notification emails might also not work. We suggest to"
 " enable internet connection for this server if you want to have all features"
 " of ownCloud."
-msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Du alle Funktionen von ownCloud nutzen möchtest."
+msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren, wenn Du alle Funktionen von ownCloud nutzen möchtest."
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -264,31 +265,31 @@ msgstr "Aktiviere Sharing-API"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr "Erlaube Apps die Nutzung der Share-API"
+msgstr "Erlaubt Apps die Nutzung der Share-API"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr "Erlaube Links"
+msgstr "Erlaubt Links"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr "Erlaube Benutzern, Inhalte über öffentliche Links zu teilen"
+msgstr "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr "Erlaube erneutes Teilen"
+msgstr "Erlaubt erneutes Teilen"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr "Erlaube Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
+msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr "Erlaube Benutzern, mit jedem zu teilen"
+msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr "Erlaube Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
+msgstr "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
 
 #: templates/admin.php:168
 msgid "Security"
@@ -307,7 +308,7 @@ msgstr "Erzwingt die Verwendung einer verschlüsselten Verbindung"
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr "Bitte verbinden Sie sich über eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu ändern"
+msgstr "Bitte verbinde Dich über eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu ändern"
 
 #: templates/admin.php:195
 msgid "Log"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 008eb03bc4dc764a61aed55b8af17c2f4b36adc0..be5f6d9eb1be7dda6a4ab75dbc9ce4e653f9a9d7 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,25 +18,29 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Löschen der Serverkonfiguration fehlgeschlagen"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr "Die Konfiguration war erfolgreich, die Verbindung konnte hergestellt werden!"
+msgstr "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!"
 
 #: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen."
+msgstr "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfe die Servereinstellungen und Anmeldeinformationen."
 
 #: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr "Die Konfiguration ist ungültig, bitte sehen Sie für weitere Details im ownCloud Log nach"
+msgstr "Die Konfiguration ist ungültig, sieh für weitere Details bitte im ownCloud Log nach"
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -51,283 +56,365 @@ msgstr "Einstellungen beibehalten?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr "Serverkonfiguration konnte nicht hinzugefügt werden."
+msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:112
+msgid "Success"
+msgstr "Erfolgreich"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fehler"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Verbindungstest erfolgreich"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Verbindungstest fehlgeschlagen"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr "Wollen Sie die aktuelle Serverkonfiguration wirklich löschen?"
+msgstr "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Löschung bestätigen"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
-msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren."
+msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Serverkonfiguration"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Serverkonfiguration hinzufügen"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Basis-DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr "Ein Base DN pro Zeile"
+msgstr "Ein Basis-DN pro Zeile"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Benutzer-DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Lasse die Felder von DN und Passwort für anonymen Zugang leer."
+msgstr "Lasse die Felder DN und Passwort für anonymen Zugang leer."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Benutzer-Login-Filter"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
+msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiert den Filter für die Anfrage der Benutzer."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiert den Filter für die Anfrage der Gruppen."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Konfiguration wird übersprungen wenn deaktiviert"
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Backup Host (Kopie)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Backup Port"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Nutze TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Schalte die SSL-Zertifikatsprüfung aus."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nicht empfohlen, nur zu Testzwecken."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Speichere Time-To-Live zwischen"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Ordnereinstellungen"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Feld für den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr "Ein Benutzer Base DN pro Zeile"
+msgstr "Ein Benutzer Basis-DN pro Zeile"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Benutzersucheigenschaften"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
-msgstr "Optional; eine Eigenschaft pro Zeile"
+msgstr "Optional; ein Attribut pro Zeile"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Feld für den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr "Ein Gruppen Base DN pro Zeile"
+msgstr "Ein Gruppen Basis-DN pro Zeile"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Gruppensucheigenschaften"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Kontingent Feld"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Standard Kontingent"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "E-Mail Feld"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Testkonfiguration"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 46673041ec1b99db1ac365b7c4d8f7156cd04e38..f6939d83e5ea522daf42898f2f4220728ceb1c68 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -4,14 +4,16 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 16:00+0000\n"
-"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -212,7 +214,7 @@ msgstr "Letztes Jahr"
 
 #: js/js.js:730
 msgid "years ago"
-msgstr "Vor  Jahren"
+msgstr "Vor Jahren"
 
 #: js/oc-dialogs.js:117 js/oc-dialogs.js:247
 msgid "Ok"
@@ -269,7 +271,7 @@ msgstr "Fehler beim Teilen"
 
 #: js/share.js:136
 msgid "Error while unsharing"
-msgstr "Fehler bei der Aufhebung der Teilung"
+msgstr "Fehler beim Aufheben der Freigabe"
 
 #: js/share.js:143
 msgid "Error while changing permissions"
@@ -403,7 +405,7 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer sinnvollen Zeitspanne erhalten prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist fragen Sie Ihren lokalen Administrator."
+msgstr "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
@@ -420,7 +422,7 @@ msgstr "Benutzername"
 
 #: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
-msgstr "Zurücksetzung beantragen"
+msgstr "Zurücksetzung anfordern"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
@@ -565,7 +567,7 @@ msgstr "Web-Services unter Ihrer Kontrolle"
 #: templates/layout.user.php:36
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr "%s ist nicht verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
+msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
 
 #: templates/layout.user.php:61
 msgid "Log out"
@@ -573,7 +575,7 @@ msgstr "Abmelden"
 
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr "Automatische Anmeldung verweigert."
+msgstr "Automatische Anmeldung verweigert!"
 
 #: templates/login.php:10
 msgid ""
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 54713d059609de9e3f0bec74ce6004e7e73a2d17..9dc61128593c3da89eeb4ea37e3015b50d04739b 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -3,13 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 20:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,28 +30,24 @@ msgstr "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert berei
 msgid "Could not move %s"
 msgstr "Konnte %s nicht verschieben"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Konnte Datei nicht umbenennen"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Es sind keine Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
+msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
 
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in der php.ini:"
+msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini"
 
 #: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist"
+msgstr "Die Datei ist größer, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
@@ -60,7 +59,7 @@ msgstr "Keine Datei konnte übertragen werden."
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Der temporäre Ordner fehlt."
+msgstr "Kein temporärer Ordner vorhanden"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -94,43 +93,43 @@ msgstr "Löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr "Einen Namen vorschlagen"
+msgstr "Namen vorschlagen"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr "führe das Löschen aus"
+msgstr "Löschvorgang ausführen"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 Datei wird hochgeladen"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -146,11 +145,11 @@ msgstr "Der Dateiname darf nicht leer sein."
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr "Ungültiger Name! Die Zeichen '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
+msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Ihr Speicher ist voll. Daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
+msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
@@ -160,7 +159,7 @@ msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien einen Moment dauern."
+msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
 #: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
@@ -177,7 +176,7 @@ msgstr "Upload abgebrochen."
 #: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
+msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
 
 #: js/files.js:486
 msgid "URL cannot be empty."
@@ -201,7 +200,7 @@ msgstr "Größe"
 
 #: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "Bearbeitet"
+msgstr "Geändert"
 
 #: js/files.js:898
 msgid "1 folder"
@@ -219,6 +218,14 @@ msgstr "1 Datei"
 msgid "{count} files"
 msgstr "{count} Dateien"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Konnte Datei nicht umbenennen"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Hochladen"
@@ -285,7 +292,7 @@ msgstr "Sie haben hier keine Schreib-Berechtigungen."
 
 #: templates/index.php:61
 msgid "Nothing in here. Upload something!"
-msgstr "Alles leer. Bitte laden Sie etwas hoch!"
+msgstr "Alles leer. Laden Sie etwas hoch!"
 
 #: templates/index.php:75
 msgid "Download"
@@ -315,4 +322,4 @@ msgstr "Scanne"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Aktualisiere den Dateisystem-Cache..."
+msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index ef17e7de8fc722639f58d4d78744569ed887b0c9..6630efe37753be7a36e869471a2b504c0d4ef90d 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 21:54+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 39812499d98bc25e204a6bc90baa39061c14b037..7646967a4f957c2828e646601db79345735245f3 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 15:10+0000\n"
-"Last-Translator: arkascha <foss@christian-reiner.info>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 22:00+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -113,7 +114,7 @@ msgstr "Externen Speicher für Benutzer aktivieren"
 
 #: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
-msgstr "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden"
+msgstr "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden"
 
 #: templates/settings.php:141
 msgid "SSL root certificates"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 1c1c9d6020a5ce2765c3615e1bdb8d13580ae90c..5a9782beebe32d34baaae908c750cf85aeb63025 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 21:57+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index 2e9654699e6e1e4a468b409587577f81c9ae2005..4cdafce67390f593073a3402d821a9dcf1edd804 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index bfad776e8e5fea5c13d3eba1300173a7b09706c5..bcbe6b91ad29f65d4d78a24f1617c7d2fe532811 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-12 02:02+0200\n"
+"PO-Revision-Date: 2013-05-06 21:53+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,19 +41,19 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:209
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:210
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: files.php:241
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
 
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 983e3752d453dd26f867c17b794dac5b91c1bb0f..860895432a1711963ac7780e6282033c2f534f08 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
 # arkascha <foss@christian-reiner.info>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 06:40+0000\n"
-"Last-Translator: arkascha <foss@christian-reiner.info>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,44 +127,44 @@ msgstr "Aktualisiert"
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "gelöscht"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Der Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "Gruppe hinzufügen"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Es muss ein gültiger Benutzername angegeben werden"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
@@ -222,7 +224,7 @@ msgstr "Dieser ownCloud-Server kann die Ländereinstellung nicht auf %s ändern.
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr "Keine Netzwerkverbindung"
+msgstr "Keine Internetverbindung"
 
 #: templates/admin.php:78
 msgid ""
@@ -276,7 +278,7 @@ msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr "Erlaube weiterverteilen"
+msgstr "Erlaube Weiterverteilen"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
@@ -284,11 +286,11 @@ msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr "Erlaube Benutzern, mit jedem zu teilen"
+msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr "Erlaube Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
+msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
 
 #: templates/admin.php:168
 msgid "Security"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 2d41e90563d7bdc23cf28c6078d0170c683686d8..c0780d51b8e61add3dd68ceafe082eb2a660279e 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
+"PO-Revision-Date: 2013-05-18 22:00+0000\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,9 +19,13 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr "Das Löschen der Server-Konfiguration schlug fehl"
+msgstr "Löschen der Serverkonfiguration fehlgeschlagen"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
@@ -29,13 +35,13 @@ msgstr "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werd
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr "Die Konfiguration ist gültig, aber das Herstellen der Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate."
+msgstr "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen."
 
 #: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr "Die Konfiguration ist ungültig. Weitere Details können Sie im ownCloud-Log nachlesen."
+msgstr "Die Konfiguration ist ungültig, sehen Sie für weitere Details bitte im ownCloud Log nach"
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -43,291 +49,373 @@ msgstr "Löschen fehlgeschlagen"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr "Sollen die Einstellungen der letzten Serverkonfiguration übernommen werden?"
+msgstr "Einstellungen von letzter Konfiguration übernehmen?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr "Einstellungen behalten?"
+msgstr "Einstellungen beibehalten?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
 msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Erfolg"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fehler"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Verbindungstest erfolgreich"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Verbindungstest fehlgeschlagen"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr "Möchten Sie die Serverkonfiguration wirklich löschen?"
+msgstr "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Löschung bestätigen"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
-msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren."
+msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Serverkonfiguration"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Serverkonfiguration hinzufügen"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Basis-DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr "Ein Base DN pro Zeile"
+msgstr "Ein Basis-DN pro Zeile"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Benutzer-DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Lassen Sie die Felder von DN und Passwort für einen anonymen Zugang leer."
+msgstr "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Benutzer-Login-Filter"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
+msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiert den Filter für die Anfrage der Benutzer."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiert den Filter für die Anfrage der Gruppen."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Wenn nicht angehakt, wird diese Konfiguration übersprungen."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr "Back-Up (Replikation) Host"
+msgstr "Backup Host (Kopie)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr "Geben Sie einen optionalen Backup-Host an. Es muss ein Replikat des Haupt-LDAP/AD Servers sein."
+msgstr "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr "Back-Up (Replikation) Port"
+msgstr "Backup Port"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Wenn eingeschaltet, wird sich die ownCloud nur mit dem Replikat-Server verbinden."
+msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
-msgstr "Benutze TLS"
+msgstr "Nutze TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nicht empfohlen, nur zu Testzwecken."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Speichere Time-To-Live zwischen"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
-msgstr "Verzeichniseinstellungen"
+msgstr "Ordnereinstellungen"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Feld für den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr "Ein Benutzer Base DN pro Zeile"
+msgstr "Ein Benutzer Basis-DN pro Zeile"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr "Eigenschaften der Benutzer-Suche"
+msgstr "Benutzersucheigenschaften"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Optional; ein Attribut pro Zeile"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Feld für den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr "Ein Gruppen Base DN pro Zeile"
+msgstr "Ein Gruppen Basis-DN pro Zeile"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr "Eigenschaften der Gruppen-Suche"
+msgstr "Gruppensucheigenschaften"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
-msgstr "Besondere Eigenschaften"
+msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Kontingent-Feld"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Standard-Kontingent"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "E-Mail-Feld"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Interner Benutzername"
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Testkonfiguration"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index e5c54f4c71df8a48c2991ea37d11e5fc602678e5..adff3efe96089693b3de849453258982ffeae027 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index d411ad2cbc122c102f59005705217e5432b3b590..78423ef92849271ddc14ef062f4733c6885ccfd7 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Αδυναμία μετακίνησης του %s - υπάρχει ήδ
 msgid "Could not move %s"
 msgstr "Αδυναμία μετακίνησης του %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Αδυναμία μετονομασίας αρχείου"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
@@ -86,7 +82,7 @@ msgstr "Διαμοιρασμός"
 msgid "Delete permanently"
 msgstr "Μόνιμη διαγραφή"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -94,43 +90,43 @@ msgstr "Διαγραφή"
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Εκκρεμεί"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} υπάρχει ήδη"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "αντικατέστησε"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "συνιστώμενο όνομα"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ακύρωση"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "αναίρεση"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "εκτέλεση της διαδικασίας διαγραφής"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 αρχείο ανεβαίνει"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "αρχεία ανεβαίνουν"
 
@@ -156,69 +152,77 @@ msgstr "Ο αποθηκευτικός σας χώρος είναι γεμάτο
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Η αποστολή ακυρώθηκε."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Η URL δεν μπορεί να είναι κενή."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 φάκελος"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} φάκελοι"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 αρχείο"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} αρχεία"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Αδυναμία μετονομασίας αρχείου"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Μεταφόρτωση"
@@ -279,37 +283,37 @@ msgstr "Διαγραμμένα αρχεία"
 msgid "Cancel upload"
 msgstr "Ακύρωση αποστολής"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Δεν έχετε δικαιώματα εγγραφής εδώ."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Σταμάτημα διαμοιρασμού"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Πολύ μεγάλο αρχείο προς αποστολή"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Τρέχουσα ανίχνευση"
 
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index e4bef56ec1d43589e142f08b428a3d15889dac2e..05b9266f9e1379c19c0967488532694cbd2f17eb 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 120f0a31d12b3828a90af77c4226a1655c798c56..9103a1e0fc4ca310b1aef01353362d04d7c834fe 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 17:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Ενημερώθηκε"
 msgid "Saving..."
 msgstr "Γίνεται αποθήκευση..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "διαγράφηκε"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "αναίρεση"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Αδυναμία αφαίρεση χρήστη"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Ομάδα Διαχειριστών"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "προσθήκη ομάδας"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Πρέπει να δοθεί έγκυρο όνομα χρήστη"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Σφάλμα δημιουργίας χρήστη"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
 
@@ -329,7 +329,7 @@ msgstr "Λιγότερα"
 msgid "Version"
 msgstr "Έκδοση"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 8b6e529e851592506e451bb2df53aa837857a753..815d1c8291e150b207eb770e1a02a4b0d41babf2 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Αποτυχία διαγραφής ρυθμίσεων διακομιστή"
@@ -53,281 +57,363 @@ msgstr "Διατήρηση ρυθμίσεων;"
 msgid "Cannot add server configuration"
 msgstr "Αδυναμία προσθήκης ρυθμίσεων διακομιστή"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Επιτυχία"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Επιτυχημένη δοκιμαστική σύνδεση"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Αποτυχημένη δοκιμαστική σύνδεσης."
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Επιβεβαίωση Διαγραφής"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Προσοχή:</b> Το άρθρωμα PHP LDAP δεν είναι εγκατεστημένο και το σύστημα υποστήριξης δεν θα δουλέψει. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να το εγκαταστήσει."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Ρυθμίσεις Διακομιστή"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Προσθήκη Ρυθμίσεων Διακομιστή"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Διακομιστής"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Ένα DN Βάσης ανά γραμμή "
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "User Login Filter"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. "
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "User List Filter"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Group Filter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Ρυθμίσεις Σύνδεσης"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Ενεργοποιηση ρυθμισεων"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Όταν δεν είναι επιλεγμένο, αυτή η ρύθμιση θα πρέπει να παραλειφθεί. "
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Θύρα"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Δημιουργία αντιγράφων ασφαλείας (Replica) Host "
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Δώστε μια προαιρετική εφεδρική υποδοχή. Πρέπει να είναι ένα αντίγραφο του κύριου LDAP / AD διακομιστη."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Απενεργοποιηση του κεντρικου διακομιστη"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Όταν ενεργοποιηθεί, με το ownCloud θα συνδεθείτε με το διακομιστή ρεπλίκα."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Χρήση TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Μην το χρησιμοποιήσετε επιπροσθέτως, για LDAPS συνδέσεις , θα αποτύχει."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Δεν προτείνεται, χρήση μόνο για δοκιμές."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Cache Time-To-Live"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Ρυθμίσεις Καταλόγου"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Πεδίο Ονόματος Χρήστη"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Base User Tree"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Ένα DN βάσης χρηστών ανά γραμμή"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Χαρακτηριστικά αναζήτησης των χρηστών "
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Προαιρετικά? Ένα χαρακτηριστικό ανά γραμμή "
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Group Display Name Field"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος ομάδας του ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Μια ομαδικη Βάση DN ανά γραμμή"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Ομάδα Χαρακτηριστικων Αναζήτηση"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Ειδικά Χαρακτηριστικά "
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Ποσοσταση πεδιου"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Προκαθισμενο πεδιο"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "σε bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Email τυπος"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Χρήστης Προσωπικόςφάκελος Ονομασία Κανόνας "
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Δοκιμαστικες ρυθμισεις"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Βοήθεια"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 31acce82fea96472466934f31861b3a7442948a1..48961fc2a5891783181dfa48dfac096c081e11bd 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 18:51+0000\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-04 04:00+0000\n"
 "Last-Translator: lhpalacio <luizhenrique_gomespalacio@hotmail.com>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "User %s shared a file with you"
 
 #: ajax/share.php:99
 #, php-format
@@ -559,7 +559,7 @@ msgstr ""
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr ""
+msgstr "web services under your control"
 
 #: templates/layout.user.php:36
 #, php-format
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index 5990ec2d715052162ce3d07b78246c2117e6d21b..754680e81f53a1c944a1f4d93269ab2ffc4c7506 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -219,6 +215,14 @@ msgstr ""
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -289,7 +293,7 @@ msgstr ""
 
 #: templates/index.php:75
 msgid "Download"
-msgstr ""
+msgstr "Download"
 
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index 0256b0cd29623acb1cc60e6cef508dd25acfb108..b60b2651147884c077bcfbc712262119ddd1dd3f 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 18:51+0000\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-04 04:00+0000\n"
 "Last-Translator: lhpalacio <luizhenrique_gomespalacio@hotmail.com>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -24,26 +24,26 @@ msgstr "Secret Code"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Submit"
 
 #: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s shared the folder %s with you"
 
 #: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s shared the file %s with you"
 
 #: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr ""
+msgstr "Download"
 
 #: templates/public.php:40
 msgid "No preview available for"
-msgstr ""
+msgstr "No preview available for"
 
 #: templates/public.php:50
 msgid "web services under your control"
-msgstr ""
+msgstr "web services under your control"
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index 084c4ad5eddb318c766bc7f86e1c49b56a8b8def..9e9a16cb2c425edbaaed74dda0210ace77a3bad2 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Passcode"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index e012849caa0279cfbd10d232027509b3fcb6222a..3fc75e611031b7ae13a2db98d256a267ec7c6aea 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 8321aacc672a7ccf60fb0552b8436b442ebfa559..bc5988ea85f1b079ab9612aec0d1461a7b72fa4e 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas"
 msgid "Could not move %s"
 msgstr "Ne eblis movi %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Ne eblis alinomigi dosieron"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
@@ -86,7 +82,7 @@ msgstr "Kunhavigi"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Forigi"
 
@@ -94,43 +90,43 @@ msgstr "Forigi"
 msgid "Rename"
 msgstr "Alinomigi"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} jam ekzistas"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "anstataÅ­igi"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugesti nomon"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "nuligi"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "anstataŭiĝis {new_name} per {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "malfari"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 dosiero estas alŝutata"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "dosieroj estas alŝutataj"
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Ne haveblas sufiĉa spaco"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "La alŝuto nuliĝis."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL ne povas esti malplena."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Eraro"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 dosierujo"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} dosierujoj"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 dosiero"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} dosierujoj"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Ne eblis alinomigi dosieron"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Alŝuti"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Nuligi alŝuton"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nenio estas ĉi tie. Alŝutu ion!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Alŝuto tro larĝa"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Dosieroj estas skanataj, bonvolu atendi."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Nuna skano"
 
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index df836da8a10b3529f6a676e8983021c74e2c8c0d..edd0e86b304f102abddab1ac1517cf5772773058 100644
--- a/l10n/eo/files_trashbin.po
+++ b/l10n/eo/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 24fba7f1cbd40a0b5020a858b4420770bd84c4fc..5103daa9313d09638bd55d8a9f81257ce991995d 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "Konservante..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "forigita"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "malfari"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupoj"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupadministranto"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Forigi"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr "Malpli"
 msgid "Version"
 msgstr "Eldono"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 6a84048239c79a1ee871a14a4014544c465b0f96..2a5527f375c60f57254cc959c24cc1c46161ec6a 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sukceso"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Eraro"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Gastigo"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Bazo-DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Uzanto-DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtrilo de uzantensaluto"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Äœi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataÅ­igas la uzantonomon en la ensaluta ago."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtrilo de uzantolisto"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtrilo de grupo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Pordo"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Uzi TLS-on"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se la konekto nur funkcias kun ĉi tiu malnepro, enportu la SSL-atestilo de la LDAP-servilo en via ownCloud-servilo."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Ne rekomendata, uzu ĝin nur por testoj."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Kampo de vidignomo de uzanto"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Baza uzantarbo"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Kampo de vidignomo de grupo"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Baza gruparbo"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Asocio de grupo kaj membro"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "duumoke"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lasu malplena por uzantonomo (defaÅ­lto). Alie, specifu LDAP/AD-atributon."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Helpo"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 1a4b035d22c6332c5688ede7f182b8fdf6aac621..7e587eed777e1defe11907b7fadde8f57d8abe5d 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ggam <ggam@brainleakage.com>, 2013
 # msoko <sokolovitch@yahoo.com>, 2013
 # iGerli <stefano@aerosoles.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 11:30+0000\n"
-"Last-Translator: iGerli <stefano@aerosoles.net>\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 23:10+0000\n"
+"Last-Translator: ggam <ggam@brainleakage.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +46,7 @@ msgstr "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarl
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr "Tipo de categoria no proporcionado."
+msgstr "Tipo de categoría no proporcionado."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
@@ -54,19 +55,19 @@ msgstr "¿Ninguna categoría para añadir?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr "Esta categoria ya existe: %s"
+msgstr "Ya existe esta categoría: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
 #: ajax/vcategories/removeFromFavorites.php:26
 msgid "Object type not provided."
-msgstr "ipo de objeto no proporcionado."
+msgstr "Tipo de objeto no proporcionado."
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr "%s ID no proporcionado."
+msgstr "ID de %s no proporcionado."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
@@ -196,7 +197,7 @@ msgstr "hace {days} días"
 
 #: js/js.js:726
 msgid "last month"
-msgstr "mes pasado"
+msgstr "el mes pasado"
 
 #: js/js.js:727
 msgid "{months} months ago"
@@ -208,7 +209,7 @@ msgstr "hace meses"
 
 #: js/js.js:729
 msgid "last year"
-msgstr "año pasado"
+msgstr "el año pasado"
 
 #: js/js.js:730
 msgid "years ago"
@@ -237,7 +238,7 @@ msgstr "No"
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
 msgid "The object type is not specified."
-msgstr "El tipo de objeto no se ha especificado."
+msgstr "No se ha especificado el tipo de objeto"
 
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
@@ -249,11 +250,11 @@ msgstr "Error"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr "El nombre de la app no se ha especificado."
+msgstr "No se ha especificado el nombre de la aplicación."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr "El fichero  {file} requerido, no está instalado."
+msgstr "¡El fichero requerido {file} no está instalado!"
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
@@ -317,7 +318,7 @@ msgstr "Fecha de caducidad"
 
 #: js/share.js:211
 msgid "Share via email:"
-msgstr "compartido via e-mail:"
+msgstr "Compartido por correo electrónico:"
 
 #: js/share.js:213
 msgid "No people found"
@@ -333,7 +334,7 @@ msgstr "Compartido en {item} con {user}"
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "No compartir"
+msgstr "Dejar de compartir"
 
 #: js/share.js:320
 msgid "can edit"
@@ -349,7 +350,7 @@ msgstr "crear"
 
 #: js/share.js:328
 msgid "update"
-msgstr "modificar"
+msgstr "actualizar"
 
 #: js/share.js:331
 msgid "delete"
@@ -384,7 +385,7 @@ msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr "La actualización ha fracasado. Por favor, informe este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</ a>."
+msgstr "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</ a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
@@ -392,7 +393,7 @@ msgstr "La actualización se ha realizado correctamente. Redireccionando a ownCl
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
-msgstr "Reiniciar contraseña de ownCloud"
+msgstr "Restablecer contraseña de ownCloud"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -403,15 +404,15 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su spam / carpetas no deseados. <br> Si no está allí pregunte a su administrador local."
+msgstr "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Petición ha fallado! <br> ¿Usted asegúrese que su dirección de correo electrónico / nombre de usuario estaba justo?"
+msgstr "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
-msgstr "Recibirás un enlace por correo electrónico para restablecer tu contraseña"
+msgstr "Recibirá un enlace por correo electrónico para restablecer su contraseña"
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
 #: templates/login.php:19
@@ -424,7 +425,7 @@ msgstr "Solicitar restablecimiento"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Tu contraseña se ha restablecido"
+msgstr "Su contraseña ha sido establecida"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
@@ -485,7 +486,7 @@ msgstr "La versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Por favor, actualice su instalación de PHP para utilizar ownCloud en forma segura."
+msgstr "Por favor, actualice su instalación de PHP para utilizar ownCloud de manera segura."
 
 #: templates/installation.php:32
 msgid ""
@@ -497,13 +498,13 @@ msgstr "No está disponible un generador de números aleatorios seguro, por favo
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de su contraseña y tomar control de su cuenta."
+msgstr "Sin un generador de números aleatorios seguro, un atacante podría predecir los tokens de restablecimiento de contraseñas y tomar el control de su cuenta."
 
 #: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr "Su directorio de datos y sus archivos están probablemente accesibles a través de internet ya que el archivo .htaccess no está funcionando."
+msgstr "Probablemente su directorio de datos y sus archivos sean accesibles a través de internet ya que el archivo .htaccess no funciona."
 
 #: templates/installation.php:40
 msgid ""
@@ -514,7 +515,7 @@ msgstr "Para información sobre cómo configurar adecuadamente su servidor, por
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
-msgstr "Crea una <strong>cuenta de administrador</strong>"
+msgstr "Crear una <strong>cuenta de administrador</strong>"
 
 #: templates/installation.php:62
 msgid "Advanced"
@@ -565,7 +566,7 @@ msgstr "Servicios web bajo su control"
 #: templates/layout.user.php:36
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr "%s esta disponible. Obtén mas información de como actualizar."
+msgstr "%s esta disponible. Obtener mas información de como actualizar."
 
 #: templates/layout.user.php:61
 msgid "Log out"
@@ -587,11 +588,11 @@ msgstr "Por favor cambie su contraseña para asegurar su cuenta nuevamente."
 
 #: templates/login.php:34
 msgid "Lost your password?"
-msgstr "¿Has perdido tu contraseña?"
+msgstr "¿Ha perdido su contraseña?"
 
 #: templates/login.php:39
 msgid "remember"
-msgstr "recuérdame"
+msgstr "recordarme"
 
 #: templates/login.php:41
 msgid "Log in"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index cbb83952dd8f373b122fc3129d19bcceab368257..eff94d9cc9e49e53ca1285b3fa1d3951f387ca54 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Art O. Pal <artopal@fastmail.fm>, 2013
+# ggam <ggam@brainleakage.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +29,6 @@ msgstr "No se puede mover %s - Ya existe un archivo con ese nombre"
 msgid "Could not move %s"
 msgstr "No se puede mover %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "No se puede renombrar el archivo"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "No se subió ningún archivo. Error desconocido"
@@ -86,7 +84,7 @@ msgstr "Compartir"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -94,49 +92,49 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pendientes"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Eliminar"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "subiendo 1 archivo"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "subiendo archivos"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr "'.' es un nombre de archivo inválido."
+msgstr "'.' no es un nombre de archivo válido."
 
 #: js/files.js:56
 msgid "File name cannot be empty."
@@ -150,75 +148,83 @@ msgstr "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Su almacenamiento esta lleno, los archivos no pueden ser mas actualizados o sincronizados!"
+msgstr "Su almacenamiento está lleno, ¡no se pueden actualizar ni sincronizar archivos!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Su almacenamiento esta lleno en un  ({usedSpacePercent}%)"
+msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes."
+msgstr "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son muy grandes."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Imposible subir su archivo, es un directorio o tiene 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "No hay suficiente espacio disponible"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida."
+msgstr "La subida del archivo está en proceso. Si sale de la página ahora, se cancelará la subida."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacía."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud"
+msgstr "El nombre de carpeta no es válido. El uso de \"Shared\" está reservado para Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} carpetas"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} archivos"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "No se puede renombrar el archivo"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Subir"
@@ -279,40 +285,40 @@ msgstr "Archivos eliminados"
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "No tienes permisos para escribir aquí."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Aquí no hay nada. ¡Sube algo!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "No compartir"
+msgstr "Dejar de compartir"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "bida demasido grande"
+msgstr "Subida demasido grande"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Se están escaneando los archivos, por favor espere."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
-msgstr "Ahora escaneando"
+msgstr "Escaneo actual"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Actualizando cache de archivos de sistema"
+msgstr "Actualizando caché del sistema de archivos"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 85d553be40be9c17ecd1b3ae6b713fc9ab7eb279..06773f7cd230d916448fe905167bc845008ed0d3 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index a15c993cab796ae8f7f8433cd5ca2f5247ecf833..cf73637ca6bdcc8e2238712613c33eeaaf538db1 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-12 02:02+0200\n"
+"PO-Revision-Date: 2013-05-04 16:20+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -41,19 +41,19 @@ msgstr "Aplicaciones"
 msgid "Admin"
 msgstr "Administración"
 
-#: files.php:209
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
 
-#: files.php:210
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados uno por uno."
 
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: files.php:241
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 01d9ecc8223cc57c6dc3294178f1e3424887a2af..4c899470e42ed7fef1e506077486dc867be17ba3 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-05-01 18:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: ggam <ggam@brainleakage.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -126,44 +126,44 @@ msgstr "Actualizado"
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "borrado"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "deshacer"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "No se puede eliminar el usuario"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupo administrador"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "añadir Grupo"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Se debe usar un nombre de usuario  válido"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Error al crear usuario"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Se debe usar una contraseña valida"
 
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 7c1c605a2ab065d57a9ca46f5036b3a27676de71..61e06ea4d97b1b70e0b5d2f18ed1b8eb69c5ed64 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
+# ordenet <roberto@ordenet.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 23:50+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +19,10 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "No se pudo borrar la configuración del servidor"
@@ -53,281 +59,363 @@ msgstr "Mantener la configuración?"
 msgid "Cannot add server configuration"
 msgstr "No se puede añadir la configuración del servidor"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Éxito"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "La prueba de conexión fue exitosa"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "La prueba de conexión falló"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "¿Realmente desea eliminar la configuración actual del servidor?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirmar eliminación"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configuración del Servidor"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Agregar configuracion del servidor"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un DN Base por línea"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN usuario"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acceso anónimo, deje DN y contraseña vacíos."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro de inicio de sesión de usuario"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "usar %%uid como placeholder, ej: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lista de filtros de usuario"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sin placeholder, ej: \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Con cualquier placeholder, ej: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Configuracion de coneccion"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuracion activa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Cuando deseleccione, esta configuracion sera omitida."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Host para backup (Replica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Dar un host de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Puerto para backup (Replica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Deshabilitar servidor principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Cuando se inicie, ownCloud unicamente estara conectado al servidor replica"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "No usar adicionalmente para conecciones LDAPS, estas fallaran"
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Apagar la validación por certificado SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "No recomendado, sólo para pruebas."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Cache TTL"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Un cambio vacía la cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Configuracion de directorio"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Árbol base de usuario"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un DN Base de Usuario por línea"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributos de la busqueda de usuario"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por linea"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Árbol base de grupo"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un DN Base de Grupo por línea"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributos de busqueda de grupo"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributos especiales"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Cuota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Cuota por defecto"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "E-mail"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regla para la carpeta Home de usuario"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nombre de usuario interno"
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr "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."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Configuración de prueba"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 1e5bebb11e358e53a745ba83674aee0620f14378..c0ae45f5a37cfca5efeb02b3caab850fe51ae310 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 76340a8c729d603cb52e42dc3da3632ed765a56a..f89b59caadb07726e91a724c394ce417dc2b5d0f 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 23:40+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +28,6 @@ msgstr "No se pudo mover %s - Un archivo con este nombre ya existe"
 msgid "Could not move %s"
 msgstr "No se pudo mover %s "
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "No fue posible cambiar el nombre al archivo"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "El archivo no fue subido. Error desconocido"
@@ -86,7 +83,7 @@ msgstr "Compartir"
 msgid "Delete permanently"
 msgstr "Borrar de manera permanente"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Borrar"
 
@@ -94,43 +91,43 @@ msgstr "Borrar"
 msgid "Rename"
 msgstr "Cambiar nombre"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pendientes"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Eliminar"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "Subiendo 1 archivo"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "Subiendo archivos"
 
@@ -156,69 +153,77 @@ msgstr "El almacenamiento está lleno, los archivos no se pueden seguir actualiz
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "No hay suficiente espacio disponible"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "La subida fue cancelada"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacía"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 directorio"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} directorios"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} archivos"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "No fue posible cambiar el nombre al archivo"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Subir"
@@ -279,37 +284,37 @@ msgstr "Archivos Borrados"
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "No tenés permisos de escritura acá."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada. ¡Subí contenido!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "El tamaño del archivo que querés subir es demasiado grande"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los archivos que intentás subir sobrepasan el tamaño máximo "
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Se están escaneando los archivos, por favor esperá."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Escaneo actual"
 
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 3912933c0c34f7d16a90d285c9a558b25fcbd376..6677f0c6240071b8436f9a43492d07614b8f1407 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 7e2eabe42cfd135ce3e3eb5a83df1f90236e68b3..fdf454a85e1fec19470f50deeab39276b5f16e67 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:05+0200\n"
+"PO-Revision-Date: 2013-05-19 23:30+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr "Error al autenticar"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "El nombre mostrado fue cambiado"
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
@@ -124,44 +125,44 @@ msgstr "Actualizado"
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "borrado"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "deshacer"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Imposible remover usuario"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupo Administrador"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Borrar"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "Agregar grupo"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Debe ingresar un nombre de usuario válido"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Error creando usuario"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Debe ingresar una contraseña válida"
 
@@ -328,7 +329,7 @@ msgstr "Menos"
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index e5394097ae87fbdba3e427babf74a4c9d66cbc68..9912a5ca2b42777ac7e642e188a79beb5194090a 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Fallo al borrar la configuración del servidor"
@@ -53,281 +57,363 @@ msgstr "¿Mantener preferencias?"
 msgid "Cannot add server configuration"
 msgstr "No se pudo añadir la configuración del servidor"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Éxito"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "El este de conexión ha sido completado satisfactoriamente"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Falló es test de conexión"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "¿Realmente desea borrar la configuración actual del servidor?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirmar borrado"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento no va a funcionar. Por favor, pedile al administrador que lo instale."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configuración del Servidor"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Añadir Configuración del Servidor"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Una DN base por línea"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN usuario"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, dejá DN y contraseña vacíos."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acceso anónimo, dejá DN y contraseña vacíos."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro de inicio de sesión de usuario"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lista de filtros de usuario"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sin plantilla, p. ej.: \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define el filtro a aplicar cuando se obtienen grupos."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Configuración de Conección"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuración activa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Si no está seleccionada, esta configuración será omitida."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Host para copia de seguridad (réplica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Puerto para copia de seguridad (réplica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Deshabilitar el Servidor Principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Al comenzar, ownCloud se conectará únicamente al servidor réplica"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "No usar adicionalmente para conexiones LDAPS, las mismas fallarán"
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desactivar la validación por certificado SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "No recomendado, sólo para pruebas."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Tiempo de vida del caché"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Cambiarlo vacía la cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Configuración de Directorio"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Árbol base de usuario"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Una DN base de usuario por línea"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributos de la búsqueda de usuario"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por linea"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Árbol base de grupo"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Una DN base de grupo por línea"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributos de búsqueda de grupo"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributos Especiales"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Campo de cuota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Cuota por defecto"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Campo de e-mail"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regla de nombre de los directorios de usuario"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Probar configuración"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 0a1d8b4be02ac2e5f57703c4fe78ec2376e17b93..a03e773beb020d4d0f4e2cfe0c643f00a4c19ca6 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 09:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 8d0e78eabd38a9dae17bd20688ba940d70417612..3084922f7727b75a188d099f4bcb94245c1fbc72 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
 # Rivo Zängov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 09:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -28,10 +29,6 @@ msgstr "Ei saa liigutada faili %s - samanimeline fail on juba olemas"
 msgid "Could not move %s"
 msgstr "%s liigutamine ebaõnnestus"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Faili ümbernimetamine ebaõnnestus"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
@@ -43,7 +40,7 @@ msgstr "Ühtegi tõrget polnud, fail on üles laetud"
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse"
+msgstr "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:"
 
 #: ajax/upload.php:29
 msgid ""
@@ -95,45 +92,45 @@ msgstr "Kustuta"
 msgid "Rename"
 msgstr "Nimeta ümber"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} on juba olemas"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "asenda"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "soovita nime"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "loobu"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "asendas nime {old_name} nimega {new_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "tagasi"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "teosta kustutamine"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
-msgstr "1 faili üleslaadimisel"
+msgstr "1 fail üleslaadimisel"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr "failide üleslaadimine"
+msgstr "faili üleslaadimisel"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -151,7 +148,7 @@ msgstr "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatu
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Sinu andmemaht on täis! Faile ei uuendata ja sünkroniseerimist ei toimu!"
+msgstr "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
@@ -161,7 +158,7 @@ msgstr "Su andmemaht on peaaegu täis ({usedSpacePercent}%)"
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega kui on tegu suurte failidega. "
+msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. "
 
 #: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
@@ -178,7 +175,7 @@ msgstr "Üleslaadimine tühistati."
 #: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Faili üleslaadimine on töös.  Lehelt lahkumine katkestab selle üleslaadimise."
+msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise."
 
 #: js/files.js:486
 msgid "URL cannot be empty."
@@ -220,6 +217,14 @@ msgstr "1 fail"
 msgid "{count} files"
 msgstr "{count} faili"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Faili ümbernimetamine ebaõnnestus"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Lae üles"
@@ -308,7 +313,7 @@ msgstr "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetav
 
 #: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr "Faile skannitakse, palun oota"
+msgstr "Faile skannitakse, palun oota."
 
 #: templates/index.php:117
 msgid "Current scanning"
@@ -316,4 +321,4 @@ msgstr "Praegune skannimine"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Uuendan failisüsteemi puhvrit..."
+msgstr "Failisüsteemi puhvri uuendamine..."
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 9e8889d3a7d4dadee290b5415be0b8e63759a4b6..655ddff37591b7952cda85cff66403b8078c28b7 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 11:11+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 6cca7168ed15097d96da8249aa721af62c74e9bb..7015ed74a80854d344fbf728ce6acd6d3d84c27e 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-16 01:58+0200\n"
+"PO-Revision-Date: 2013-05-15 08:40+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,25 +42,25 @@ msgstr "Rakendused"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "ZIP-ina allalaadimine on välja lülitatud."
 
-#: files.php:210
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "Failid tuleb alla laadida ükshaaval."
 
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "Tagasi failide juurde"
 
-#: files.php:241
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
 
 #: helper.php:228
 msgid "couldn't be determined"
-msgstr "Ei suuda tuvastada"
+msgstr "ei suudetud tuvastada"
 
 #: json.php:28
 msgid "Application is not enabled"
@@ -173,13 +173,13 @@ msgstr "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s"
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL kasutajatunnus ja/või parool pole õiged: %s"
 
-#: setup.php:858
+#: setup.php:859
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv."
 
-#: setup.php:859
+#: setup.php:860
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 1724aa9431ab68e4b0b49fdcc0e46c661490c5d5..8ba6e31707109747b8db1e999eafa909444326d0 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 02:00+0200\n"
-"PO-Revision-Date: 2013-04-30 09:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Uuendatud"
 msgid "Saving..."
 msgstr "Salvestamine..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "kustutatud"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "tagasi"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr "Ei suuda kustutada kasutajat eemaldada"
+msgstr "Kasutaja eemaldamine ebaõnnestus"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupid"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupi admin"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Kustuta"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "lisa grupp"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Sisesta nõuetele vastav kasutajatunnus"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Viga kasutaja loomisel"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Sisesta nõuetele vastav parool"
 
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index a173e5abffe9d6fec5e0d6f84be7da67189a5550..93e601cf3e131615e16cb8480aad2b63000a9403 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
 # Rivo Zängov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 09:30+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 07:58+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +19,10 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Vastendususte puhastamine ebaõnnestus."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Serveri seadistuse kustutamine ebaõnnestus"
@@ -48,287 +53,369 @@ msgstr "Võta sätted viimasest serveri seadistusest?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr "Säilitada seadistus?"
+msgstr "Säilitada seadistused?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
 msgstr "Ei suuda lisada serveri seadistust"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "vastendused puhastatud"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Korras"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Viga"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
-msgstr "Test ühendus õnnestus"
+msgstr "Ühenduse testimine õnnestus"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
-msgstr "Test ühendus ebaõnnestus"
+msgstr "Ühenduse testimine ebaõnnestus"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Oled kindel, et tahad kustutada praegust serveri seadistust?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Kinnita kustutamine"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<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."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Hoiatus:</b>PHP LDAP moodul pole paigaldatud ning LDAP kasutamine ei ole võimalik. Palu oma süsteeihaldurit see paigaldada."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Serveri seadistus"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Lisa serveri seadistus"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Baas DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Ãœks baas-DN rea kohta"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Kasutaja DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Parool"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Kasutajanime filter"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Kasutajate nimekirja filter"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Grupi filter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Määrab gruppe hankides filtri, mida rakendatakse."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Ãœhenduse seaded"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Seadistus aktiivne"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Kui märkimata, siis seadistust ei kasutata"
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Varuserver"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Lisa täiendav LDAP/AD server, mida replikeeritakse peaserveriga."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Varuserveri (replika) port"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Ära kasuta peaserverit"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Märgituna ownCloud ühendub ainult varuserverisse."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Kasuta TLS-i"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "LDAPS puhul ära kasuta. Ühendus ei toimi."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Mittetõstutundlik LDAP server (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Lülita SSL sertifikaadi kontrollimine välja."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Pole soovitatav, kasuta ainult testimiseks."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Puhvri iga"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "sekundites. Muudatus tühjendab vahemälu."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Kataloogi seaded"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Kasutaja näidatava nime väli"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Baaskasutaja puu"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Ãœks kasutajate baas-DN rea kohta"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Kasutaja otsingu atribuudid"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Valikuline; üks atribuut rea kohta"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Grupi näidatava nime väli"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Baasgrupi puu"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Ãœks grupi baas-DN rea kohta"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Grupi otsingu atribuudid"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Grupiliikme seotus"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Spetsiifilised atribuudid"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Mahupiirangu atribuut"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Vaikimisi mahupiirang"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "baitides"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Email atribuut"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Kasutaja kodukataloogi nimetamise reegel"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Sisemine kasutajanimi"
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URL pordiks, näiteks kõikidel *DAV teenustel.Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud)."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Sisemise kasutajatunnuse atribuut:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Tühista UUID tuvastus"
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr "Vaikimis ownCloud tuvastab automaatlselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud)."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "UUID atribuut:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "LDAP-Kasutajatunnus Kasutaja Vastendus"
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, iga LDAP kasutaja peab omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Puhasta LDAP-Grupinimi Grupp Vastendus"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Testi seadistust"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Abiinfo"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 7f5af267bd9e6a6c07fc19d8cb713cd59c393046..930dc72fd734478cb85d3493f22ca3411e8ac345 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 61fa18f263b2ccefcc41c8eb82dffd540d0d99a0..df564bee56ebb3fb8d27f509e94d9483a7f161b1 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da"
 msgid "Could not move %s"
 msgstr "Ezin dira fitxategiak mugitu %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Ezin izan da fitxategia berrizendatu"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ez da fitxategirik igo. Errore ezezaguna"
@@ -86,7 +82,7 @@ msgstr "Elkarbanatu"
 msgid "Delete permanently"
 msgstr "Ezabatu betirako"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -94,43 +90,43 @@ msgstr "Ezabatu"
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Zain"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} dagoeneko existitzen da"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ordeztu"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "aholkatu izena"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ezeztatu"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr " {new_name}-k {old_name} ordezkatu du"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Ezabatu"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "fitxategi 1 igotzen"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "fitxategiak igotzen"
 
@@ -156,69 +152,77 @@ msgstr "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. "
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Ez dago leku nahikorik."
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URLa ezin da hutsik egon."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Errorea"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} fitxategi"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Ezin izan da fitxategia berrizendatu"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Igo"
@@ -279,37 +283,37 @@ msgstr "Ezabatutako fitxategiak"
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Ez duzu hemen idazteko baimenik."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ez dago ezer. Igo zerbait!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Igoera handiegia da"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Orain eskaneatzen ari da"
 
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index d86ad26b2e0ad6cac6413a17a56d831a6d26e6d0..d29b34cf73d9f7026bb672dd12787b99af40f4b7 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 229680c871bc787de47a5f2a3ef85eebd312f626..6c4e25ee0aa4beab23b9a3878f930bdd5e000c2a 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Eguneratuta"
 msgid "Saving..."
 msgstr "Gordetzen..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "ezabatuta"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "desegin"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Ezin izan da erabiltzailea aldatu"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Taldeak"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Talde administradorea"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "gehitu taldea"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Baliozko erabiltzaile izena eman behar da"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Errore bat egon da erabiltzailea sortzean"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Baliozko pasahitza eman behar da"
 
@@ -328,7 +328,7 @@ msgstr "Gutxiago"
 msgid "Version"
 msgstr "Bertsioa"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 396651c963a96d3b7ce0f89de745f584c84f5795..c0a31304c6c21e66bed5cfc7843baf9c61cfb115 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Zerbitzariaren konfigurazioa ezabatzeak huts egin du"
@@ -53,281 +57,363 @@ msgstr "Mantendu ezarpenak?"
 msgid "Cannot add server configuration"
 msgstr "Ezin da zerbitzariaren konfigurazioa gehitu"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Arrakasta"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Errorea"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Konexio froga ongi burutu da"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Konexio frogak huts egin du"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Baieztatu Ezabatzea"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Zerbitzariaren konfigurazioa"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Gehitu Zerbitzariaren Konfigurazioa"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Hostalaria"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Oinarrizko DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "DN Oinarri bat lerroko"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Erabiltzaile DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Erabiltzaileen saioa hasteko iragazkia"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Erabiltzaile zerrendaren Iragazkia"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Taldeen iragazkia"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Konexio Ezarpenak"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfigurazio Aktiboa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Portua"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Babeskopia (Replica) Ostalaria"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Eman babeskopia ostalari gehigarri bat. LDAP/AD zerbitzari nagusiaren replica bat izan behar da."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Babeskopia (Replica) Ataka"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desgaitu Zerbitzari Nagusia"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Markatuta dagoenean, ownCloud bakarrik replica zerbitzarira konektatuko da."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Erabili TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Ez erabili LDAPS konexioetarako, huts egingo du."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Katxearen Bizi-Iraupena"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "segundutan. Aldaketak katxea husten du."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Karpetaren Ezarpenak"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Oinarrizko Erabiltzaile Zuhaitza"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Erabiltzaile DN Oinarri bat lerroko"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Erabili Bilaketa Atributuak "
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Aukerakoa; atributu bat lerro bakoitzeko"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Taldeen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Oinarrizko Talde Zuhaitza"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Talde DN Oinarri bat lerroko"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Taldekatu Bilaketa Atributuak "
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Talde-Kide elkarketak"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributu Bereziak"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Kuota Eremua"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Kuota Lehenetsia"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "bytetan"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Eposta eremua"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Egiaztatu Konfigurazioa"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Laguntza"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 5e282fc91e9621c675c8dd84273eaf2e36cc8a40..b399c5fbc0bf34ce26574521a93bb7b5d7600f92 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 003b3ef9ccac778a6ac0b73df99cfab58c89094b..ca53e5b2c93d5e101c68eb2d6cb7373b7ee4ccff 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "%s نمی تواند حرکت کند - در حال حاضر پرونده
 msgid "Could not move %s"
 msgstr "%s نمی تواند حرکت کند "
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "قادر به تغییر نام پرونده نیست."
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
@@ -86,7 +82,7 @@ msgstr "اشتراک‌گذاری"
 msgid "Delete permanently"
 msgstr "حذف قطعی"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "حذف"
 
@@ -94,43 +90,43 @@ msgstr "حذف"
 msgid "Rename"
 msgstr "تغییرنام"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "در انتظار"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{نام _جدید} در حال حاضر وجود دارد."
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "جایگزین"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "پیشنهاد نام"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "لغو"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد."
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "بازگشت"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "انجام عمل حذف"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 پرونده آپلود شد."
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "بارگذاری فایل ها"
 
@@ -156,69 +152,77 @@ msgstr "فضای ذخیره ی شما کاملا پر است، بیش از ای
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "فضای کافی در دسترس نیست"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "بار گذاری لغو شد"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. "
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL  نمی تواند خالی باشد."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "خطا"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "نام"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "تاریخ"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 پوشه"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{ شمار} پوشه ها"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 پرونده"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{ شمار } فایل ها"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "قادر به تغییر نام پرونده نیست."
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "بارگزاری"
@@ -279,37 +283,37 @@ msgstr "فایل های حذف شده"
 msgid "Cancel upload"
 msgstr "متوقف کردن بار گذاری"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "شما اجازه ی نوشتن در اینجا را ندارید"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "اینجا هیچ چیز نیست."
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "دانلود"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "لغو اشتراک"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "بازرسی کنونی"
 
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index b513c23be8b92d5ab7aae881f134b26bd05b9793..adcafe886a93df474474f3e8a8078378d3858e9b 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index a9623596238e74afc183b0d59a54cdb5b8b8adeb..2b0be0416583093a5cc185ece9beaf5d0db5508c 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "بروز رسانی انجام شد"
 msgid "Saving..."
 msgstr "در حال ذخیره سازی..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "حذف شده"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "بازگشت"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "حذف کاربر امکان پذیر نیست"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "گروه ها"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "گروه مدیران"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "حذف"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "افزودن گروه"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "نام کاربری صحیح باید وارد شود"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "خطا در ایجاد کاربر"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "رمز عبور صحیح باید وارد شود"
 
@@ -328,7 +328,7 @@ msgstr "کم‌تر"
 msgid "Version"
 msgstr "نسخه"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index a5b101124fb8d95ca7be9aa3829ea8f5fb584094..4a8fe98a4cfbc7b08203e5959763a48c710bdbfc 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "عملیات حذف پیکربندی سرور ناموفق ماند"
@@ -53,281 +57,363 @@ msgstr "آیا تنظیمات ذخیره شود ؟"
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "خطا"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "تست اتصال با موفقیت انجام گردید"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "تست اتصال ناموفق بود"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "تایید حذف"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "پیکربندی سرور"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "افزودن پیکربندی سرور"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "میزبانی"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "گذرواژه"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "فیلتر گروه"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "درگاه"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "در بایت"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "راه‌نما"
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
index af389b21f9a87d2dcbbf9086045a0f07a36f6dd9..a43906c14d2736c0f8161dcd5f38039d2dfc8b3c 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 36d65066e3db4d71531154861faf56cd700ee122..0110a051c43fee50a574bd0f543b53cba9de0b9a 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 861e5ebe9fd235e1981e68187aa8a97e31fe5de9..d1f62c02c71c45f0faf53c282f0089e71961be24 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemas
 msgid "Could not move %s"
 msgstr "Kohteen %s siirto ei onnistunut"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Tiedoston nimeäminen uudelleen ei onnistunut"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
@@ -86,7 +82,7 @@ msgstr "Jaa"
 msgid "Delete permanently"
 msgstr "Poista pysyvästi"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Poista"
 
@@ -94,43 +90,43 @@ msgstr "Poista"
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} on jo olemassa"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "korvaa"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "ehdota nimeä"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "peru"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "suorita poistotoiminto"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkro
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Tallennustila on melkein loppu ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Tilaa ei ole riittävästi"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Lähetys peruttu."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Verkko-osoite ei voi olla tyhjä"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Virhe"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Muokattu"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 kansio"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} kansiota"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} tiedostoa"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Tiedoston nimeäminen uudelleen ei onnistunut"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Lähetä"
@@ -279,37 +283,37 @@ msgstr "Poistetut tiedostot"
 msgid "Cancel upload"
 msgstr "Peru lähetys"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Tunnuksellasi ei ole kirjoitusoikeuksia tänne."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Lähetettävä tiedosto on liian suuri"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Tiedostoja tarkistetaan, odota hetki."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Tämänhetkinen tutkinta"
 
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index c076a783a1826215aefe48e9816aee38a0c6239d..b3da91aeffd657f91a85a70694ac9e05e14cbe1e 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 75d1540673fa8f677dc13deef7886b758f5d0555..52d5c8723a622c1e65227746e8d7a4e3a0344380 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Päivitetty"
 msgid "Saving..."
 msgstr "Tallennetaan..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "poistettu"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "kumoa"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Käyttäjän poistaminen ei onnistunut"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Ryhmän ylläpitäjä"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Poista"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "lisää ryhmä"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Virhe käyttäjää luotaessa"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -329,7 +329,7 @@ msgstr "Vähemmän"
 msgid "Version"
 msgstr "Versio"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 8cad6d46a11939c177a5f4037371e428ed84c8e7..0bfc9766d9a5b4c244cd086fbaaf07dcf46b458f 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr "Säilytetäänkö asetukset?"
 msgid "Cannot add server configuration"
 msgstr "Palvelinasetusten lisäys epäonnistui"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Onnistui!"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Virhe"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Yhteystesti onnistui"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Yhteystesti epäonnistui"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Vahvista poisto"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Isäntä"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Oletus DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä  "
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Käyttäjän DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi "
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Login suodatus"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Määrittelee käytettävän suodattimen, kun sisäänkirjautumista yritetään. %%uid korvaa sisäänkirjautumisessa käyttäjätunnuksen."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Käyttäjien suodatus"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Määrittelee käytettävän suodattimen, kun käyttäjiä haetaan.  "
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ilman paikanvaraustermiä, ts. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Ryhmien suodatus"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan.  "
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Yhteysasetukset"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Portti"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Poista pääpalvelin käytöstä"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Käytä TLS:ää"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Poista käytöstä SSL-varmenteen vahvistus"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Jos yhteys toimii vain tällä valinnalla, siirrä LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Ei suositella, käytä vain testausta varten."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "sekunneissa. Muutos tyhjentää välimuistin."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Hakemistoasetukset"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Käyttäjän näytettävän nimen kenttä"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP-attribuutti, jota käytetään käyttäjän ownCloud-käyttäjänimenä "
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Oletuskäyttäjäpuu"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Ryhmän \"näytettävä nimi\"-kenttä"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP-attribuutti, jota käytetään luomaan ryhmän ownCloud-nimi"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Ryhmien juuri"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "tavuissa"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Sähköpostikenttä"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ohje"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 5b8b4cdeb02cf0163fbaeff53af655737da160fa..62215da210b46042c206710c3fa77cee1c2bcae8 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# msoko <sokolovitch@yahoo.com>, 2013
 # plachance <patlachance@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: msoko <sokolovitch@yahoo.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -564,7 +565,7 @@ msgstr "services web sous votre contrôle"
 #: templates/layout.user.php:36
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour."
 
 #: templates/layout.user.php:61
 msgid "Log out"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 94e0d502d9051dd1997defa0654de188a7a29c17..aef01563f9d04bfc504c8c33cc1853c43c17ce1d 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Christophe Lherieau <skimpax@gmail.com>, 2013
+# MathieuP <mathieu.payrol@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,17 +29,13 @@ msgstr "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà"
 msgid "Could not move %s"
 msgstr "Impossible de déplacer %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Impossible de renommer le fichier"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
+msgstr "Aucun fichier n'a été envoyé. Erreur inconnue"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Il n'y a pas d'erreur, le fichier a été envoyé avec succes."
+msgstr "Aucune erreur, le fichier a été envoyé avec succès."
 
 #: ajax/upload.php:27
 msgid ""
@@ -52,7 +50,7 @@ msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifi
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Le fichier envoyé n'a été que partiellement envoyé."
+msgstr "Le fichier n'a été que partiellement envoyé."
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
@@ -86,7 +84,7 @@ msgstr "Partager"
 msgid "Delete permanently"
 msgstr "Supprimer de façon définitive"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -94,45 +92,45 @@ msgstr "Supprimer"
 msgid "Rename"
 msgstr "Renommer"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "En attente"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} existe déjà"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "remplacer"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "Suggérer un nom"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "annuler"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} a été remplacé par {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "effectuer l'opération de suppression"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
-msgstr "1 fichier en cours de téléchargement"
+msgstr "1 fichier en cours d'envoi"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr "fichiers en cours de téléchargement"
+msgstr "fichiers en cours d'envoi"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -156,69 +154,77 @@ msgstr "Votre espage de stockage est plein, les fichiers ne peuvent plus être t
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Impossible de téléverser votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle"
+msgstr "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Espace disponible insuffisant"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
-msgstr "Chargement annulé."
+msgstr "Envoi annulé."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "L'URL ne peut-être vide"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Erreur"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 dossier"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} dossiers"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fichier"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} fichiers"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Impossible de renommer le fichier"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Envoyer"
@@ -279,37 +285,37 @@ msgstr "Fichiers supprimés"
 msgid "Cancel upload"
 msgstr "Annuler l'envoi"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Vous n'avez pas le droit d'écriture ici."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Téléversement trop volumineux"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Analyse en cours"
 
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index eaa5def5c6bc28a07b6864a0526a2ee60062b11d..1116a5b394581457065b233928c7474d4d0c6dfe 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index dbd916ae194c3b11615238531fad829eda89d2f7..d6ec6b40d051e58edba9d41c97740bd23b6a312b 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Mise à jour effectuée avec succès"
 msgid "Saving..."
 msgstr "Enregistrement..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "supprimé"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "annuler"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Impossible de retirer l'utilisateur"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Groupes"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Groupe Admin"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Supprimer"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "ajouter un groupe"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Un nom d'utilisateur valide doit être saisi"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Erreur lors de la création de l'utilisateur"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Un mot de passe valide doit être saisi"
 
@@ -329,7 +329,7 @@ msgstr "Moins"
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 26cf3a1a6d9f559c0e0365e3551344b16576e6d4..d277eef42e23f8301964d5e01c858de41987f3c1 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# plachance <patlachance@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-19 01:58+0200\n"
+"PO-Revision-Date: 2013-05-18 18:01+0000\n"
+"Last-Translator: plachance <patlachance@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,10 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Erreur lors de la suppression des associations."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Échec de la suppression de la configuration du serveur"
@@ -51,283 +56,365 @@ msgstr "Garder ces paramètres ?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr "Impossible d'ajouter la configuration du serveur."
+msgstr "Impossible d'ajouter la configuration du serveur"
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "associations supprimées"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Succès"
 
-#: js/settings.js:121
+#: js/settings.js:117
+msgid "Error"
+msgstr "Erreur"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Test de connexion réussi"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
-msgstr "Le test de connexion a échoué"
+msgstr "Test de connexion échoué"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirmer la suppression"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<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."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configuration du serveur"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Ajouter une configuration du serveur"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Hôte"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
-msgstr "DN Racine"
+msgstr "DN racine"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un DN racine par ligne"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "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."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides."
+msgstr "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Modèle d'authentification utilisateurs"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtre d'utilisateurs"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtre de groupes"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Définit le filtre à appliquer lors de la récupération des groupes."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Paramètres de connexion"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuration active"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Lorsque non cochée, la configuration sera ignorée."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Serveur de backup (réplique)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Fournir un serveur de backup optionnel.  Il doit s'agir d'une réplique du serveur LDAP/AD principal."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Port du serveur de backup (réplique)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Désactiver le serveur principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Lorsqu'activé, ownCloud ne se connectera qu'au serveur répliqué."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Utiliser TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "À ne pas utiliser pour les connexions LDAPS (cela échouera)."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Serveur LDAP insensible à la casse (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Désactiver la validation du certificat SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Non recommandé, utilisation pour tests uniquement."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Durée de vie du cache"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "en secondes. Tout changement vide le cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Paramètres du répertoire"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Champ \"nom d'affichage\" de l'utilisateur"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "DN racine de l'arbre utilisateurs"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un DN racine utilisateur par ligne"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Recherche des attributs utilisateur"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Optionnel, un attribut par ligne"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Champ \"nom d'affichage\" du groupe"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "DN racine de l'arbre groupes"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un DN racine groupe par ligne"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Recherche des attributs du groupe"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Association groupe-membre"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Attributs spéciaux"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Champ du quota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota par défaut"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
-msgstr "en octets"
+msgstr "en bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Champ Email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Convention de nommage du répertoire utilisateur"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laisser vide "
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nom d'utilisateur interne"
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr "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."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Nom d'utilisateur interne:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Surcharger la détection d'UUID"
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr "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."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Attribut UUID :"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Association Nom d'utilisateur-Utilisateur LDAP"
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr "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."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Supprimer l'association utilisateur interne-utilisateur LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Supprimer l'association nom de groupe-groupe LDAP"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Tester la configuration"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Aide"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 40d9a6e9cef1e92361266f0967d957787fe76a11..74443dba87e9ca1a255e31f471c2c1c11d11562e 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 06:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index df7ddc55d2ae10e39238b9f073c298463aedf792..627dadfcfa2f4a2a97eb06a9a187d59b8dc32e21 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mbouzada <mbouzada@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +28,6 @@ msgstr "Non se moveu %s - Xa existe un ficheiro con ese nome."
 msgid "Could not move %s"
 msgstr "Non foi posíbel mover %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Non é posíbel renomear o ficheiro"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Non se enviou ningún ficheiro. Produciuse un erro descoñecido."
@@ -86,7 +83,7 @@ msgstr "Compartir"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -94,43 +91,43 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "Xa existe un {new_name}"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "substituír"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "suxerir nome"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituír {new_name} por {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desfacer"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "realizar a operación de eliminación"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "Enviándose 1 ficheiro"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "ficheiros enviándose"
 
@@ -156,69 +153,77 @@ msgstr "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Non foi posíbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "O espazo dispoñíbel é insuficiente"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Envío cancelado."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "O URL non pode quedar baleiro."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de cartafol incorrecto. O uso de «Shared» está reservado por Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Erro"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} cartafoles"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Non é posíbel renomear o ficheiro"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Enviar"
@@ -241,7 +246,7 @@ msgstr "Precísase para a descarga de varios ficheiros e cartafoles."
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
-msgstr "Habilitar a descarga-ZIP"
+msgstr "Activar a descarga ZIP"
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
@@ -279,37 +284,37 @@ msgstr "Ficheiros eliminados"
 msgid "Cancel upload"
 msgstr "Cancelar o envío"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Non ten permisos para escribir aquí."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Aquí non hai nada. Envíe algo."
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Envío demasiado grande"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Estanse analizando os ficheiros. Agarde."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Análise actual"
 
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index 5f9f69c52689055e89dbc36dde0e71e755a0ea28..917e0cfc516a433e9ff4e52b6d4b8cd75476b4eb 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 7b3e9df3f15cb841d2d8033a4ce3208d6f306bd9..3914db5ce19685b17261827240729e46f4a3a2bf 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 09:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Actualizado"
 msgid "Saving..."
 msgstr "Gardando..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "eliminado"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "desfacer"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Non é posíbel retirar o usuario"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupo Admin"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "engadir un grupo"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Debe fornecer un nome de usuario"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Produciuse un erro ao crear o usuario"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Debe fornecer un contrasinal"
 
@@ -252,7 +252,7 @@ msgstr "cron.php está rexistrado nun servizo de WebCron. Chame á página cron.
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr "Use o servizo de sistema cron. Chame ao ficheiro cron.php no catfaol owncloud a través dun sistema de cronjob unna vez por minuto."
+msgstr "Use o servizo de sistema cron. Chame ao ficheiro cron.php no cartafol owncloud a través dun sistema de cronjob unha vez por minuto."
 
 #: templates/admin.php:128
 msgid "Sharing"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 37a1e107ae4e70019a78c1839981fd7265a44a04..a4c52f858f39499e33773d3d1db7532469f9b51d 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mbouzada <mbouzada@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 11:30+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,10 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Non foi posíbel limpar as asignacións."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Non foi posíbel eliminar a configuración do servidor"
@@ -53,281 +58,363 @@ msgstr "Manter os axustes?"
 msgid "Cannot add server configuration"
 msgstr "Non é posíbel engadir a configuración do servidor"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "limpadas as asignacións"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Correcto"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Erro"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "A proba de conexión foi satisfactoria"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "A proba de conexión fracasou"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Confirma que quere eliminar a configuración actual do servidor?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirmar a eliminación"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatíbeis. Pode acontecer un comportamento estraño. Consulte co administrador do sistema para desactivar un deles."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Aviso:</b> O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configuración do servidor"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Engadir a configuración do servidor"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un DN base por liña"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN do usuario"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "O DN do cliente do usuario co que hai que estabelecer unha conexión, p.ex uid=axente, dc=exemplo, dc=com. Para o acceso anónimo deixe o DN e o contrasinal baleiros."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para o acceso anónimo deixe o DN e o contrasinal baleiros."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro de acceso de usuarios"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "usar a marca de posición %%uid, p.ex «uid=%%uid»"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtro da lista de usuarios"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define o filtro a aplicar cando se recompilan os usuarios."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sen ningunha marca de posición, como p.ex «objectClass=persoa»."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define o filtro a aplicar cando se recompilan os grupos."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix»."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Axustes da conexión"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuración activa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Se está sen marcar, omítese esta configuración."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Porto"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Servidor da copia de seguranza (Réplica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Porto da copia de seguranza (Réplica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desactivar o servidor principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Cando está activado, ownCloud só se conectará ao servidor de réplica."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Non utilizalo ademais para conexións LDAPS xa que fallará."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desactiva a validación do certificado SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se a conexión só funciona con esta opción importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Non se recomenda. Só para probas."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Tempo de persistencia da caché"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Calquera cambio baleira a caché."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Axustes do directorio"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Campo de mostra do nome de usuario"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "O atributo LDAP a empregar para xerar o nome de usuario de ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Base da árbore de usuarios"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un DN base de usuario por liña"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributos de busca do usuario"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por liña"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Campo de mostra do nome de grupo"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "O atributo LDAP úsase para xerar os nomes dos grupos de ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Base da árbore de grupo"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un DN base de grupo por liña"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributos de busca do grupo"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Asociación de grupos e membros"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributos especiais"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Campo de cota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Cota predeterminada"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Campo do correo"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regra de nomeado do cartafol do usuario"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nome de usuario interno"
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr "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."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Atributo do nome de usuario interno:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Ignorar a detección do UUID"
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr "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."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Atributo do UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Asignación do usuario ao «nome de usuario LDAP»"
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr "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."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Limpar a asignación do usuario ao «nome de usuario LDAP»"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Limpar a asignación do grupo ao «nome de grupo LDAP»"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Probar a configuración"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Axuda"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index e37d0c016b4c907f94f3ad13cf8017249a6c2c4f..d605f6893b8b5d216ac78542b62ad4b947a15053 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
-"PO-Revision-Date: 2013-05-02 09:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 9466616bd3b900715eca2f5c22bd39c8f0c55951..a9d272af9ce4952e79a281277f6f7928e8c9203c 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "לא הועלה קובץ. טעות בלתי מזוהה."
@@ -86,7 +82,7 @@ msgstr "שתף"
 msgid "Delete permanently"
 msgstr "מחק לצמיתות"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "מחיקה"
 
@@ -94,43 +90,43 @@ msgstr "מחיקה"
 msgid "Rename"
 msgstr "שינוי שם"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "ממתין"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} כבר קיים"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "החלפה"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "הצעת שם"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ביטול"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} הוחלף ב־{old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "ביטול"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "קובץ אחד נשלח"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "ההעלאה בוטלה."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "קישור אינו יכול להיות ריק."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "שגיאה"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "שם"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "תיקייה אחת"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} תיקיות"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "קובץ אחד"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} קבצים"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "העלאה"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "ביטול ההעלאה"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו?"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "הסר שיתוף"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "העלאה גדולה מידי"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "הקבצים נסרקים, נא להמתין."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "הסריקה הנוכחית"
 
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index c5e7737bb82a94e14c65151b9157eb4550ab2252..7c32f2b83ba56988cff17fdeb864d3e270cdb0ab 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index ce9cabd5bccad793fadc0fe3e089469b04b1665d..fa36b2f31e4e9f6460cd0ce2d1503ae7c7f3c9fb 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "שמירה…"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "ביטול"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "קבוצות"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "מנהל הקבוצה"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "מחיקה"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr "פחות"
 msgid "Version"
 msgstr "גרסא"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index dea5250c455c0fe9c1abd8d5a97ec8f37b504462..86da0727977ce4490ba1f2af9632742397a05741 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
-"PO-Revision-Date: 2013-05-02 13:50+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -54,281 +58,363 @@ msgstr "האם לשמור את ההגדרות?"
 msgid "Cannot add server configuration"
 msgstr "לא ניתן להוסיף את הגדרות השרת"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "שגיאה"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "בדיקת החיבור עברה בהצלחה"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "בדיקת החיבור נכשלה"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "האם אכן למחוק את הגדרות השרת הנוכחיות?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "אישור המחיקה"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "הגדרות השרת"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "הוספת הגדרות השרת"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "מארח"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN משתמש"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "סיסמא"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "לגישה אנונימית, השאר את הDM והסיסמא ריקים."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "סנן כניסת משתמש"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "סנן רשימת משתמשים"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "סנן קבוצה"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "פורט"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "בשניות. שינוי מרוקן את המטמון."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "בבתים"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "עזרה"
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index e2c6db13a0faeed1893d8a62a56f472aea389721..9474cdb73f6e233d2ed3f6a6f6f8212616a9da84 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 68d753a4e27bcc3dc4ae3219d86c8f8100d78fa2..9b539eea4a957cf6d66b388a6d71df057e011313 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "पासवर्ड"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "सहयोग"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 5ad69e813e1922e0192485871d45cbc4a48203cf..73cc62216f8cca2c01db2f3099864fe395afd35f 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index bf86e8720add899d2a5b7982db222b9ef4e6ae08..8e5d0343835b7d6068ba49ade3e6158e155ad30b 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr "Podijeli"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Obriši"
 
@@ -94,43 +90,43 @@ msgstr "Obriši"
 msgid "Rename"
 msgstr "Promjeni ime"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "zamjeni"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "predloži ime"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "odustani"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "vrati"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 datoteka se učitava"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "datoteke se učitavaju"
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Slanje poništeno."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Greška"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Učitaj"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Prekini upload"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nema ničega u ovoj mapi. Pošalji nešto!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Makni djeljenje"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Prijenos je preobiman"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Datoteke se skeniraju, molimo pričekajte."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Trenutno skeniranje"
 
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index 991690ed18340671525752b1b3f1e52b549067d2..a0d1710ecdf950eed2ff928a85525523e33d9367 100644
--- a/l10n/hr/files_trashbin.po
+++ b/l10n/hr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 6bc11873716864decd8ca102f6f0465843c68e90..958c0ac531c60f5c5dee92374765e4b76967c4d8 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "Spremanje..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "izbrisano"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "vrati"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupe"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupa Admin"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Obriši"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 7cec467c48abddbdec4a2a6cfd4e3a475fddf5ba..166e8e4738bdc1dc5edf422818a26e8fe2ab9cd7 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Greška"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Pomoć"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 1ce61dc98c82548445f881b98a5c4da191255510..3d1f00c6a412b074d4a313fd266b342d4a2b722a 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 16:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 6b5c091cb94ef0943b3a9df4311165dbd233c6c6..bbdedfe71e9c0a7708a8dabc38066975ac1e39b1 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a név
 msgid "Could not move %s"
 msgstr "Nem sikerült %s áthelyezése"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nem lehet átnevezni a fájlt"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nem történt feltöltés. Ismeretlen hiba"
@@ -86,7 +82,7 @@ msgstr "Megosztás"
 msgid "Delete permanently"
 msgstr "Végleges törlés"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Törlés"
 
@@ -94,43 +90,43 @@ msgstr "Törlés"
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} már létezik"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "írjuk fölül"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "legyen más neve"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "mégse"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} fájlt kicseréltük ezzel:  {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "visszavonás"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "a törlés végrehajtása"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 fájl töltődik föl"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "fájl töltődik föl"
 
@@ -156,69 +152,77 @@ msgstr "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhat
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "A tároló majdnem tele van ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nincs elég szabad hely"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "A feltöltést megszakítottuk."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Az URL nem lehet semmi."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Érvénytelen mappanév. A név használata csak a Owncloud számára lehetséges."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Hiba"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Név"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mappa"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fájl"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} fájl"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Nem lehet átnevezni a fájlt"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Feltöltés"
@@ -279,37 +283,37 @@ msgstr "Törölt fájlok"
 msgid "Cancel upload"
 msgstr "A feltöltés megszakítása"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Itt nincs írásjoga."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Itt nincs semmi. Töltsön fel valamit!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "A megosztás visszavonása"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "A feltöltés túl nagy"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "A fájllista ellenőrzése zajlik, kis türelmet!"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Ellenőrzés alatt"
 
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index a9a5961b1792876a63fc7139126c46c0fcf53d05..2b1cf55a603a73f97c3251c1293bde0120bb10c1 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index d341340b804f004d296c6478a6add0f1d716c72e..4bc6f8ef6fcfffafd61e2b9992480efdb31a6bed 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-05-01 16:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Frissítve"
 msgid "Saving..."
 msgstr "Mentés..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "törölve"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "visszavonás"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "A felhasználót nem sikerült eltávolítáni"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Csoportok"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Csoportadminisztrátor"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Törlés"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "csoport hozzáadása"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Érvényes felhasználónevet kell megadnia"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "A felhasználó nem hozható létre"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Érvényes jelszót kell megadnia"
 
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 55f3c268735ce9e206f3717a0e6accd81f4f524a..537f774ff53838d4014b90ea59a1d0492d321683 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Nem sikerült törölni a kiszolgáló konfigurációját"
@@ -53,281 +57,363 @@ msgstr "Tartsuk meg a beállításokat?"
 msgid "Cannot add server configuration"
 msgstr "Az új  kiszolgáló konfigurációja nem hozható létre"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Hiba"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "A kapcsolatellenőrzés eredménye: sikerült"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "A kapcsolatellenőrzés eredménye: nem sikerült"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Tényleg törölni szeretné a kiszolgáló beállításait?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "A törlés megerősítése"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Figyelmeztetés:</b> Az LDAP PHP modul nincs telepítve, ezért ez az alrendszer nem fog működni. Kérje meg a rendszergazdát, hogy telepítse!"
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "A kiszolgálók beállításai"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Új kiszolgáló beállításának hozzáadása"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Kiszolgáló"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így:  ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN-gyökér"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Soronként egy DN-gyökér"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "A kapcsolódó felhasználó DN-je"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "Annak a felhasználónak a DN-je, akinek a nevében bejelentkezve kapcsolódunk a kiszolgálóhoz, pl. uid=agent,dc=example,dc=com. Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Szűrő a bejelentkezéshez"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "használja az %%uid változót, pl. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "A felhasználók szűrője"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Ez a szűrő érvényes a felhasználók listázásakor."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "itt ne használjon változót, pl. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "A csoportok szűrője"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Ez a szűrő érvényes a csoportok listázásakor."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "itt ne használjunk változót, pl. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Kapcsolati beállítások"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "A beállítás aktív"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ha nincs kipipálva, ez a beállítás kihagyódik."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Másodkiszolgáló (replika)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Adjon meg egy opcionális másodkiszolgálót. Ez a fő LDAP/AD kiszolgáló szinkron másolata (replikája) kell legyen."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "A másodkiszolgáló (replika) portszáma"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "A fő szerver kihagyása"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Ha ezt bekapcsoljuk, akkor az ownCloud csak a másodszerverekhez kapcsolódik."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Használjunk TLS-t"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "LDAPS kapcsolatok esetén ne kapcsoljuk be, mert nem fog működni."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Ne ellenőrizzük az SSL-tanúsítvány érvényességét"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát az ownCloud kiszolgálóra!"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nem javasolt, csak tesztelésre érdemes használni."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "A gyorsítótár tárolási időtartama"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "másodpercben. A változtatás törli a cache tartalmát."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Címtár beállítások"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "A felhasználónév mezője"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Ebből az LDAP attribútumból képződik a felhasználó elnevezése, ami megjelenik az ownCloudban."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "A felhasználói fa gyökere"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Soronként egy felhasználói fa gyökerét adhatjuk meg"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "A felhasználók lekérdezett attribútumai"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Nem kötelező megadni, soronként egy attribútum"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "A csoport nevének mezője"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Ebből az LDAP attribútumból képződik a csoport elnevezése, ami megjelenik az ownCloudban."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "A csoportfa gyökere"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Soronként egy csoportfa gyökerét adhatjuk meg"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "A csoportok lekérdezett attribútumai"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "A csoporttagság attribútuma"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Különleges attribútumok"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Kvóta mező"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Alapértelmezett kvóta"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "bájtban"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Email mező"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "A home könyvtár elérési útvonala"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!"
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "A beállítások tesztelése"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Súgó"
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index f372a97b7a0bf6c70a74b3280f1a85e10aca576a..52f66f4a8d31bf85dedc8918ad824c915e4ae74a 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
 
@@ -94,43 +90,43 @@ msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 8968d1e06683876a16c49dacf86c1baa2c406c2e..8e5b97b1c5a215591accbcea992c03c844318ad0 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -243,7 +243,7 @@ msgstr ""
 #: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
 #: js/share.js:589
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
@@ -303,7 +303,7 @@ msgstr ""
 
 #: js/share.js:174
 msgid "Send"
-msgstr ""
+msgstr "Invia"
 
 #: js/share.js:178
 msgid "Set expiration date"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 307781850393a1a453791d49b3a9db5a9120054c..861f74f8217329422a87870552a13e0d1eca593e 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr "Compartir"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Deler"
 
@@ -94,43 +90,43 @@ msgstr "Deler"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Incargar"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nihil hic. Incarga alcun cosa!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Incargamento troppo longe"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index b4969f152eb3b8812cb7dee3580387c954376dda..262c7e82f7bcb142df491ffa7753f02784e5ca37 100644
--- a/l10n/ia/files_trashbin.po
+++ b/l10n/ia/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
 
 #: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: js/trash.js:34
 msgid "delete file permanently"
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 401027e5623cb44a13143c76f687d652ecad3114..9297795c3bed2df40411e1780214509d948ec2f9 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -106,7 +106,7 @@ msgstr ""
 
 #: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: js/apps.js:90
 msgid "Updating...."
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Gruppos"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Deler"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index f0a118496f4e048584047db630ea0fb6aa03b143..2cccdd93f88d9c08f60df45bfaf5f6b7e5aca0c1 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Contrasigno"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Adjuta"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 99b5e5b934d3a877fb3f055a336a891addbf9d38..e17e73ed172c5855147e786ba4f1c9737eb76925 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index b7dcb610f8b0961cddc5ecb7b86d283bf0b9299f..9d29950e69bd986ea27c976935179a9868afaef5 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada"
 msgid "Could not move %s"
 msgstr "Tidak dapat memindahkan %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Tidak dapat mengubah nama berkas"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Tidak ada berkas yang diunggah. Galat tidak dikenal."
@@ -86,7 +82,7 @@ msgstr "Bagikan"
 msgid "Delete permanently"
 msgstr "Hapus secara permanen"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Hapus"
 
@@ -94,43 +90,43 @@ msgstr "Hapus"
 msgid "Rename"
 msgstr "Ubah nama"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} sudah ada"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sarankan nama"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "batalkan"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "mengganti {new_name} dengan {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "urungkan"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Lakukan operasi penghapusan"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 berkas diunggah"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "berkas diunggah"
 
@@ -156,69 +152,77 @@ msgstr "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkr
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Ruang penyimpanan tidak mencukupi"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL tidak boleh kosong"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Galat"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} folder"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 berkas"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} berkas"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Tidak dapat mengubah nama berkas"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Unggah"
@@ -279,37 +283,37 @@ msgstr "Berkas yang dihapus"
 msgid "Cancel upload"
 msgstr "Batal pengunggahan"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Anda tidak memiliki izin menulis di sini."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Batalkan berbagi"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Yang diunggah terlalu besar"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Berkas sedang dipindai, silakan tunggu."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Yang sedang dipindai"
 
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index d701cfac2ef2c789b2eeb2cc125fb947171400ab..eb5ff111db8d691a97fcf46a2b8e13df4cbef96e 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index d462146a70c85a3bc7501f2d460a0ae1a8972812..e490ada997c02b9fd2fe6b7a11414b5cd2b06a5e 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Diperbarui"
 msgid "Saving..."
 msgstr "Menyimpan..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "dihapus"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "urungkan"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Tidak dapat menghapus pengguna"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grup"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Admin Grup"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Hapus"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "tambah grup"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Tuliskan nama pengguna yang valid"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Gagal membuat pengguna"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Tuliskan sandi yang valid"
 
@@ -328,7 +328,7 @@ msgstr "Ciutkan"
 msgid "Version"
 msgstr "Versi"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 4a2648e5ce087be68ff7e2ed5f41b08e7e8c4383..339de48adee9cedc79b268516c16cee8bdf7a71a 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Gagal menghapus konfigurasi server"
@@ -53,281 +57,363 @@ msgstr "Biarkan pengaturan?"
 msgid "Cannot add server configuration"
 msgstr "Gagal menambah konfigurasi server"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sukses"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Galat"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Tes koneksi sukses"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Tes koneksi gagal"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Anda ingin menghapus Konfigurasi Server saat ini?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Konfirmasi Penghapusan"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Peringatan:/b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami kejadian yang tidak diharapkan. Silakan minta administrator sistem untuk menonaktifkan salah satunya."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Konfigurasi server"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Tambah Konfigurasi Server"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Satu Base DN per baris"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Sandi"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Untuk akses anonim, biarkan DN dan Kata sandi kosong."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "gunakan saringan login"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "gunakan pengganti %%uid, mis. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Daftar Filter Pengguna"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definisikan filter untuk diterapkan saat menerima pengguna."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "tanpa pengganti apapun, mis. \"objectClass=seseorang\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "saringan grup"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definisikan filter untuk diterapkan saat menerima grup."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Pengaturan Koneksi"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfigurasi Aktif"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Jika tidak dicentang, konfigurasi ini dilewati."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Host Cadangan (Replika)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Port Cadangan (Replika)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Nonaktifkan Server Utama"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "gunakan TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Server LDAP dengan kapitalisasi tidak sensitif (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "matikan validasi sertivikat SSL"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "tidak disarankan, gunakan hanya untuk pengujian."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Gunakan Tembolok untuk Time-To-Live"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "dalam detik. perubahan mengosongkan cache"
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Pengaturan Direktori"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Bidang Tampilan Nama Pengguna"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Pohon Pengguna Dasar"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Satu Pengguna Base DN per baris"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atribut Pencarian Pengguna"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Pilihan; satu atribut per baris"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Bidang Tampilan Nama Grup"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Pohon Grup Dasar"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Satu Grup Base DN per baris"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atribut Pencarian Grup"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "asosiasi Anggota-Grup"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atribut Khusus"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Bidang Kuota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Kuota Baku"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "dalam bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Bidang Email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Aturan Penamaan Folder Home Pengguna"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Uji Konfigurasi"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Bantuan"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 0fcf1d0e314cf3288c17ab7e5809b992b5768d71..53ede14ddb07def530409bfa9523d71f611c35bd 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/is/files.po b/l10n/is/files.po
index c96049906804723e2abf8130fbe506d6aebd742a..c568952bc04f4abb0784b94c05c07b74085c7464 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Gat ekki fært %s - Skrá með þessu nafni er þegar til"
 msgid "Could not move %s"
 msgstr "Gat ekki fært %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Gat ekki endurskýrt skrá"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Engin skrá var send inn. Óþekkt villa."
@@ -86,7 +82,7 @@ msgstr "Deila"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Eyða"
 
@@ -94,43 +90,43 @@ msgstr "Eyða"
 msgid "Rename"
 msgstr "Endurskýra"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Bíður"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} er þegar til"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "yfirskrifa"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "stinga upp á nafni"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "hætta við"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "yfirskrifaði {new_name} með {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 skrá innsend"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Ekki nægt pláss tiltækt"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Hætt við innsendingu."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Vefslóð má ekki vera tóm."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Óleyfilegt nafn á möppu. Nafnið 'Shared' er frátekið fyrir Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Villa"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Stærð"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Breytt"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} möppur"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 skrá"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} skrár"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Gat ekki endurskýrt skrá"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Senda inn"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Hætta við innsendingu"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ekkert hér. Settu eitthvað inn!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Niðurhal"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Hætta deilingu"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Innsend skrá er of stór"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Er að skima"
 
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 180cfb3bd3efc18f785eecf711f2530121c3ec5a..ceeac18a0944f32368b70de71e769e26cc73f309 100644
--- a/l10n/is/files_trashbin.po
+++ b/l10n/is/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 6bc82b29441be46fc74221f8271d45ba5db64918..0906807b3c4f87a65d6ce719c3716c83ba5b28ca 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "Er að vista ..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Hópar"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Hópstjóri"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Eyða"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr "Minna"
 msgid "Version"
 msgstr "Útgáfa"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 707f5e97758ac80b92fc6c2b038b25e9d253bc84..ee1bb681f85330b941fae9817cc7d6329e5d0129 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Villa"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Netþjónn"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Lykilorð"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hjálp"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index ce6ac93cb799a656d597d9baf1530d26308546ed..df7f35c828ff801d7ae531822ccc5c0252fec767 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 07:30+0000\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:22+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index f5ae1c2dbeaa1780402ff64f20a5f96e147249b4..4245330eb175eb70f0ae52171024d026309a4a8a 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +28,6 @@ msgstr "Impossibile spostare %s - un file con questo nome esiste già"
 msgid "Could not move %s"
 msgstr "Impossibile spostare %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Impossibile rinominare il file"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nessun file è stato inviato. Errore sconosciuto"
@@ -86,7 +83,7 @@ msgstr "Condividi"
 msgid "Delete permanently"
 msgstr "Elimina definitivamente"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Elimina"
 
@@ -94,43 +91,43 @@ msgstr "Elimina"
 msgid "Rename"
 msgstr "Rinomina"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "In corso"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} esiste già"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "sostituisci"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "suggerisci nome"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "annulla"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "sostituito {new_name} con {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "esegui l'operazione di eliminazione"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 file in fase di caricamento"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "caricamento file"
 
@@ -156,69 +153,77 @@ msgstr "Lo spazio di archiviazione è pieno, i file non possono essere più aggi
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Spazio disponibile insufficiente"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "L'URL non può essere vuoto."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato da ownCloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Errore"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 cartella"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} cartelle"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 file"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} file"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Impossibile rinominare il file"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Carica"
@@ -279,37 +284,37 @@ msgstr "File eliminati"
 msgid "Cancel upload"
 msgstr "Annulla invio"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Qui non hai i permessi di scrittura."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Non c'è niente qui. Carica qualcosa!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Caricamento troppo grande"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Scansione dei file in corso, attendi"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Scansione corrente"
 
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index 6bd8dcce9aa2c924a59c8ca9c4c42796de9bb8d5..7fa5301fd908abfeade81041a58233c6890e7bce 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index aeafcdb3098b3bbeb302731194557e733a7a8a81..14033bcc2c3a1e0859c71290b8581efd84265eb0 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index 64e3b10980ef6453a208c483adeb485377576519..3e03f7b349ecc025fa1c3be1e936d51f9ea1c4a1 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:24+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index 31244b0df3dff645d5e4c8f4ddecaadaca99675a..3091e2a39fc576f9a95044fb043af2aa1849f92c 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:24+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 9009790625e47db03025e29820eefb94e5382399..51be74320b20a4e169c375dd94ff98aeeb0032a9 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:24+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index bf15d74fffc59b29b8e56a4be415cca1c9c84413..cebca82b595b7422841283d2b31ecdd02e268e56 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:03+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,19 +41,19 @@ msgstr "Applicazioni"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
 
-#: files.php:210
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "I file devono essere scaricati uno alla volta."
 
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "Torna ai file"
 
-#: files.php:241
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr "I  file selezionati sono troppo grandi per generare un file zip."
 
@@ -172,13 +172,13 @@ msgstr "Il comando non consentito era: \"%s\", nome: %s, password: %s"
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nome utente e/o password MS SQL non validi: %s"
 
-#: setup.php:858
+#: setup.php:859
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata."
 
-#: setup.php:859
+#: setup.php:860
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index bed35b958128700932c5387c8d22800822724604..ca626d4fa3ddcd4e03140dbef54c34c1e6f26abb 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:05+0200\n"
+"PO-Revision-Date: 2013-05-19 09:23+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -124,44 +125,44 @@ msgstr "Aggiornato"
 msgid "Saving..."
 msgstr "Salvataggio in corso..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "eliminati"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "annulla"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Impossibile rimuovere l'utente"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Gruppi"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppi amministrati"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Elimina"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "aggiungi gruppo"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Deve essere fornito un nome utente valido"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Errore durante la creazione dell'utente"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Deve essere fornita una password valida"
 
@@ -318,7 +319,7 @@ msgstr "Livello di log"
 
 #: templates/admin.php:227
 msgid "More"
-msgstr "Più"
+msgstr "Altro"
 
 #: templates/admin.php:228
 msgid "Less"
@@ -328,7 +329,7 @@ msgstr "Meno"
 msgid "Version"
 msgstr "Versione"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 55a4663df93b9a935c598eecd8d88000bc9d72c0..294dede9336a06964742b78b0dffe9361f4da143 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:24+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,10 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Cancellazione delle associazioni non riuscita."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Eliminazione della configurazione del server non riuscita"
@@ -53,281 +58,363 @@ msgstr "Vuoi mantenere le impostazioni?"
 msgid "Cannot add server configuration"
 msgstr "Impossibile aggiungere la configurazione del server"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "associazioni cancellate"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Riuscito"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Errore"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Prova di connessione riuscita"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Prova di connessione non riuscita"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Vuoi davvero eliminare la configurazione attuale del server?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Conferma l'eliminazione"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Avviso:</b> il modulo PHP LDAP non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configurazione del server"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Aggiungi configurazione del server"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un DN base per riga"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN utente"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Password"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro per l'accesso utente"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtro per l'elenco utenti"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtro per il gruppo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Impostazioni di connessione"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configurazione attiva"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Se deselezionata, questa configurazione sarà saltata."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Porta"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Host di backup (Replica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Fornisci un host di backup opzionale. Deve essere una replica del server AD/LDAP principale."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Porta di backup (Replica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Disabilita server principale"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Se abilitata, ownCloud si collegherà solo al server di replica."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Da non utilizzare per le connessioni LDAPS, non funzionerà."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Case insensitve LDAP server (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Disattiva il controllo del certificato SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Non consigliato, utilizzare solo per test."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Tempo di vita della cache"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "in secondi. Il cambio svuota la cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Impostazioni delle cartelle"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Campo per la visualizzazione del nome utente"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "L'attributo LDAP da usare per generare il nome dell'utente ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Struttura base dell'utente"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un DN base utente per riga"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Attributi di ricerca utente"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opzionale; un attributo per riga"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Campo per la visualizzazione del nome del gruppo"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "L'attributo LDAP da usare per generare il nome del gruppo ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Struttura base del gruppo"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un DN base gruppo per riga"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Attributi di ricerca gruppo"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Associazione gruppo-utente "
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Attributi speciali"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Campo Quota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota predefinita"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "in byte"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Campo Email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regola di assegnazione del nome della cartella utente"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nome utente interno"
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr "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)."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Attributo nome utente interno:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Ignora rilevamento UUID"
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr "In modo predefinito, ownCloud rileva automaticamente l'attributo UUID. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti)."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Attributo UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Associazione Nome utente-Utente LDAP"
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr "ownCloud utilizza i nomi utente per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente di ownCloud e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate da ownCloud. Il nome utente interno di ownCloud è utilizzato dappertutto in ownCloud. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione. Procedere alla cancellazione delle associazioni solo in una fase sperimentale o di test."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Cancella associazione Nome utente-Utente LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Cancella associazione Nome gruppo-Gruppo LDAP"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Prova configurazione"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Aiuto"
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index f88d74e447e70ae25e99d6de581218917666fc3a..705336024c24cd4c1eda9b212bced30b830185c1 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013.
+# Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 09:22+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index eca1551834fcbd976e6ad0606a24ac7090f2d9dd..f36a992b1146539c090b075b1523b7e4a7f45b30 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 04:50+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -496,7 +496,7 @@ msgstr "セキュアな乱数生成器が利用可能ではありません。PHP
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr "セキュアな乱数生成器が無い場合、攻撃者はパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。"
+msgstr "セキュアな乱数生成器が無い場合、攻撃者がパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。"
 
 #: templates/installation.php:39
 msgid ""
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index ef82ef3ed32ce4d85a18098d4feeaff2f5474945..32f0f5daf357287b36b6b75a3dedc35d91080747 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 12:00+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +28,6 @@ msgstr "%s を移動できませんでした ― この名前のファイルは
 msgid "Could not move %s"
 msgstr "%s を移動できませんでした"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "ファイル名の変更ができません"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "ファイルは何もアップロードされていません。不明なエラー"
@@ -86,7 +83,7 @@ msgstr "共有"
 msgid "Delete permanently"
 msgstr "完全に削除する"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "削除"
 
@@ -94,43 +91,43 @@ msgstr "削除"
 msgid "Rename"
 msgstr "名前の変更"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "中断"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} はすでに存在しています"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "置き換え"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "推奨名称"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "キャンセル"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} を {new_name} に置換"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "元に戻す"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "削除を実行"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "ファイルを1つアップロード中"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "ファイルをアップロード中"
 
@@ -156,69 +153,77 @@ msgstr "あなたのストレージは一杯です。ファイルの更新と同
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "あなたのストレージはほぼ一杯です（{usedSpacePercent}%）"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ディレクトリもしくは0バイトのファイルはアップロードできません"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "利用可能なスペースが十分にありません"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "アップロードはキャンセルされました。"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URLは空にできません。"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "エラー"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "変更"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 フォルダ"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} フォルダ"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ファイル"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} ファイル"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "ファイル名の変更ができません"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "アップロード"
@@ -279,37 +284,37 @@ msgstr "削除ファイル"
 msgid "Cancel upload"
 msgstr "アップロードをキャンセル"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "あなたには書き込み権限がありません。"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "ここには何もありません。何かアップロードしてください。"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "共有解除"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "アップロードには大きすぎます。"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "ファイルをスキャンしています、しばらくお待ちください。"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "スキャン中"
 
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index e3d441e8879d4c615ac5c45d7a3afd1a26f79534..bdec5a34504ec672f6705544940394dc9e138236 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 3902b760a083895d32002a664ebb9e1ad4de1747..5c7b4905c9e38faa839e3ebf522e2893069be4e6 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 02:00+0200\n"
-"PO-Revision-Date: 2013-04-30 04:50+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "更新済み"
 msgid "Saving..."
 msgstr "保存中..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "削除"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "元に戻す"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "ユーザを削除出来ません"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "グループ"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "グループ管理者"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "削除"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "グループを追加"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "有効なユーザ名を指定する必要があります"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "ユーザ作成エラー"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "有効なパスワードを指定する必要があります"
 
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index d954d491167f50ba7106aa6d25d2d6b52828be3a..4c7f9ca2dcd4a16929692fd4af90032e7207bbd6 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 07:58+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,10 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "マッピングのクリアに失敗しました。"
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "サーバ設定の削除に失敗しました"
@@ -53,281 +58,363 @@ msgstr "設定を保持しますか？"
 msgid "Cannot add server configuration"
 msgstr "サーバ設定を追加できません"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "マッピングをクリアしました"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "成功"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "エラー"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "接続テストに成功しました"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "接続テストに失敗しました"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "現在のサーバ設定を本当に削除してもよろしいですか？"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "削除の確認"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能姓があります。システム管理者にどちらかを無効にするよう問い合わせてください。"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しく動作しません。システム管理者にインストールするよう問い合わせてください。"
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "サーバ設定"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "サーバ設定を追加"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "ホスト"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "ベースDN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "1行に1つのベースDN"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "拡張タブでユーザとグループのベースDNを指定することができます。"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "ユーザDN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "匿名アクセスの場合は、DNとパスワードを空にしてください。"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "ユーザログインフィルタ"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "ユーザリストフィルタ"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "ユーザーを取得するときに適用するフィルターを定義する。"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "プレースホルダーを利用しないでください。例 \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "グループフィルタ"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "グループを取得するときに適用するフィルターを定義する。"
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "接続設定"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "設定はアクティブです"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "チェックを外すと、この設定はスキップされます。"
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "ポート"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "バックアップ（レプリカ）ホスト"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバのレプリカである必要があります。"
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "バックアップ（レプリカ）ポート"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "メインサーバを無効にする"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "有効にすると、ownCloudはレプリカサーバにのみ接続します。"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLSを利用"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "LDAPS接続のために追加でそれを利用しないで下さい。失敗します。"
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大文字／小文字を区別しないLDAPサーバ（Windows）"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL証明書の確認を無効にする。"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "推奨しません、テスト目的でのみ利用してください。"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "キャッシュのTTL"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "秒。変更後にキャッシュがクリアされます。"
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "ディレクトリ設定"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "ユーザ表示名のフィールド"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "ユーザのownCloud名の生成に利用するLDAP属性。"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "ベースユーザツリー"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "1行に1つのユーザベースDN"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "ユーザ検索属性"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "オプション：1行に1属性"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "グループ表示名のフィールド"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "グループのownCloud名の生成に利用するLDAP属性。"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "ベースグループツリー"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "1行に1つのグループベースDN"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "グループ検索属性"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "グループとメンバーの関連付け"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "特殊属性"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "クォータフィールド"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "クォータのデフォルト"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "バイト"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "メールフィールド"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "ユーザのホームフォルダ命名規則"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください。"
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "内部ユーザ名"
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr "デフォルトでは、内部ユーザ名はUUID属性から作成されます。これにより、ユーザ名がユニークであり、かつ文字の変換が必要ないことを保証します。内部ユーザ名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザ名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダ名としても用いられます。例えば*DAVサービスのように、リモートURLのポートでもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザ表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザにおいてのみ有効となります。"
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "内部ユーザ名属性:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "UUID検出を再定義する"
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr "デフォルトでは、ownCloud は UUID 属性を自動的に検出します。UUID属性は、LDAPユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザとLDAPグループに対してのみ有効となります。"
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "UUID属性:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "ユーザ名とLDAPユーザのマッピング"
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr "ownCloudは（メタ） データの保存と割り当てにユーザ名を使用します。ユーザを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ownCloudユーザ名とLDAPユーザ名の間のマッピングが必要であることを意味しています。生成されたユーザ名は、LDAPユーザのUUIDとマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更をownCloudが見つけます。内部のownCloud名はownCloud全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。"
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "ユーザ名とLDAPユーザのマッピングをクリアする"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "グループ名とLDAPグループのマッピングをクリアする"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
-msgstr "テスト設定"
+msgstr "設定をテスト"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "ヘルプ"
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index 25301e504fbf07dfe18fd49e33af28bf2864de1b..b139973c0ca0c32333e265ddfcb3bee4d0a71ba7 100644
--- a/l10n/ka/files.po
+++ b/l10n/ka/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "გადმოწერა"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index a6e12c17b84714be55a9979c3d9ff1e58eec45c5..597ca2251745727f6a6182fca3544c05e5995348 100644
--- a/l10n/ka/user_ldap.po
+++ b/l10n/ka/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "პაროლი"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "შველა"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 7051022af7b8ef46db233747e0418700ecb16062..e0df88abc2fc8beeb864bd31aef88616ebd53a06 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index b20fd4c236f32f7ff7c2b4b1c045f26ef2cc4d47..11183252ce8a8e407d3b1d6779ab90e193a5a5c6 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:02+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +27,6 @@ msgstr "%s –ის გადატანა ვერ მოხერხდა
 msgid "Could not move %s"
 msgstr "%s –ის გადატანა ვერ მოხერხდა"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "ფაილის სახელის გადარქმევა ვერ მოხერხდა"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "ფაილი არ აიტვირთა. უცნობი შეცდომა"
@@ -86,7 +82,7 @@ msgstr "გაზიარება"
 msgid "Delete permanently"
 msgstr "სრულად წაშლა"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "წაშლა"
 
@@ -94,43 +90,43 @@ msgstr "წაშლა"
 msgid "Rename"
 msgstr "გადარქმევა"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "მოცდის რეჟიმში"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} უკვე არსებობს"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "შეცვლა"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "სახელის შემოთავაზება"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "უარყოფა"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} შეცვლილია {old_name}–ით"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "დაბრუნება"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "მიმდინარეობს წაშლის ოპერაცია"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 ფაილის ატვირთვა"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "ფაილები იტვირთება"
 
@@ -156,69 +152,77 @@ msgstr "თქვენი საცავი გადაივსო. ფა
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "საკმარისი ადგილი არ არის"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "ატვირთვა შეჩერებულ იქნა."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL არ შეიძლება იყოს ცარიელი."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "დაუშვებელი ფოლდერის სახელი.  'Shared'–ის გამოყენება რეზერვირებულია Owncloud–ის მიერ"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "შეცდომა"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "სახელი"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "ზომა"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "შეცვლილია"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 საქაღალდე"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} საქაღალდე"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ფაილი"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} ფაილი"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "ფაილის სახელის გადარქმევა ვერ მოხერხდა"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "ატვირთვა"
@@ -279,37 +283,37 @@ msgstr "წაშლილი ფაილები"
 msgid "Cancel upload"
 msgstr "ატვირთვის გაუქმება"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "თქვენ არ გაქვთ ჩაწერის უფლება აქ."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "აქ არაფერი არ არის. ატვირთე რამე!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "ჩამოტვირთვა"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "გაუზიარებადი"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "ასატვირთი ფაილი ძალიან დიდია"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "მიმდინარე სკანირება"
 
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 592898b1ea377e3d0e53b565c9d57ab1245a5c5a..41bba41dbdc34e6fdfdc76ad36bb404d7098541e 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:04+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 734eede528730ac4a04cf7e1dccb8cc0119a46e2..b7c222205a149cd2c2591cf2ed788791b06bfa9f 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "განახლებულია"
 msgid "Saving..."
 msgstr "შენახვა..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "წაშლილი"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "დაბრუნება"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "მომხმარებლის წაშლა ვერ მოხერხდა"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "ჯგუფები"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "ჯგუფის ადმინისტრატორი"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "წაშლა"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "ჯგუფის დამატება"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "უნდა მიუთითოთ არსებული მომხმარებლის სახელი"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "შეცდომა მომხმარებლის შექმნისას"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "უნდა მიუთითოთ არსებული პაროლი"
 
@@ -329,7 +329,7 @@ msgstr "უფრო ნაკლები"
 msgid "Version"
 msgstr "ვერსია"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index cdc9f72873ff4b809fde0ef9308ebf3276b8639c..b59faa4d492597c8b40af623fd584f0f3d1517bd 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:04+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "შეცდომა სერვერის კონფიგურაციის წაშლისას"
@@ -53,281 +57,363 @@ msgstr "დავტოვოთ პარამეტრები?"
 msgid "Cannot add server configuration"
 msgstr "სერვერის პარამეტრების დამატება ვერ მოხერხდა"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "დასრულდა"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "შეცდომა"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "კავშირის ტესტირება მოხერხდა"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "კავშირის ტესტირება ვერ მოხერხდა"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "წაშლის დადასტურება"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>გაფრთხილება:</b>  აპლიკაციის user_ldap და user_webdavauth არათავსებადია. თქვენ შეიძლება შეეჩეხოთ მოულოდნელ შშედეგებს. თხოვეთ თქვენს ადმინისტრატორს ჩათიშოს ერთერთი."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>გაფრთხილება:</b> PHP LDAP მოდული არ არის ინსტალირებული, ბექენდი არ იმუშავებს. თხოვეთ თქვენს ადმინისტრატორს დააინსტალიროს ის."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "სერვერის პარამეტრები"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "სერვერის პარამეტრების დამატება"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "ჰოსტი"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "თქვენ შეგიძლიათ გამოტოვოთ პროტოკოლი. გარდა ამისა გჭირდებათ SSL. შემდეგ დაიწყეთ ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "საწყისი DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "ერთი საწყისი DN ერთ ხაზზე"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "თქვენ შეგიძლიათ მიუთითოთ საწყისი DN მომხმარებლებისთვის და ჯგუფებისთვის Advanced ტაბში"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "მომხმარებლის DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "მომხმარებლის DN რომელთანაც უნდა მოხდეს დაკავშირება მოხდება შემდეგნაირად მაგ: uid=agent,dc=example,dc=com. ხოლო ანონიმური დაშვებისთვის, დატოვეთ DN–ის და პაროლის ველები ცარიელი."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "პაროლი"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "ანონიმური დაშვებისთვის, დატოვეთ DN–ის და პაროლის ველები ცარიელი."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "მომხმარებლის ფილტრი"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "როცა შემოსვლა განხორციელდება ასეიძლება მოვახდინოთ გაფილტვრა. %%uid შეიცვლება იუზერნეიმით მომხმარებლის ველში."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "გამოიყენეთ %%uid დამასრულებელი მაგ: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "მომხმარებლებიის სიის ფილტრი"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "გაფილტვრა განხორციელდება, როცა მომხმარებლების სია ჩამოიტვირთება."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "ჯგუფის ფილტრი"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "გაფილტვრა განხორციელდება, როცა ჯგუფის სია ჩამოიტვირთება."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "კავშირის პარამეტრები"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "კონფიგურაცია აქტიურია"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "როცა გადანიშნულია, ეს კონფიგურაცია გამოტოვებული იქნება."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "პორტი"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "ბექაფ  (რეპლიკა)  ჰოსტი"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "მიუთითეთ რაიმე ბექაფ ჰოსტი. ის უნდა იყოს ძირითადი LDAP/AD სერვერის რეპლიკა."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "ბექაფ (რეპლიკა) პორტი"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "გამორთეთ ძირითადი სერვერი"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "როცა მონიშნულია, ownCloud დაუკავშირდება მხოლოდ რეპლიკა სერვერს."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "გამოიყენეთ TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "არ გამოიყენოთ დამატებით LDAPS კავშირი. ის წარუმატებლად დასრულდება."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "გამორთეთ SSL სერთიფიკატის ვალიდაცია."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "იმ შემთხვევაში თუ მუშაობს მხოლოდ ეს ოფცია, დააიმპორტეთ LDAP სერვერის SSL სერთიფიკატი თქვენს ownCloud სერვერზე."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "არ არის რეკომენდირებული, გამოიყენეთ მხოლოდ სატესტოდ."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "ქეშის სიცოცხლის ხანგრძლივობა"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "წამებში. ცვლილება ასუფთავებს ქეშს."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "დირექტორიის პარამეტრები"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "მომხმარებლის დისფლეის სახელის ფილდი"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP ატრიბუტი მომხმარებლის  ownCloud სახელის გენერაციისთვის."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "ძირითად მომხმარებელთა სია"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "ერთი მომხმარებლის საწყისი DN ერთ ხაზზე"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "მომხმარებლის ძებნის ატრიბუტი"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "ოფციონალური; თითო ატრიბუტი თითო ხაზზე"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "ჯგუფის დისფლეის სახელის ფილდი"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP ატრიბუტი ჯგუფის  ownCloud სახელის გენერაციისთვის."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "ძირითად ჯგუფთა სია"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "ერთი ჯგუფის საწყისი DN ერთ ხაზზე"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "ჯგუფური ძებნის ატრიბუტი"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "ჯგუფის წევრობის ასოციაცია"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "სპეციალური ატრიბუტები"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "ქვოტას ველი"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "საწყისი ქვოტა"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "ბაიტებში"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "იმეილის ველი"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "მომხმარებლის Home დირექტორიის სახელების დარქმევის წესი"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "დატოვეთ ცარიელი მომხმარებლის სახელი (default). სხვა დანარჩენში მიუთითეთ LDAP/AD ატრიბუტი."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "კავშირის ტესტირება"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "დახმარება"
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 7e61c23fc10eb58f1092b78b465988bf3a661bcc..6dc22644115d7c8c3324e868a3794d7e50e9085c 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index 3b3ac191a817ec21e39c4265e73f96b8768a1921..f6390750e15784298fc0a898e640d692f1aaa1c3 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 2e8b6e43eb6888e2e2571e78dbe8e2b354abd780..cdaa87d744d59c0d83da87c157f50bfc672c1799 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 32901091a746e599c045eb0a4e203e5dffe598d4..7db090797c8dbb66120e62c6282e703137c56f63 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -3,12 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sungjin Gang <potopro@gmail.com>, 2013
+# Sungjin Gang <potopro@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +29,6 @@ msgstr "%s 항목을 이동시키지 못하였음 - 파일 이름이 이미 존
 msgid "Could not move %s"
 msgstr "%s 항목을 이딩시키지 못하였음"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "파일 이름바꾸기 할 수 없음"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "파일이 업로드되지 않았습니다. 알 수 없는 오류입니다"
@@ -68,7 +66,7 @@ msgstr "디스크에 쓰지 못했습니다"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "저장소가 용량이 충분하지 않습니다."
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
@@ -84,9 +82,9 @@ msgstr "공유"
 
 #: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr ""
+msgstr "영원히 삭제"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "삭제"
 
@@ -94,45 +92,45 @@ msgstr "삭제"
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "대기 중"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name}이(가) 이미 존재함"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "바꾸기"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "이름 제안"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "취소"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name}이(가) {new_name}(으)로 대체됨"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "되돌리기"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "삭제 작업중"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "파일 1개 업로드 중"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "파일 업로드중"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -156,69 +154,77 @@ msgstr "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "디렉터리 및 빈 파일은 업로드할 수 없습니다"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "여유 공간이 부족합니다"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "업로드가 취소되었습니다."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL을 입력해야 합니다."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "폴더 이름이 유효하지 않습니다. "
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "오류"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "폴더 1개"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "폴더 {count}개"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "파일 1개"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "파일 {count}개"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "파일 이름바꾸기 할 수 없음"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "업로드"
@@ -273,43 +279,43 @@ msgstr "링크에서"
 
 #: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "파일 삭제됨"
 
 #: templates/index.php:48
 msgid "Cancel upload"
 msgstr "업로드 취소"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "당신은 여기에 쓰기를 할 수 있는 권한이 없습니다."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "내용이 없습니다. 업로드할 수 있습니다!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "공유 해제"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "업로드한 파일이 너무 큼"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "파일을 검색하고 있습니다. 기다려 주십시오."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "현재 검색"
 
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index b2f9321e0e603261a1e49c251cd542af487ab31e..fbea475af8c5b9138bae6546654e5a558c78fbee 100644
--- a/l10n/ko/files_trashbin.po
+++ b/l10n/ko/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgstr ""
 
 #: js/trash.js:121
 msgid "Delete permanently"
-msgstr ""
+msgstr "영원히 삭제"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 6e2db6fcc84cf46c619a62e76d95f6d65f1778bf..a914eb05241999665b124c0079139b5b6a969068 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "저장 중..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "삭제"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "되돌리기"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "그룹"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "그룹 관리자"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "삭제"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr "덜 중요함"
 msgid "Version"
 msgstr "버전"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index e08a48a9b5c2d7f31e66f1d1bb611407c7e4e13b..9f36e614e1e868da258466271ceb46614bd0b772 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr "설정을 유지합니까?"
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "오류"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "연결 시험 성공"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "연결 시험 실패"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>경고:</b> user_ldap 앱과 user_webdavauth 앱은 호환되지 않습니다. 오동작을 일으킬 수 있으므로, 시스템 관리자에게 요청하여 둘 중 하나만 사용하도록 하십시오."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>경고:</b> PHP LDAP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. 백엔드를 사용할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "호스트"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL을 사용하는 경우가 아니라면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오."
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "기본 DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "기본 DN을 한 줄에 하나씩 입력하십시오"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다."
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "사용자 DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "바인딩 작업을 수행할 클라이언트 사용자 DN입니다. 예를 들어서 uid=agent,dc=example,dc=com입니다. 익명 접근을 허용하려면 DN과 암호를 비워 두십시오."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "암호"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "익명 접근을 허용하려면 DN과 암호를 비워 두십시오."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "사용자 로그인 필터"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "로그인을 시도할 때 적용할 필터입니다. %%uid는 로그인 작업에서의 사용자 이름으로 대체됩니다."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid 자리 비움자를 사용하십시오. 예제: \"uid=%%uid\"\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "사용자 목록 필터"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "사용자를 검색할 때 적용할 필터를 정의합니다."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "그룹 필터"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "그룹을 검색할 때 적용할 필터를 정의합니다."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "연결 설정"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "구성 활성화"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "포트"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "백업 (복제) 포트"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "백업 (복제) 포트"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "주 서버 비활성화"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLS 사용"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "서버에서 대소문자를 구분하지 않음 (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL 인증서 유효성 검사를 해제합니다."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "이 옵션을 사용해야 연결할 수 있는 경우에는 LDAP 서버의 SSL 인증서를 ownCloud로 가져올 수 있습니다."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "추천하지 않음, 테스트로만 사용하십시오."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "초. 항목 변경 시 캐시가 갱신됩니다."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "디렉토리 설정"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "사용자의 표시 이름 필드"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP 속성은 사용자의 ownCloud 이름을 생성하기 위해 사용합니다."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "기본 사용자 트리"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "사용자 DN을 한 줄에 하나씩 입력하십시오"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "사용자 검색 속성"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "그룹의 표시 이름 필드"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP 속성은 그룹의 ownCloud 이름을 생성하기 위해 사용합니다."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "기본 그룹 트리"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "그룹 기본 DN을 한 줄에 하나씩 입력하십시오"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "그룹 검색 속성"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "그룹-회원 연결"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "바이트"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "도움말"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 4be0cb61d85e21e2f9d1967d120be87728f139f3..9a9a4568887d93dd239f7f934b5faca3f185c060 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 0eab1067b2ffa7a9e2a1ed48824447b01b411261..8a8df832c2da8810c658abfff76c2e86e6e0c9d1 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "ناو"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "بارکردن"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "داگرتن"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index c875155aa9dcbe0c10a2764f4b1fb0d0264ddf03..f1b2bac0ba733c3402ba9508208ec69f0c1c0ff9 100644
--- a/l10n/ku_IQ/files_trashbin.po
+++ b/l10n/ku_IQ/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index a59db52635b82a6ddcdff4142479d0a5488006f3..57cd5d6abcf86054d3e5776eda0187bb0545adce 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "پاشکه‌وتده‌کات..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 4830e9d27a5e193d698ea15b0fef5e980ddf7437..1a425c728db980cddb1a14ad5d6adfc482d37807 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "سه‌رکه‌وتن"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "هه‌ڵه"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "یارمەتی"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 297e614c2b0524801fc87b75e512323265302362..91e5887e0bc6ef01b98e6b200e7183a3f4c577ce 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 9c56c3d4da497518e6e06d3234eb4e3e1566ae7d..f6df3c81116159922e57ecbc74589a55609cbc64 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr "Deelen"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Läschen"
 
@@ -94,43 +90,43 @@ msgstr "Läschen"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ofbriechen"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "réckgängeg man"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Upload ofgebrach."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Fehler"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Eroplueden"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Upload ofbriechen"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Hei ass näischt. Lued eppes rop!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Net méi deelen"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Upload ze grouss"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Fichieren gi gescannt, war weg."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Momentane Scan"
 
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 55332908947b8ddb4bae5cca059beebdd01a38a4..69c55f0f895a8190c5648ec214445cf1c5616ed9 100644
--- a/l10n/lb/files_trashbin.po
+++ b/l10n/lb/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 8e088e758a13be7aa84e6cfcc47de53cda017749..6575b570b9be7153f933de0ccb3cc2760ac63d64 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "Speicheren..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "geläscht"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "réckgängeg man"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppen Admin"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Läschen"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index f6e6bd009ab1702c9c2461f5e2328d3cfa84f291..38893be1d6bedefd986220366b99ee4744aedfad 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fehler"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hëllef"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index ad40286f05b65ad208ee76a96491557a14eaf09f..472e6577080aeda49d70566635b1b159f4d5eb73 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Roman Deniobe <rms200x@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: Roman Deniobe <rms200x@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +21,12 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Vartotojas %s pasidalino su jumis failu"
 
 #: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Vartotojas %s su jumis pasidalino aplanku"
 
 #: ajax/share.php:101
 #, php-format
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 2178a80a06b81db3b529289736b3723c3bf73177..c4731e2bd87b4f7d25de5813c61dd3fee37b0bec 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr "Dalintis"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "IÅ¡trinti"
 
@@ -94,43 +90,43 @@ msgstr "IÅ¡trinti"
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} jau egzistuoja"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "pakeisti"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "pasiūlyti pavadinimą"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "atšaukti"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "pakeiskite {new_name} į {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "įkeliamas 1 failas"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Klaida"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 aplankalas"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} aplankalai"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 failas"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} failai"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Įkelti"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Atšaukti siuntimą"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Čia tuščia. Įkelkite ką nors!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Įkėlimui failas per didelis"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Skenuojami failai, prašome palaukti."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Å iuo metu skenuojama"
 
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index 77bed8165a4af7ca18ddda2d41ceb8c9f1b08167..38d8809bf8d7e45c9dbd3d8fe08290f01928a754 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 164db54bc9829c0a71c10f728fe32c49a7d8aa2c..e8508048b44688071775fb5b231fe1ac4d41acc5 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "Saugoma..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "GrupÄ—s"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "IÅ¡trinti"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr "Mažiau"
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 26af0dbe27881a54e472a051d5eca4bd124d26f2..83ba46a5fdab8996ed4cacbd3465ba09a11353d2 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Klaida"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "GrupÄ—s filtras"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Prievadas"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Naudoti TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "IÅ¡jungti SSL sertifikato tikrinimÄ…."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nerekomenduojama, naudokite tik testavimui."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Pagalba"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index ed8d247b10dea6503f3429054a18e84033565c96..f06cd6259bacda982adb82a5e67d85191c0de9cc 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index f4d2f07452c5278169709d2c8a1bc8da2fc07bac..40ca8300d6bfba967cc2798cbecb31576c2c46e5 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu"
 msgid "Could not move %s"
 msgstr "Nevarēja pārvietot %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nevarēja pārsaukt datni"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Netika augšupielādēta neviena datne. Nezināma kļūda"
@@ -86,7 +82,7 @@ msgstr "Dalīties"
 msgid "Delete permanently"
 msgstr "Dzēst pavisam"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Dzēst"
 
@@ -94,43 +90,43 @@ msgstr "Dzēst"
 msgid "Rename"
 msgstr "Pārsaukt"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Gaida savu kārtu"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} jau eksistē"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "aizvietot"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "ieteiktais nosaukums"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "atcelt"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "aizvietoja {new_name} ar {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "atsaukt"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "veikt dzēšanas darbību"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "Augšupielādē 1 datni"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhron
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nepietiek brīvas vietas"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Augšupielāde ir atcelta."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL nevar būt tukšs."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nederīgs mapes nosaukums. “Koplietots” izmantojums ir rezervēts ownCloud servisam."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Mainīts"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mape"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mapes"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 datne"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} datnes"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Nevarēja pārsaukt datni"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Augšupielādēt"
@@ -279,37 +283,37 @@ msgstr "Dzēstās datnes"
 msgid "Cancel upload"
 msgstr "Atcelt augšupielādi"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Jums nav tiesību šeit rakstīt."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Lejupielādēt"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Pārtraukt dalīšanos"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Datne ir par lielu, lai to augšupielādētu"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Šobrīd tiek caurskatīts"
 
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 46290b2436a487be290f319e481351154fbfc349..a777ecbef2ab585969bc23aabe012bba68961927 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 2fd80f4858a62d6d1546d1f3f14b43c099830aff..0b232f50be3862f2f24aa8cdff7c48e37fca202a 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Atjaunināta"
 msgid "Saving..."
 msgstr "Saglabā..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "izdzests"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "atsaukt"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Nevar izņemt lietotāju"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupas"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupas administrators"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Dzēst"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "pievienot grupu"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Jānorāda derīgs lietotājvārds"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Kļūda, veidojot lietotāju"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Jānorāda derīga parole"
 
@@ -328,7 +328,7 @@ msgstr "Mazāk"
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 100f2ca501a158fe743d911a356fca506662a206..cb1532a7903ff98b57c8458bcbccbcc3dc15e7b6 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Neizdevās izdzēst servera konfigurāciju"
@@ -53,281 +57,363 @@ msgstr "Paturēt iestatījumus?"
 msgid "Cannot add server configuration"
 msgstr "Nevar pievienot servera konfigurāciju"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Kļūda"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Savienojuma tests ir veiksmīgs"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Savienojuma tests cieta neveiksmi"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Apstiprināt dzēšanu"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Brīdinājums:</b> lietotnes user_ldap un user_webdavauth ir nesavietojamas. Tās var izraisīt negaidītu uzvedību. Lūdzu, prasiet savam sistēmas administratoram kādu no tām deaktivēt."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Brīdinājums:</b> PHP LDAP modulis nav uzinstalēts, aizmugure nedarbosies. Lūdzu, prasiet savam sistēmas administratoram kādu no tām deaktivēt."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Servera konfigurācija"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Pievienot servera konfigurāciju"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Resursdators"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Var neiekļaut protokolu, izņemot, ja vajag SSL. Tad sākums ir ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Bāzes DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Viena bāzes DN rindā"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Lietotājiem un grupām bāzes DN var norādīt cilnē “Paplašināti”"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Lietotāja DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "Klienta lietotāja DN, ar ko veiks sasaisti, piemēram, uid=agent,dc=example,dc=com. Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Parole"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Lietotāja ierakstīšanās filtrs"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Definē filtru, ko izmantot, kad mēģina ierakstīties. %%uid ierakstīšanās darbībā aizstāj lietotājvārdu."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "lieto %%uid vietturi, piemēram, \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lietotāju saraksta filtrs"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definē filtru, ko izmantot, kad saņem lietotāju sarakstu."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Grupu filtrs"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definē filtru, ko izmantot, kad saņem grupu sarakstu."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Savienojuma iestatījumi"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfigurācija ir aktīva"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ja nav atzīmēts, šī konfigurācija tiks izlaista."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Ports"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Rezerves (kopija) serveris"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Norādi rezerves serveri (nav obligāti). Tam ir jābūt galvenā LDAP/AD servera kopijai."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Rezerves (kopijas) ports"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Deaktivēt galveno serveri"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Kad ieslēgts, ownCloud savienosies tikai ar kopijas serveri."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Lietot TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Neizmanto papildu LDAPS savienojumus! Tas nestrādās."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Reģistrnejutīgs LDAP serveris (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Izslēgt SSL sertifikātu validēšanu."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Ja savienojums darbojas ar šo opciju, importē LDAP serveru SSL sertifikātu savā ownCloud serverī."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nav ieteicams, izmanto tikai testēšanai!"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Kešatmiņas dzīvlaiks"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "sekundēs. Izmaiņas iztukšos kešatmiņu."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Direktorijas iestatījumi"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Lietotāja redzamā vārda lauks"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP atribūts, ko izmantot lietotāja ownCloud vārda veidošanai."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Bāzes lietotāju koks"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Viena lietotāju bāzes DN rindā"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Lietotāju meklēšanas atribūts"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Neobligāti; viens atribūts rindā"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Grupas redzamā nosaukuma lauks"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP atribūts, ko izmantot grupas ownCloud nosaukuma veidošanai."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Bāzes grupu koks"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Viena grupu bāzes DN rindā"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Grupu meklēšanas atribūts"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Grupu piederības asociācija"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Īpašie atribūti"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Kvotu lauks"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Kvotas noklusējums"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "baitos"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "E-pasta lauks"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Lietotāja mājas mapes nosaukšanas kārtula"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Testa konfigurācija"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Palīdzība"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index cca6e22f555d016727450e486f0ae0e78610e4a9..cffc24c7a78e923763c19e81b0374af3af9e82ff 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index ee5a7fa3ff5d27e47a3bcab6fc6e3a143a1fec1b..299b8fd800e1029aa1de6cc9ea15a427a509e73c 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ниту еден фајл не се вчита. Непозната грешка"
@@ -86,7 +82,7 @@ msgstr "Сподели"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Избриши"
 
@@ -94,43 +90,43 @@ msgstr "Избриши"
 msgid "Rename"
 msgstr "Преименувај"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Чека"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} веќе постои"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "замени"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "предложи име"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "откажи"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "заменета {new_name} со {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "врати"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 датотека се подига"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Преземањето е прекинато."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Адресата неможе да биде празна."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Грешка"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} датотеки"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Подигни"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Откажи прикачување"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Тука нема ништо. Снимете нешто!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Не споделувај"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Фајлот кој се вчитува е преголем"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Се скенираат датотеки, ве молам почекајте."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Моментално скенирам"
 
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 53216a98dea47189654e148cdc3df25ec79615f5..f0e618ecbaa7784ee2eb312e0b9b83604008f56f 100644
--- a/l10n/mk/files_trashbin.po
+++ b/l10n/mk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 7e664ae61dbdeb984400d59750f2d8a02e9babbe..945c5571dfcb4f20efebc353d2c8ee827c3119ee 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "Снимам..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "врати"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Групи"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Администратор на група"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Избриши"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr "Помалку"
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 92d9c35763e255c50d9bde7bfcd73704decd9ce2..9a3f735d5e3a45aad2c4ad3c212e75a4600d70ee 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Грешка"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Домаќин"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Помош"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 4559ef41db5ab282f2141d79a71d3955f314d34f..366bfde66de8ddc0ce66fa8a7530ed874098e39f 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index ffc6777c0f32d03cb63bc15b8011ee7a06de84ff..f213c62924ceeea9f96fc29476ace73bf5a346ca 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
@@ -86,7 +82,7 @@ msgstr "Kongsi"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Padam"
 
@@ -94,43 +90,43 @@ msgstr "Padam"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "Batal"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Ralat"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Muat naik"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Batal muat naik"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Muatnaik terlalu besar"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Fail sedang diimbas, harap bersabar."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Imbasan semasa"
 
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 8eaef7bab2da09619fb05c0df0fa39e0dd44791a..b54157fab2de92c8bc0daf12fe188526ce84a6dc 100644
--- a/l10n/ms_MY/files_trashbin.po
+++ b/l10n/ms_MY/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index b86d2eb41ba6ddd2fcceacd3d41bf2bc301a0c40..5f4003d2e8748eaaf40cc0a1ab4943fed20a3325 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "Simpan..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "dihapus"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Kumpulan"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Padam"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index f8d3c3c7fb10aee4adb86ea7b3c2ceb523395ba5..784790e0e9e80deb8e68d40a3ec69e690193fa61 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Ralat"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Kata laluan"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Bantuan"
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index c524b59a4cca9df36a7c025fdd52aa7b68cbcd43..fedecb2ad5a8855ca6af54d7c24423e52c584c29 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "ဒေါင်းလုတ်"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index 67429168c145b3568f8eee48d7b26be29128d322..edf738755a06d155d3c83f28234cb08eac8cf449 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "စကားဝှက်"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "အကူအညီ"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index fb7fcade4029ad7cdaf0c8f43781ecae5a772612..e229487e28cc71562b55f20176f44db219d5f48a 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index a7f905b65180318a520d0f310503e106eb35b1d3..f1431fbd1f320a8eb41a81c0fc94a9ccee33c11c 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Hans Nesse <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 23:00+0000\n"
+"Last-Translator: Hans Nesse <>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,16 +21,12 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Kan ikke flytte %s - En fil med samme navn finnes allerede"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr ""
-
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
+msgstr "Kunne ikke flytte %s"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
@@ -42,7 +39,7 @@ msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen."
 
 #: ajax/upload.php:29
 msgid ""
@@ -68,11 +65,11 @@ msgstr "Klarte ikke å skrive til disk"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "Ikke nok lagringsplass"
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "Ugyldig katalog."
 
 #: appinfo/app.php:12
 msgid "Files"
@@ -86,7 +83,7 @@ msgstr "Del"
 msgid "Delete permanently"
 msgstr "Slett permanent"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Slett"
 
@@ -94,53 +91,53 @@ msgstr "Slett"
 msgid "Rename"
 msgstr "Omdøp"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} finnes allerede"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "erstatt"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "foreslå navn"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstatt {new_name} med {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "utfør sletting"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 fil lastes opp"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "filer lastes opp"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' er et ugyldig filnavn."
 
 #: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Filnavn kan ikke være tomt."
 
 #: js/files.js:64
 msgid ""
@@ -150,75 +147,83 @@ msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke ti
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
-msgstr ""
+msgstr "Ikke nok lagringsplass"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL-en kan ikke være tom."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Feil"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} filer"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Kan ikke gi nytt navn"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Last opp"
@@ -273,46 +278,46 @@ msgstr "Fra link"
 
 #: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "Slettet filer"
 
 #: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Du har ikke skrivetilgang her."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last opp noe!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Filen er for stor"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filene du prøver å laste opp er for store for å laste opp til denne serveren."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Skanner etter filer, vennligst vent."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Pågående skanning"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Oppgraderer filsystemets  mellomlager..."
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 00e13b64477352757c812ef476aab5bfc695663e..476b81ff07fe9b0ce144c6a4f8a43e7edd9733d7 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Hans Nesse <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 12:20+0000\n"
+"Last-Translator: Hans Nesse <>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,31 +32,31 @@ msgstr "Gi tilgang"
 
 #: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet."
 
 #: js/google.js:36 js/google.js:93
 msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Feil med konfigurering av Google Drive"
 
 #: lib/config.php:431
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Advarsel:</b> \"smbclient\" er ikke installert. Kan ikke montere CIFS/SMB mapper. Ta kontakt med din systemadministrator for å installere det."
 
 #: lib/config.php:434
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr ""
+msgstr "<b>Advarsel:</b> FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere FTP mapper. Ta kontakt med din systemadministrator for å innstallere det."
 
 #: lib/config.php:437
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
 "your system administrator to install it."
-msgstr ""
+msgstr "<b>Advarsel:</b> Curl støtte i PHP er ikke aktivert eller innstallert. Kan ikke montere owncloud/WebDAV eller Googledrive. Ta kontakt med din systemadministrator for å innstallerer det."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 1e5a285a90e7bcee62888b23a36cbbaa3e67249d..9ee75563d8e9d0b6094eef12d6fcbfa94e48ef1c 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Hans Nesse <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:01+0200\n"
+"PO-Revision-Date: 2013-05-19 12:10+0000\n"
+"Last-Translator: Hans Nesse <>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,4 +82,4 @@ msgstr "Slett"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Slettet filer"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 1b6be2e344746090f7bd62812dbaea68cd0c3428..38770e18e43bbc3d4521917dc9f5316a7b912f85 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
+"POT-Creation-Date: 2013-05-20 02:03+0200\n"
+"PO-Revision-Date: 2013-05-19 23:30+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -41,19 +41,19 @@ msgstr "Apper"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "ZIP-nedlasting av avslått"
 
-#: files.php:210
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "Filene må lastes ned en om gangen"
 
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "Tilbake til filer"
 
-#: files.php:241
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr "De valgte filene er for store til å kunne generere ZIP-fil"
 
@@ -172,16 +172,16 @@ msgstr ""
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:858
+#: setup.php:859
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
 
-#: setup.php:859
+#: setup.php:860
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
 
 #: template.php:113
 msgid "seconds ago"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index a00278adbdf82ae9ec46b3fbec8063042107e376..2f581ebbee45f0d12fa28c0ccdfc8b364f317547 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Hans Nesse <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-20 02:05+0200\n"
+"PO-Revision-Date: 2013-05-19 23:30+0000\n"
+"Last-Translator: Hans Nesse <>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,15 +25,15 @@ msgstr "Lasting av liste fra App Store feilet."
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Autentikasjonsfeil"
+msgstr "Autentiseringsfeil"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "Ditt visningsnavn er blitt endret."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
-msgstr ""
+msgstr "Kunne ikke endre visningsnavn"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -72,7 +73,7 @@ msgstr "Ugyldig forespørsel"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Admin kan ikke flytte seg selv fra admingruppen"
 
 #: ajax/togglegroups.php:30
 #, php-format
@@ -86,11 +87,11 @@ msgstr "Kan ikke slette bruker fra gruppen %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "Kunne ikke oppdatere app."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Oppdater til {appversion}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
@@ -102,7 +103,7 @@ msgstr "Aktiver"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "Vennligst vent..."
 
 #: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
@@ -110,60 +111,60 @@ msgstr "Feil"
 
 #: js/apps.js:90
 msgid "Updating...."
-msgstr ""
+msgstr "Oppdaterer..."
 
 #: js/apps.js:93
 msgid "Error while updating app"
-msgstr ""
+msgstr "Feil ved oppdatering av app"
 
 #: js/apps.js:96
 msgid "Updated"
-msgstr ""
+msgstr "Oppdatert"
 
 #: js/personal.js:118
 msgid "Saving..."
 msgstr "Lagrer..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "slettet"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "angre"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Kunne ikke slette bruker"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppeadministrator"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Slett"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "legg til gruppe"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Oppgi et gyldig brukernavn"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
-msgstr ""
+msgstr "Feil ved oppretting av bruker"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Oppgi et gyldig passord"
 
 #: personal.php:35 personal.php:36
 msgid "__language_name__"
@@ -180,36 +181,36 @@ msgid ""
 "strongly suggest that you configure your webserver in a way that the data "
 "directory is no longer accessible or you move the data directory outside the"
 " webserver document root."
-msgstr ""
+msgstr "Ditt data mappe og dine filer er sannsynligvis tilgjengelig fra internet. .htaccess filene som ownCloud bruker virker ikke. Du bør konfigurere din nettserver slik at data mappa ikke lenger er tilgjengelig eller flytt data mappe ut av nettserverens dokumentområde."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Installasjonsadvarsel"
 
 #: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Modulen 'fileinfo' mangler"
 
 #: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr ""
+msgstr "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Språk virker ikke"
 
 #: templates/admin.php:63
 #, php-format
@@ -217,11 +218,11 @@ msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
 "might be problems with certain characters in file names. We strongly suggest"
 " to install the required packages on your system to support %s."
-msgstr ""
+msgstr "Denne ownCloud serveren kan ikke sette systemspråk til %s. Det kan være problemer med visse tegn i filnavn. Vi foreslår at du installerer de nødvendige pakkene på ditt system for å støtte %s."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Ingen internettilkopling"
 
 #: templates/admin.php:78
 msgid ""
@@ -231,7 +232,7 @@ msgid ""
 "remote and sending of notification emails might also not work. We suggest to"
 " enable internet connection for this server if you want to have all features"
 " of ownCloud."
-msgstr ""
+msgstr "Denne ownCloud serveren har ikke tilkopling til internett. Noen funksjoner som f.eks. tilkopling til ekstern lager, melgin om oppdatering og installasjon av tredjeparts apps vil ikke virke. Vi foreslår at du aktivere en internettilkopling til denne serveren hvis du vil bruke alle funksjonene i ownCloud."
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -239,19 +240,19 @@ msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Utfør en oppgave med hver side som blir lastet"
 
 #: templates/admin.php:111
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr ""
+msgstr "cron.php er registrert som webcron-tjeneste. Kjør cron.php siden  i ownCloud rot hvert minutt vha http."
 
 #: templates/admin.php:121
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "Bruk systemets crontjeneste. Kjør cron.php filen i owncloud mappa vha systemets crontjeneste hver minutt."
 
 #: templates/admin.php:128
 msgid "Sharing"
@@ -259,11 +260,11 @@ msgstr "Deling"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Aktiver API for Deling"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Tillat apps å bruke API for Deling"
 
 #: templates/admin.php:142
 msgid "Allow links"
@@ -275,7 +276,7 @@ msgstr "Tillat brukere å dele filer med lenker"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "TIllat videredeling"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
@@ -291,22 +292,22 @@ msgstr "Tillat kun deling med andre brukere i samme gruppe"
 
 #: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Sikkerhet"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Tving HTTPS"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Tvinger klienter til å bruke ownCloud via kryptert tilkopling."
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Vær vennlig, bruk denne ownCloud instansen via HTTPS for å aktivere eller deaktivere tvungen bruk av SSL."
 
 #: templates/admin.php:195
 msgid "Log"
@@ -328,7 +329,7 @@ msgstr "Mindre"
 msgid "Version"
 msgstr "Versjon"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -336,7 +337,7 @@ msgid ""
 "licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
 "target=\"_blank\"><abbr title=\"Affero General Public "
 "License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "Utviklet av<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud sammfunnet</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:11
 msgid "Add your App"
@@ -356,7 +357,7 @@ msgstr "Se applikasjonens side på apps.owncloud.org"
 
 #: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>"
 
 #: templates/apps.php:38
 msgid "Update"
@@ -372,15 +373,15 @@ msgstr "Administratordokumentasjon"
 
 #: templates/help.php:9
 msgid "Online Documentation"
-msgstr ""
+msgstr "Online dokumentasjon"
 
 #: templates/help.php:11
 msgid "Forum"
-msgstr ""
+msgstr "Forum"
 
 #: templates/help.php:14
 msgid "Bugtracker"
-msgstr ""
+msgstr "Feilsporing"
 
 #: templates/help.php:17
 msgid "Commercial Support"
@@ -397,7 +398,7 @@ msgstr "Få dine apps til å synkronisere dine filer"
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
-msgstr ""
+msgstr "Vis \"Førstegangs veiveiseren\" på nytt"
 
 #: templates/personal.php:37 templates/users.php:23 templates/users.php:77
 msgid "Password"
@@ -425,7 +426,7 @@ msgstr "Endre passord"
 
 #: templates/personal.php:56 templates/users.php:76
 msgid "Display Name"
-msgstr ""
+msgstr "Visningsnavn"
 
 #: templates/personal.php:68
 msgid "Email"
@@ -453,11 +454,11 @@ msgstr "WebDAV"
 
 #: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "Bruk denne adressen for å kople til ownCloud i din filbehandler"
 
 #: templates/users.php:21 templates/users.php:75
 msgid "Login Name"
-msgstr ""
+msgstr "Logginn navn"
 
 #: templates/users.php:30
 msgid "Create"
@@ -465,11 +466,11 @@ msgstr "Opprett"
 
 #: templates/users.php:33
 msgid "Default Storage"
-msgstr ""
+msgstr "Standard lager"
 
 #: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
-msgstr ""
+msgstr "Ubegrenset"
 
 #: templates/users.php:57 templates/users.php:148
 msgid "Other"
@@ -477,16 +478,16 @@ msgstr "Annet"
 
 #: templates/users.php:82
 msgid "Storage"
-msgstr ""
+msgstr "Lager"
 
 #: templates/users.php:93
 msgid "change display name"
-msgstr ""
+msgstr "endre visningsnavn"
 
 #: templates/users.php:97
 msgid "set new password"
-msgstr ""
+msgstr "sett nytt passord"
 
 #: templates/users.php:128
 msgid "Default"
-msgstr ""
+msgstr "Standard"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 643c1a84bfad4012af56f3e4df70756d678fa043..f6e688d10288a6abcd498635111f37d21de3e9bb 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Klarte ikke å slette tjener-konfigurasjonen."
@@ -53,281 +57,363 @@ msgstr "Behold innstillinger?"
 msgid "Cannot add server configuration"
 msgstr "Kan ikke legge til tjener-konfigurasjon"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Suksess"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Feil"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Tilkoblingstest lyktes"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Tilkoblingstest mislyktes"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Bekreft sletting"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Advarsel:</b>Apps user_ldap og user_webdavauth er ikke kompatible. Du kan oppleve uventet atferd fra systemet. Vennligst spør din system-administrator om å deaktivere en av dem."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om å installere den."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Tjener-konfigurasjon"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Legg til tjener-konfigurasjon"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Tjener"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Du kan utelate protokollen, men du er påkrevd å bruke SSL.  Deretter starte med ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "En hoved DN pr. linje"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Du kan spesifisere Base DN for brukere og grupper under Avansert fanen"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Bruker DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "DN nummeret til klienten som skal bindes til, f.eks. uid=agent,dc=example,dc=com. For anonym tilgang, la DN- og passord-feltet stå tomt."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Passord"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "For anonym tilgang, la DN- og passord-feltet stå tomt."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Brukerpålogging filter"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Definerer filteret som skal brukes når et påloggingsforsøk blir utført. %%uid erstatter brukernavnet i innloggingshandlingen."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "bruk %%uid plassholder, f.eks. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Brukerliste filter"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definerer filteret som skal brukes, når systemet innhenter brukere."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "uten noe plassholder, f.eks. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Gruppefilter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definerer filteret som skal brukes, når systemet innhenter grupper."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "uten noe plassholder, f.eks. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfigurasjon aktiv"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Når ikke huket av så vil denne konfigurasjonen bli hoppet over."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Sikkerhetskopierings (Replica) vert"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Bruk TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Case-insensitiv LDAP tjener (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Slå av SSL-sertifikat validering"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Hvis tilgang kun fungerer med dette alternativet, importer LDAP-tjenerens SSL-sertifikat til din egen ownCloud tjener."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Ikke anbefalt, bruk kun for testing"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "i sekunder. En endring tømmer bufferen."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Vis brukerens navnfelt"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP-attributen å bruke for å generere brukers ownCloud navn."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Hovedbruker tre"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "En Bruker Base DN pr. linje"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Vis gruppens navnfelt"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP-attributen å bruke for å generere gruppens ownCloud navn."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Hovedgruppe tre"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "En gruppe hoved-DN pr. linje"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "gruppe-medlem assosiasjon"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hjelp"
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index 1bd24b1346fec57de7dee51ba88382a8e499db64..a20804fbfeb8deb6bf233ed23d445177451ffd2f 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index 871723423d8003e2110424b1e3f4d330521be557..8bc9905662c9c164b41b0c160b335439c090844a 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 2a620401ee084f7dce02d7b2d4c5bee400a9b113..d35357a3ad3ac7030090e4f3e9e96e2183ae4da7 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 19:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index f1d984cf414f726ff24feec124a4f4fae4312d36..c394fb203c9d31a9288190867c2912dfa1b9c488 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# André Koot <meneer@tken.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +28,6 @@ msgstr "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam"
 msgid "Could not move %s"
 msgstr "Kon %s niet verplaatsen"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Kan bestand niet hernoemen"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Er was geen bestand geladen.  Onbekende fout"
@@ -86,7 +83,7 @@ msgstr "Delen"
 msgid "Delete permanently"
 msgstr "Verwijder definitief"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -94,43 +91,43 @@ msgstr "Verwijder"
 msgid "Rename"
 msgstr "Hernoem"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "In behandeling"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} bestaat al"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "vervang"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "Stel een naam voor"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "annuleren"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "verving {new_name} met {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "uitvoeren verwijderactie"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 bestand wordt ge-upload"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "bestanden aan het uploaden"
 
@@ -156,69 +153,77 @@ msgstr "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Niet genoeg ruimte beschikbaar"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL kan niet leeg zijn."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Fout"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Grootte"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Aangepast"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 map"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mappen"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 bestand"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} bestanden"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Kan bestand niet hernoemen"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Uploaden"
@@ -279,37 +284,37 @@ msgstr "Verwijderde bestanden"
 msgid "Cancel upload"
 msgstr "Upload afbreken"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "U hebt hier geen schrijfpermissies."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Er bevindt zich hier niets. Upload een bestand!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Downloaden"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Stop met delen"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Upload is te groot"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Bestanden worden gescand, even wachten."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Er wordt gescand"
 
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 944f801c1ab9bf8ac7ced3b89248d244fbbba12e..ba389cde31c97a8de421f112b6f7d0ed82f96f77 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 577422c46913f68e9fe4b146f053309a3abcbccf..24737684e099549a4a79783dc49a4cf157be2aa5 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 06:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Bijgewerkt"
 msgid "Saving..."
 msgstr "Opslaan"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "verwijderd"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Kon gebruiker niet verwijderen"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Groepen"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Groep beheerder"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Verwijder"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "toevoegen groep"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Er moet een geldige gebruikersnaam worden opgegeven"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Fout bij aanmaken gebruiker"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Er moet een geldig wachtwoord worden opgegeven"
 
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index e7ea1823141912af094d63e36506d5f0c2ae9294..af11411cb64780d184689e2214f090b404d07408 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# André Koot <meneer@tken.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,10 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Niet gelukt de vertalingen leeg te maken."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Verwijderen serverconfiguratie mislukt"
@@ -53,281 +58,363 @@ msgstr "Instellingen bewaren?"
 msgid "Cannot add server configuration"
 msgstr "Kon de serverconfiguratie niet toevoegen"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "vertaaltabel leeggemaakt"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Succes"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fout"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Verbindingstest geslaagd"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Verbindingstest mislukt"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Bevestig verwijderen"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Serverconfiguratie"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Toevoegen serverconfiguratie"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Een Base DN per regel"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd."
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Voor anonieme toegang, laat de DN en het wachtwoord leeg."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Gebruikers Login Filter"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Definiëerd de toe te passen filter indien er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam in de login actie."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "gebruik %%uid placeholder, bijv. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Gebruikers Lijst Filter"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiëerd de toe te passen filter voor het ophalen van gebruikers."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "zonder een placeholder, bijv. \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Groep Filter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiëerd de toe te passen filter voor het ophalen van groepen."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "zonder een placeholder, bijv. \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Verbindingsinstellingen"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuratie actief"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Poort"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Backup (Replica) Host"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Opgeven optionele backup host. Het moet een replica van de hoofd LDAP/AD server."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Backup (Replica) Poort"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Deactiveren hoofdserver"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Wanneer ingeschakeld, zal ownCloud allen verbinden met de replicaserver."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Gebruik TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Gebruik het niet voor LDAPS verbindingen, dat gaat niet lukken."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Schakel SSL certificaat validatie uit."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Niet aangeraden, gebruik alleen voor test doeleinden."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Cache time-to-live"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "in seconden. Een verandering maakt de cache leeg."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Mapinstellingen"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Gebruikers Schermnaam Veld"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de gebruikers."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Basis Gebruikers Structuur"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Een User Base DN per regel"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Attributen voor gebruikerszoekopdrachten"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Optioneel; één attribuut per regel"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Groep Schermnaam Veld"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de groepen."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Basis Groupen Structuur"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Een Group Base DN per regel"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Attributen voor groepszoekopdrachten"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Groepslid associatie"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Speciale attributen"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Quota veld"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota standaard"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "in bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "E-mailveld"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Gebruikers Home map naamgevingsregel"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Interne gebruikersnaam"
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Interne gebruikersnaam attribuut:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Negeren UUID detectie"
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "UUID Attribuut:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Gebruikersnaam-LDAP gebruikers vertaling"
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Leegmaken Groepsnaam-LDAP groep vertaling"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Test configuratie"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Help"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 6c4ba95164ad92de6041b4efe6ca0243e5b38044..08adadd957a329e5a8e36ba7925cce904586167e 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 06:50+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: unhammer <unhammer+dill@mm.st>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -70,7 +71,7 @@ msgstr "Ingen %s-ID."
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr "Klarte ikkje å leggja til %s i favorittar."
+msgstr "Klarte ikkje leggja til %s i favorittar."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -79,7 +80,7 @@ msgstr "Ingen kategoriar valt for sletting."
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr "Klarte ikkje å fjerna %s frå favorittar."
+msgstr "Klarte ikkje fjerna %s frå favorittar."
 
 #: js/config.php:34
 msgid "Sunday"
@@ -199,11 +200,11 @@ msgstr "førre månad"
 
 #: js/js.js:727
 msgid "{months} months ago"
-msgstr "{months) månader sidan"
+msgstr "{months} månadar sidan"
 
 #: js/js.js:728
 msgid "months ago"
-msgstr "månader sidan"
+msgstr "månadar sidan"
 
 #: js/js.js:729
 msgid "last year"
@@ -248,7 +249,7 @@ msgstr "Feil"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr "App-namnet er ikkje spesifisert."
+msgstr "Programnamnet er ikkje spesifisert."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
@@ -308,11 +309,11 @@ msgstr "Send"
 
 #: js/share.js:178
 msgid "Set expiration date"
-msgstr "Set utlaupsdato"
+msgstr "Set utløpsdato"
 
 #: js/share.js:179
 msgid "Expiration date"
-msgstr "Utlaupsdato"
+msgstr "Utløpsdato"
 
 #: js/share.js:211
 msgid "Share via email:"
@@ -364,11 +365,11 @@ msgstr "Passordverna"
 
 #: js/share.js:577
 msgid "Error unsetting expiration date"
-msgstr "Klarte ikkje å fjerna utlaupsdato"
+msgstr "Klarte ikkje fjerna utløpsdato"
 
 #: js/share.js:589
 msgid "Error setting expiration date"
-msgstr "Klarte ikkje å setja utlaupsdato"
+msgstr "Klarte ikkje setja utløpsdato"
 
 #: js/share.js:604
 msgid "Sending ..."
@@ -447,7 +448,7 @@ msgstr "Brukarar"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Applikasjonar"
+msgstr "Program"
 
 #: strings.php:8
 msgid "Admin"
@@ -525,13 +526,13 @@ msgstr "Datamappe"
 
 #: templates/installation.php:74
 msgid "Configure the database"
-msgstr "Konfigurer databasen"
+msgstr "Set opp databasen"
 
 #: templates/installation.php:79 templates/installation.php:91
 #: templates/installation.php:102 templates/installation.php:113
 #: templates/installation.php:125
 msgid "will be used"
-msgstr "vil bli nytta"
+msgstr "vil verta nytta"
 
 #: templates/installation.php:137
 msgid "Database user"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 388d90f63a91c223ac8e17e228653d72ceeaf716..8bf6b233b5c711add7254d459ce7ff66a59a252d 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 17:50+0000\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 13:00+0000\n"
 "Last-Translator: unhammer <unhammer+dill@mm.st>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -21,16 +22,12 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Klarte ikkje å flytta %s – det finst allereie ei fil med dette namnet"
+msgstr "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr "Klarte ikkje å flytta %s"
-
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Klarte ikkje å endra filnamnet"
+msgstr "Klarte ikkje flytta %s"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
@@ -65,7 +62,7 @@ msgstr "Manglar ei mellombels mappe"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
-msgstr "Klarte ikkje å skriva til disk"
+msgstr "Klarte ikkje skriva til disk"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
@@ -95,43 +92,43 @@ msgstr "Slett"
 msgid "Rename"
 msgstr "Endra namn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Under vegs"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} finst allereie"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "byt ut"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "føreslå namn"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "bytte ut {new_name} med {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "utfør sletting"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 fil lastar opp"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "filer lastar opp"
 
@@ -165,7 +162,7 @@ msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
 
 #: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Klarte ikkje å lasta opp fila sidan ho er ei mappe eller er på 0 byte"
+msgstr "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte"
 
 #: js/files.js:277
 msgid "Not enough space available"
@@ -178,11 +175,11 @@ msgstr "Opplasting avbroten."
 #: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga bli avbroten."
+msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten."
 
 #: js/files.js:486
 msgid "URL cannot be empty."
-msgstr "URL-en kan ikkje vera tom."
+msgstr "Nettadressa kan ikkje vera tom."
 
 #: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
@@ -220,6 +217,14 @@ msgstr "1 fil"
 msgid "{count} files"
 msgstr "{count} filer"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Klarte ikkje endra filnamnet"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Last opp"
@@ -238,11 +243,11 @@ msgstr "maks. moglege:"
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr "Naudsynt for fleirfils- og mappenedlastingar."
+msgstr "Nødvendig for fleirfils- og mappenedlastingar."
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
-msgstr "Skru på ZIP-nedlasting"
+msgstr "Slå på ZIP-nedlasting"
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
@@ -304,7 +309,7 @@ msgstr "For stor opplasting"
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
+msgstr "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren."
 
 #: templates/index.php:114
 msgid "Files are being scanned, please wait."
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 94d12c1829ea76a3d5f7983e6cb47b94401fe976..1edc28d346e88d56370d09ff779e6cd6f2623dbc 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 17:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 13:00+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,12 +29,12 @@ msgstr "Send"
 #: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s delte mappa %s med deg"
 
 #: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s delte fila %s med deg"
 
 #: templates/public.php:19 templates/public.php:43
 msgid "Download"
@@ -41,7 +42,7 @@ msgstr "Last ned"
 
 #: templates/public.php:40
 msgid "No preview available for"
-msgstr ""
+msgstr "Inga førehandsvising tilgjengeleg for"
 
 #: templates/public.php:50
 msgid "web services under your control"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 14a63b146293eb851455ace35f17cb2204e073ab..6abeaf62de62e8596146aa1dca74fe735fb0ec6a 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 14:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 11:10+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,16 +21,16 @@ msgstr ""
 #: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "Klarte ikkje sletta %s for godt"
 
 #: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "Klarte ikkje gjenoppretta %s"
 
 #: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr ""
+msgstr "utfør gjenoppretting"
 
 #: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
 msgid "Error"
@@ -37,7 +38,7 @@ msgstr "Feil"
 
 #: js/trash.js:34
 msgid "delete file permanently"
-msgstr ""
+msgstr "slett fila for godt"
 
 #: js/trash.js:121
 msgid "Delete permanently"
@@ -49,7 +50,7 @@ msgstr "Namn"
 
 #: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "Sletta"
 
 #: js/trash.js:184
 msgid "1 folder"
@@ -69,11 +70,11 @@ msgstr "{count} filer"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Ingenting her. Papirkorga di er tom!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
-msgstr ""
+msgstr "Gjenopprett"
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
@@ -81,4 +82,4 @@ msgstr "Slett"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Sletta filer"
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index 0a5ad71179639aa580749b38ec6f0546c3b678dd..925f545edd8e14d3488152bd2cb4045224724d54 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
+"PO-Revision-Date: 2013-05-20 15:10+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,38 +21,38 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "Klarte ikkje å tilbakestilla: %s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "vellukka"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "Tilbakestilte fila %s til utgåva %s"
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "feil"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "Klarte ikkje tilbakestilla fila %s til utgåva %s"
 
 #: history.php:69
 msgid "No old versions available"
-msgstr ""
+msgstr "Ingen eldre utgåver tilgjengelege"
 
 #: history.php:74
 msgid "No path specified"
-msgstr ""
+msgstr "Ingen sti gjeve"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "Utgåver"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "Tilbakestill ei fil til ei tidlegare utgåve ved å klikka tilbakestill-knappen"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 9521606544ab33c0d7905314e086adde90735234..0fced10d3216948709a0ba286fa37ce374958648 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 17:40+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-16 09:30+0000\n"
 "Last-Translator: unhammer <unhammer+dill@mm.st>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -35,25 +36,25 @@ msgstr "Brukarar"
 
 #: app.php:398
 msgid "Apps"
-msgstr "Applikasjonar"
+msgstr "Program"
 
 #: app.php:406
 msgid "Admin"
 msgstr "Administrer"
 
-#: files.php:209
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -172,13 +173,13 @@ msgstr ""
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:858
+#: setup.php:859
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
 
-#: setup.php:859
+#: setup.php:860
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index ac35cb7aedce8cc2b8d688d1913f911d1aef6f8a..7661744100b14c4bf4bc4ee1bba8c8dc49a10bfb 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 17:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: unhammer <unhammer+dill@mm.st>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -29,11 +30,11 @@ msgstr "Autentiseringsfeil"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr "Visningsnamnet ditt er endra."
+msgstr "Visingsnamnet ditt er endra."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
-msgstr "Klarte ikkje å endra visningsnamnet"
+msgstr "Klarte ikkje endra visingsnamnet"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -41,11 +42,11 @@ msgstr "Gruppa finst allereie"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr "Klarte ikkje å leggja til gruppa"
+msgstr "Klarte ikkje leggja til gruppa"
 
 #: ajax/enableapp.php:11
 msgid "Could not enable app. "
-msgstr "Klarte ikkje å aktivera app-en."
+msgstr "Klarte ikkje slå på programmet."
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -61,7 +62,7 @@ msgstr "Klarte ikkje å sletta gruppa"
 
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
-msgstr "Klarte ikkje å sletta brukaren"
+msgstr "Klarte ikkje sletta brukaren"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
@@ -78,16 +79,16 @@ msgstr "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa"
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr "Klarte ikkje å leggja til brukaren til gruppa %s"
+msgstr "Klarte ikkje leggja til brukaren til gruppa %s"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr "Klarte ikkje å fjerna brukaren frå gruppa %s"
+msgstr "Klarte ikkje fjerna brukaren frå gruppa %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr "Klarte ikkje å oppdatera app-en."
+msgstr "Klarte ikkje oppdatera programmet."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
@@ -125,44 +126,44 @@ msgstr "Oppdatert"
 msgid "Saving..."
 msgstr "Lagrar …"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "sletta"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "angra"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr "Klarte ikkje å fjerna brukaren"
+msgstr "Klarte ikkje fjerna brukaren"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppestyrar"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Slett"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "legg til gruppe"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Du må oppgje eit gyldig brukarnamn"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Feil ved oppretting av brukar"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Du må oppgje eit gyldig passord"
 
@@ -206,7 +207,7 @@ msgstr "Modulen «fileinfo» manglar"
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr "PHP-modulen «fileinfo» manglar. Me rår sterkt til å skru på denne modulen for å best mogleg oppdaga MIME-typar."
+msgstr "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar."
 
 #: templates/admin.php:58
 msgid "Locale not working"
@@ -218,7 +219,7 @@ msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
 "might be problems with certain characters in file names. We strongly suggest"
 " to install the required packages on your system to support %s."
-msgstr "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som krevst for å støtta %s."
+msgstr "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som trengst for å støtta %s."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
@@ -232,7 +233,7 @@ msgid ""
 "remote and sending of notification emails might also not work. We suggest to"
 " enable internet connection for this server if you want to have all features"
 " of ownCloud."
-msgstr "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsapplikasjonar ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du skrur på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud."
+msgstr "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsprogram ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du slå på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud."
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -260,7 +261,7 @@ msgstr "Deling"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr "Skru på API-et for deling"
+msgstr "Slå på API-et for deling"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
@@ -307,7 +308,7 @@ msgstr "Krev at klientar koplar til ownCloud med ei kryptert tilkopling."
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å skru av/på SSL-handhevinga."
+msgstr "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å slå av/på SSL-handhevinga."
 
 #: templates/admin.php:195
 msgid "Log"
@@ -349,11 +350,11 @@ msgstr "Fleire app-ar"
 
 #: templates/apps.php:28
 msgid "Select an App"
-msgstr "Vel ein applikasjon"
+msgstr "Vel eit program"
 
 #: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
-msgstr "Sjå applikasjonssida på apps.owncloud.com"
+msgstr "Sjå programsida på apps.owncloud.com"
 
 #: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
@@ -410,7 +411,7 @@ msgstr "Passordet ditt er endra"
 
 #: templates/personal.php:39
 msgid "Unable to change your password"
-msgstr "Klarte ikkje å endra passordet"
+msgstr "Klarte ikkje endra passordet"
 
 #: templates/personal.php:40
 msgid "Current password"
@@ -426,7 +427,7 @@ msgstr "Endra passord"
 
 #: templates/personal.php:56 templates/users.php:76
 msgid "Display Name"
-msgstr "Visningsnamn"
+msgstr "Visingsnamn"
 
 #: templates/personal.php:68
 msgid "Email"
@@ -438,7 +439,7 @@ msgstr "Di epost-adresse"
 
 #: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
-msgstr "Fyll inn e-postadressa di for å aktivera passordgjenoppretting"
+msgstr "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg"
 
 #: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
@@ -482,7 +483,7 @@ msgstr "Lagring"
 
 #: templates/users.php:93
 msgid "change display name"
-msgstr "endra visningsnamn"
+msgstr "endra visingsnamn"
 
 #: templates/users.php:97
 msgid "set new password"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 8e326e3829fd7b244b4888e278cc545439c5be65..aa60a28904e1de7fee7919a7ad84e2970b392910 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 07:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Feil"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Passord"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hjelp"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 7e55cfc676040d93fc4269e172ca82eaeb534d3a..fb3ea7ee10fabdcdbfc37e369b56e881a5212ce8 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 7bff1f0e1bc842140671077654b32e91b5a7e657..6add33eaeb9a815fbc085f0d57860b2f8f049ec4 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr "Parteja"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Escafa"
 
@@ -94,43 +90,43 @@ msgstr "Escafa"
 msgid "Rename"
 msgstr "Torna nomenar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Al esperar"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "remplaça"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "nom prepausat"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "anulla"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "defar"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 fichièr al amontcargar"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "fichièrs al amontcargar"
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Amontcargar anullat."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. "
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Amontcarga"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr " Anulla l'amontcargar"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Pas res dedins. Amontcarga qualquaren"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Pas partejador"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Amontcargament tròp gròs"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Los fiichièrs son a èsser explorats, "
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Exploracion en cors"
 
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index 70bce2472e74a372128478e22f27c6308c080808..68e83d04f5eb67bc8bf25ced5ca5be5eb0e7fcf0 100644
--- a/l10n/oc/files_trashbin.po
+++ b/l10n/oc/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 69c7ff6ab76e639ac31ae0a349087ecd6229feb6..cf78308378364d7f79f7ac164b0d72baa6082c24 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "Enregistra..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "escafat"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "defar"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grops"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grop Admin"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Escafa"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 4da5e8266b156960d73da0d0294e68b6f49e8f93..32a16d4e26a3b0e76afc8ed585bdfcb1a23ed29c 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Senhal"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index ea1cd8ebbc988db3075124afac7b7ce502f2ef2f..e023ed3428064bf0566313a69129af63bc07d04f 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# adbrand <pkwiecin@adbrand.pl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -405,7 +406,7 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -563,7 +564,7 @@ msgstr "Kontrolowane serwisy"
 #: templates/layout.user.php:36
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s jest dostępna. Dowiedz się więcej na temat aktualizacji."
 
 #: templates/layout.user.php:61
 msgid "Log out"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index bd3470063b50d1d873b7745b838eb978f0693094..bd2888a2b8140d076297053a910e2163800e4023 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# adbrand <pkwiecin@adbrand.pl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +28,6 @@ msgstr "Nie można było przenieść %s - Plik o takiej nazwie już istnieje"
 msgid "Could not move %s"
 msgstr "Nie można było przenieść %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nie można zmienić nazwy pliku"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Żaden plik nie został załadowany. Nieznany błąd"
@@ -86,7 +83,7 @@ msgstr "Udostępnij"
 msgid "Delete permanently"
 msgstr "Trwale usuń"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Usuń"
 
@@ -94,43 +91,43 @@ msgstr "Usuń"
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "OczekujÄ…ce"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} już istnieje"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "zastÄ…p"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "zasugeruj nazwÄ™"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "anuluj"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "zastÄ…piono {new_name} przez {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "cofnij"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "wykonaj operację usunięcia"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 plik wczytywany"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "pliki wczytane"
 
@@ -156,69 +153,77 @@ msgstr "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchro
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Za mało miejsca"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL nie może być pusty."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nieprawidłowa nazwa folderu. Korzystanie z nazwy „Shared” jest zarezerwowane dla ownCloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modyfikacja"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "Ilość folderów: {count}"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "Ilość plików: {count}"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Nie można zmienić nazwy pliku"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Wyślij"
@@ -279,37 +284,37 @@ msgstr "Pliki usunięte"
 msgid "Cancel upload"
 msgstr "Anuluj wysyłanie"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Nie masz uprawnień do zapisu w tym miejscu."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Pusto. Wyślij coś!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Zatrzymaj współdzielenie"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Ładowany plik jest za duży"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Skanowanie plików, proszę czekać."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Aktualnie skanowane"
 
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 48d0debe7fc3c46f59cb91bf49bdb0f4d3e6fdca..0b1495b8d0f9836a901b4bf10329a9df9ef00117 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 111fad7ad06240ce5c671a01b306eed1bf3c429c..569af9fbc98e18baa9951454c9cc23aedf03fee7 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# adbrand <pkwiecin@adbrand.pl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr "BÅ‚Ä…d uwierzytelniania"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "Twoje wyświetlana nazwa została zmieniona."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
@@ -124,44 +125,44 @@ msgstr "Zaktualizowano"
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "usunięto"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "cofnij"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Nie można usunąć użytkownika"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupy"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Administrator grupy"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Usuń"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "dodaj grupÄ™"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Należy podać prawidłową nazwę użytkownika"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Błąd podczas tworzenia użytkownika"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Należy podać prawidłowe hasło"
 
@@ -328,7 +329,7 @@ msgstr "Mniej"
 msgid "Version"
 msgstr "Wersja"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index c1425a6570edc232178aceca581ef458efc8bf76..1cd3ec895b8a9ce2d14d0588c525020f00d86e2f 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Nie można usunąć konfiguracji serwera"
@@ -53,281 +57,363 @@ msgstr "Zachować ustawienia?"
 msgid "Cannot add server configuration"
 msgstr "Nie można dodać konfiguracji serwera"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sukces"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "BÅ‚Ä…d"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Test połączenia udany"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Test połączenia nie udany"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Czy chcesz usunąć bieżącą konfigurację serwera?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Potwierdź usunięcie"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są  kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Ostrzeżenie:</b>  Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Konfiguracja servera"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Dodaj konfiguracjÄ™ servera"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Baza DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Jedna baza DN na liniÄ™"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Użytkownik DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Dla dostępu anonimowego pozostawić DN i hasło puste."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtr logowania użytkownika"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Definiuje filtr do zastosowania, gdy podejmowana jest próba logowania. %%uid zastępuje nazwę użytkownika w działaniu logowania."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Użyj %%uid zastępczy, np. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lista filtrów użytkownika"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiuje filtry do zastosowania, podczas pobierania użytkowników."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez żadnych symboli zastępczych np. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Grupa filtrów"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiuje filtry do zastosowania, podczas pobierania grup."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Konfiguracja połączeń"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfiguracja archiwum"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Gdy niezaznaczone, ta konfiguracja zostanie pominięta."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Kopia zapasowa (repliki) host"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Dać opcjonalnie  hosta kopii zapasowej . To musi być repliką głównego serwera LDAP/AD."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Kopia zapasowa (repliki) Port"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Wyłącz serwer główny"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Po włączeniu, ownCloud tylko połączy się z serwerem repliki."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Użyj TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Nie używaj go dodatkowo dla połączeń protokołu LDAPS, zakończy się niepowodzeniem."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Wielkość liter serwera LDAP (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Wyłączyć sprawdzanie poprawności certyfikatu SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Niezalecane, użyj tylko testowo."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Przechowuj czas życia"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Ustawienia katalogów"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Pole wyświetlanej nazwy użytkownika"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atrybut LDAP służy do generowania nazwy użytkownika ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Drzewo bazy użytkowników"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Jeden użytkownik Bazy DN na linię"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Szukaj atrybutów"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcjonalnie; jeden atrybut w wierszu"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Pole wyświetlanej nazwy grupy"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atrybut LDAP służy do generowania nazwy grup ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Drzewo bazy grup"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Jedna grupa bazy DN na liniÄ™"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Grupa atrybutów wyszukaj"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Członek grupy stowarzyszenia"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Specjalne atrybuty"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Pole przydziału"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Przydział domyślny"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "w bajtach"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Pole email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Reguły nazewnictwa folderu domowego użytkownika"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Konfiguracja testowa"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index 4cf5e0b54776b5a9183bdd289e39e9670bfd97de..8e524496642b6e56201af77d9017195929ada877 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 21467c1e4d4b0dc4ba98c92e5c58e4dc379c987c..e92342be50451f1320b2a49ae1c60dc7f5b36e4a 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 00:50+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 2e9f259cd2b5e2cffcaf387e16e2e6b0cd2ff8db..5d86a5195a4304c60498a846b4c454293753aa3f 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Flávio Veras <flaviove@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +28,6 @@ msgstr "Impossível mover %s - Um arquivo com este nome já existe"
 msgid "Could not move %s"
 msgstr "Impossível mover %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Impossível renomear arquivo"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum arquivo foi enviado. Erro desconhecido"
@@ -86,7 +83,7 @@ msgstr "Compartilhar"
 msgid "Delete permanently"
 msgstr "Excluir permanentemente"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Excluir"
 
@@ -94,43 +91,43 @@ msgstr "Excluir"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} já existe"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugerir nome"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "Substituído {old_name} por {new_name} "
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "realizar operação de exclusão"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "enviando 1 arquivo"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "enviando arquivos"
 
@@ -156,69 +153,77 @@ msgstr "Seu armazenamento está cheio, arquivos não podem mais ser atualizados
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Espaço de armazenamento insuficiente"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL não pode ficar em branco"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de pasta inválido. O uso de 'Shared' é reservado para o Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Erro"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} arquivos"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Impossível renomear arquivo"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Upload"
@@ -279,37 +284,37 @@ msgstr "Arquivos apagados"
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Você não possui permissão de escrita aqui."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nada aqui.Carrege alguma coisa!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Upload muito grande"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Arquivos sendo escaneados, por favor aguarde."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Scanning atual"
 
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index 8336eefd7e7c2e236a64fb79483867462dd426db..c9a34e60931205034806943c0152448f40931a22 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 9bd9a0bb7f41620c8d4b08d200649f965cae7d76..c5cf67cadd25663fb662fa2157e710b62991a860 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 11:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Atualizado"
 msgid "Saving..."
 msgstr "Salvando..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "excluído"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "desfazer"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Impossível remover usuário"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupo Administrativo"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Excluir"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "adicionar grupo"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Forneça um nome de usuário válido"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Erro ao criar usuário"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Forneça uma senha válida"
 
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 04273762bd84a85f6a3c9e5899c916f8e639acdc..eb862c273a126afcb765730419ef7fa0b736df84 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Flávio Veras <flaviove@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:15+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,10 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Falha ao limpar os mapeamentos."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Falha ao deletar a configuração do servidor"
@@ -53,281 +58,363 @@ msgstr "Manter ajustes?"
 msgid "Cannot add server configuration"
 msgstr "Impossível adicionar a configuração do servidor"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "mapeamentos limpos"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sucesso"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Erro"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Teste de conexão bem sucedida"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Teste de conexão falhou"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Você quer realmente deletar as atuais Configurações de Servidor?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirmar Exclusão"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você deverá experienciar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Aviso:</b> O módulo PHP LDAP não está instalado, o backend não funcionará. Por favor, peça ao seu administrador do sistema para instalá-lo."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configuração de servidor"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Adicionar Configuração de Servidor"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN Base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Uma base DN por linha"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Você pode especificar DN Base para usuários e grupos na guia Avançada"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN Usuário"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "O DN do cliente usuário com qual a ligação deverá ser feita, ex. uid=agent,dc=example,dc=com. Para acesso anônimo, deixe DN e Senha vazios."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Senha"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acesso anônimo, deixe DN e Senha vazios."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro de Login de Usuário"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "use %%uid placeholder, ex. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtro de Lista de Usuário"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define filtro a ser aplicado ao obter usuários."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sem nenhum espaço reservado, ex. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtro de Grupo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define o filtro a aplicar ao obter grupos."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sem nenhum espaço reservado, ex.  \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Configurações de Conexão"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuração ativa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Quando não marcada, esta configuração será ignorada."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Porta"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Servidor de Backup (Réplica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Defina um servidor de backup opcional. Ele deverá ser uma réplica do servidor LDAP/AD principal."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Porta do Backup (Réplica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desativar Servidor Principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Quando ativado, ownCloud somente se conectará ao servidor de réplica."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Não use adicionalmente para conexões LDAPS, pois falhará."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP sensível à caixa alta (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desligar validação de certificado SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se a conexão só funciona com essa opção, importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Não recomendado, use somente para testes."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Cache Time-To-Live"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "em segundos. Uma mudança esvaziará o cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Configurações de Diretório"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Campo Nome de Exibição de Usuário"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "O atributo LDAP para usar para gerar nome ownCloud do usuário."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Árvore de Usuário Base"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Um usuário-base DN por linha"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributos de Busca de Usuário"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; um atributo por linha"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Campo Nome de Exibição de Grupo"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "O atributo LDAP para usar para gerar nome ownCloud do grupo."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Árvore de Grupo Base"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Um grupo-base DN por linha"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributos de Busca de Grupo"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Associação Grupo-Membro"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributos Especiais"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Campo de Cota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Cota Padrão"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Campo de Email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regra para Nome da Pasta Pessoal do Usuário"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nome de usuário interno"
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr "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. "
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Atributo Interno de Nome de Usuário:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Substituir detecção UUID"
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr "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."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Atributo UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Usuário-LDAP Mapeamento de Usuário"
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr "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."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Limpar Mapeamento de Usuário Nome de Usuário-LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Limpar NomedoGrupo-LDAP Mapeamento do Grupo"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Teste de Configuração"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 9fd8df290be759980b621f5b4cf360a43968752a..3e8b32a2e5fded3d31494982cdffc4a682033f72 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mouxy <daniel@mouxy.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: Mouxy <daniel@mouxy.net>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -401,11 +402,11 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -563,7 +564,7 @@ msgstr "serviços web sob o seu controlo"
 #: templates/layout.user.php:36
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s está disponível. Tenha mais informações como actualizar."
 
 #: templates/layout.user.php:61
 msgid "Log out"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 664e95876ae397636d96eee34267ab9352b4bcbb..45addc54d27f89f4038bcda296b25d9ab2e0e433 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Não foi possível mover o ficheiro %s - Já existe um ficheiro com esse
 msgid "Could not move %s"
 msgstr "Não foi possível move o ficheiro %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Não foi possível renomear o ficheiro"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
@@ -86,7 +82,7 @@ msgstr "Partilhar"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -94,43 +90,43 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "O nome {new_name} já existe"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugira um nome"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituido {new_name} por {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Executar a tarefa de apagar"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "A enviar 1 ficheiro"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "A enviar os ficheiros"
 
@@ -156,69 +152,77 @@ msgstr "O seu armazenamento está cheio, os ficheiros não podem ser sincronizad
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Espaço em disco insuficiente!"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "O URL não pode estar vazio."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de pasta inválido. O Uso de 'shared' é reservado para o ownCloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Erro"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Não foi possível renomear o ficheiro"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Carregar"
@@ -279,37 +283,37 @@ msgstr "Ficheiros eliminados"
 msgid "Cancel upload"
 msgstr "Cancelar envio"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Não tem permissões de escrita aqui."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Vazio. Envie alguma coisa!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Upload muito grande"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Análise actual"
 
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 4941cbba20d5aae5c7957dd075f7fcd982d74cae..57de8c823efa9116493afcbfda80cb5bda8d3547 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mouxy <daniel@mouxy.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 16:40+0000\n"
+"Last-Translator: Mouxy <daniel@mouxy.net>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +56,7 @@ msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
 "your system administrator to install it."
-msgstr ""
+msgstr "<b>Atenção:<br> O suporte PHP para o Curl não está activado ou instalado. A montagem do ownCloud/WebDav ou GoolgeDriver não é possível. Por favor contacte o administrador para o instalar."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index bc0ceb89d58b53440e186165e40701b8fc917e78..2b2ad1fa7b3ade35c9f4ed336ed94da0b9dfb631 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index c9af2137f5f2cf24bdb8e7d607fc7c5733e9e991..8ac1ac314ae0de4b1c834a86c4e7616d0a23b880 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mouxy <daniel@mouxy.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: Mouxy <daniel@mouxy.net>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr "Erro na autenticação"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "O seu nome foi alterado"
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
@@ -124,44 +125,44 @@ msgstr "Actualizado"
 msgid "Saving..."
 msgstr "A guardar..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "apagado"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "desfazer"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Não foi possível remover o utilizador"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupo Administrador"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "Adicionar grupo"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Um nome de utilizador válido deve ser fornecido"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Erro a criar utilizador"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Uma password válida deve ser fornecida"
 
@@ -328,7 +329,7 @@ msgstr "Menos"
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index d5ad8a47f579438798f25809267a2ef1ac55c2d5..35d7b778aa758f6d0bc8e389ccc05cb5fa30ec74 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Erro ao eliminar as configurações do servidor"
@@ -53,281 +57,363 @@ msgstr "Manter as definições?"
 msgid "Cannot add server configuration"
 msgstr "Não foi possível adicionar as configurações do servidor."
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sucesso"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Erro"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Teste de conecção passado com sucesso."
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Erro no teste de conecção."
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Deseja realmente apagar as configurações de servidor actuais?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirmar a operação de apagar"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Aviso:</b> O módulo PHP LDAP não está instalado, logo não irá funcionar. Por favor peça ao administrador para o instalar."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configurações do servidor"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Adicionar configurações do servidor"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Anfitrião"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Uma base DN por linho"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Pode especificar o ND Base para utilizadores e grupos no separador Avançado"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN do utilizador"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "O DN to cliente "
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Password"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acesso anónimo, deixe DN e a Palavra-passe vazios."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro de login de utilizador"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Use a variável %%uid , exemplo: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Utilizar filtro"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Defina o filtro a aplicar, ao recuperar utilizadores."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sem variável. Exemplo: \"objectClass=pessoa\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtrar por grupo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Defina o filtro a aplicar, ao recuperar grupos."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Definições de ligação"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuração activa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Se não estiver marcada, esta definição não será tida em conta."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Porto"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Servidor de Backup (Réplica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Forneça um servidor (anfitrião) de backup. Deve ser uma réplica do servidor principal de LDAP/AD "
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Porta do servidor de backup (Replica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desactivar servidor principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Se estiver ligado, o ownCloud vai somente ligar-se a este servidor de réplicas."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Não utilize para adicionar ligações LDAP, irá falhar!"
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP (Windows) não sensível a maiúsculas."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desligar a validação de certificado SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se a ligação apenas funcionar com está opção, importe o certificado SSL do servidor LDAP para o seu servidor do ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Não recomendado, utilizado apenas para testes!"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Cache do tempo de vida dos objetos no servidor"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "em segundos. Uma alteração esvazia a cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Definições de directorias"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Mostrador do nome de utilizador."
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atributo LDAP para gerar o nome de utilizador do ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Base da árvore de utilizadores."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Uma base de utilizador DN por linha"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Utilizar atributos de pesquisa"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; Um atributo por linha"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Mostrador do nome do grupo."
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atributo LDAP para gerar o nome do grupo do ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Base da árvore de grupos."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Uma base de grupo DN por linha"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributos de pesquisa de grupo"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Associar utilizador ao grupo."
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributos especiais"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Quota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota padrão"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Campo de email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regra da pasta inicial do utilizador"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Testar a configuração"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index a5db03c655c3f8c5f5e8085bb4831405bfa8ef97..cb0f3da3c4d50bc608e123be16b2b5a21497ca56 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 5b878d86c2bfd5d9a089bde43df8f6e597102de9..4d7f89ed97a32e6c8046fc6338cbaf4ecc282585 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 13:00+0000\n"
-"Last-Translator: ripkid666 <ripkid666@gmail.com>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,10 +28,6 @@ msgstr "Nu se poate de mutat %s - Fișier cu acest nume deja există"
 msgid "Could not move %s"
 msgstr "Nu s-a putut muta %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nu s-a putut redenumi fișierul"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nici un fișier nu a fost încărcat. Eroare necunoscută"
@@ -87,7 +83,7 @@ msgstr "Partajează"
 msgid "Delete permanently"
 msgstr "Stergere permanenta"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Șterge"
 
@@ -95,43 +91,43 @@ msgstr "Șterge"
 msgid "Rename"
 msgstr "Redenumire"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "În așteptare"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} deja exista"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "înlocuire"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugerează nume"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "anulare"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} inlocuit cu {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "Anulează ultima acțiune"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "efectueaza operatiunea de stergere"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "un fișier se încarcă"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "fișiere se încarcă"
 
@@ -157,69 +153,77 @@ msgstr "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Spatiul de stocare este aproape plin ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nu este suficient spațiu disponibil"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Încărcare anulată."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Adresa URL nu poate fi goală."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Invalid folder name. Usage of 'Shared' is reserved by Ownclou"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Eroare"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} foldare"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fisier"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} fisiere"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Nu s-a putut redenumi fișierul"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Încărcare"
@@ -280,37 +284,37 @@ msgstr "Sterge fisierele"
 msgid "Cancel upload"
 msgstr "Anulează încărcarea"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Nu ai permisiunea de a sterge fisiere aici."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nimic aici. Încarcă ceva!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Anulare partajare"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Fișierul încărcat este prea mare"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Fișierele sunt scanate, te rog așteptă."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "ÃŽn curs de scanare"
 
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index 0691654cd6745f9dfcd912d596d6c5da31ac4b88..c4888b41a062cef923149450676ce8e7a8d964d9 100644
--- a/l10n/ro/files_trashbin.po
+++ b/l10n/ro/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 13:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 28af7d896f5443e6caf3b0f3f6efe73bb1b44738..b3c9bd49afb066da4912b8273d13e1ea4a732aca 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 13:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "Se salvează..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "șters"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "Anulează ultima acțiune"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupuri"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Grupul Admin "
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Șterge"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 9dab61a2a4bc9980c7040874b471eeec8073f93a..46778737fa5b0a171489ff6c886d8717d96da25f 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Succes"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Eroare"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<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."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Gazdă"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN de bază"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un Base DN pe linie"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN al utilizatorului"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "DN-ul clientului utilizator cu care se va efectua conectarea, d.e. uid=agent,dc=example,dc=com. Pentru acces anonim, lăsăți DN și Parolă libere."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Parolă"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Pentru acces anonim, lăsați DN și Parolă libere."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtrare după Nume Utilizator"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtrarea după lista utilizatorilor"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "fără substituenți, d.e. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Fitrare Grup"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definește filtrele care se aplică, când se preiau grupurile."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "fără substituenți, d.e. \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Portul"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Utilizează TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Server LDAP insensibil la majuscule (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Oprește validarea certificatelor SSL "
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nu este recomandat, a se utiliza doar pentru testare."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "în secunde. O schimbare curăță memoria tampon."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Câmpul cu numele vizibil al utilizatorului"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Arborele de bază al Utilizatorilor"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un User Base DN pe linie"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Câmpul cu numele grupului"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Arborele de bază al Grupurilor"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un Group Base DN pe linie"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Asocierea Grup-Membru"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "în octeți"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ajutor"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 22276bcd58090395b4e198cd1dca2c6ec414a716..fbe806ab0ec3bda00d637223101ea0310d7074ac 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 19:20+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: foool <andrglad@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 0493878feb101420bc8b5c83ce9d46da744fc2bb..99301a68747233f0f4e51ab7ce7e608d5c2baa09 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Невозможно переместить %s - файл с таким
 msgid "Could not move %s"
 msgstr "Невозможно переместить %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Невозможно переименовать файл"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Файл не был загружен. Неизвестная ошибка"
@@ -86,7 +82,7 @@ msgstr "Открыть доступ"
 msgid "Delete permanently"
 msgstr "Удалено навсегда"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Удалить"
 
@@ -94,43 +90,43 @@ msgstr "Удалить"
 msgid "Rename"
 msgstr "Переименовать"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} уже существует"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "заменить"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "предложить название"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "отмена"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "заменено {new_name} на {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "отмена"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "выполняется операция удаления"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "загружается 1 файл"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "файлы загружаются"
 
@@ -156,69 +152,77 @@ msgstr "Ваше дисковое пространство полностью з
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше хранилище почти заполнено ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Файл не был загружен: его размер 0 байт либо это не файл, а директория."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Недостаточно свободного места"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Загрузка отменена."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Ссылка не может быть пустой."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Имя"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Изменён"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} файлов"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Невозможно переименовать файл"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Загрузка"
@@ -279,37 +283,37 @@ msgstr "Удалённые файлы"
 msgid "Cancel upload"
 msgstr "Отмена загрузки"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "У вас нет разрешений на запись здесь."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Здесь ничего нет. Загрузите что-нибудь!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Закрыть общий доступ"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Файл слишком велик"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файлы, которые Вы пытаетесь загрузить, превышают лимит для файлов на этом сервере."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Подождите, файлы сканируются."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Текущее сканирование"
 
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 28de0c794ca1153001a329ffb37e679747a579ca..42f971ee765fcd7e1c34a5ddac826924a16f837c 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 29b575a0067ea86065a921be524701bffbce8a9c..7b98bf3705b0cc2c6e8cd923edbc402a468104e3 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: eurekafag <eurekafag@eureka7.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Обновлено"
 msgid "Saving..."
 msgstr "Сохранение..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "удален"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "отмена"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Невозможно удалить пользователя"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Группы"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Группа Администраторы"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "добавить группу"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Предоставте подходящее имя пользователя"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Ошибка создания пользователя"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Предоставте подходящий пароль"
 
@@ -329,7 +329,7 @@ msgstr "Меньше"
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index cd1cb84f03d09b8a8d3179df8d015d82c7d8b186..4b20940944123e21897223edec4aed973030f1c1 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Не удалось удалить конфигурацию сервера"
@@ -53,281 +57,363 @@ msgstr "Сохранить настройки?"
 msgid "Cannot add server configuration"
 msgstr "Не получилось добавить конфигурацию сервера"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Успешно"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Ошибка"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Проверка соединения удалась"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Проверка соединения не удалась"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Вы действительно хотите удалить существующую конфигурацию сервера?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Подтверждение удаления"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Внимание:</b>Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением. Пожалуйста, обратитесь к системному администратору, чтобы отключить одно из них."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Внимание:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. "
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Конфигурация сервера"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Добавить конфигурацию сервера"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Сервер"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Базовый DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "По одному базовому DN в строке."
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN пользователя"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "DN-клиента пользователя, с которым связывают должно быть заполнено, например, uid=агент, dc=пример, dc=com. Для анонимного доступа, оставьте DN и пароль пустыми."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Для анонимного доступа оставьте DN и пароль пустыми."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Фильтр входа пользователей"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "используйте заполнитель %%uid, например: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Фильтр списка пользователей"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Определяет фильтр для применения при получении пользователей."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "без заполнителя, например: \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Фильтр группы"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Определяет фильтр для применения при получении группы."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "без заполнения, например \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Настройки подключения"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Конфигурация активна"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Когда галочка снята, эта конфигурация будет пропущена."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Адрес резервного сервера"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Порт резервного сервера"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Отключение главного сервера"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Когда включено, ownCloud будет соединяться только с резервным сервером."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Использовать TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Не используйте совместно с безопасными подключениями (LDAPS), это не сработает."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Нечувствительный к регистру сервер LDAP (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Отключить проверку сертификата SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Если соединение работает только с этой опцией, импортируйте на ваш сервер ownCloud сертификат SSL сервера LDAP."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Не рекомендуется, используйте только для тестирования."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Кэш времени жизни"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Изменение очистит кэш."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Настройки каталога"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Поле отображаемого имени пользователя"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Атрибут LDAP для генерации имени пользователя ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "База пользовательского дерева"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "По одной базовому DN пользователей в строке."
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Поисковые атрибуты пользователя"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Опционально; один атрибут на линию"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Поле отображаемого имени группы"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Атрибут LDAP для генерации имени группы ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "База группового дерева"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "По одной базовому DN групп в строке."
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Атрибуты поиска для группы"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Ассоциация Группа-Участник"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Специальные атрибуты"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Поле квота"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Квота по умолчанию"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Поле адресса эллектронной почты"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Правило именования Домашней Папки Пользователя"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Тестовая конфигурация"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Помощь"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index bfbe3274c4516057798452d31f7fee0acb4465a6..a63e62e68ae85923ff451deadc156c42050d9cb9 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:20+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -243,7 +243,7 @@ msgstr ""
 #: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
 #: js/share.js:589
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 32e4d26536d73e213f9437c792bfd3528398568f..9803ad4bf83a13daa4a7fb20d2ef74195ee96016 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AnnaSch <cdewqazxsqwe@gmail.com>, 2013
-# AnnaSch <cdewqazxsqwe@gmail.com>, 2012
-# skoptev <skoptev@ukr.net>, 2012
-# Langaru <langaru@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 01:55+0200\n"
-"PO-Revision-Date: 2013-04-25 23:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,256 +20,260 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Неполучается перенести %s - Файл с таким именем уже существует"
+msgstr ""
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr "Неполучается перенести %s "
-
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Невозможно переименовать файл"
+msgstr ""
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr "Файл не был загружен. Неизвестная ошибка"
+msgstr ""
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Ошибка отсутствует, файл загружен успешно."
+msgstr ""
 
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Размер загружаемого файла превышает upload_max_filesize директиву в php.ini:"
+msgstr ""
 
 #: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Размер загруженного"
+msgstr ""
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Загружаемый файл был загружен частично"
+msgstr ""
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Файл не был загружен"
+msgstr ""
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Отсутствует временная папка"
+msgstr ""
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
-msgstr "Не удалось записать на диск"
+msgstr ""
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr "Недостаточно места в хранилище"
+msgstr ""
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr "Неверный каталог."
+msgstr ""
 
 #: appinfo/app.php:12
 msgid "Files"
-msgstr "Файлы"
+msgstr ""
 
 #: js/fileactions.js:116
 msgid "Share"
-msgstr "Сделать общим"
+msgstr ""
 
 #: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr "Удалить навсегда"
+msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
-msgstr "Удалить"
+msgstr ""
 
 #: js/fileactions.js:194
 msgid "Rename"
-msgstr "Переименовать"
+msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Ожидающий решения"
+msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
-msgstr "{новое_имя} уже существует"
+msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
-msgstr "отмена"
+msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr "подобрать название"
+msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
-msgstr "отменить"
+msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
-msgstr "заменено {новое_имя} с {старое_имя}"
+msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
-msgstr "отменить действие"
+msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr "выполняется процесс удаления"
+msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
-msgstr "загрузка 1 файла"
+msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr "'.' является неверным именем файла."
+msgstr ""
 
 #: js/files.js:56
 msgid "File name cannot be empty."
-msgstr "Имя файла не может быть пустым."
+msgstr ""
 
 #: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы."
+msgstr ""
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Ваше хранилище переполнено, фалы больше не могут быть обновлены или синхронизированы!"
+msgstr ""
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Ваше хранилище почти полно ({usedSpacePercent}%)"
+msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "Идёт подготовка к скачке Вашего файла. Это может занять некоторое время, если фалы большие."
+msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией"
+msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
-msgstr "Не достаточно свободного места"
+msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
-msgstr "Загрузка отменена"
+msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена."
+msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr "URL не должен быть пустым."
+msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Неверное имя папки. Использование наименования 'Опубликовано' зарезервировано Owncloud"
+msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "Имя"
+msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
-msgstr "Размер"
+msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "Изменен"
+msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
-msgstr "1 папка"
+msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
-msgstr "{количество} папок"
+msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
-msgstr "1 файл"
+msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
-msgstr "{количество} файлов"
+msgstr ""
+
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
-msgstr "Загрузить "
+msgstr ""
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr "Работа с файлами"
+msgstr ""
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr "Максимальный размер загружаемого файла"
+msgstr ""
 
 #: templates/admin.php:10
 msgid "max. possible: "
-msgstr "Максимально возможный"
+msgstr ""
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr "Необходимо для множественной загрузки."
+msgstr ""
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
-msgstr "Включение ZIP-загрузки"
+msgstr ""
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
-msgstr "0 без ограничений"
+msgstr ""
 
 #: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
-msgstr "Максимальный размер входящих ZIP-файлов "
+msgstr ""
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr "Сохранить"
+msgstr ""
 
 #: templates/index.php:7
 msgid "New"
-msgstr "Новый"
+msgstr ""
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr "Текстовый файл"
+msgstr ""
 
 #: templates/index.php:12
 msgid "Folder"
-msgstr "Папка"
+msgstr ""
 
 #: templates/index.php:14
 msgid "From link"
-msgstr "По ссылке"
+msgstr ""
 
 #: templates/index.php:42
 msgid "Deleted files"
@@ -281,42 +281,42 @@ msgstr ""
 
 #: templates/index.php:48
 msgid "Cancel upload"
-msgstr "Отмена загрузки"
+msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
-msgstr "Здесь ничего нет. Загрузите что-нибудь!"
+msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
-msgstr "Загрузить"
+msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Скрыть"
+msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Загрузка слишком велика"
+msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер."
+msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr "Файлы сканируются, пожалуйста, подождите."
+msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
-msgstr "Текущее сканирование"
+msgstr ""
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Обновление кэша файловой системы... "
+msgstr ""
diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po
index dd27b348b3b423279ccddf6b69a36801e04ea1e5..4e65e5d446d1f47a1e6c6d8bcb51b6e5331abf22 100644
--- a/l10n/ru_RU/files_trashbin.po
+++ b/l10n/ru_RU/files_trashbin.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,16 +20,16 @@ msgstr ""
 #: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr "%s не может быть удалён навсегда"
+msgstr ""
 
 #: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr "%s не может быть восстановлен"
+msgstr ""
 
 #: js/trash.js:7 js/trash.js:96
 msgid "perform restore operation"
-msgstr "выполнить операцию восстановления"
+msgstr ""
 
 #: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
 msgid "Error"
@@ -38,48 +37,48 @@ msgstr "Ошибка"
 
 #: js/trash.js:34
 msgid "delete file permanently"
-msgstr "удалить файл навсегда"
+msgstr ""
 
 #: js/trash.js:121
 msgid "Delete permanently"
-msgstr "Удалить навсегда"
+msgstr ""
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
-msgstr "Имя"
+msgstr ""
 
 #: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr "Удалён"
+msgstr ""
 
 #: js/trash.js:184
 msgid "1 folder"
-msgstr "1 папка"
+msgstr ""
 
 #: js/trash.js:186
 msgid "{count} folders"
-msgstr "{количество} папок"
+msgstr ""
 
 #: js/trash.js:194
 msgid "1 file"
-msgstr "1 файл"
+msgstr ""
 
 #: js/trash.js:196
 msgid "{count} files"
-msgstr "{количество} файлов"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Здесь ничего нет. Ваша корзина пуста!"
+msgstr ""
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
-msgstr "Восстановить"
+msgstr ""
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
-msgstr "Удалить"
+msgstr ""
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr "Удаленные файлы"
+msgstr ""
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index bea523051683db141277b6b3632ec55a78fe8ef0..5fc2851ce67fb503d563e358d076edc0b83d689b 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
 "PO-Revision-Date: 2013-04-26 08:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -106,7 +106,7 @@ msgstr ""
 
 #: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 #: js/apps.js:90
 msgid "Updating...."
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "удалено"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 3ee3d4714504a8c57098f550377073ce7b572dda..5d247f8926875551b876ce71f5a11c50c38937b7 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -3,22 +3,24 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <cdewqazxsqwe@gmail.com>, 2013.
-#   <cdewqazxsqwe@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -41,7 +43,7 @@ msgstr ""
 
 #: js/settings.js:66
 msgid "Deletion failed"
-msgstr "Удаление не удалось"
+msgstr ""
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
@@ -55,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Успех"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Ошибка"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
-msgstr "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением системы. Пожалуйста, обратитесь к системному администратору для отключения одного из них."
+msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
-msgstr "<b>Предупреждение:</b> Модуль PHP LDAP не установлен, бэкэнд не будет работать. Пожалуйста, обратитесь к Вашему системному администратору, чтобы установить его."
+msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
-msgstr "Хост"
+msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://"
+msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
-msgstr "База DN"
+msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr "Одно базовое DN на линию"
+msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»"
+msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
-msgstr "DN пользователя"
+msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
-msgstr "DN клиентского пользователя, с которого должна осуществляться привязка, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте поля DN и Пароль пустыми."
+msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
-msgstr "Пароль"
+msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Для анонимного доступа оставьте поля DN и пароль пустыми."
+msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
-msgstr "Фильтр имен пользователей"
+msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr "Задает фильтр, применяемый при загрузке пользователя. %%uid заменяет имя пользователя при входе."
+msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "используйте %%uid заполнитель, например, \"uid=%%uid\""
+msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
-msgstr "Фильтр списка пользователей"
+msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
-msgstr "Задает фильтр, применяемый при получении пользователей."
+msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "без каких-либо заполнителей, например, \"objectClass=person\"."
+msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
-msgstr "Групповой фильтр"
+msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Задает фильтр, применяемый при получении групп."
+msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "без каких-либо заполнителей, например, \"objectClass=posixGroup\"."
+msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
-msgstr "Порт"
+msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
-msgstr "Использовать TLS"
+msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
-msgstr "Нечувствительный к регистру LDAP-сервер (Windows)"
+msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
-msgstr "Выключить проверку сертификата SSL."
+msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер."
+msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
-msgstr "Не рекомендовано, используйте только для тестирования."
+msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
-msgstr "в секундах. Изменение очищает кэш."
+msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
-msgstr "Поле, отображаемое как имя пользователя"
+msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Атрибут LDAP, используемый для создания имени пользователя в ownCloud."
+msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
-msgstr "Базовое дерево пользователей"
+msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr "Одно пользовательское базовое DN на линию"
+msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
-msgstr "Поле, отображаемое как имя группы"
+msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Атрибут LDAP, используемый для создания группового имени в ownCloud."
+msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
-msgstr "Базовое дерево групп"
+msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr "Одно групповое базовое DN на линию"
+msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
-msgstr "Связь член-группа"
+msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
-msgstr "в байтах"
+msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут."
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
-msgstr "Помощь"
+msgstr ""
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 56ebb8d40520a92b0a04442a70d72facad75d110..21ffdc00b28a6f88e6c979e42230504e7d62f98c 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index eb144d24e4788c67de2b9c6b34743387696b09f6..ba42d3104178d83fd8583b4ae8258849f7e29855 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "ගොනුවක් උඩුගත නොවුනි. නොහැඳිනු දෝෂයක්"
@@ -86,7 +82,7 @@ msgstr "බෙදා හදා ගන්න"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "මකා දමන්න"
 
@@ -94,43 +90,43 @@ msgstr "මකා දමන්න"
 msgid "Rename"
 msgstr "නැවත නම් කරන්න"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ප්‍රතිස්ථාපනය කරන්න"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "නමක් යෝජනා කරන්න"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "අත් හරින්න"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "නිෂ්ප්‍රභ කරන්න"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 ගොනුවක් උඩගත කෙරේ"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "යොමුව හිස් විය නොහැක"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "නම"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "වෙනස් කළ"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 ෆොල්ඩරයක්"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ගොනුවක්"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "උඩුගත කරන්න"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "උඩුගත කිරීම අත් හරින්න"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "බාන්න"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "නොබෙදු"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "උඩුගත කිරීම විශාල වැඩිය"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "වර්තමාන පරික්ෂාව"
 
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index 8ba334fb5afb8543cac17045d04e62e8a1402838..872a72761b56d8ad7035826b1ae3f02ddba73e83 100644
--- a/l10n/si_LK/files_trashbin.po
+++ b/l10n/si_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 4f85fab02b67e2a6a3c0789c7e66a55234944221..dcbbfc411ad308e0a36b1bfca7a5f238fabf2a45 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "සුරැකෙමින් පවතී..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "නිෂ්ප්‍රභ කරන්න"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "කණ්ඩායම්"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "කාණ්ඩ පරිපාලක"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "මකා දමන්න"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr "අඩු"
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index b535f61782cbd616b4e7c0210166e26b94ebdd1d..76caf1c7709db00255468cea79af8e9493ccbcea 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "සාර්ථකයි"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "දෝෂයක්"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "සත්කාරකය"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "මුර පදය"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "පරිශීලක පිවිසුම් පෙරහන"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "පරිශීලක ලැයිස්තු පෙරහන"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "කණ්ඩායම් පෙරහන"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "කණ්ඩායම් සොයා ලබාගන්නා විට, යොදන පෙරහන නියම කරයි"
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "තොට"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLS භාවිතා කරන්න"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "උදව්"
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index b8788c7a3b862bd6158456a425ce125ee5b21efc..29c0e202761089822737956de93ffce0a3b3aa28 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index 289b258772e91fc5ee96075222d89be23b6b68a9..7e555cc8df96b9e9b626a15709fe794256d705ea 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index bac1aabe45ce3c2b8b264957db9c16c0094f6e93..0d1e882f635004c247b9190f8a68017ab1c2fc5b 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -564,7 +564,7 @@ msgstr "webové služby pod Vašou kontrolou"
 #: templates/layout.user.php:36
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s je dostupná. Získajte viac informácií k postupu aktualizáce."
 
 #: templates/layout.user.php:61
 msgid "Log out"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index f482515f73c67ec4bd9db12c311ff0868afaaf67..09050750255ea861603e1595525e0cf8fc433ce2 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Nie je možné presunúť %s - súbor s týmto menom už existuje"
 msgid "Could not move %s"
 msgstr "Nie je možné presunúť %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nemožno premenovať súbor"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
@@ -86,7 +82,7 @@ msgstr "Zdieľať"
 msgid "Delete permanently"
 msgstr "Zmazať  trvalo"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Zmazať"
 
@@ -94,43 +90,43 @@ msgstr "Zmazať"
 msgid "Rename"
 msgstr "Premenovať"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Prebieha"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} už existuje"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "nahradiť"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "pomôcť s menom"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "zrušiť"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "prepísaný {new_name} súborom {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "vrátiť"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "vykonať zmazanie"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 súbor sa posiela "
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "nahrávanie súborov"
 
@@ -156,69 +152,77 @@ msgstr "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchroniz
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Vaše úložisko je takmer plné ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nie je k dispozícii dostatok miesta"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Odosielanie zrušené"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL nemôže byť prázdne"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Chyba"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Názov"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 priečinok"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} priečinkov"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 súbor"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} súborov"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Nemožno premenovať súbor"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Odoslať"
@@ -279,37 +283,37 @@ msgstr "Zmazané súbory"
 msgid "Cancel upload"
 msgstr "Zrušiť odosielanie"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Nemáte oprávnenie na zápis."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Žiadny súbor. Nahrajte niečo!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "SÅ¥ahovanie"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Zrušiť zdieľanie"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Nahrávanie je príliš veľké"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Čakajte, súbory sú prehľadávané."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Práve prezerané"
 
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index e46d3c3aa58db84771299746f7528b6e6b2ae12f..2ae6687e6948b651b0c0de725bfe4b003d6aeaf0 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index adbef6c0f0cd7a83a3ad40cfabf6e98339961396..a440dde63960baa85cf3da0856af7d63eca8c1a4 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-29 01:58+0200\n"
-"PO-Revision-Date: 2013-04-28 18:50+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Aktualizované"
 msgid "Saving..."
 msgstr "Ukladám..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "zmazané"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "vrátiť"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Nemožno odobrať používateľa"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Skupiny"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Správca skupiny"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Zmazať"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "pridať skupinu"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Musíte zadať platné používateľské meno"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Chyba pri vytváraní používateľa"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Musíte zadať platné heslo"
 
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 5cbcb9424216f7ab6ea7b90fb4ed60883352b2d1..740f7040fb90395bf16d5a90020ebdd695cab756 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Zlyhalo zmazanie nastavenia servera."
@@ -53,281 +57,363 @@ msgstr "Ponechať nastavenia?"
 msgid "Cannot add server configuration"
 msgstr "Nemožno pridať nastavenie servera"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Úspešné"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Chyba"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Test pripojenia bol úspešný"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Test pripojenia zlyhal"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Naozaj chcete zmazať súčasné nastavenie servera?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Potvrdiť vymazanie"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth nie sú kompatibilné. Môže nastávať neočakávané správanie. Požiadajte administrátora systému aby jednu z nich zakázal."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požádejte administrátora systému aby ho nainštaloval."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Nastavenia servera"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Pridať nastavenia servera."
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Hostiteľ"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Môžete vynechať protokol, s výnimkou požadovania SSL. Vtedy začnite s ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Základné DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Jedno základné DN na riadok"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Používateľské DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "DN klientského používateľa, ku ktorému tvoríte väzbu, napr. uid=agent,dc=example,dc=com. Pre anonymný prístup ponechajte údaje DN a Heslo prázdne."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filter prihlásenia používateľov"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "použite zástupný vzor %%uid, napr. \\\"uid=%%uid\\\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filter zoznamov používateľov"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definuje použitý filter, pre získanie používateľov."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez zástupných znakov, napr. \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filter skupiny"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definuje použitý filter, pre získanie skupín."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez zástupných znakov, napr. \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Nastavenie pripojenia"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Nastavenia sú aktívne "
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ak nie je zaškrtnuté, nastavenie bude preskočené."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Záložný server (kópia) hosť"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Zadajte záložný LDAP/AD. Musí to byť kópia hlavného LDAP/AD servera."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Záložný server (kópia) port"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Zakázať hlavný server"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Pri zapnutí sa ownCloud pripojí len k záložnému serveru."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Použi TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Nepoužívajte pre pripojenie LDAPS, zlyhá."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server nerozlišuje veľkosť znakov (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Vypnúť overovanie SSL certifikátu."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Ak pripojenie pracuje len s touto možnosťou, tak importujte SSL certifikát LDAP serveru do vášho servera ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nie je doporučované, len pre testovacie účely."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Životnosť objektov v cache"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Nastavenie priečinka"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Pole pre zobrazenia mena používateľa"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atribút LDAP použitý na vygenerovanie mena používateľa ownCloud "
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Základný používateľský strom"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Jedna používateľská základná DN na riadok"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atribúty vyhľadávania používateľov"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Voliteľné, jeden atribút na jeden riadok"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Pole pre zobrazenie mena skupiny"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atribút LDAP použitý na vygenerovanie mena skupiny ownCloud "
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Základný skupinový strom"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Jedna skupinová základná DN na riadok"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atribúty vyhľadávania skupín"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Priradenie člena skupiny"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Špeciálne atribúty"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Pole kvóty"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Predvolená kvóta"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "v bajtoch"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Pole email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Pravidlo pre nastavenie mena používateľského priečinka dát"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Test nastavenia"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index c420c56eafc5264ca5ebe08e16d55d32ef7ba72f..c16d289f19d4b0b4e22f1ad6898270b19f666071 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -564,7 +564,7 @@ msgstr "spletne storitve pod vašim nadzorom"
 #: templates/layout.user.php:36
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s je na voljo. Pridobite več podrobnosti za posodobitev."
 
 #: templates/layout.user.php:61
 msgid "Log out"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 3cd5da7a411cbe2c92bd0ff36dabe08376a2c84d..76edc3fd319d21794963b267a84155f479b4d9c5 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Ni mogoče premakniti %s - datoteka s tem imenom že obstaja"
 msgid "Could not move %s"
 msgstr "Ni mogoče premakniti %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Ni mogoče preimenovati datoteke"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ni poslane datoteke. Neznana napaka."
@@ -86,7 +82,7 @@ msgstr "Souporaba"
 msgid "Delete permanently"
 msgstr "Izbriši dokončno"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -94,43 +90,43 @@ msgstr "Izbriši"
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "V čakanju ..."
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} že obstaja"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "zamenjaj"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "predlagaj ime"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "prekliči"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "preimenovano ime {new_name} z imenom {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "izvedi opravilo brisanja"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "Pošiljanje 1 datoteke"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "poteka pošiljanje datotek"
 
@@ -156,69 +152,77 @@ msgstr "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in us
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Na voljo ni dovolj prostora."
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Pošiljanje je preklicano."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Naslov URL ne sme biti prazna vrednost."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Napaka"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} map"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} datotek"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Ni mogoče preimenovati datoteke"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Pošlji"
@@ -279,37 +283,37 @@ msgstr "Izbrisane datoteke"
 msgid "Cancel upload"
 msgstr "Prekliči pošiljanje"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Za to mesto ni ustreznih dovoljenj za pisanje."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Prekliči souporabo"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Prekoračenje omejitve velikosti"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Poteka preučevanje datotek, počakajte ..."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Trenutno poteka preučevanje"
 
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 8900ee66e4f52742166f99de0c760962138e829f..2ce8f9f03e69acfdb29822e34a71675707b92ce3 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 65640901d208d36a37f89aeab2a2e8bb42829f0d..b4b74e10e0de4eb3999f3742baacfa5a9b1e39fc 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 18:10+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Posodobljeno"
 msgid "Saving..."
 msgstr "Poteka shranjevanje ..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "izbrisano"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Uporabnika ni mogoče odstraniti"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Skupine"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Skrbnik skupine"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Izbriši"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "dodaj skupino"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Navedeno mora biti veljavno uporabniško ime"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Napaka ustvarjanja uporabnika"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Navedeno mora biti veljavno geslo"
 
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index e5fd3aba3e4b21fd34a2a7d271b87194a5fe73e8..b3d02a17606b343c7752998dcd91b82af9615e6f 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Brisanje nastavitev strežnika je spodletelo."
@@ -53,281 +57,363 @@ msgstr "Ali nas se nastavitve ohranijo?"
 msgid "Cannot add server configuration"
 msgstr "Ni mogoče dodati nastavitev strežnika"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Uspešno končano."
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Napaka"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Preizkus povezave je uspešno končan."
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Preizkus povezave je spodletel."
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ali res želite izbrisati trenutne nastavitve strežnika?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Potrdi brisanje"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Opozorilo:</b> možnosti user_ldap in user_webdavauth nista združljivi. Pri uporabi je mogoče nepričakovano obnašanje sistema. Eno izmed možnosti je priporočeno onemgočiti."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Opozorilo:</b> modul PHP LDAP mora biti nameščen, sicer vmesnik ne bo deloval. Paket je treba namestiti."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Nastavitev strežnika"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Dodaj nastavitve strežnika"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Gostitelj"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Osnovni DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "En osnovni DN na vrstico"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Osnovni DN za uporabnike in skupine lahko določite v zavihku naprednih možnosti."
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Uporabnik DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za brezimni dostop sta polji DN in geslo prazni."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Za brezimni dostop sta polji DN in geslo prazni."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filter prijav uporabnikov"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime v postopku prijave."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filter seznama uporabnikov"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Določi filter za uporabo med pridobivanjem uporabnikov."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filter skupin"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Določi filter za uporabo med pridobivanjem skupin."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Nastavitve povezave"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Dejavna nastavitev"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Neizbrana možnost preskoči nastavitev."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Vrata"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Varnostna kopija (replika) podatkov gostitelja"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natančna replika strežnika LDAP/AD."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Varnostna kopija (replika) podatka vrat"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Onemogoči glavni strežnik"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Ob priklopu bo strežnik ownCloud povezan le s kopijo (repliko) strežnika."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Uporabi TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Strežnika ni priporočljivo uporabljati za povezave LDAPS. Povezava bo spodletela."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Onemogoči določanje veljavnosti potrdila SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Kadar deluje povezava le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Predpomni podatke TTL"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "v sekundah. Sprememba izprazni predpomnilnik."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Nastavitve mape"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Polje za uporabnikovo prikazano ime"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Osnovno uporabniško drevo"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Eno osnovno uporabniško ime DN na vrstico"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Uporabi atribute iskanja"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Izbirno; en atribut na vrstico"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Polje za prikazano ime skupine"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Osnovno drevo skupine"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Eno osnovno ime skupine DN na vrstico"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributi iskanja skupine"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Povezava član-skupina"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Posebni atributi"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Polje količinske omejitve"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Privzeta količinska omejitev"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "v bajtih"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Polje elektronske pošte"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Pravila poimenovanja uporabniške osebne mape"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Preizkusne nastavitve"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Pomoč"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 71dbe1382869e7221c37fe30f9a9bdf8e0d0a728..758cd937b6126d146be30e7ada41f5bd2a34d74c 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 5a921c586aba652b7285fd94f3ad64099113c3bf..56ec4bbaf9c1fae52734fc99dfe41c0a22865eff 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "%s nuk u spostua - Aty ekziston një skedar me të njëjtin emër"
 msgid "Could not move %s"
 msgstr "%s nuk u spostua"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nuk është i mundur riemërtimi i skedarit"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nuk u ngarkua asnjë skedar. Veprim i gabuar i panjohur"
@@ -86,7 +82,7 @@ msgstr "Nda"
 msgid "Delete permanently"
 msgstr "Elimino përfundimisht"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Elimino"
 
@@ -94,43 +90,43 @@ msgstr "Elimino"
 msgid "Rename"
 msgstr "Riemërto"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pezulluar"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ekziston"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "zëvëndëso"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugjero një emër"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "anulo"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "U zëvëndësua {new_name} me {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "anulo"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "ekzekuto operacionin e eliminimit"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "Po ngarkohet 1 skedar"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "po ngarkoj skedarët"
 
@@ -156,69 +152,77 @@ msgstr "Hapësira juaj e memorizimit është plot, nuk mund të ngarkoni apo sin
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nuk ka hapësirë memorizimi e mjaftueshme"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Ngarkimi u anulua."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL-i nuk mund të jetë bosh."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Veprim i gabuar"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Emri"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dimensioni"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modifikuar"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 dosje"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} dosje"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 skedar"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} skedarë"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Nuk është i mundur riemërtimi i skedarit"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Ngarko"
@@ -279,37 +283,37 @@ msgstr "Skedarë të eliminuar"
 msgid "Cancel upload"
 msgstr "Anulo ngarkimin"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Nuk keni të drejta për të shkruar këtu."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Këtu nuk ka asgjë. Ngarkoni diçka!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Shkarko"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Hiq ndarjen"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Ngarkimi është shumë i madh"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Skedarët që doni të ngarkoni tejkalojnë dimensionet maksimale për ngarkimet në këtë server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Skedarët po analizohen, ju lutemi pritni."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Analizimi aktual"
 
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index afda019715b3495657d5578c07a3acee28c1a0fc..630e921b32fa4dc9113f87cd4b40b6335343f655 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 7ad44cb2f897722d563be4572b2dc5af12cee64b..4c1226537b114908af633193a3a4e782293dee7b 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 22:00+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "anulo"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Elimino"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index d7433610003905b932c9bd0b647eb98e6ac53e1b..839c6616a816f12a380802f7b3f9112e9c4972f9 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Veprim i gabuar"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Kodi"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ndihmë"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index c71d78698596707d9a1ed0417a21338113185fc9..6866ad5df6965a369fc84dad9a84d591e5ec7911 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 9a0ef172ee6d784c0fb396111dc3fd0444403db5..008e27f634be9a979cb3dbe67855c1f023ead2de 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Не могу да преместим %s – датотека с ови
 msgid "Could not move %s"
 msgstr "Не могу да преместим %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Не могу да преименујем датотеку"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ниједна датотека није отпремљена услед непознате грешке"
@@ -86,7 +82,7 @@ msgstr "Дели"
 msgid "Delete permanently"
 msgstr "Обриши за стално"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Обриши"
 
@@ -94,43 +90,43 @@ msgstr "Обриши"
 msgid "Rename"
 msgstr "Преименуј"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "На чекању"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} већ постоји"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "замени"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "предложи назив"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "откажи"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "замењено {new_name} са {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "опозови"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "обриши"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "Отпремам 1 датотеку"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "датотеке се отпремају"
 
@@ -156,69 +152,77 @@ msgstr "Ваше складиште је пуно. Датотеке више н
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше складиште је скоро па пуно ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Нема довољно простора"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Отпремање је прекинуто."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Адреса не може бити празна."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Неисправно име фасцикле. Фасцикла „Shared“ је резервисана за ownCloud."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Грешка"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Измењено"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 фасцикла"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} фасцикле/и"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} датотеке/а"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Не могу да преименујем датотеку"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Отпреми"
@@ -279,37 +283,37 @@ msgstr "Обрисане датотеке"
 msgid "Cancel upload"
 msgstr "Прекини отпремање"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Овде немате дозволу за писање."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Овде нема ничег. Отпремите нешто!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Укини дељење"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Датотека је превелика"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеке које желите да отпремите прелазе ограничење у величини."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Скенирам датотеке…"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Тренутно скенирање"
 
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index a412f3ccd3ff0ec3e17debc4eab74c5bdad5d79b..0c35b3793672f7fcd0b7f273a281a255b8a11c03 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 405497d2c32412cd38d48ed660e6c3a9ed1256ae..372c87d23e7d47319a8aa3081aabb110fa766751 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Ажурирано"
 msgid "Saving..."
 msgstr "Чување у току..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "обрисано"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "опозови"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Не могу да уклоним корисника"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Групе"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Управник групе"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Обриши"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "додај групу"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Морате унети исправно корисничко име"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Грешка при прављењу корисника"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Морате унети исправну лозинку"
 
@@ -328,7 +328,7 @@ msgstr "Мање"
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index a87033c8c506abf841c20e9e9f795432ba15fb90..d13753c822ec0de009ae9a3cf673c793ae96b830 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Грешка"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Домаћин"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://."
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "База DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Корисник DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "DN корисника клијента са којим треба да се успостави веза, нпр. uid=agent,dc=example,dc=com. За анониман приступ, оставите поља DN и лозинка празним."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "За анониман приступ, оставите поља DN и лозинка празним."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Филтер за пријаву корисника"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Одређује филтер за примењивање при покушају пријаве. %%uid замењује корисничко име."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "користите чувар места %%uid, нпр. „uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Филтер за списак корисника"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Одређује филтер за примењивање при прибављању корисника."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "без икаквог чувара места, нпр. „objectClass=person“."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Филтер групе"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Одређује филтер за примењивање при прибављању група."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "без икаквог чувара места, нпр. „objectClass=posixGroup“."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Користи TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP сервер осетљив на велика и мала слова (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Искључите потврду SSL сертификата."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Увезите SSL сертификат LDAP сервера у свој ownCloud ако веза ради само са овом опцијом."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Не препоручује се; користите само за тестирање."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "у секундама. Промена испражњава кеш меморију."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Име приказа корисника"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP атрибут за стварање имена ownCloud-а корисника."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Основно стабло корисника"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Име приказа групе"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP атрибут за стварање имена ownCloud-а групе."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Основна стабло група"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Придруживање чланова у групу"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "у бајтовима"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Помоћ"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index d7489c981916ada4effd5567a98112b66e4d96ee..e7c6cc4f5301cf47a0a2b6c44e6a4e8122edf53f 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Obriši"
 
@@ -94,43 +90,43 @@ msgstr "Obriši"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Pošalji"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ovde nema ničeg. Pošaljite nešto!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Pošiljka je prevelika"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 39eaebf0ac721f3143f641848a1fddf2ece205b4..f3a97db15e8b0eeaab01191c395408eb9ceeea9f 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Pomoć"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 800698a5ad16a8bff875fb9e3700d04496e8c3fe..bd03e0f4876bcac1413395e7c1e3a7884161c3c6 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index a36c0ffa80a8e82401817edba1c085e4f7a5d4dd..f99535735abf7af1b4af5cb416a422b3dd614189 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Kunde inte flytta %s - Det finns redan en fil med detta namn"
 msgid "Could not move %s"
 msgstr "Kan inte flytta %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Kan inte byta namn på filen"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil uppladdad. Okänt fel"
@@ -86,7 +82,7 @@ msgstr "Dela"
 msgid "Delete permanently"
 msgstr "Radera permanent"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Radera"
 
@@ -94,43 +90,43 @@ msgstr "Radera"
 msgid "Rename"
 msgstr "Byt namn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} finns redan"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ersätt"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "föreslå namn"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "ersatt {new_name} med {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "Ã¥ngra"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "utför raderingen"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 filuppladdning"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "filer laddas upp"
 
@@ -156,69 +152,77 @@ msgstr "Ditt lagringsutrymme är fullt, filer kan ej längre laddas upp eller sy
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Inte tillräckligt med utrymme tillgängligt"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL kan inte vara tom."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Fel"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mapp"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mappar"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} filer"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Kan inte byta namn på filen"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Ladda upp"
@@ -279,37 +283,37 @@ msgstr "Raderade filer"
 msgid "Cancel upload"
 msgstr "Avbryt uppladdning"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Du saknar skrivbehörighet här."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting här. Ladda upp något!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "För stor uppladdning"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Filer skannas, var god vänta"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Aktuell skanning"
 
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index 45c3d95fd3a57c00fd7fce2c0475090308c65015..33c448aa9e39de94dd733916d0d884055337efb8 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 6d8243e128c0c5e7f101b052e473ae10d16b4590..3be85181fede47801dc1475d59b54d989b0670fb 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Uppdaterad"
 msgid "Saving..."
 msgstr "Sparar..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "raderad"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "Ã¥ngra"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Kan inte ta bort användare"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Gruppadministratör"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Radera"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "lägg till grupp"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Ett giltigt användarnamn måste anges"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Fel vid skapande av användare"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Ett giltigt lösenord måste anges"
 
@@ -328,7 +328,7 @@ msgstr "Mindre"
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 3d51619fa06d78de1961c7f752b759d43a9efed5..9fca84c6571ca0806b3d54cec1e4d2fd338c64ef 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Misslyckades med att radera serverinställningen"
@@ -53,281 +57,363 @@ msgstr "Behåll inställningarna?"
 msgid "Cannot add server configuration"
 msgstr "Kunde inte lägga till serverinställning"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Lyckat"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fel"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Anslutningstestet lyckades"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Anslutningstestet misslyckades"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Vill du verkligen radera den nuvarande serverinställningen?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Bekräfta radering"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Varning:</b> PHP LDAP - modulen är inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratör för installation."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Serverinställning"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Lägg till serverinställning"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Server"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Start DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Ett Start DN per rad"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Du kan ange start DN för användare och grupper under fliken Avancerat"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Användare DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "För anonym åtkomst, lämna DN och lösenord tomt."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filter logga in användare"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "använd platshållare %%uid, t ex \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filter lista användare"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definierar filter att tillämpa vid listning av användare."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "utan platshållare, t.ex. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Gruppfilter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definierar filter att tillämpa vid listning av grupper."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Uppkopplingsinställningar"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ifall denna är avbockad så kommer konfigurationen att skippas."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Säkerhetskopierings-värd (Replika)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Ange en valfri värd för säkerhetskopiering. Den måste vara en replika av den huvudsakliga LDAP/AD-servern"
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Säkerhetskopierins-port (Replika)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Inaktivera huvudserver"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "När denna är påkopplad kommer ownCloud att koppla upp till replika-servern, endast."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Använd TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Använd inte för LDAPS-anslutningar, det kommer inte att fungera."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Stäng av verifiering av SSL-certifikat."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Om anslutningen bara fungerar med det här alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Rekommenderas inte, använd bara för test. "
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Cache Time-To-Live"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "i sekunder. En förändring tömmer cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Mappinställningar"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Attribut för användarnamn"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Attribut som används för att generera användarnamn i ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Bas för användare i katalogtjänst"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "En Användare start DN per rad"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Användarsökningsattribut"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Valfritt; ett attribut per rad"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Attribut för gruppnamn"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Attribut som används för att generera gruppnamn i ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Bas för grupper i katalogtjänst"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "En Grupp start DN per rad"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Gruppsökningsattribut"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Attribut för gruppmedlemmar"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Specialattribut"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Kvotfält"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Datakvot standard"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "E-postfält"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Namnregel för hemkatalog"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Testa konfigurationen"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hjälp"
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index 13e9c0e6db0a57bb70e6687b08c081bad8f3a32d..a8b0ef83d0892b632824018f0fa4db669383fba6 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-15 01:59+0200\n"
+"PO-Revision-Date: 2013-05-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index b16b2afdf5e9c9eb1f32903d2b54fff20d7c79a4..61cca7831d4c9a70f5af2aeb232f95dd1deb6f4c 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 40d5b280c9b59c8a39b7bd65637590b6edb3d7cd..07325fade991184976db85ef88e21e1569b83eda 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 3e527911022a72070b64534970ff6cf1e65d3da0..9ad71c544c0e79c7447dbb7e30597ca7c29ea84a 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "ஒரு கோப்பும் பதிவேற்றப்படவில்லை. அறியப்படாத வழு"
@@ -86,7 +82,7 @@ msgstr "பகிர்வு"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "நீக்குக"
 
@@ -94,43 +90,43 @@ msgstr "நீக்குக"
 msgid "Rename"
 msgstr "பெயர்மாற்றம்"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "நிலுவையிலுள்ள"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ஏற்கனவே உள்ளது"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "மாற்றிடுக"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "பெயரை பரிந்துரைக்க"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "இரத்து செய்க"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "முன் செயல் நீக்கம் "
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 கோப்பு பதிவேற்றப்படுகிறது"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL  வெறுமையாக இருக்கமுடியாது."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "வழு"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "அளவு"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "மாற்றப்பட்டது"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 கோப்புறை"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{எண்ணிக்கை} கோப்புறைகள்"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 கோப்பு"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{எண்ணிக்கை} கோப்புகள்"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "பதிவேற்றுக"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "பதிவேற்றலை இரத்து செய்க"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "பதிவிறக்குக"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "பகிரப்படாதது"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "பதிவேற்றல் மிகப்பெரியது"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "தற்போது வருடப்படுபவை"
 
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index b6113a6d1ddf6e9fb06625b1cec0ae9daaa79a2e..79d45d3828c263a197b9fe26d55af823a796cb5b 100644
--- a/l10n/ta_LK/files_trashbin.po
+++ b/l10n/ta_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 6fff478e034fbceb3503938e5e58b262d68605ff..96dcf4f4658bda93b77750918fc5a0293f1aa887 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr "சேமிக்கப்படுகிறது..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "முன் செயல் நீக்கம் "
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "குழுக்கள்"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "குழு நிர்வாகி"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "நீக்குக"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr "குறைவான"
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index a82d11f9a136e26d5e50302bbf3bf980cd133720..2a5d7bf5409f7c2fe06ea29435f7b58e9cad7ab1 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "வழு"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "ஓம்புனர்"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "தள DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் "
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "பயனாளர்  DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "எந்த ஒதுக்கீடும் இல்லாமல், உதாரணம். \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "துறை "
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLS ஐ பயன்படுத்தவும்"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "இந்த தெரிவுகளில் மட்டும் இணைப்பு வேலைசெய்தால், உங்களுடைய owncloud சேவையகத்திலிருந்து LDAP சேவையகத்தின் SSL சான்றிதழை இறக்குமதி செய்யவும்"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "பரிந்துரைக்கப்படவில்லை, சோதனைக்காக மட்டும் பயன்படுத்தவும்."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "பயனாளர் காட்சிப்பெயர் புலம்"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "பயனாளரின் ownCloud பெயரை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "தள பயனாளர் மரம்"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "குழுவின் காட்சி பெயர் புலம் "
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "ownCloud குழுக்களின் பெயர்களை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "தள குழு மரம்"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "குழு உறுப்பினர் சங்கம்"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "bytes களில் "
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "உதவி"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 5e3424a27a192193f8644d06d0fd4de4b39971cc..a4aaf33a494a89682cb0bbc5d45640c22a579d14 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/te/files.po b/l10n/te/files.po
index 3b1c8bdab4ac266be6b7cfe8c344241c61ef9657..2dbe5ff11e63a76d0bcc8d6332b8e9387566ccb1 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr "శాశ్వతంగా తొలగించు"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "తొలగించు"
 
@@ -94,43 +90,43 @@ msgstr "తొలగించు"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "రద్దుచేయి"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "పేరు"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index 373705a9ee8de982efe14ea300adea850f51ef92..90a947f784843b7b2e85a5d22832a7736b2bd81f 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index f270bb90f0d2a34ebf7567d7d5a334780e93af25..fb91ffa67f39f9c04ef8b9f5c9c4aa6487bf601e 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 0166659309bc26f85503a273efb904f186506e85..eebc4da9ed9d1e8a11dae50e71e45f0835dec926 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "పొరపాటు"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "సహాయం"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 335109ff801596798d5d89f19d1d9c56e16c2f2f..78d60372e1874298abd5022a8bab99f14cbe0829 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 9b68d7cb8f6bda8fd2f1172c904b330b8963cbd4..0ab57eb950c513d55d35e0821706bc9653d1d083 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -219,6 +215,14 @@ msgstr ""
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index f03efb72e21a4086bb918be9f8a3ec2355dbb955..76b4b7293ab7f74917c6e1cc5d026456bbd62538 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index ee90c1e50e50869bcb63568692554cff9f7beca3..7bfc3647ddd06f98902d80f2c4903b85cc00cdce 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 20769d5c9aac6951b7c61e690545718bd80a624b..48923f8af3ad58f71e387aadc1f6333844705070 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 47c0473b7e50274d8f7fcbd06093da8d23a4d7b9..3e9ecd756f1e449bd44289a2102e1b42dc73bc81 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index b3e86bb60214e95f5bc721ade846926732e8a212..91f8d60881e785ab44a96e2b9e6983b961d2bd85 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index c328cfc66edf37ba82785e35b7d483a6a3f3219e..55b22c52c62aa615c4c0a2d5c7e4bf081875331a 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
+"POT-Creation-Date: 2013-05-21 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:209
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -172,13 +172,13 @@ msgstr ""
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:858
+#: setup.php:859
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:859
+#: setup.php:860
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 590c9af7b7af53797122a7281600b884ae7e7751..fe59c434e975b774f14f9da7d363b2ffdcc6f5c8 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
+"POT-Creation-Date: 2013-05-21 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index e14dc12ac1e4d8a49180e3883306628dfb3f6eb9..e14b4cb292a2cc9c39a5f40ab561394dfe1f47ff 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,279 +57,361 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 776217d3aec831c42c0b790c37489b026078091d..018936d3d9d5916f455074f90d37ae29b0ecb6e0 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-03 02:02+0200\n"
+"POT-Creation-Date: 2013-05-21 02:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index daec53114a637f2ccd384a83f63e6e7904898528..568570f897f8aeb6a39f52abb31fbc1f56213b6a 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 55940d310ae75d893233ac31409068d1f6ebdd30..52962e21fbbe24005f4486ba4274797409e8ec65 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "ไม่สามารถย้าย %s ได้ - ไฟล์ท
 msgid "Could not move %s"
 msgstr "ไม่สามารถย้าย %s ได้"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "ไม่สามารถเปลี่ยนชื่อไฟล์ได้"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"
@@ -86,7 +82,7 @@ msgstr "แชร์"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "ลบ"
 
@@ -94,43 +90,43 @@ msgstr "ลบ"
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนินการ"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} มีอยู่แล้วในระบบ"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "แทนที่"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "แนะนำชื่อ"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ยกเลิก"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "เลิกทำ"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "ดำเนินการตามคำสั่งลบ"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "กำลังอัพโหลดไฟล์ 1 ไฟล์"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "การอัพโหลดไฟล์"
 
@@ -156,69 +152,77 @@ msgstr "พื้นที่จัดเก็บข้อมูลของค
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "มีพื้นที่เหลือไม่เพียงพอ"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "การอัพโหลดถูกยกเลิก"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL ไม่สามารถเว้นว่างได้"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "แก้ไขแล้ว"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 โฟลเดอร์"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} โฟลเดอร์"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ไฟล์"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} ไฟล์"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "ไม่สามารถเปลี่ยนชื่อไฟล์ได้"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "อัพโหลด"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "ยกเลิกการอัพโหลด"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "ยกเลิกการแชร์"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
 
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index 59f6d749014def97ff4de7c1a667f4c265bead08..0481d13799a336482036ec26b3c0f5ce1611b834 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index b25982bed32ec603fab309d3dbcaf2baffe2b303..0c88025491978e8cd51bd82918e0227753cfd625 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "อัพเดทแล้ว"
 msgid "Saving..."
 msgstr "กำลังบันทึกข้อมูล..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "ลบแล้ว"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "เลิกทำ"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "กลุ่ม"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "ผู้ดูแลกลุ่ม"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "ลบ"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr "น้อย"
 msgid "Version"
 msgstr "รุ่น"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index a085e8c732945e7e6b112870ed6620c0d7b90080..ebb8a40aefcceffb792139ba234d8d25eea046ff 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "การลบการกำหนดค่าเซิร์ฟเวอร์ล้มเหลว"
@@ -53,281 +57,363 @@ msgstr "รักษาการตั้งค่าไว้?"
 msgid "Cannot add server configuration"
 msgstr "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "เสร็จสิ้น"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "ข้อผิดพลาด"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "ทดสอบการเชื่อมต่อสำเร็จ"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "ทดสอบการเชื่อมต่อล้มเหลว"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "ยืนยันการลบทิ้ง"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>คำเตือน:</b> แอปฯ user_ldap และ user_webdavauth ไม่สามารถใช้งานร่วมกันได้. คุณอาจประสพปัญหาที่ไม่คาดคิดจากเหตุการณ์ดังกล่าว กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อระงับการใช้งานแอปฯ ตัวใดตัวหนึ่งข้างต้น"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>คำเตือน:</b> โมดูล PHP LDAP ยังไม่ได้ถูกติดตั้ง, ระบบด้านหลังจะไม่สามารถทำงานได้ กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อทำการติดตั้งโมดูลดังกล่าว"
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "การกำหนดค่าเซิร์ฟเวอร์"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "เพิ่มการกำหนดค่าเซิร์ฟเวอร์"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "โฮสต์"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN ฐาน"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "หนึ่ง Base DN ต่อบรรทัด"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN ของผู้ใช้งาน"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\","
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "ตัวกรองข้อมูลกลุ่ม"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม"
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\","
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "ตั้งค่าการเชื่อมต่อ"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "พอร์ต"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "ปิดใช้งานเซิร์ฟเวอร์หลัก"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "ใช้ TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "หากการเชื่อมต่อสามารถทำงานได้เฉพาะกับตัวเลือกนี้เท่านั้น, ให้นำเข้าข้อมูลใบรับรองความปลอดภัยแบบ SSL ของเซิร์ฟเวอร์ LDAP ดังกล่าวเข้าไปไว้ในเซิร์ฟเวอร์ ownCloud"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า"
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "ตั้งค่าไดเร็กทอรี่"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สำหรับสร้างชื่อของผู้ใช้งาน ownCloud"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "รายการผู้ใช้งานหลักแบบ Tree"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "หนึ่ง User Base DN ต่อบรรทัด"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "คุณลักษณะการค้นหาชื่อผู้ใช้"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "ตัวเลือกเพิ่มเติม; หนึ่งคุณลักษณะต่อบรรทัด"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "ช่องแสดงชื่อกลุ่มที่ต้องการ"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สร้างชื่อกลุ่มของ ownCloud"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "รายการกลุ่มหลักแบบ Tree"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "หนึ่ง Group Base DN ต่อบรรทัด"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "คุณลักษณะการค้นหาแบบกลุ่ม"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "คุณลักษณะพิเศษ"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "ในหน่วยไบต์"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "ช่วยเหลือ"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 787d2a015e96b06653a57a5952a6786dce918a75..6049fb79a27d2a9e177227af0dca9afc2f4ddd06 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-05-01 16:40+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 826904dd186b34f10ed11c3693d336f74bd2bf74..7a65c39831a5f03dc8d932e80c6e0324942491ae 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "%s taşınamadı. Bu isimde dosya zaten var."
 msgid "Could not move %s"
 msgstr "%s taşınamadı"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Dosya adı değiştirilemedi"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Dosya yüklenmedi. Bilinmeyen hata"
@@ -86,7 +82,7 @@ msgstr "PaylaÅŸ"
 msgid "Delete permanently"
 msgstr "Kalıcı olarak sil"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Sil"
 
@@ -94,43 +90,43 @@ msgstr "Sil"
 msgid "Rename"
 msgstr "Ä°sim deÄŸiÅŸtir."
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} zaten mevcut"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "deÄŸiÅŸtir"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "Öneri ad"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "iptal"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ismi {old_name} ile deÄŸiÅŸtirildi"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Silme işlemini gerçekleştir"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 dosya yüklendi"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "Dosyalar yükleniyor"
 
@@ -156,69 +152,77 @@ msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkron
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Yeterli disk alanı yok"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Yükleme iptal edildi."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL boÅŸ olamaz."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Hata"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Ä°sim"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "DeÄŸiÅŸtirilme"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 dizin"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} dizin"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 dosya"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} dosya"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Dosya adı değiştirilemedi"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Yükle"
@@ -279,37 +283,37 @@ msgstr "Dosyalar silindi"
 msgid "Cancel upload"
 msgstr "Yüklemeyi iptal et"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Buraya erişim hakkınız yok."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Ä°ndir"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Paylaşılmayan"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Yükleme çok büyük"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Dosyalar taranıyor, lütfen bekleyin."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Güncel tarama"
 
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index 7727f20a77c071ad33defe35dd62aafb9995b830..ff3ae0eaacea2a513bda0c160eec9c0f0285cf05 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 8c795e8401cae88aabe932b275fd02e769663aaf..851ae213cc827bb85a524f42deab0d69cd214f2d 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ismail yenigül <ismail.yenigul@surgate.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-28 01:57+0200\n"
-"PO-Revision-Date: 2013-04-27 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-04 01:59+0200\n"
+"PO-Revision-Date: 2013-05-03 12:40+0000\n"
+"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,19 +42,19 @@ msgstr "Uygulamalar"
 msgid "Admin"
 msgstr "Yönetici"
 
-#: files.php:209
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "ZIP indirmeleri kapatılmıştır."
 
-#: files.php:210
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr "Dosyaların birer birer indirilmesi gerekmektedir."
 
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr "Dosyalara dön"
 
-#: files.php:241
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür."
 
@@ -96,22 +97,22 @@ msgstr "Parola yonetici birlemek. "
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s veritabanı kullanıcı adını gir."
 
 #: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s veritabanı adını gir."
 
 #: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s veritabanı adında nokta kullanamayabilirsiniz"
 
 #: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s veritabanı sunucu adını tanımla"
 
 #: setup.php:132 setup.php:325 setup.php:370
 msgid "PostgreSQL username and/or password not valid"
@@ -127,7 +128,7 @@ msgstr "Adi klullanici ve/veya parola Oracle mantikli deÄŸildir. "
 
 #: setup.php:233
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "MySQL kullanıcı adı ve/veya parolası geçerli değil"
 
 #: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
 #: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
@@ -160,17 +161,17 @@ msgstr "MySQL kullanici '%s @ % % zaten var (zaten yazili)"
 
 #: setup.php:311
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Bu kulanıcıyı MySQL veritabanından kaldır"
 
 #: setup.php:584 setup.php:616
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Hatalı komut: \"%s\", ad: %s, parola: %s"
 
 #: setup.php:636
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s"
 
 #: setup.php:858
 msgid ""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index e14def81bc79b3e8d020c1c425e1c7c0cb588d89..2734559427e14cb8c3802bf1d893976f9330fe3c 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-05-01 16:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "Güncellendi"
 msgid "Saving..."
 msgstr "Kaydediliyor..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "silindi"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "geri al"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Kullanıcı kaldırılamıyor"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Gruplar"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Yönetici Grubu "
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Sil"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "grup ekle"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Geçerli bir kullanıcı adı mutlaka sağlanmalı"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Kullanıcı oluşturulurken hata"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Geçerli bir parola mutlaka sağlanmalı"
 
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index dad12246488e6a02dc9b35bfcea88a28b08c06d3..576140cd3189355e5c8ff57a8c8e65f6ec3698c8 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,9 +18,13 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Sunucu uyunlama basarmadi "
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
@@ -53,281 +58,363 @@ msgstr "Ayarları kalsınmı?"
 msgid "Cannot add server configuration"
 msgstr "Sunucu uyunlama birlemek edemen. "
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Hata"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Bağlantı testi başarılı oldu"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Bağlantı testi başarısız oldu"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Hakikatten, Sonuncu Funksyon durmak istiyor mi?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Silmeyi onayla"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Uyari </b> Apps kullanici_Idap ve user_webdavauth uyunmayan. Bu belki sik degil. Lutfen sistem yonetici sormak on aktif yapmaya. "
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Ihbar <b> Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak  yuklemek icin."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
-msgstr ""
+msgstr "Sunucu uyunlama "
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Sunucu Uyunlama birlemek "
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Sunucu"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Protokol atlamak edesin, sadece SSL istiyorsaniz. O zaman, idapsile baslamak. "
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Ana DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Bir Tabani DN herbir dizi. "
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Base DN kullanicileri  ve kaynaklari icin tablosu Advanced tayin etmek ederiz. "
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Kullanıcı DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "DN musterinin, kimle baglamaya yapacagiz,meselâ uid=agent.dc mesela, dc=com Gecinme adisiz ici, DN  ve Parola bos birakmak. "
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Parola"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Anonim erişim için DN ve Parola alanlarını boş bırakın."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Kullanıcı Oturum Filtresi"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Filter uyunlamak icin tayin ediyor, ne zaman giriÅŸmek isteminiz. % % uid adi kullanici girismeye karsi koymacak. "
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Kullanıcı Liste Filtresi"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Filter uyunmak icin tayin ediyor, ne zaman adi  kullanici geri aliyor. "
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bir yer tutucusu olmadan, örneğin \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Grup Süzgeci"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Filter uyunmak icin tayin ediyor, ne zaman grubalari tekrar aliyor. "
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "siz bir yer tutucu, mes. 'objectClass=posixGroup ('posixGrubu''. "
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Bağlantı ayarları"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Ne zaman iptal, bu uynnlama isletici "
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Sigorta Kopya Cephe "
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Bir kopya cevre vermek, kopya sunucu onemli olmali. "
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Kopya Port "
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Ana sunucuyu devredışı birak"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "Ne zaman acik, ownCloud sadece sunuce replikayin baglamis."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLS kullan"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Bu LDAPS baglama icin kullamaminiz, basamacak. "
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Dusme sunucu LDAP zor degil. (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL sertifika doğrulamasını kapat."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Bagladiginda, bunla secene sadece calisiyor, sunucu LDAP SSL sunucun ithal etemek, dneyme sizine sunucu ownClouden. "
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Önerilmez, sadece test için kullanın."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Cache Time-To-Live "
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
-msgstr ""
+msgstr "Parametrar Listesin Adresinin "
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "LDAP kategori kullanmaya adi ownCloud kullanicin uremek icin. "
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Temel Kullanıcı Ağacı"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "Bir Temel Kullanici DN her dizgi "
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Kategorii Arama Kullanici "
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Grub Ekrane Alani Adi"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP kullamayin grub adi ownCloud uremek icin. "
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Temel Grup Ağacı"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Bir Grubu Tabani DN her dizgi. "
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Kategorii Arama Grubu"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Grup-Ãœye iÅŸbirliÄŸi"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "byte cinsinden"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Kullanıcı adı bölümünü boş bırakın (varsayılan). "
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Yardım"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index ee5739f4cf356864febbeb73190af2826a3c5945..4642a6e1a20ec1fe3a01c0c296bb3aa0a5069ac4 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,83 +82,83 @@ msgstr ""
 
 #: js/config.php:34
 msgid "Sunday"
-msgstr ""
+msgstr "يەكشەنبە"
 
 #: js/config.php:35
 msgid "Monday"
-msgstr ""
+msgstr "دۈشەنبە"
 
 #: js/config.php:36
 msgid "Tuesday"
-msgstr ""
+msgstr "سەيشەنبە"
 
 #: js/config.php:37
 msgid "Wednesday"
-msgstr ""
+msgstr "چارشەنبە"
 
 #: js/config.php:38
 msgid "Thursday"
-msgstr ""
+msgstr "پەيشەنبە"
 
 #: js/config.php:39
 msgid "Friday"
-msgstr ""
+msgstr "جۈمە"
 
 #: js/config.php:40
 msgid "Saturday"
-msgstr ""
+msgstr "شەنبە"
 
 #: js/config.php:45
 msgid "January"
-msgstr ""
+msgstr "قەھرىتان"
 
 #: js/config.php:46
 msgid "February"
-msgstr ""
+msgstr "ھۇت"
 
 #: js/config.php:47
 msgid "March"
-msgstr ""
+msgstr "نەۋرۇز"
 
 #: js/config.php:48
 msgid "April"
-msgstr ""
+msgstr "ئۇمۇت"
 
 #: js/config.php:49
 msgid "May"
-msgstr ""
+msgstr "باھار"
 
 #: js/config.php:50
 msgid "June"
-msgstr ""
+msgstr "سەپەر"
 
 #: js/config.php:51
 msgid "July"
-msgstr ""
+msgstr "چىللە"
 
 #: js/config.php:52
 msgid "August"
-msgstr ""
+msgstr "تومۇز"
 
 #: js/config.php:53
 msgid "September"
-msgstr ""
+msgstr "مىزان"
 
 #: js/config.php:54
 msgid "October"
-msgstr ""
+msgstr "ئوغۇز"
 
 #: js/config.php:55
 msgid "November"
-msgstr ""
+msgstr "ئوغلاق"
 
 #: js/config.php:56
 msgid "December"
-msgstr ""
+msgstr "ÙƒÛ†Ù†Û•Ùƒ"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr ""
+msgstr "تەڭشەكلەر"
 
 #: js/js.js:718
 msgid "seconds ago"
@@ -166,7 +166,7 @@ msgstr ""
 
 #: js/js.js:719
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 مىنۇت ئىلگىرى"
 
 #: js/js.js:720
 msgid "{minutes} minutes ago"
@@ -174,7 +174,7 @@ msgstr ""
 
 #: js/js.js:721
 msgid "1 hour ago"
-msgstr ""
+msgstr "1 سائەت ئىلگىرى"
 
 #: js/js.js:722
 msgid "{hours} hours ago"
@@ -182,11 +182,11 @@ msgstr ""
 
 #: js/js.js:723
 msgid "today"
-msgstr ""
+msgstr "بۈگۈن"
 
 #: js/js.js:724
 msgid "yesterday"
-msgstr ""
+msgstr "تۈنۈگۈن"
 
 #: js/js.js:725
 msgid "{days} days ago"
@@ -214,11 +214,11 @@ msgstr ""
 
 #: js/oc-dialogs.js:117 js/oc-dialogs.js:247
 msgid "Ok"
-msgstr ""
+msgstr "جەزملە"
 
 #: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
 msgid "Cancel"
-msgstr ""
+msgstr "ۋاز كەچ"
 
 #: js/oc-dialogs.js:185
 msgid "Choose"
@@ -226,11 +226,11 @@ msgstr ""
 
 #: js/oc-dialogs.js:215
 msgid "Yes"
-msgstr ""
+msgstr "ھەئە"
 
 #: js/oc-dialogs.js:222
 msgid "No"
-msgstr ""
+msgstr "ياق"
 
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
@@ -243,7 +243,7 @@ msgstr ""
 #: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
 #: js/share.js:589
 msgid "Error"
-msgstr ""
+msgstr "خاتالىق"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
@@ -259,7 +259,7 @@ msgstr ""
 
 #: js/share.js:90
 msgid "Share"
-msgstr ""
+msgstr "ھەمبەھىر"
 
 #: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
@@ -283,7 +283,7 @@ msgstr ""
 
 #: js/share.js:159
 msgid "Share with"
-msgstr ""
+msgstr "ھەمبەھىر"
 
 #: js/share.js:164
 msgid "Share with link"
@@ -295,7 +295,7 @@ msgstr ""
 
 #: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr ""
+msgstr "ئىم"
 
 #: js/share.js:173
 msgid "Email link to person"
@@ -303,7 +303,7 @@ msgstr ""
 
 #: js/share.js:174
 msgid "Send"
-msgstr ""
+msgstr "يوللا"
 
 #: js/share.js:178
 msgid "Set expiration date"
@@ -331,7 +331,7 @@ msgstr ""
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr ""
+msgstr "ھەمبەھىرلىمە"
 
 #: js/share.js:320
 msgid "can edit"
@@ -351,11 +351,11 @@ msgstr ""
 
 #: js/share.js:331
 msgid "delete"
-msgstr ""
+msgstr "ئۆچۈر"
 
 #: js/share.js:334
 msgid "share"
-msgstr ""
+msgstr "ھەمبەھىر"
 
 #: js/share.js:368 js/share.js:564
 msgid "Password protected"
@@ -414,7 +414,7 @@ msgstr ""
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
 #: templates/login.php:19
 msgid "Username"
-msgstr ""
+msgstr "ئىشلەتكۈچى ئاتى"
 
 #: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
@@ -430,7 +430,7 @@ msgstr ""
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr ""
+msgstr "يېڭى ئىم"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
@@ -438,15 +438,15 @@ msgstr ""
 
 #: strings.php:5
 msgid "Personal"
-msgstr ""
+msgstr "شەخسىي"
 
 #: strings.php:6
 msgid "Users"
-msgstr ""
+msgstr "ئىشلەتكۈچىلەر"
 
 #: strings.php:7
 msgid "Apps"
-msgstr ""
+msgstr "ئەپلەر"
 
 #: strings.php:8
 msgid "Admin"
@@ -454,7 +454,7 @@ msgstr ""
 
 #: strings.php:9
 msgid "Help"
-msgstr ""
+msgstr "ياردەم"
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -470,7 +470,7 @@ msgstr ""
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr ""
+msgstr "قوش"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -516,7 +516,7 @@ msgstr ""
 
 #: templates/installation.php:62
 msgid "Advanced"
-msgstr ""
+msgstr "ئالىي"
 
 #: templates/installation.php:64
 msgid "Data folder"
@@ -554,7 +554,7 @@ msgstr ""
 
 #: templates/installation.php:172
 msgid "Finish setup"
-msgstr ""
+msgstr "تەڭشەك تامام"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
@@ -567,7 +567,7 @@ msgstr ""
 
 #: templates/layout.user.php:61
 msgid "Log out"
-msgstr ""
+msgstr "تىزىمدىن چىق"
 
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 03b8fe9308ed165399794dc4a83e83f08d77a51e..f69fcf0815452ef69e306ef1192b8373ae7b56c1 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,15 +25,11 @@ msgstr ""
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr ""
-
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
+msgstr "%s يۆتكىيەلمەيدۇ"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "ھېچقانداق ھۆججەت يۈكلەنمىدى. يوچۇن خاتالىق"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
@@ -56,19 +52,19 @@ msgstr ""
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr ""
+msgstr "ھېچقانداق ھۆججەت يۈكلەنمىدى"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "ۋاقىتلىق قىسقۇچ كەم."
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "دىسكىغا يازالمىدى"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "يېتەرلىك ساقلاش بوشلۇقى يوق"
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
@@ -76,63 +72,63 @@ msgstr ""
 
 #: appinfo/app.php:12
 msgid "Files"
-msgstr ""
+msgstr "ھۆججەتلەر"
 
 #: js/fileactions.js:116
 msgid "Share"
-msgstr ""
+msgstr "ھەمبەھىر"
 
 #: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr ""
+msgstr "مەڭگۈلۈك ئۆچۈر"
 
 #: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
-msgstr ""
+msgstr "ئۆچۈر"
 
 #: js/fileactions.js:194
 msgid "Rename"
-msgstr ""
+msgstr "ئات ئۆزگەرت"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr ""
+msgstr "كۈتۈۋاتىدۇ"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} مەۋجۇت"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
-msgstr ""
+msgstr "ئالماشتۇر"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr ""
+msgstr "تەۋسىيە ئات"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
-msgstr ""
+msgstr "ۋاز كەچ"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
-msgstr ""
+msgstr "يېنىۋال"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
-msgstr ""
+msgstr "1 ھۆججەت يۈكلىنىۋاتىدۇ"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "ھۆججەت يۈكلىنىۋاتىدۇ"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -168,16 +164,16 @@ msgstr ""
 
 #: js/files.js:277
 msgid "Not enough space available"
-msgstr ""
+msgstr "يېتەرلىك بوشلۇق يوق"
 
 #: js/files.js:317
 msgid "Upload cancelled."
-msgstr ""
+msgstr "يۈكلەشتىن ۋاز كەچتى."
 
 #: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload."
 
 #: js/files.js:486
 msgid "URL cannot be empty."
@@ -189,23 +185,23 @@ msgstr ""
 
 #: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
-msgstr ""
+msgstr "خاتالىق"
 
 #: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr ""
+msgstr "ئاتى"
 
 #: js/files.js:878 templates/index.php:80
 msgid "Size"
-msgstr ""
+msgstr "چوڭلۇقى"
 
 #: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr ""
+msgstr "ئۆزگەرتكەن"
 
 #: js/files.js:898
 msgid "1 folder"
-msgstr ""
+msgstr "1 قىسقۇچ"
 
 #: js/files.js:900
 msgid "{count} folders"
@@ -213,15 +209,23 @@ msgstr ""
 
 #: js/files.js:908
 msgid "1 file"
-msgstr ""
+msgstr "1 ھۆججەت"
 
 #: js/files.js:910
 msgid "{count} files"
+msgstr "{count} ھۆججەت"
+
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr ""
 
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "ھۆججەت ئاتىنى ئۆزگەرتكىلى بولمايدۇ"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
-msgstr ""
+msgstr "يۈكلە"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -253,19 +257,19 @@ msgstr ""
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr ""
+msgstr "ساقلا"
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "يېڭى"
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr ""
+msgstr "تېكىست ھۆججەت"
 
 #: templates/index.php:12
 msgid "Folder"
-msgstr ""
+msgstr "قىسقۇچ"
 
 #: templates/index.php:14
 msgid "From link"
@@ -273,11 +277,11 @@ msgstr ""
 
 #: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "ئۆچۈرۈلگەن ھۆججەتلەر"
 
 #: templates/index.php:48
 msgid "Cancel upload"
-msgstr ""
+msgstr "يۈكلەشتىن ۋاز كەچ"
 
 #: templates/index.php:54
 msgid "You don’t have write permissions here."
@@ -285,19 +289,19 @@ msgstr ""
 
 #: templates/index.php:61
 msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "بۇ جايدا ھېچنېمە يوق. Upload something!"
 
 #: templates/index.php:75
 msgid "Download"
-msgstr ""
+msgstr "چۈشۈر"
 
 #: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr ""
+msgstr "ھەمبەھىرلىمە"
 
 #: templates/index.php:107
 msgid "Upload too large"
-msgstr ""
+msgstr "يۈكلەندىغىنى بەك چوڭ"
 
 #: templates/index.php:109
 msgid ""
@@ -315,4 +319,4 @@ msgstr ""
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…"
diff --git a/l10n/ug/files_encryption.po b/l10n/ug/files_encryption.po
index f41668c2584d4b913d661ae5515fc0766f07bf49..ce1f593333f4b9fc39e65dea1a37b2a9acba24ae 100644
--- a/l10n/ug/files_encryption.po
+++ b/l10n/ug/files_encryption.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-04 12:10+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,20 +19,20 @@ msgstr ""
 
 #: templates/settings-personal.php:4 templates/settings.php:5
 msgid "Encryption"
-msgstr ""
+msgstr "شىفىرلاش"
 
 #: templates/settings-personal.php:7
 msgid "File encryption is enabled."
-msgstr ""
+msgstr "ھۆججەت شىفىرلاش قوزغىتىلدى."
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "تۆۋەندىكى ھۆججەت تىپلىرى شىفىرلانمايدۇ:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "تۆۋەندىكى ھۆججەت تىپلىرى شىفىرلاشنىڭ سىرتىدا:"
 
 #: templates/settings.php:12
 msgid "None"
-msgstr ""
+msgstr "يوق"
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
index eb512c8a138331494675863e97bc19e0f4cea1a1..1da94038c56cf265b4e163cd8124ea66050cb738 100644
--- a/l10n/ug/files_external.po
+++ b/l10n/ug/files_external.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-04 11:50+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -63,19 +63,19 @@ msgstr ""
 
 #: templates/settings.php:9 templates/settings.php:28
 msgid "Folder name"
-msgstr ""
+msgstr "قىسقۇچ ئاتى"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "سىرتقى ساقلىغۇچ"
 
 #: templates/settings.php:11
 msgid "Configuration"
-msgstr ""
+msgstr "سەپلىمە"
 
 #: templates/settings.php:12
 msgid "Options"
-msgstr ""
+msgstr "تاللانما"
 
 #: templates/settings.php:13
 msgid "Applicable"
@@ -95,16 +95,16 @@ msgstr ""
 
 #: templates/settings.php:92
 msgid "Groups"
-msgstr ""
+msgstr "گۇرۇپپا"
 
 #: templates/settings.php:100
 msgid "Users"
-msgstr ""
+msgstr "ئىشلەتكۈچىلەر"
 
 #: templates/settings.php:113 templates/settings.php:114
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "ئۆچۈر"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index b8c70243a8db622552b890558e16805015d153bf..85d88c618198534de485d7f25bdbe15ca6bba813 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# uqkun <uqkun@outlook.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-08 15:21+0000\n"
+"Last-Translator: uqkun <uqkun@outlook.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "ئىم"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "تاپشۇر"
 
 #: templates/public.php:10
 #, php-format
@@ -37,7 +38,7 @@ msgstr ""
 
 #: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr ""
+msgstr "چۈشۈر"
 
 #: templates/public.php:40
 msgid "No preview available for"
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index 50afd6bcf85c89a686d45fe8f1b947fb901645fa..d9d8571860c424345f646dea8af737ab5cdcb40a 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/files_trashbin.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +33,7 @@ msgstr ""
 
 #: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
 msgid "Error"
-msgstr ""
+msgstr "خاتالىق"
 
 #: js/trash.js:34
 msgid "delete file permanently"
@@ -41,19 +41,19 @@ msgstr ""
 
 #: js/trash.js:121
 msgid "Delete permanently"
-msgstr ""
+msgstr "مەڭگۈلۈك ئۆچۈر"
 
 #: js/trash.js:174 templates/index.php:17
 msgid "Name"
-msgstr ""
+msgstr "ئاتى"
 
 #: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "ئۆچۈرۈلدى"
 
 #: js/trash.js:184
 msgid "1 folder"
-msgstr ""
+msgstr "1 قىسقۇچ"
 
 #: js/trash.js:186
 msgid "{count} folders"
@@ -61,15 +61,15 @@ msgstr ""
 
 #: js/trash.js:194
 msgid "1 file"
-msgstr ""
+msgstr "1 ھۆججەت"
 
 #: js/trash.js:196
 msgid "{count} files"
-msgstr ""
+msgstr "{count} ھۆججەت"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
@@ -77,7 +77,7 @@ msgstr ""
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
-msgstr ""
+msgstr "ئۆچۈر"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
diff --git a/l10n/ug/files_versions.po b/l10n/ug/files_versions.po
index 7237f3fcb8cef8b59a785d7247d228a202c7bf28..bc0751f8d0a6d3b9859f695ad239ee7d4cef1009 100644
--- a/l10n/ug/files_versions.po
+++ b/l10n/ug/files_versions.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-04 11:40+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,20 +20,20 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "ئەسلىگە قايتۇرالمايدۇ: %s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "مۇۋەپپەقىيەتلىك"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "ھۆججەت %s نى %s نەشرىگە ئەسلىگە قايتۇردى"
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "مەغلۇپ بولدى"
 
 #: history.php:51
 #, php-format
@@ -42,15 +42,15 @@ msgstr ""
 
 #: history.php:69
 msgid "No old versions available"
-msgstr ""
+msgstr "كونا نەشرى يوق"
 
 #: history.php:74
 msgid "No path specified"
-msgstr ""
+msgstr "يول بەلگىلەنمىگەن"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "نەشرى"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index c1abb1aaa8fe2730ddad3d030638f489b7b66236..a14470fe87248743c7c8d8ccbaf258cc933ce42a 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/lib.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
+"POT-Creation-Date: 2013-05-12 02:02+0200\n"
+"PO-Revision-Date: 2013-05-04 12:00+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,41 +19,41 @@ msgstr ""
 
 #: app.php:349
 msgid "Help"
-msgstr ""
+msgstr "ياردەم"
 
 #: app.php:362
 msgid "Personal"
-msgstr ""
+msgstr "شەخسىي"
 
 #: app.php:373
 msgid "Settings"
-msgstr ""
+msgstr "تەڭشەكلەر"
 
 #: app.php:385
 msgid "Users"
-msgstr ""
+msgstr "ئىشلەتكۈچىلەر"
 
 #: app.php:398
 msgid "Apps"
-msgstr ""
+msgstr "ئەپلەر"
 
 #: app.php:406
 msgid "Admin"
 msgstr ""
 
-#: files.php:209
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -67,7 +67,7 @@ msgstr ""
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr ""
+msgstr "سالاھىيەت دەلىللەش خاتالىقى"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
@@ -75,15 +75,15 @@ msgstr ""
 
 #: search/provider/file.php:17 search/provider/file.php:35
 msgid "Files"
-msgstr ""
+msgstr "ھۆججەتلەر"
 
 #: search/provider/file.php:26 search/provider/file.php:33
 msgid "Text"
-msgstr ""
+msgstr "قىسقا ئۇچۇر"
 
 #: search/provider/file.php:29
 msgid "Images"
-msgstr ""
+msgstr "سۈرەتلەر"
 
 #: setup.php:34
 msgid "Set an admin username."
@@ -189,34 +189,34 @@ msgstr ""
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 مىنۇت ئىلگىرى"
 
 #: template.php:115
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d مىنۇت ئىلگىرى"
 
 #: template.php:116
 msgid "1 hour ago"
-msgstr ""
+msgstr "1 سائەت ئىلگىرى"
 
 #: template.php:117
 #, php-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "%d سائەت ئىلگىرى"
 
 #: template.php:118
 msgid "today"
-msgstr ""
+msgstr "بۈگۈن"
 
 #: template.php:119
 msgid "yesterday"
-msgstr ""
+msgstr "تۈنۈگۈن"
 
 #: template.php:120
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d كۈن ئىلگىرى"
 
 #: template.php:121
 msgid "last month"
@@ -225,7 +225,7 @@ msgstr ""
 #: template.php:122
 #, php-format
 msgid "%d months ago"
-msgstr ""
+msgstr "%d ئاي ئىلگىرى"
 
 #: template.php:123
 msgid "last year"
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index 8908acf11ab2a8fcd3d8d1fa76b0970ed6de482f..d7d4d921f92443afee5fe7641049d388a489978a 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:15+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,56 +19,56 @@ msgstr ""
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "ئەپ بازىرىدىن تىزىمنى يۈكلىيەلمىدى"
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr ""
+msgstr "سالاھىيەت دەلىللەش خاتالىقى"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "كۆرسىتىدىغان ئىسمىڭىز ئۆزگەردى."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
-msgstr ""
+msgstr "كۆرسىتىدىغان ئىسىمنى ئۆزگەرتكىلى بولمايدۇ"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
-msgstr ""
+msgstr "گۇرۇپپا مەۋجۇت"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr ""
+msgstr "گۇرۇپپا قوشقىلى بولمايدۇ"
 
 #: ajax/enableapp.php:11
 msgid "Could not enable app. "
-msgstr ""
+msgstr "ئەپنى قوزغىتالمىدى. "
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
-msgstr ""
+msgstr "تورخەت ساقلاندى"
 
 #: ajax/lostpassword.php:14
 msgid "Invalid email"
-msgstr ""
+msgstr "ئىناۋەتسىز تورخەت"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr ""
+msgstr "گۇرۇپپىنى ئۆچۈرەلمىدى"
 
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
-msgstr ""
+msgstr "ئىشلەتكۈچىنى ئۆچۈرەلمىدى"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
-msgstr ""
+msgstr "تىل ئۆزگەردى"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr ""
+msgstr "ئىناۋەتسىز ئىلتىماس"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -77,91 +77,91 @@ msgstr ""
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "ئىشلەتكۈچىنى %s گۇرۇپپىغا قوشالمايدۇ"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەلمەيدۇ"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "ئەپنى يېڭىلىيالمايدۇ."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "{appversion} غا يېڭىلايدۇ"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
-msgstr ""
+msgstr "چەكلە"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr ""
+msgstr "قوزغات"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "سەل كۈتۈڭ…"
 
 #: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
-msgstr ""
+msgstr "خاتالىق"
 
 #: js/apps.js:90
 msgid "Updating...."
-msgstr ""
+msgstr "يېڭىلاۋاتىدۇ…"
 
 #: js/apps.js:93
 msgid "Error while updating app"
-msgstr ""
+msgstr "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى"
 
 #: js/apps.js:96
 msgid "Updated"
-msgstr ""
+msgstr "يېڭىلاندى"
 
 #: js/personal.js:118
 msgid "Saving..."
-msgstr ""
+msgstr "ساقلاۋاتىدۇ…"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
-msgstr ""
+msgstr "ئۆچۈرۈلگەن"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
-msgstr ""
+msgstr "يېنىۋال"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "ئىشلەتكۈچىنى چىقىرىۋېتەلمەيدۇ"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
-msgstr ""
+msgstr "گۇرۇپپا"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
-msgstr ""
+msgstr "گۇرۇپپا باشقۇرغۇچى"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
-msgstr ""
+msgstr "ئۆچۈر"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "گۇرۇپپا قوش"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -255,7 +255,7 @@ msgstr ""
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "ھەمبەھىر"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
@@ -291,7 +291,7 @@ msgstr ""
 
 #: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "بىخەتەرلىك"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
@@ -310,23 +310,23 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "خاتىرە"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "خاتىرە دەرىجىسى"
 
 #: templates/admin.php:227
 msgid "More"
-msgstr ""
+msgstr "تېخىمۇ كۆپ"
 
 #: templates/admin.php:228
 msgid "Less"
-msgstr ""
+msgstr "ئاز"
 
 #: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
-msgstr ""
+msgstr "نەشرى"
 
 #: templates/admin.php:237 templates/personal.php:108
 msgid ""
@@ -340,15 +340,15 @@ msgstr ""
 
 #: templates/apps.php:11
 msgid "Add your App"
-msgstr ""
+msgstr "ئەپىڭىزنى قوشۇڭ"
 
 #: templates/apps.php:12
 msgid "More Apps"
-msgstr ""
+msgstr "تېخىمۇ كۆپ ئەپلەر"
 
 #: templates/apps.php:28
 msgid "Select an App"
-msgstr ""
+msgstr "بىر ئەپ تاللاڭ"
 
 #: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
@@ -360,23 +360,23 @@ msgstr ""
 
 #: templates/apps.php:38
 msgid "Update"
-msgstr ""
+msgstr "يېڭىلا"
 
 #: templates/help.php:4
 msgid "User Documentation"
-msgstr ""
+msgstr "ئىشلەتكۈچى قوللانمىسى"
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
-msgstr ""
+msgstr "باشقۇرغۇچى قوللانمىسى"
 
 #: templates/help.php:9
 msgid "Online Documentation"
-msgstr ""
+msgstr "توردىكى قوللانما"
 
 #: templates/help.php:11
 msgid "Forum"
-msgstr ""
+msgstr "مۇنبەر"
 
 #: templates/help.php:14
 msgid "Bugtracker"
@@ -401,55 +401,55 @@ msgstr ""
 
 #: templates/personal.php:37 templates/users.php:23 templates/users.php:77
 msgid "Password"
-msgstr ""
+msgstr "ئىم"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
-msgstr ""
+msgstr "ئىمىڭىز مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى"
 
 #: templates/personal.php:39
 msgid "Unable to change your password"
-msgstr ""
+msgstr "ئىمنى ئۆزگەرتكىلى بولمايدۇ."
 
 #: templates/personal.php:40
 msgid "Current password"
-msgstr ""
+msgstr "نۆۋەتتىكى ئىم"
 
 #: templates/personal.php:42
 msgid "New password"
-msgstr ""
+msgstr "يېڭى ئىم"
 
 #: templates/personal.php:44
 msgid "Change password"
-msgstr ""
+msgstr "ئىم ئۆزگەرت"
 
 #: templates/personal.php:56 templates/users.php:76
 msgid "Display Name"
-msgstr ""
+msgstr "كۆرسىتىش ئىسمى"
 
 #: templates/personal.php:68
 msgid "Email"
-msgstr ""
+msgstr "تورخەت"
 
 #: templates/personal.php:70
 msgid "Your email address"
-msgstr ""
+msgstr "تورخەت ئادرېسىڭىز"
 
 #: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "ئىم ئەسلىگە كەلتۈرۈشتە ئىشلىتىدىغان تور خەت ئادرېسىنى تولدۇرۇڭ"
 
 #: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
-msgstr ""
+msgstr "تىل"
 
 #: templates/personal.php:89
 msgid "Help translate"
-msgstr ""
+msgstr "تەرجىمىگە ياردەم"
 
 #: templates/personal.php:94
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
 #: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
@@ -457,36 +457,36 @@ msgstr ""
 
 #: templates/users.php:21 templates/users.php:75
 msgid "Login Name"
-msgstr ""
+msgstr "تىزىمغا كىرىش ئاتى"
 
 #: templates/users.php:30
 msgid "Create"
-msgstr ""
+msgstr "قۇر"
 
 #: templates/users.php:33
 msgid "Default Storage"
-msgstr ""
+msgstr "كۆڭۈلدىكى ساقلىغۇچ"
 
 #: templates/users.php:39 templates/users.php:133
 msgid "Unlimited"
-msgstr ""
+msgstr "چەكسىز"
 
 #: templates/users.php:57 templates/users.php:148
 msgid "Other"
-msgstr ""
+msgstr "باشقا"
 
 #: templates/users.php:82
 msgid "Storage"
-msgstr ""
+msgstr "ساقلىغۇچ"
 
 #: templates/users.php:93
 msgid "change display name"
-msgstr ""
+msgstr "كۆرسىتىدىغان ئىسىمنى ئۆزگەرت"
 
 #: templates/users.php:97
 msgid "set new password"
-msgstr ""
+msgstr "يېڭى ئىم تەڭشە"
 
 #: templates/users.php:128
 msgid "Default"
-msgstr ""
+msgstr "كۆڭۈلدىكى"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index a8ca272882e4eae2f5b0acb3ae645abed651dd48..96f22a9e8b7f3c0d2f4daed94da90480c7e3c6f1 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,16 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -39,7 +43,7 @@ msgstr ""
 
 #: js/settings.js:66
 msgid "Deletion failed"
-msgstr ""
+msgstr "ئۆچۈرۈش مەغلۇپ بولدى"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "خاتالىق"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
-msgstr ""
+msgstr "باش ئاپپارات"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
-msgstr ""
+msgstr "ئىم"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
-msgstr ""
+msgstr "ئىشلەتكۈچى تىزىمغا كىرىش سۈزگۈچى"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
-msgstr ""
+msgstr "ئىشلەتكۈچى تىزىم سۈزگۈچى"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
-msgstr ""
+msgstr "گۇرۇپپا سۈزگۈچ"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
-msgstr ""
+msgstr "باغلىنىش تەڭشىكى"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
-msgstr ""
+msgstr "سەپلىمە ئاكتىپ"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
-msgstr ""
+msgstr "ئېغىز"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
-msgstr ""
+msgstr "TLS ئىشلەت"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
-msgstr ""
+msgstr "ياردەم"
diff --git a/l10n/ug/user_webdavauth.po b/l10n/ug/user_webdavauth.po
index 5af769591049674271906ec3f0f2e91c10995503..30ac4d4ad7ece75d83d68b403a986ad8c86f738c 100644
--- a/l10n/ug/user_webdavauth.po
+++ b/l10n/ug/user_webdavauth.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# uqkun <uqkun@outlook.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-04 11:40+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "WebDAV سالاھىيەت دەلىللەش"
 
 #: templates/settings.php:4
 msgid "URL: http://"
-msgstr ""
+msgstr "URL: http://"
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 8c37c907369f6cfad25a95f069ce20bbac4e18b2..0d847d93921f9f35f7ee0660d832f7ec639a9948 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 6f4e493551b89428d5f82f85c0aa668fd7fa2fc8..617b66ad3ec0d738e7a551e8877775dc5fda872c 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "Не вдалося перемістити %s - Файл з таким 
 msgid "Could not move %s"
 msgstr "Не вдалося перемістити %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Не вдалося перейменувати файл"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Не завантажено жодного файлу. Невідома помилка"
@@ -86,7 +82,7 @@ msgstr "Поділитися"
 msgid "Delete permanently"
 msgstr "Видалити назавжди"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Видалити"
 
@@ -94,43 +90,43 @@ msgstr "Видалити"
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Очікування"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} вже існує"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "заміна"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "запропонуйте назву"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "відміна"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "замінено {new_name} на {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "відмінити"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "виконати операцію видалення"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 файл завантажується"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "файли завантажуються"
 
@@ -156,69 +152,77 @@ msgstr "Ваше сховище переповнене, файли більше
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше сховище майже повне ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Місця більше немає"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Завантаження перервано."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL не може бути пустим."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Помилка"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} файлів"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Не вдалося перейменувати файл"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Вивантажити"
@@ -279,37 +283,37 @@ msgstr "Видалено файлів"
 msgid "Cancel upload"
 msgstr "Перервати завантаження"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "У вас тут немає прав на запис."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Тут нічого немає. Відвантажте що-небудь!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Закрити доступ"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Файл занадто великий"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Файли скануються, зачекайте, будь-ласка."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Поточне сканування"
 
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 37b8c494805ee33bbae57e14aeff1dbf0eb46c6e..7c13dac4da6f9a6c7a168d807cdd6e9b7920efe6 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 5a52fbc66ede01eddff4d2c4d04adf4659d61a33..dcbbcd305534bae5df689aeda8502d7f2c0ce462 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Оновлено"
 msgid "Saving..."
 msgstr "Зберігаю..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "видалені"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "відмінити"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Неможливо видалити користувача"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Групи"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Адміністратор групи"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Видалити"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "додати групу"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "Потрібно задати вірне ім'я користувача"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "Помилка при створенні користувача"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "Потрібно задати вірний пароль"
 
@@ -328,7 +328,7 @@ msgstr "Менше"
 msgid "Version"
 msgstr "Версія"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 89484b09eeee40af01621d85f779548b3f52a310..e57d6368ab327870dde10f50df18e5facd5059bd 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Не вдалося видалити конфігурацію сервера"
@@ -53,281 +57,363 @@ msgstr "Зберегти налаштування ?"
 msgid "Cannot add server configuration"
 msgstr "Неможливо додати конфігурацію сервера"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Успіх"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Помилка"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Перевірка з'єднання пройшла успішно"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Перевірка з'єднання завершилась неуспішно"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Підтвердіть Видалення"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>Увага:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них."
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Налаштування Сервера"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Додати налаштування Сервера"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Хост"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Базовий DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Один Base DN на одній строчці"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN Користувача"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "DN клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Для анонімного доступу, залиште DN і Пароль порожніми."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Фільтр Користувачів, що під'єднуються"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Фільтр Списку Користувачів"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Визначає фільтр, який застосовується при отриманні користувачів"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "без будь-якого заповнювача, наприклад: \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Фільтр Груп"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Визначає фільтр, який застосовується при отриманні груп."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Налаштування З'єднання"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Налаштування Активне"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Якщо \"галочка\" знята, ця конфігурація буде пропущена."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Сервер для резервних копій"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Порт сервера для резервних копій"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Вимкнути Головний Сервер"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Коли увімкнуто, ownCloud  буде приєднуватись лише до сервера з резервними копіями."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Використовуйте TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Не використовуйте це додатково для під'єднання до LDAP, бо виконано не буде."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Нечутливий до регістру LDAP сервер (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Вимкнути перевірку SSL сертифіката."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Не рекомендується, використовуйте лише для тестів."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Час актуальності Кеша"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Зміна очищує кеш."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Налаштування Каталога"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Поле, яке відображає Ім'я Користувача"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Атрибут LDAP, який використовується для генерації імен користувачів ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Основне Дерево Користувачів"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Один Користувач Base DN на одній строчці"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Пошукові Атрибути Користувача"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Додатково; один атрибут на строчку"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Поле, яке відображає Ім'я Групи"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Атрибут LDAP, який використовується для генерації імен груп ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Основне Дерево Груп"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Одна Група Base DN на одній строчці"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Пошукові Атрибути Групи"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Асоціація Група-Член"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Спеціальні Атрибути"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Поле Квоти"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Квота за замовчанням"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Поле Ел. пошти"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Правило іменування домашньої теки користувача"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Тестове налаштування"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Допомога"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index dab44591bda6104093bd2f1f0254990675c71c43..b16f5c533b744d9c69d77527ca5aa9452444e641 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 11f0069a8178311ed7574052efd7ea94a43c7c34..e34cfafff4b43726dfcb9cb346d5c65a6ed4a335 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
@@ -94,43 +90,43 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "ایرر"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "شئیرنگ ختم کریں"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index 4191c258672ce7805310a5dd7bf495ec5c50ab2d..8844c8c59e1e2e53041dbd90f3b6138aefdd33aa 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index df2fa2592c01148d016e0a1e5a86116ec75a8f23..f659385b36ff5df006682c2fae12e78b8198a87e 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 88926609e226f32f9f0670c1de35a2c4c0a43b98..61c99c1fcb8e83ac6a7e400349268b2f25062c7b 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "ایرر"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "پاسورڈ"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "مدد"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index d664c1fa0669e2fbf3e4355f7dae9eb42fb9cadc..d5016bce855a19c5a43d6a9f26c6f2ad41d512df 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# xtdv <truong.tx8@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: xtdv <truong.tx8@gmail.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -401,11 +402,11 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "Liên kết tạo lại mật khẩu đã được gửi tới hộp thư của bạn.<br>Nếu bạn không thấy nó sau một khoảng thời gian, vui lòng kiểm tra trong thư mục Spam/Rác.<br>Nếu vẫn không thấy, vui lòng hỏi người quản trị hệ thống."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Yêu cầu thất bại!<br>Bạn có chắc là email/tên đăng nhập của bạn chính xác?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -479,11 +480,11 @@ msgstr "Cảnh bảo bảo mật"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
+msgstr "Vui lòng cập nhật bản cài đặt PHP để sử dụng ownCloud một cách an toàn."
 
 #: templates/installation.php:32
 msgid ""
@@ -563,7 +564,7 @@ msgstr "dịch vụ web dưới sự kiểm soát của bạn"
 #: templates/layout.user.php:36
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s còn trống. Xem thêm thông tin cách cập nhật."
 
 #: templates/layout.user.php:61
 msgid "Log out"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 8a9cc154480be88f5da84e851ca77e3c4d499aec..67d6e94d7f4903e570c8898bbcfb882a471ee4d3 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# xtdv <truong.tx8@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -20,17 +21,13 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Không thể di chuyển %s - Đã có tên file này trên hệ thống"
+msgstr "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
 msgstr "Không thể di chuyển %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Không thể đổi tên file"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Không có tập tin nào được tải lên. Lỗi không xác định"
@@ -86,7 +83,7 @@ msgstr "Chia sẻ"
 msgid "Delete permanently"
 msgstr "Xóa vĩnh vễn"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Xóa"
 
@@ -94,43 +91,43 @@ msgstr "Xóa"
 msgid "Rename"
 msgstr "Sửa tên"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Đang chờ"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} đã tồn tại"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "thay thế"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "tên gợi ý"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "hủy"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "đã thay thế {new_name} bằng {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "lùi lại"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "thực hiện việc xóa"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 tệp tin đang được tải lên"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "tệp tin đang được tải lên"
 
@@ -156,69 +153,77 @@ msgstr "Your storage is full, files can not be updated or synced anymore!"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Your storage is almost full ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
-msgstr ""
+msgstr "Không đủ chỗ trống cần thiết"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Hủy tải lên"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL không được để trống."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Lá»—i"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Tên"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Thay đổi"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 thư mục"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} thư mục"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 tập tin"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} tập tin"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Không thể đổi tên file"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Tải lên"
@@ -279,40 +284,40 @@ msgstr "File đã bị xóa"
 msgid "Cancel upload"
 msgstr "Hủy upload"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Bạn không có quyền ghi vào đây."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Không có gì ở đây .Hãy tải lên một cái gì đó !"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Tải về"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Bỏ chia sẻ"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Tập tin tải lên quá lớn"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ ."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Tập tin đang được quét ,vui lòng chờ."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Hiện tại đang quét"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Upgrading filesystem cache..."
+msgstr "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index 5a4d0493a7807ec7c96eae0c0147c8027dbf8e72..fd539c747a26b038694dfdb48ca758a3f0ed8174 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# xtdv <truong.tx8@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-05 06:20+0000\n"
+"Last-Translator: xtdv <truong.tx8@gmail.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +56,7 @@ msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
 "your system administrator to install it."
-msgstr ""
+msgstr "<b>Cảnh báo:</b> Tính năng Curl trong PHP chưa được kích hoạt hoặc cài đặt. Việc gắn kết ownCloud / WebDAV hay GoogleDrive không thực hiện được. Vui lòng liên hệ người quản trị để cài đặt nó."
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -67,7 +68,7 @@ msgstr "Tên thư mục"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "Lưu trữ ngoài"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -83,7 +84,7 @@ msgstr "Áp dụng"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "Thêm bộ nhớ"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index 5131f96d88b3093f31977015c7e2867ebf6abc4b..6e5de8cd4c2cc9ab3bf84fdf7bf6a29c3fab7296 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index e491b49c01e2a38e2f9bb54bd0ae837a72c7b11b..22139400b8037a9c885ee8a76af8be42ed94f96d 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "Đã cập nhật"
 msgid "Saving..."
 msgstr "Đang lưu..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "đã xóa"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "lùi lại"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "Nhóm"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "Nhóm quản trị"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "Xóa"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr "ít"
 msgid "Version"
 msgstr "Phiên bản"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 09d7c04c674e34fcfe3fc00206dd28ecffaf81fa..c94715753c3fbc0528b1c0df290e8062d0365abc 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Thành công"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Lá»—i"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Máy chủ"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN cơ bản"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Bạn có thể chỉ định DN cơ bản cho người dùng và các nhóm trong tab Advanced"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Người dùng DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "Các DN của người sử dụng đã được thực hiện, ví dụ như uid =agent , dc = example, dc = com. Để truy cập nặc danh ,DN và mật khẩu trống."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Cho phép truy cập nặc danh , DN và mật khẩu trống."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Lọc người dùng đăng nhập"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Xác định các bộ lọc để áp dụng, khi đăng nhập . uid%% thay thế tên người dùng trong các lần đăng nhập."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "use %%uid placeholder, e.g. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lọc danh sách thành viên"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Xác định các bộ lọc để áp dụng, khi người dụng sử dụng."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Bộ lọc nhóm"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Xác định các bộ lọc để áp dụng, khi nhóm sử dụng."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Connection Settings"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Cổng"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Cổng sao lưu (Replica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Tắt máy chủ chính"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "When switched on, ownCloud will only connect to the replica server."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Sử dụng TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Do not use it additionally for LDAPS connections, it will fail."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Trường hợp insensitve LDAP máy chủ (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Tắt xác thực chứng nhận SSL"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Nếu kết nối chỉ hoạt động với tùy chọn này, vui lòng import LDAP certificate SSL  trong máy chủ ownCloud của bạn."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Không khuyến khích, Chỉ sử dụng để thử nghiệm."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "trong vài giây. Một sự thay đổi bộ nhớ cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Directory Settings"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Hiển thị tên người sử dụng"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Các thuộc tính LDAP sử dụng để tạo tên người dùng ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Cây người dùng cơ bản"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "User Search Attributes"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Optional; one attribute per line"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Hiển thị tên nhóm"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Các thuộc tính LDAP sử dụng để tạo các nhóm ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Cây nhóm cơ bản"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Group Search Attributes"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Nhóm thành viên Cộng đồng"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Special Attributes"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "Theo Byte"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD"
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Giúp đỡ"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 3722c01c65838969fc56adc699c8ff1e3b4bd169..0915509f39cacbe0b3f0f974f38bf737cdd683de 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index c2de52c9959411be163e8f574bddbb017fd1851c..c6e9e821ef1a925c6a4348edb58c50129744420a 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "没有上传文件。未知错误"
@@ -86,7 +82,7 @@ msgstr "分享"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "删除"
 
@@ -94,43 +90,43 @@ msgstr "删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "等待中"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "推荐名称"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "已用 {old_name} 替换 {new_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 个文件正在上传"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "个文件正在上传"
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "不能上传您的文件，由于它是文件夹或者为空文件"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "上传取消了"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传。关闭页面会取消上传。"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "网址不能为空。"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "出错"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 个文件夹"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} 个文件"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "上传"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "这里没有东西.上传点什么!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "取消分享"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "上传过大"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "你正在试图上传的文件超过了此服务器支持的最大的文件大小."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "正在扫描文件,请稍候."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "正在扫描"
 
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index 487b06cc016ce5d0d15e201411ff51f00fb8afa0..a6c759cdf0ae7822b098be109625cbb18d02b7cf 100644
--- a/l10n/zh_CN.GB2312/files_trashbin.po
+++ b/l10n/zh_CN.GB2312/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 06965bd61228ed45a28a34c7e6cce7894727bf8d..bd917dd80d40ca95908b634f7a4229f7b328ad7c 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr "已升级"
 msgid "Saving..."
 msgstr "保存中..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "删除"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "撤销"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "无法移除用户"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "群组"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "群组管理员"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "删除"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "添加群组"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "请填写有效用户名"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "新增用户时出现错误"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "请填写有效密码"
 
@@ -328,7 +328,7 @@ msgstr "æ›´å°‘"
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 0836d8955ed6ab0bc60232409f6a9a9f88548668..8eb298ee7eb731ce3a236dde95456ad90b6a2822 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "成功"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "出错"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "主机"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "您可以忽略协议，除非您需要 SSL。然后用 ldaps:// 开头"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "基本判别名"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "您可以在高级选项卡中为用户和群组指定基本判别名"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "用户判别名"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "客户机用户的判别名，将用于绑定，例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "密码"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "匿名访问请留空判别名和密码。"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "用户登录过滤器"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "使用 %%uid 占位符，例如 \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "用户列表过滤器"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "定义撷取用户时要应用的过滤器。"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "不能使用占位符，例如 \"objectClass=person\"。"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "群组过滤器"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "定义撷取群组时要应用的过滤器"
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "不能使用占位符，例如 \"objectClass=posixGroup\"。"
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "端口"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "使用 TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大小写不敏感的 LDAP 服务器 (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "关闭 SSL 证书校验。"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "如果只有使用此选项才能连接，请导入 LDAP 服务器的 SSL 证书到您的 ownCloud 服务器。"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "不推荐，仅供测试"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "以秒计。修改会清空缓存。"
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "用户显示名称字段"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "用于生成用户的 ownCloud 名称的 LDAP 属性。"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "基本用户树"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "群组显示名称字段"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "用于生成群组的 ownCloud 名称的 LDAP 属性。"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "基本群组树"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "群组-成员组合"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "以字节计"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "用户名请留空 (默认)。否则，请指定一个 LDAP/AD 属性。"
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "帮助"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 1b9c3c8856809089f141137a7740fbb60d3cb48a..59cf8218e131e637afa740af9bc530f970624f42 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# zhangmin <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -401,11 +402,11 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "重置密码的链接已发送到您的邮箱。<br>如果您觉得在合理的时间内还未收到邮件，请查看 spam/junk 目录。<br>如果没有在那里，请询问您的本地管理员。"
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "请求失败<br>您确定您的邮箱/用户名是正确的？"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -563,7 +564,7 @@ msgstr "您控制的web服务"
 #: templates/layout.user.php:36
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s 可用。获取更多关于如何升级的信息。"
 
 #: templates/layout.user.php:61
 msgid "Log out"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 6f0626fc69461324032d3c0674132fc9969555a2..7bd8ad81e9bd633fead67953f840671f170023d4 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# zhangmin <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,10 +28,6 @@ msgstr "无法移动 %s - 同名文件已存在"
 msgid "Could not move %s"
 msgstr "无法移动 %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "无法重命名文件"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "没有文件被上传。未知错误"
@@ -86,7 +83,7 @@ msgstr "分享"
 msgid "Delete permanently"
 msgstr "永久删除"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "删除"
 
@@ -94,43 +91,43 @@ msgstr "删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "等待"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "建议名称"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "已将 {old_name}替换成 {new_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "进行删除操作"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1个文件上传中"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "文件上传中"
 
@@ -156,69 +153,77 @@ msgstr "您的存储空间已满，文件将无法更新或同步！"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的存储空间即将用完 ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "无法上传您的文件，文件夹或者空文件"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "没有足够可用空间"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL不能为空"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "错误"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1个文件夹"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} 个文件"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "无法重命名文件"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "上传"
@@ -279,37 +284,37 @@ msgstr "删除文件"
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "您没有写权限"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "这里还什么都没有。上传些东西吧！"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "取消共享"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "上传文件过大"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您正尝试上传的文件超过了此服务器可以上传的最大容量限制"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "文件正在被扫描，请稍候。"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "当前扫描"
 
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 3d23aa4013937b7d3cbc57e7f26b0fa7bc650170..75da62afbf698d45bc6d082220433e19e35e1bf7 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 7398714007494a2518774aad42e6e22169dad690..fef0cdd11bd810b55ad5f300db031c772c9b30c8 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# zhangmin <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
+"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr "认证出错"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "您的显示名字已经改变"
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
@@ -124,44 +125,44 @@ msgstr "已更新"
 msgid "Saving..."
 msgstr "保存中"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "已经删除"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "撤销"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "无法移除用户"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "组"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "组管理员"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "删除"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "添加组"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "必须提供合法的用户名"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "创建用户出错"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "必须提供合法的密码"
 
@@ -328,7 +329,7 @@ msgstr "æ›´å°‘"
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 763966dd291b9011c9d3c60e8250a72428231d74..47d10ead3671122cb119726b54da650d37973648 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "未能删除服务器配置"
@@ -53,281 +57,363 @@ msgstr "保留设置吗？"
 msgid "Cannot add server configuration"
 msgstr "无法添加服务器配置"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "成功"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "错误"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "连接测试成功"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "连接测试失败"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "您真的想要删除当前服务器配置吗？"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "确认删除"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr "<b>警告：</b>应用 user_ldap 和 user_webdavauth 不兼容。您可能遭遇未预料的行为。请垂询您的系统管理员禁用其中一个。"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr "<b>警告：</b> PHP LDAP 模块未安装，后端将无法工作。请请求您的系统管理员安装该模块。"
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "服务器配置"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "添加服务器配置"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "主机"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "可以忽略协议，但如要使用SSL，则需以ldaps://开头"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "每行一个基本判别名"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "您可以在高级选项卡里为用户和组指定Base DN"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr "客户端使用的DN必须与绑定的相同，比如uid=agent,dc=example,dc=com\n如需匿名访问，将DN和密码保留为空"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "密码"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "启用匿名访问，将DN和密码保留为空"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "用户登录过滤"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "定义当尝试登录时的过滤器。 在登录过程中，%%uid将会被用户名替换"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "使用 %%uid作为占位符，例如“uid=%%uid”"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "用户列表过滤"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "定义拉取用户时的过滤器"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "没有任何占位符,如 \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "组过滤"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "定义拉取组信息时的过滤器"
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "无需占位符，例如\"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "连接设置"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "现行配置"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "当反选后，此配置将被忽略。"
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "端口"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "备份 (镜像) 主机"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "给出一个可选的备份主机。它必须为主 LDAP/AD 服务器的一个镜像。"
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "备份 (镜像) 端口"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "禁用主服务器"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "当开启后，ownCloud 将仅连接到镜像服务器。"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "使用TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "对于 LDAPS 连接不要额外启用它，连接必然失败。"
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大小写敏感LDAP服务器(Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "关闭SSL证书验证"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "如果链接仅在此选项时可用，在您的ownCloud服务器中导入LDAP服务器的SSL证书。"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "暂不推荐，仅供测试"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "缓存存活时间"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "以秒计。修改将清空缓存。"
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "目录设置"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "用户显示名称字段"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "用来生成用户的ownCloud名称的 LDAP属性"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "基础用户树"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "每行一个用户基准判别名"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "用户搜索属性"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "可选;每行一个属性"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "组显示名称字段"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "用来生成组的ownCloud名称的LDAP属性"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "基础组树"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "每行一个群组基准判别名"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "群组搜索属性"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "组成员关联"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "特殊属性"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "配额字段"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "默认配额"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "字节数"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "电邮字段"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "用户主目录命名规则"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "测试配置"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "帮助"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 524bd63e93256f3c41008eb947aa2a33c577b030..000af61d0fc83dc944d65db69e3996f409fcb9c2 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index c309f0cffbea5685d1848465a7c41101948fd8e6..57d0ed08b7a677848195485482917fb4e1a3a24c 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -86,7 +82,7 @@ msgstr "分享"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "刪除"
 
@@ -94,43 +90,43 @@ msgstr "刪除"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "錯誤"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{}文件夾"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "上傳"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "取消分享"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 257a2b7d6d2b8a69f87c92b6a73fcac5d7186543..50a8313ffdc22604d0ed047c94b979560cb09a49 100644
--- a/l10n/zh_HK/files_trashbin.po
+++ b/l10n/zh_HK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index 8f52891b9d5fb57c691303ee9e4640cdcd2ffde5..b9e2346a6f9363508e51d0a71b19042325b7ae59 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 08:28+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -124,44 +124,44 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "群組"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "刪除"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 1ca728241010d2f779ec77f20763c1e43e2843f0..f619852c77af19eaf5cb1f5a076dde63b5ad8fd3 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "成功"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "錯誤"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "密碼"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "連接埠"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "幫助"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 1191b8653f1eb11c008def82d46acafdb91fcb37..e3de472e4ea8597c2a81647e705e35171ac442fe 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pellaeon <nfsmwlin@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 23:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:18+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -401,11 +402,11 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被放到垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。"
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -563,7 +564,7 @@ msgstr "由您控制的網路服務"
 #: templates/layout.user.php:36
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s 已經釋出，瞭解更多資訊以進行更新。"
 
 #: templates/layout.user.php:61
 msgid "Log out"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index d4eeb6cbc2f3677a41ab68c32e4b554e3d01dcc8..81e77b9fbc4e2e29925a31f35b260938e87d78d4 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:27+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr "無法移動 %s - 同名的檔案已經存在"
 msgid "Could not move %s"
 msgstr "無法移動 %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "無法重新命名檔案"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "沒有檔案被上傳。未知的錯誤。"
@@ -86,7 +82,7 @@ msgstr "分享"
 msgid "Delete permanently"
 msgstr "永久刪除"
 
-#: js/fileactions.js:128 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "刪除"
 
@@ -94,43 +90,43 @@ msgstr "刪除"
 msgid "Rename"
 msgstr "重新命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "等候中"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} 已經存在"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "取代"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "建議檔名"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "使用 {new_name} 取代 {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "復原"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "進行刪除動作"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 個檔案正在上傳"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "檔案正在上傳中"
 
@@ -156,69 +152,77 @@ msgstr "您的儲存空間已滿，沒有辦法再更新或是同步檔案！"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的儲存空間快要滿了 ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "正在準備您的下載，若您的檔案較大，將會需要更多時間。"
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "沒有足夠的可用空間"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "上傳已取消"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "檔案上傳中。離開此頁面將會取消上傳。"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL 不能為空白。"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "錯誤"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 個資料夾"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} 個資料夾"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 個檔案"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} 個檔案"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "無法重新命名檔案"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "上傳"
@@ -279,37 +283,37 @@ msgstr "已刪除的檔案"
 msgid "Cancel upload"
 msgstr "取消上傳"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "您在這裡沒有編輯權。"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "這裡什麼也沒有，上傳一些東西吧！"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "取消共享"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "上傳過大"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "正在掃描檔案，請稍等。"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "目前掃描"
 
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index bc188ef03e90d1f750553f8655d459b61b47cb75..1a247511511bb43f24cb8ef52549388156039c36 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index 0269ee3c3417be79328f9dbee37613ffe19f038b..ceb0cbe05351883f36729ffaebe978766f214e72 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pellaeon <nfsmwlin@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 07:10+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,7 +47,7 @@ msgstr "沒有舊的版本"
 
 #: history.php:74
 msgid "No path specified"
-msgstr "沒有指定路線"
+msgstr "沒有指定路徑"
 
 #: js/versions.js:6
 msgid "Versions"
@@ -54,4 +55,4 @@ msgstr "版本"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "按一按復原的按鈕，就能把一個檔案復原至以前的版本"
+msgstr "按一下復原的按鈕即可把檔案復原至以前的版本"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 9c5b7713d9df073ab5def716027da39a28697e89..dca33e8dbca5657dc235e55ce438b427658ae3a1 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:17+0200\n"
-"PO-Revision-Date: 2013-04-26 16:22+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -125,44 +125,44 @@ msgstr "已更新"
 msgid "Saving..."
 msgstr "儲存中..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "已刪除"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "復原"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "無法刪除用戶"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
 #: templates/users.php:103
 msgid "Groups"
 msgstr "群組"
 
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
 msgid "Group Admin"
 msgstr "群組 管理員"
 
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
 msgid "Delete"
 msgstr "刪除"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "新增群組"
 
-#: js/users.js:414
+#: js/users.js:420
 msgid "A valid username must be provided"
 msgstr "一定要提供一個有效的用戶名"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
 msgid "Error creating user"
 msgstr "創建用戶時出現錯誤"
 
-#: js/users.js:420
+#: js/users.js:426
 msgid "A valid password must be provided"
 msgstr "一定要提供一個有效的密碼"
 
@@ -329,7 +329,7 @@ msgstr "å°‘"
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:238 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 87daf4265bbe2b93831f11649c51adae73087241..bfa71664a2f93a53ea87e2440767f1b6f2356106 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-18 01:58+0200\n"
+"PO-Revision-Date: 2013-05-17 10:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "成功"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "錯誤"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "主機"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "密碼"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "連接阜"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "使用TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "關閉 SSL 憑證驗證"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "說明"
diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index 19c7a6a94c8d610b9b6ef602a27ea614ffe51ab3..4dd48e2ce3d2ab01c7efbef68984aed2ba59fb3b 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@alphacorp.tk>, 2013.
-# Hydriz Scholz <admin@alphacorp.tk>, 2013.
-#   <sofia168@livemail.tw>, 2012.
+# Hydriz <admin@alphacorp.tk>, 2013
+# Hydriz <admin@alphacorp.tk>, 2013
+# pellaeon <nfsmwlin@gmail.com>, 2013
+# sofiasu <sofia168@livemail.tw>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-17 02:20+0200\n"
-"PO-Revision-Date: 2013-04-17 00:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-12 02:01+0200\n"
+"PO-Revision-Date: 2013-05-06 07:10+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,4 +34,4 @@ msgid ""
 "ownCloud will send the user credentials to this URL. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud會將把用戶的證件發送到這個網址。這個插件會檢查回應，並把HTTP狀態代碼401和403視為無效證件和所有其他回應視為有效證件。"
+msgstr "ownCloud 會將把用戶的登入資訊發送到這個網址以嘗試登入，並檢查回應， HTTP 狀態碼401和403視為登入失敗，所有其他回應視為登入成功。"
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index aef0eab9bf1507d28207e3d3d797ec26925fb0a8..693ceffa01c0d22b9ef49ce5e3a6ddb5557d908d 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -387,7 +387,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
         $php_errormsg = '';
 		$this->connection = new SQLite3($database_file);
 		if(is_callable(array($this->connection, 'busyTimeout'))) {//busy timout is only available in php>=5.3
-			$this->connection->busyTimeout(100);
+			$this->connection->busyTimeout(60000);
 		}
         $this->_lasterror = $this->connection->lastErrorMsg();
         if (!$this->connection) {
diff --git a/lib/autoloader.php b/lib/autoloader.php
new file mode 100644
index 0000000000000000000000000000000000000000..9615838a9a2a27d608621ad32cf8eddb6e0ac5e2
--- /dev/null
+++ b/lib/autoloader.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC;
+
+class Autoloader {
+	private $useGlobalClassPath = true;
+
+	private $prefixPaths = array();
+
+	private $classPaths = array();
+
+	/**
+	 * Add a custom prefix to the autoloader
+	 *
+	 * @param string $prefix
+	 * @param string $path
+	 */
+	public function registerPrefix($prefix, $path) {
+		$this->prefixPaths[$prefix] = $path;
+	}
+
+	/**
+	 * Add a custom classpath to the autoloader
+	 *
+	 * @param string $class
+	 * @param string $path
+	 */
+	public function registerClass($class, $path) {
+		$this->classPaths[$class] = $path;
+	}
+
+	/**
+	 * disable the usage of the global classpath \OC::$CLASSPATH
+	 */
+	public function disableGlobalClassPath() {
+		$this->useGlobalClassPath = false;
+	}
+
+	/**
+	 * enable the usage of the global classpath \OC::$CLASSPATH
+	 */
+	public function enableGlobalClassPath() {
+		$this->useGlobalClassPath = true;
+	}
+
+	/**
+	 * get the possible paths for a class
+	 *
+	 * @param string $class
+	 * @return array|bool an array of possible paths or false if the class is not part of ownCloud
+	 */
+	public function findClass($class) {
+		$class = trim($class, '\\');
+
+		$paths = array();
+		if (array_key_exists($class, $this->classPaths)) {
+			$paths[] = $this->classPaths[$class];
+		} else if ($this->useGlobalClassPath and array_key_exists($class, \OC::$CLASSPATH)) {
+			$paths[] = \OC::$CLASSPATH[$class];
+			/**
+			 * @TODO: Remove this when necessary
+			 * Remove "apps/" from inclusion path for smooth migration to mutli app dir
+			 */
+			if (strpos(\OC::$CLASSPATH[$class], 'apps/') === 0) {
+				\OC_Log::write('core', 'include path for class "' . $class . '" starts with "apps/"', \OC_Log::DEBUG);
+				$paths[] = str_replace('apps/', '', \OC::$CLASSPATH[$class]);
+			}
+		} elseif (strpos($class, 'OC_') === 0) {
+			// first check for legacy classes if underscores are used
+			$paths[] = 'legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+			$paths[] = strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+		} elseif (strpos($class, 'OC\\') === 0) {
+			$paths[] = strtolower(str_replace('\\', '/', substr($class, 3)) . '.php');
+		} elseif (strpos($class, 'OCP\\') === 0) {
+			$paths[] = 'public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php');
+		} elseif (strpos($class, 'OCA\\') === 0) {
+			list(, $app, $rest) = explode('\\', $class, 3);
+			$app = strtolower($app);
+			foreach (\OC::$APPSROOTS as $appDir) {
+				if (stream_resolve_include_path($appDir['path'] . '/' . $app)) {
+					$paths[] = $appDir['path'] . '/' . $app . '/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+					// If not found in the root of the app directory, insert '/lib' after app id and try again.
+					$paths[] = $appDir['path'] . '/' . $app . '/lib/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+				}
+			}
+		} elseif (strpos($class, 'Test_') === 0) {
+			$paths[] = 'tests/lib/' . strtolower(str_replace('_', '/', substr($class, 5)) . '.php');
+		} elseif (strpos($class, 'Test\\') === 0) {
+			$paths[] = 'tests/lib/' . strtolower(str_replace('\\', '/', substr($class, 5)) . '.php');
+		} else {
+			foreach ($this->prefixPaths as $prefix => $dir) {
+				if (0 === strpos($class, $prefix)) {
+					$path = str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php';
+					$path = str_replace('_', DIRECTORY_SEPARATOR, $path);
+					$paths[] = $dir . '/' . $path;
+				}
+			}
+		}
+		return $paths;
+	}
+
+	/**
+	 * Load the specified class
+	 *
+	 * @param string $class
+	 * @return bool
+	 */
+	public function load($class) {
+		$paths = $this->findClass($class);
+
+		if (is_array($paths)) {
+			foreach ($paths as $path) {
+				if ($fullPath = stream_resolve_include_path($path)) {
+					require_once $fullPath;
+				}
+			}
+		}
+		return false;
+	}
+}
diff --git a/lib/base.php b/lib/base.php
index e4f2d98e5e4f8e3f3f6d688bb4e14d32f5fce40f..edd1860b65239ebf88bacd00afc6a4a64b399c30 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -75,61 +75,9 @@ class OC {
 	protected static $router = null;
 
 	/**
-	 * SPL autoload
+	 * @var \OC\Autoloader $loader
 	 */
-	public static function autoload($className) {
-		$className = trim($className, '\\');
-		
-		if (array_key_exists($className, OC::$CLASSPATH)) {
-			$path = OC::$CLASSPATH[$className];
-			/** @TODO: Remove this when necessary
-			Remove "apps/" from inclusion path for smooth migration to mutli app dir
-			 */
-			if (strpos($path, 'apps/') === 0) {
-				OC_Log::write('core', 'include path for class "' . $className . '" starts with "apps/"', OC_Log::DEBUG);
-				$path = str_replace('apps/', '', $path);
-			}
-		} elseif (strpos($className, 'OC_') === 0) {
-			$path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php');
-		} elseif (strpos($className, 'OC\\') === 0) {
-			$path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
-		} elseif (strpos($className, 'OCP\\') === 0) {
-			$path = 'public/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
-		} elseif (strpos($className, 'OCA\\') === 0) {
-			foreach (self::$APPSROOTS as $appDir) {
-				$path = strtolower(str_replace('\\', '/', substr($className, 4)) . '.php');
-				$fullPath = stream_resolve_include_path($appDir['path'] . '/' . $path);
-				if (file_exists($fullPath)) {
-					require_once $fullPath;
-					return false;
-				}
-				// If not found in the root of the app directory, insert '/lib' after app id and try again.
-				$libpath = substr($path, 0, strpos($path, '/')) . '/lib' . substr($path, strpos($path, '/'));
-				$fullPath = stream_resolve_include_path($appDir['path'] . '/' . $libpath);
-				if (file_exists($fullPath)) {
-					require_once $fullPath;
-					return false;
-				}
-			}
-		} elseif (strpos($className, 'Sabre_') === 0) {
-			$path = str_replace('_', '/', $className) . '.php';
-		} elseif (strpos($className, 'Symfony\\Component\\Routing\\') === 0) {
-			$path = 'symfony/routing/' . str_replace('\\', '/', $className) . '.php';
-		} elseif (strpos($className, 'Sabre\\VObject') === 0) {
-			$path = str_replace('\\', '/', $className) . '.php';
-		} elseif (strpos($className, 'Test_') === 0) {
-			$path = 'tests/lib/' . strtolower(str_replace('_', '/', substr($className, 5)) . '.php');
-		} elseif (strpos($className, 'Test\\') === 0) {
-			$path = 'tests/lib/' . strtolower(str_replace('\\', '/', substr($className, 5)) . '.php');
-		} else {
-			return false;
-		}
-
-		if ($fullPath = stream_resolve_include_path($path)) {
-			require_once $fullPath;
-		}
-		return false;
-	}
+	public static $loader = null;
 
 	public static function initPaths() {
 		// calculate the root directories
@@ -393,8 +341,14 @@ class OC {
 
 	public static function init() {
 		// register autoloader
-		spl_autoload_register(array('OC', 'autoload'));
-		OC_Util::issetlocaleworking();
+		require_once __DIR__ . '/autoloader.php';
+		self::$loader=new \OC\Autoloader();
+		self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib');
+		self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib');
+		self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing');
+		self::$loader->registerPrefix('Sabre\\VObject', '3rdparty');
+		self::$loader->registerPrefix('Sabre_', '3rdparty');
+		spl_autoload_register(array(self::$loader, 'load'));
 
 		// set some stuff
 		//ob_start();
@@ -451,6 +405,7 @@ class OC {
 		}
 
 		self::initPaths();
+		OC_Util::issetlocaleworking();
 
 		// set debug mode if an xdebug session is active
 		if (!defined('DEBUG') || !DEBUG) {
@@ -584,10 +539,12 @@ class OC {
 	 * register hooks for sharing
 	 */
 	public static function registerShareHooks() {
-		OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
-		OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
-		OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
-		OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
+		if(\OC_Config::getValue('installed')) {
+			OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
+			OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
+			OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
+			OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
+		}
 	}
 
 	/**
@@ -640,7 +597,7 @@ class OC {
 			
 			// Deny the redirect if the URL contains a @
 			// This prevents unvalidated redirects like ?redirect_url=:user@domain.com
-			if (strpos($location, '@') === FALSE) {
+			if (strpos($location, '@') === false) {
 				header('Location: ' . $location);
 				return;
 			}
diff --git a/lib/files.php b/lib/files.php
index 04ba51d9d2404727a1c29f1bd287bcdb64ea8479..ab7fa1ed096ef21ec0d0b8413de8e16cd6920eae 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -59,11 +59,7 @@ class OC_Files {
 			$executionTime = intval(ini_get('max_execution_time'));
 			set_time_limit(0);
 			$zip = new ZipArchive();
-			if ($xsendfile) {
-				$filename = OC_Helper::tmpFileNoClean('.zip');
-			}else{
-				$filename = OC_Helper::tmpFile('.zip');
-			}
+			$filename = OC_Helper::tmpFile('.zip');
 			if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
 				exit("cannot open <$filename>\n");
 			}
@@ -78,6 +74,9 @@ class OC_Files {
 				}
 			}
 			$zip->close();
+			if ($xsendfile) {
+				$filename = OC_Helper::moveToNoClean($filename);
+			}
 			$basename = basename($dir);
 			if ($basename) {
 				$name = $basename . '.zip';
@@ -91,17 +90,16 @@ class OC_Files {
 			$executionTime = intval(ini_get('max_execution_time'));
 			set_time_limit(0);
 			$zip = new ZipArchive();
-			if ($xsendfile) {
-				$filename = OC_Helper::tmpFileNoClean('.zip');
-			}else{
-				$filename = OC_Helper::tmpFile('.zip');
-			}
+			$filename = OC_Helper::tmpFile('.zip');
 			if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
 				exit("cannot open <$filename>\n");
 			}
 			$file = $dir . '/' . $files;
 			self::zipAddDir($file, $zip);
 			$zip->close();
+			if ($xsendfile) {
+				$filename = OC_Helper::moveToNoClean($filename);
+			}
 			$name = $files . '.zip';
 			set_time_limit($executionTime);
 		} else {
diff --git a/lib/files/cache/backgroundwatcher.php b/lib/files/cache/backgroundwatcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..8933101577d5cab06c2c59425f5e386b24bffad9
--- /dev/null
+++ b/lib/files/cache/backgroundwatcher.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Cache;
+
+use \OC\Files\Mount;
+use \OC\Files\Filesystem;
+
+class BackgroundWatcher {
+	static $folderMimetype = null;
+
+	static private function getFolderMimetype() {
+		if (!is_null(self::$folderMimetype)) {
+			return self::$folderMimetype;
+		}
+		$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?');
+		$result = $query->execute(array('httpd/unix-directory'));
+		$row = $result->fetchRow();
+		return $row['id'];
+	}
+
+	static private function checkUpdate($id) {
+		$cacheItem = Cache::getById($id);
+		if (is_null($cacheItem)) {
+			return;
+		}
+		list($storageId, $internalPath) = $cacheItem;
+		$mounts = Filesystem::getMountByStorageId($storageId);
+
+		if (count($mounts) === 0) {
+			//if the storage we need isn't mounted on default, try to find a user that has access to the storage
+			$permissionsCache = new Permissions($storageId);
+			$users = $permissionsCache->getUsers($id);
+			if (count($users) === 0) {
+				return;
+			}
+			Filesystem::initMountPoints($users[0]);
+			$mounts = Filesystem::getMountByStorageId($storageId);
+			if (count($mounts) === 0) {
+				return;
+			}
+		}
+		$storage = $mounts[0]->getStorage();
+		$watcher = new Watcher($storage);
+		$watcher->checkUpdate($internalPath);
+	}
+
+	/**
+	 * get the next fileid in the cache
+	 *
+	 * @param int $previous
+	 * @param bool $folder
+	 * @return int
+	 */
+	static private function getNextFileId($previous, $folder) {
+		if ($folder) {
+			$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` > ? AND mimetype = ' . self::getFolderMimetype() . ' ORDER BY `fileid` ASC', 1);
+		} else {
+			$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` > ? AND mimetype != ' . self::getFolderMimetype() . ' ORDER BY `fileid` ASC', 1);
+		}
+		$result = $query->execute(array($previous));
+		if ($row = $result->fetchRow()) {
+			return $row['fileid'];
+		} else {
+			return 0;
+		}
+	}
+
+	static public function checkNext() {
+		// check both 1 file and 1 folder, this way new files are detected quicker because there are less folders than files usually
+		$previousFile = \OC_Appconfig::getValue('files', 'backgroundwatcher_previous_file', 0);
+		$previousFolder = \OC_Appconfig::getValue('files', 'backgroundwatcher_previous_folder', 0);
+		$nextFile = self::getNextFileId($previousFile, false);
+		$nextFolder = self::getNextFileId($previousFolder, true);
+		\OC_Appconfig::setValue('files', 'backgroundwatcher_previous_file', $nextFile);
+		\OC_Appconfig::setValue('files', 'backgroundwatcher_previous_folder', $nextFolder);
+		if ($nextFile > 0) {
+			self::checkUpdate($nextFile);
+		}
+		if ($nextFolder > 0) {
+			self::checkUpdate($nextFolder);
+		}
+	}
+
+	static public function checkAll() {
+		$previous = 0;
+		$next = 1;
+		while ($next != 0) {
+			$next = self::getNextFileId($previous, true);
+			self::checkUpdate($next);
+		}
+		$previous = 0;
+		$next = 1;
+		while ($next != 0) {
+			$next = self::getNextFileId($previous, false);
+			self::checkUpdate($next);
+		}
+	}
+}
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 47f3c272b13b32c0fadc6831cafa6f152cd8caf6..8f5c9643bef2a006d787792ae0eb1ad3b179d7ea 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -318,19 +318,22 @@ class Cache {
 	 * @param string $target
 	 */
 	public function move($source, $target) {
-		$sourceId = $this->getId($source);
+		$sourceData = $this->get($source);
+		$sourceId = $sourceData['fileid'];
 		$newParentId = $this->getParentId($target);
 
-		//find all child entries
-		$query = \OC_DB::prepare('SELECT `path`, `fileid` FROM `*PREFIX*filecache` WHERE `path` LIKE ?');
-		$result = $query->execute(array($source . '/%'));
-		$childEntries = $result->fetchAll();
-		$sourceLength = strlen($source);
-		$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ? WHERE `fileid` = ?');
-
-		foreach ($childEntries as $child) {
-			$targetPath = $target . substr($child['path'], $sourceLength);
-			$query->execute(array($targetPath, md5($targetPath), $child['fileid']));
+		if ($sourceData['mimetype'] === 'httpd/unix-directory') {
+			//find all child entries
+			$query = \OC_DB::prepare('SELECT `path`, `fileid` FROM `*PREFIX*filecache` WHERE `path` LIKE ?');
+			$result = $query->execute(array($source . '/%'));
+			$childEntries = $result->fetchAll();
+			$sourceLength = strlen($source);
+			$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ? WHERE `fileid` = ?');
+
+			foreach ($childEntries as $child) {
+				$targetPath = $target . substr($child['path'], $sourceLength);
+				$query->execute(array($targetPath, md5($targetPath), $child['fileid']));
+			}
 		}
 
 		$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ?, `name` = ?, `parent` =?'
diff --git a/lib/files/cache/permissions.php b/lib/files/cache/permissions.php
index a5c9c144054d0e8200d688e314c7575f14a5c97f..faa5ff5eacc4a5ee938a1d71b12d582c803c2f8a 100644
--- a/lib/files/cache/permissions.php
+++ b/lib/files/cache/permissions.php
@@ -107,4 +107,19 @@ class Permissions {
 			$query->execute(array($fileId, $user));
 		}
 	}
+
+	/**
+	 * get the list of users which have permissions stored for a file
+	 *
+	 * @param int $fileId
+	 */
+	public function getUsers($fileId) {
+		$query = \OC_DB::prepare('SELECT `user` FROM `*PREFIX*permissions` WHERE `fileid` = ?');
+		$result = $query->execute(array($fileId));
+		$users = array();
+		while ($row = $result->fetchRow()) {
+			$users[] = $row['user'];
+		}
+		return $users;
+	}
 }
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 5241acec1ee6b6b3c34c0196f3b98362a9020cec..661bc4863305e8bc5f197165038038633f9270bf 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -62,7 +62,9 @@ class Scanner {
 	 * @return array with metadata of the scanned file
 	 */
 	public function scanFile($file, $checkExisting = false) {
-		if (!self::isIgnoredFile($file)) {
+		if ( ! self::isPartialFile($file)
+			and ! \OC\Files\Filesystem::isFileBlacklisted($file)
+		) {
 			\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId));
 			$data = $this->getData($file);
 			if ($data) {
@@ -166,10 +168,8 @@ class Scanner {
 	 * @param String $file
 	 * @return boolean
 	 */
-	public static function isIgnoredFile($file) {
-		if (pathinfo($file, PATHINFO_EXTENSION) === 'part'
-			|| \OC\Files\Filesystem::isFileBlacklisted($file)
-		) {
+	public static function isPartialFile($file) {
+		if (pathinfo($file, PATHINFO_EXTENSION) === 'part') {
 			return true;
 		}
 		return false;
diff --git a/lib/files/cache/updater.php b/lib/files/cache/updater.php
index 92a16d9d9b61a86ce458e8878e6cc7e1bb1fcfff..417a47f3830d8d9c5575e0630393c0ff1f2e3a1e 100644
--- a/lib/files/cache/updater.php
+++ b/lib/files/cache/updater.php
@@ -132,7 +132,14 @@ class Updater {
 	 * @param array $params
 	 */
 	static public function touchHook($params) {
-		self::writeUpdate($params['path']);
+		$path = $params['path'];
+		list($storage, $internalPath) = self::resolvePath($path);
+		$cache = $storage->getCache();
+		$id = $cache->getId($internalPath);
+		if ($id !== -1) {
+			$cache->update($id, array('etag' => $storage->getETag($internalPath)));
+		}
+		self::writeUpdate($path);
 	}
 
 	/**
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index ad21a98fabcf46dbaf89a7ae8785b2086daf5117..d60d430d77cb76da949ad7d8e712170d93d453f0 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -199,7 +199,7 @@ class Filesystem {
 	 * @return Mount\Mount[]
 	 */
 	public static function getMountByNumericId($id) {
-		return self::$mounts->findByStorageId($id);
+		return self::$mounts->findByNumericId($id);
 	}
 
 	/**
@@ -222,7 +222,10 @@ class Filesystem {
 			return false;
 		}
 		self::$defaultInstance = new View($root);
-		self::$mounts = new Mount\Manager();
+
+		if(!self::$mounts) {
+			self::$mounts = new Mount\Manager();
+		}
 
 		//load custom mount config
 		self::initMountPoints($user);
diff --git a/lib/files/view.php b/lib/files/view.php
index f89b7f66ffdf95fceaa23131554b23dc37322dc4..f35e1e3dc161727ed034b86262b93d3fb7b5d6de 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -263,12 +263,13 @@ class View {
 		if (is_resource($data)) { //not having to deal with streams in file_put_contents makes life easier
 			$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
 			if (\OC_FileProxy::runPreProxies('file_put_contents', $absolutePath, $data)
-				&& Filesystem::isValidPath($path)
+				and Filesystem::isValidPath($path)
+				and ! Filesystem::isFileBlacklisted($path)
 			) {
 				$path = $this->getRelativePath($absolutePath);
 				$exists = $this->file_exists($path);
 				$run = true;
-				if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isIgnoredFile($path)) {
+				if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) {
 					if (!$exists) {
 						\OC_Hook::emit(
 							Filesystem::CLASSNAME,
@@ -296,7 +297,7 @@ class View {
 					list ($count, $result) = \OC_Helper::streamCopy($data, $target);
 					fclose($target);
 					fclose($data);
-					if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isIgnoredFile($path)) {
+					if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) {
 						if (!$exists) {
 							\OC_Hook::emit(
 								Filesystem::CLASSNAME,
@@ -340,6 +341,7 @@ class View {
 			\OC_FileProxy::runPreProxies('rename', $absolutePath1, $absolutePath2)
 			and Filesystem::isValidPath($path2)
 			and Filesystem::isValidPath($path1)
+			and ! Filesystem::isFileBlacklisted($path2)
 		) {
 			$path1 = $this->getRelativePath($absolutePath1);
 			$path2 = $this->getRelativePath($absolutePath2);
@@ -348,7 +350,7 @@ class View {
 				return false;
 			}
 			$run = true;
-			if ($this->fakeRoot == Filesystem::getRoot()) {
+			if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path1)) {
 				\OC_Hook::emit(
 					Filesystem::CLASSNAME, Filesystem::signal_rename,
 					array(
@@ -376,7 +378,7 @@ class View {
 					list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
 					$storage1->unlink($internalPath1);
 				}
-				if ($this->fakeRoot == Filesystem::getRoot()) {
+				if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path1)) {
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
 						Filesystem::signal_post_rename,
@@ -404,6 +406,7 @@ class View {
 			\OC_FileProxy::runPreProxies('copy', $absolutePath1, $absolutePath2)
 			and Filesystem::isValidPath($path2)
 			and Filesystem::isValidPath($path1)
+			and ! Filesystem::isFileBlacklisted($path2)
 		) {
 			$path1 = $this->getRelativePath($absolutePath1);
 			$path2 = $this->getRelativePath($absolutePath2);
@@ -606,7 +609,10 @@ class View {
 	private function basicOperation($operation, $path, $hooks = array(), $extraParam = null) {
 		$postFix = (substr($path, -1, 1) === '/') ? '/' : '';
 		$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
-		if (\OC_FileProxy::runPreProxies($operation, $absolutePath, $extraParam) and Filesystem::isValidPath($path)) {
+		if (\OC_FileProxy::runPreProxies($operation, $absolutePath, $extraParam)
+			and Filesystem::isValidPath($path)
+			and ! Filesystem::isFileBlacklisted($path)
+		) {
 			$path = $this->getRelativePath($absolutePath);
 			if ($path == null) {
 				return false;
@@ -635,7 +641,7 @@ class View {
 	private function runHooks($hooks, $path, $post = false) {
 		$prefix = ($post) ? 'post_' : '';
 		$run = true;
-		if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isIgnoredFile($path)) {
+		if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot()) {
 			foreach ($hooks as $hook) {
 				if ($hook != 'read') {
 					\OC_Hook::emit(
diff --git a/lib/helper.php b/lib/helper.php
index 2ba70294f4b28e452817e2018d49f1fb026594b6..c69445ed78823cc9dae27ebd439e93c23b24ddcb 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -541,13 +541,15 @@ class OC_Helper {
 	}
 
 	/**
-	 * create a temporary file with an unique filename. It will not be deleted
-	 * automatically
-	 * @param string $postfix
-	 * @return string
+	 * move a file to oc-noclean temp dir
+	 * @param string $filename
+	 * @return mixed
 	 *
 	 */
-	public static function tmpFileNoClean($postfix='') {
+	public static function moveToNoClean($filename='') {
+		if ($filename == '') {
+			return false;
+		}
 		$tmpDirNoClean=get_temp_dir().'/oc-noclean/';
 		if (!file_exists($tmpDirNoClean) || !is_dir($tmpDirNoClean)) {
 			if (file_exists($tmpDirNoClean)) {
@@ -555,10 +557,12 @@ class OC_Helper {
 			}
 			mkdir($tmpDirNoClean);
 		}
-		$file=$tmpDirNoClean.md5(time().rand()).$postfix;
-		$fh=fopen($file, 'w');
-		fclose($fh);
-		return $file;
+		$newname=$tmpDirNoClean.basename($filename);
+		if (rename($filename, $newname)) {
+			return $newname;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -597,7 +601,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * remove all files created by self::tmpFileNoClean
+	 * remove all files in PHP /oc-noclean temp dir 
 	 */
 	public static function cleanTmpNoClean() {
 		$tmpDirNoCleanFile=get_temp_dir().'/oc-noclean/';
diff --git a/lib/l10n.php b/lib/l10n.php
index 315e326b29232df4d255ec4698db186d8293f00a..d35ce5fed14f4b19b3007f9e8b71c919b6ef4780 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -122,9 +122,21 @@ class OC_L10N{
 				)
 				&& file_exists($i18ndir.$lang.'.php')) {
 				// Include the file, save the data from $CONFIG
-				include strip_tags($i18ndir).strip_tags($lang).'.php';
+				$transFile = strip_tags($i18ndir).strip_tags($lang).'.php';
+				include $transFile;
 				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
 					$this->translations = $TRANSLATIONS;
+					//merge with translations from theme
+					$theme = OC_Config::getValue( "theme" );
+					if (!is_null($theme)) {
+						$transFile = OC::$SERVERROOT.'/themes/'.$theme.substr($transFile, strlen(OC::$SERVERROOT));
+						if (file_exists($transFile)) {
+							include $transFile;
+							if (isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
+								$this->translations = array_merge($this->translations, $TRANSLATIONS);
+							}
+						}
+					}
 				}
 			}
 
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index cd1bf104d354426ba6f8a1b1bf436411addc30d3..13acc1c55b50330d92fc16a7ff57eecd6c9bf782 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -35,7 +35,7 @@
 "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
 "MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Password ungültig: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
 "seconds ago" => "Gerade eben",
 "1 minute ago" => "vor einer Minute",
 "%d minutes ago" => "Vor %d Minuten",
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 90c9c4168274a86ed40688d1e85fd5f185b6b69f..a4423343ce0bace66d5ca904e07b22237a1c0ff3 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -9,7 +9,7 @@
 "Files need to be downloaded one by one." => "Failid tuleb alla laadida ükshaaval.",
 "Back to Files" => "Tagasi failide juurde",
 "Selected files too large to generate zip file." => "Valitud failid on ZIP-faili loomiseks liiga suured.",
-"couldn't be determined" => "Ei suuda tuvastada",
+"couldn't be determined" => "ei suudetud tuvastada",
 "Application is not enabled" => "Rakendus pole sisse lülitatud",
 "Authentication error" => "Autentimise viga",
 "Token expired. Please reload page." => "Kontrollkood aegus. Paelun lae leht uuesti.",
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index fc95561d3b4e9835af05c0c04a23670cb0ce1f7a..23146154c77b1228256c9602ec0c7763ce8d8441 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -15,6 +15,8 @@
 "Files" => "Filer",
 "Text" => "Tekst",
 "Images" => "Bilder",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
+"Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
 "seconds ago" => "sekunder siden",
 "1 minute ago" => "1 minutt siden",
 "%d minutes ago" => "%d minutter siden",
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
index f8f15c9fba613539c411805cb54b718b7a7ebe9c..8241573f9aeda9afeff0e54a914fa712045fdb70 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -3,7 +3,7 @@
 "Personal" => "Personleg",
 "Settings" => "Innstillingar",
 "Users" => "Brukarar",
-"Apps" => "Applikasjonar",
+"Apps" => "Program",
 "Admin" => "Administrer",
 "Authentication error" => "Feil i autentisering",
 "Files" => "Filer",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 94ffed067c6980166be2783fc7f6d1f42a050ce3..641da2447ee6340367f9de12056c5ebc33355e3a 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -18,14 +18,22 @@
 "Images" => "Resimler",
 "Set an admin username." => "Bir adi kullanici vermek. ",
 "Set an admin password." => "Parola yonetici birlemek. ",
+"%s enter the database username." => "%s veritabanı kullanıcı adını gir.",
+"%s enter the database name." => "%s veritabanı adını gir.",
+"%s you may not use dots in the database name" => "%s veritabanı adında nokta kullanamayabilirsiniz",
+"%s set the database host." => "%s veritabanı sunucu adını tanımla",
 "PostgreSQL username and/or password not valid" => "PostgreSQL adi kullanici ve/veya parola yasal degildir. ",
 "You need to enter either an existing account or the administrator." => "Bir konto veya kullanici birlemek ihtiyacin. ",
 "Oracle username and/or password not valid" => "Adi klullanici ve/veya parola Oracle mantikli deÄŸildir. ",
+"MySQL username and/or password not valid" => "MySQL kullanıcı adı ve/veya parolası geçerli değil",
 "DB Error: \"%s\"" => "DB Hata: ''%s''",
 "Offending command was: \"%s\"" => "Komut rahasiz ''%s''. ",
 "MySQL user '%s'@'localhost' exists already." => "MySQL kullanici '%s @local host zatan var. ",
 "Drop this user from MySQL" => "Bu kullanici MySQLden list disari koymak. ",
 "MySQL user '%s'@'%%' already exists" => "MySQL kullanici '%s @ % % zaten var (zaten yazili)",
+"Drop this user from MySQL." => "Bu kulanıcıyı MySQL veritabanından kaldır",
+"Offending command was: \"%s\", name: %s, password: %s" => "Hatalı komut: \"%s\", ad: %s, parola: %s",
+"MS SQL username and/or password not valid: %s" => "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.",
 "Please double check the <a href='%s'>installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin.",
 "seconds ago" => "saniye önce",
diff --git a/lib/l10n/ug.php b/lib/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..62d91616c1d3cd02a9270195be5d287eb578a673
--- /dev/null
+++ b/lib/l10n/ug.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"Help" => "ياردەم",
+"Personal" => "شەخسىي",
+"Settings" => "تەڭشەكلەر",
+"Users" => "ئىشلەتكۈچىلەر",
+"Apps" => "ئەپلەر",
+"Authentication error" => "سالاھىيەت دەلىللەش خاتالىقى",
+"Files" => "ھۆججەتلەر",
+"Text" => "قىسقا ئۇچۇر",
+"Images" => "سۈرەتلەر",
+"1 minute ago" => "1 مىنۇت ئىلگىرى",
+"%d minutes ago" => "%d مىنۇت ئىلگىرى",
+"1 hour ago" => "1 سائەت ئىلگىرى",
+"%d hours ago" => "%d سائەت ئىلگىرى",
+"today" => "بۈگۈن",
+"yesterday" => "تۈنۈگۈن",
+"%d days ago" => "%d كۈن ئىلگىرى",
+"%d months ago" => "%d ئاي ئىلگىرى"
+);
diff --git a/lib/filesystem.php b/lib/legacy/filesystem.php
similarity index 100%
rename from lib/filesystem.php
rename to lib/legacy/filesystem.php
diff --git a/lib/filesystemview.php b/lib/legacy/filesystemview.php
similarity index 100%
rename from lib/filesystemview.php
rename to lib/legacy/filesystemview.php
diff --git a/lib/ocs/result.php b/lib/ocs/result.php
index 8ab378d79c530091387f0c61ab393c68243a1620..729c39056d9548cf873457660a0256d737b3c079 100644
--- a/lib/ocs/result.php
+++ b/lib/ocs/result.php
@@ -22,7 +22,7 @@
 
 class OC_OCS_Result{
 
-	private $data, $message, $statusCode, $items, $perPage;
+	protected $data, $message, $statusCode, $items, $perPage;
 
 	/**
 	 * create the OCS_Result object
diff --git a/lib/public/share.php b/lib/public/share.php
index 525fe7e853310e18dfa7f53a793597f04b9222fb..a561319e9bdaa247b92a244a0f98754df63f7674 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -875,7 +875,10 @@ class Share {
 					$row['path'] = '/Shared/'.basename($row['path']);
 				} else {
 					if (!isset($mounts[$row['storage']])) {
-						$mounts[$row['storage']] = \OC\Files\Filesystem::getMountByNumericId($row['storage']);
+						$mountPoints = \OC\Files\Filesystem::getMountByNumericId($row['storage']);
+						if (is_array($mountPoints)) {
+							$mounts[$row['storage']] = $mountPoints[key($mountPoints)];
+						}
 					}
 					if ($mounts[$row['storage']]) {
 						$path = $mounts[$row['storage']]->getMountPoint().$row['path'];
diff --git a/lib/setup.php b/lib/setup.php
index d1197b3ebf3bf0a47808cfda9147793f42802417..f1ac6b8b2b81c610d4135427d7cdccbfaec93d45 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -811,6 +811,7 @@ class OC_Setup {
 		$content.= "php_value upload_max_filesize 512M\n";//upload limit
 		$content.= "php_value post_max_size 512M\n";
 		$content.= "php_value memory_limit 512M\n";
+		$content.= "php_value mbstring.func_overload 0\n";
 		$content.= "<IfModule env_module>\n";
 		$content.= "  SetEnv htaccessWorking true\n";
 		$content.= "</IfModule>\n";
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index d385bb7f19d8bd5ce3dee70a05ea0228a377be7b..7115b8f03063092de620bf3646a72c7abde0ac8b 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -56,7 +56,7 @@ class OC_TemplateLayout extends OC_Template {
 		$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
 		$this->assign('jsfiles', array(), false);
 		if (OC_Config::getValue('installed', false) && $renderas!='error') {
-			$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config'));
+			$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter);
 		}
 		if (!empty(OC_Util::$core_scripts)) {
 			$this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false) . $versionParameter);
diff --git a/lib/user.php b/lib/user.php
index 226b716188d3c71cfbc8b2bdd28198df164e9347..b607874afafc2b699effc31d545fca28a2822f98 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -32,7 +32,7 @@
  *   post_deleteUser(uid)
  *   pre_setPassword(&run, uid, password)
  *   post_setPassword(uid, password)
- *   pre_login(&run, uid)
+ *   pre_login(&run, uid, password)
  *   post_login(uid)
  *   logout()
  */
@@ -244,7 +244,7 @@ class OC_User {
 	 */
 	public static function login( $uid, $password ) {
 		$run = true;
-		OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid ));
+		OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid, "password" => $password));
 
 		if( $run ) {
 			$uid = self::checkPassword( $uid, $password );
diff --git a/lib/util.php b/lib/util.php
index 382c2efce758fbbc15734e74b5ab444fde295ced..f30cdf6a5346c93c52fbf0ec9ea5f1403cd82d44 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -67,6 +67,7 @@ class OC_Util {
 	public static function tearDownFS() {
 		\OC\Files\Filesystem::tearDown();
 		self::$fsSetup=false;
+        self::$rootMounted=false;
 	}
 
 	/**
@@ -248,7 +249,7 @@ class OC_Util {
 				'hint'=>'Please ask your server administrator to install the module.');
 			$web_server_restart=true;
 		}
-		if(!function_exists('imagepng')) {
+		if(!extension_loaded('gd') || !function_exists('gd_info')) {
 			$errors[]=array('error'=>'PHP module GD is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
 			$web_server_restart=true;
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 5975e688b75cad4ff9a5422c3052a3aedfc9a6b8..91c72d5dfaecda0cf31c007f8a411b45b8bf3ae7 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -324,6 +324,37 @@ class OC_VCategories {
 		return $id;
 	}
 
+	/**
+	* @brief Rename category.
+	* @param string $from The name of the existing category
+	* @param string $to The new name of the category.
+	* @returns bool
+	*/
+	public function rename($from, $to) {
+		$id = $this->array_searchi($from, $this->categories);
+		if($id === false) {
+			OCP\Util::writeLog('core', __METHOD__.', category: ' . $from. ' does not exist', OCP\Util::DEBUG);
+			return false;
+		}
+
+		$sql = 'UPDATE `' . self::CATEGORY_TABLE . '` SET `category` = ? '
+			. 'WHERE `uid` = ? AND `type` = ? AND `id` = ?';
+		try {
+			$stmt = OCP\DB::prepare($sql);
+			$result = $stmt->execute(array($to, $this->user, $this->type, $id));
+			if (OC_DB::isError($result)) {
+				OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
+				return false;
+			}
+		} catch(Exception $e) {
+			OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+				OCP\Util::ERROR);
+			return false;
+		}
+		$this->categories[$id] = $to;
+		return true;
+	}
+
 	/**
 	* @brief Add a new category.
 	* @param $names A string with a name or an array of strings containing
diff --git a/lib/vobject/compoundproperty.php b/lib/vobject/compoundproperty.php
new file mode 100644
index 0000000000000000000000000000000000000000..d702ab802e0e835bf35141274ed4d2322533046a
--- /dev/null
+++ b/lib/vobject/compoundproperty.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * ownCloud - VObject Compound Property
+ *
+ * @author Thomas Tanghus
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ *
+ * 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/>.
+ *
+ */
+
+namespace OC\VObject;
+
+/**
+ * This class overrides \Sabre\VObject\Property::serialize() to not
+ * double escape commas and semi-colons in compound properties.
+*/
+class CompoundProperty extends \Sabre\VObject\Property\Compound {
+
+	/**
+	* Turns the object back into a serialized blob.
+	*
+	* @return string
+	*/
+	public function serialize() {
+
+		$str = $this->name;
+		if ($this->group) {
+			$str = $this->group . '.' . $this->name;
+		}
+
+		foreach($this->parameters as $param) {
+			$str.=';' . $param->serialize();
+		}
+		$src = array(
+			"\n",
+		);
+		$out = array(
+			'\n',
+		);
+		$str.=':' . str_replace($src, $out, $this->value);
+
+		$out = '';
+		while(strlen($str) > 0) {
+			if (strlen($str) > 75) {
+				$out .= mb_strcut($str, 0, 75, 'utf-8') . "\r\n";
+				$str = ' ' . mb_strcut($str, 75, strlen($str), 'utf-8');
+			} else {
+				$out .= $str . "\r\n";
+				$str = '';
+				break;
+			}
+		}
+
+		return $out;
+
+	}
+
+}
\ No newline at end of file
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 1fc6d0e10002eae6296f1701bf8544c6150aa165..4f16bff63d5283dd73858f2df1c83763f85321fa 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -8,7 +8,7 @@ OC_JSON::checkLoggedIn();
 OC_APP::loadApps();
 
 $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
-$password = isset($_POST["password"]) ? $_POST["password"] : null;
+$password = isset($_POST["newpassword"]) ? $_POST["newpassword"] : null;
 $oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
 
 $userstatus = null;
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index cd8dc0e2796ee8fe99df217f6009a1e86f85f87b..8dcb7ddd424bc234b696bef8224ea865ac4cfa94 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -22,11 +22,7 @@ if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))
 $quota=$_POST["quota"];
 if($quota!='none' and $quota!='default') {
 	$quota= OC_Helper::computerFileSize($quota);
-	if($quota==0) {
-		$quota='default';
-	}else{
-		$quota=OC_Helper::humanFileSize($quota);
-	}
+	$quota=OC_Helper::humanFileSize($quota);
 }
 
 // Return Success story
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index 87b42395749c74398b78cd12db4caf40023b13b0..4abf54b8987e36ed2b598d3afa1c2a0044137ec6 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -27,9 +27,14 @@ if (isset($_GET['offset'])) {
 } else {
 	$offset = 0;
 }
+if (isset($_GET['limit'])) {
+	$limit = $_GET['limit'];
+} else {
+	$limit = 10;
+}
 $users = array();
 if (OC_User::isAdminUser(OC_User::getUser())) {
-	$batch = OC_User::getDisplayNames('', 10, $offset);
+	$batch = OC_User::getDisplayNames('', $limit, $offset);
 	foreach ($batch as $user => $displayname) {
 		$users[] = array(
 			'name' => $user,
@@ -40,7 +45,7 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
 	}
 } else {
 	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$batch = OC_Group::usersInGroups($groups, '', 10, $offset);
+	$batch = OC_Group::usersInGroups($groups, '', $limit, $offset);
 	foreach ($batch as $user) {
 		$users[] = array(
 			'name' => $user,
diff --git a/settings/js/users.js b/settings/js/users.js
index 4a358a4392d6490d81f871fe7426bf2c10c72e82..690c9ad046440998c8b787ee0a96fdc57f23d7f8 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -19,6 +19,10 @@ function setQuota (uid, quota, ready) {
 var UserList = {
 	useUndo: true,
 	availableGroups: [],
+	offset: 30, //The first 30 users are there. No prob, if less in total.
+				//hardcoded in settings/users.php
+
+	usersToLoad: 10, //So many users will be loaded when user scrolls down
 
 	/**
 	 * @brief Initiate user deletion process in UI
@@ -192,14 +196,17 @@ var UserList = {
 			return;
 		}
 		UserList.updating = true;
-		$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset }), function (result) {
+		$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset, limit: UserList.usersToLoad }), function (result) {
 			if (result.status === 'success') {
+				//The offset does not mirror the amount of users available,
+				//because it is backend-dependent. For correct retrieval,
+				//always the limit(requested amount of users) needs to be added.
+				UserList.offset += UserList.usersToLoad;
 				$.each(result.data, function (index, user) {
 					if($('tr[data-uid="' + user.name + '"]').length > 0) {
 						return true;
 					}
 					var tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, false);
-					UserList.offset++;
 					if (index == 9) {
 						$(tr).bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
 							$(this).unbind(event);
@@ -315,7 +322,6 @@ $(document).ready(function () {
 
 	UserList.doSort();
 	UserList.availableGroups = $('#content table').attr('data-groups').split(', ');
-	UserList.offset = $('tbody tr').length;
 	$('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
 		OC.Router.registerLoadedCallback(function () {
 			UserList.update();
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 12ef97ca75ade37d3863833d898bde734c0fb324..2cf828e73426e95b52b1ebfdf61f514adb6c1970 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -46,24 +46,24 @@
 "Locale not working" => "Ländereinstellung funktioniert nicht",
 "This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für %s benötigten Pakete auf Deinem System zu installieren.",
 "Internet connection not working" => "Keine Netzwerkverbindung",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Du alle Funktionen von ownCloud nutzen möchtest.",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren, wenn Du alle Funktionen von ownCloud nutzen möchtest.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Führe eine Aufgabe mit jeder geladenen Seite aus",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist an einem Webcron-Service registriert. Die cron.php Seite wird einmal pro Minute über http abgerufen.",
 "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutze den Cron Systemdienst. Rufe die Datei cron.php im owncloud Ordner einmal pro Minute über einen Cronjob auf.",
 "Sharing" => "Teilen",
 "Enable Share API" => "Aktiviere Sharing-API",
-"Allow apps to use the Share API" => "Erlaube Apps die Nutzung der Share-API",
-"Allow links" => "Erlaube Links",
-"Allow users to share items to the public with links" => "Erlaube Benutzern, Inhalte über öffentliche Links zu teilen",
-"Allow resharing" => "Erlaube erneutes Teilen",
-"Allow users to share items shared with them again" => "Erlaube Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
-"Allow users to share with anyone" => "Erlaube Benutzern, mit jedem zu teilen",
-"Allow users to only share with users in their groups" => "Erlaube Benutzern, nur mit Benutzern ihrer Gruppe zu teilen",
+"Allow apps to use the Share API" => "Erlaubt Apps die Nutzung der Share-API",
+"Allow links" => "Erlaubt Links",
+"Allow users to share items to the public with links" => "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen",
+"Allow resharing" => "Erlaubt erneutes Teilen",
+"Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
+"Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
+"Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "Erzwinge HTTPS",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "Erzwingt die Verwendung einer verschlüsselten Verbindung",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich über eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu ändern",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinde Dich über eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu ändern",
 "Log" => "Log",
 "Log level" => "Loglevel",
 "More" => "Mehr",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index febc67ef2d7e8322b7eeebd4e916645c85608450..91a96ca9f0ef24251c62b13feda15753c84037c3 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -45,7 +45,7 @@
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
 "Locale not working" => "Die Lokalisierung funktioniert nicht",
 "This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Dieser ownCloud-Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen, die für %s benötigten Pakete auf ihrem System zu installieren.",
-"Internet connection not working" => "Keine Netzwerkverbindung",
+"Internet connection not working" => "Keine Internetverbindung",
 "This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud-Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungs-E-Mails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen von ownCloud nutzen wollen.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Eine Aufgabe bei jedem Laden der Seite ausführen",
@@ -56,10 +56,10 @@
 "Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
 "Allow links" => "Links erlauben",
 "Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
-"Allow resharing" => "Erlaube weiterverteilen",
+"Allow resharing" => "Erlaube Weiterverteilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
-"Allow users to share with anyone" => "Erlaube Benutzern, mit jedem zu teilen",
-"Allow users to only share with users in their groups" => "Erlaube Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen",
+"Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
+"Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "HTTPS erzwingen",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "Zwingt die Clients, sich über eine verschlüsselte Verbindung mit ownCloud zu verbinden.",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index f6e378177a6610dcd031b035134eb6ea39330cf3..f7eb7dd5c2d3552f8438d77c976529600787357a 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
 "Authentication error" => "Error al autenticar",
+"Your display name has been changed." => "El nombre mostrado fue cambiado",
 "Unable to change display name" => "No fue posible cambiar el nombre mostrado",
 "Group already exists" => "El grupo ya existe",
 "Unable to add group" => "No fue posible añadir el grupo",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index e52fce624d458e0e87d8b4a2a670ff6d8670e5be..f4bf379b7ef2db7b86c9187feb2580a9332ecbe1 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -27,7 +27,7 @@
 "Saving..." => "Salvestamine...",
 "deleted" => "kustutatud",
 "undo" => "tagasi",
-"Unable to remove user" => "Ei suuda kustutada kasutajat eemaldada",
+"Unable to remove user" => "Kasutaja eemaldamine ebaõnnestus",
 "Groups" => "Grupid",
 "Group Admin" => "Grupi admin",
 "Delete" => "Kustuta",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index a6c5018626eea3b4ac0c2cfe21e6c43f433eca9f..61e86a83f3355776a59a9066ead62fae043f1d01 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -50,7 +50,7 @@
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Executar unha tarefa con cada páxina cargada",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está rexistrado nun servizo de WebCron. Chame á página cron.php na raíz ownCloud unha vez por minuto a través de HTTP.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Use o servizo de sistema cron. Chame ao ficheiro cron.php no catfaol owncloud a través dun sistema de cronjob unna vez por minuto.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Use o servizo de sistema cron. Chame ao ficheiro cron.php no cartafol owncloud a través dun sistema de cronjob unha vez por minuto.",
 "Sharing" => "Compartindo",
 "Enable Share API" => "Activar o API para compartir",
 "Allow apps to use the Share API" => "Permitir que os aplicativos empreguen o API para compartir",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index b9869e26f0c9050418453fcfa250e1fb1cad6e91..8d67b45347a72e1b0b6b78d867f00fe8c09a02bf 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Language changed" => "Linguage cambiate",
 "Invalid request" => "Requesta invalide",
+"Error" => "Error",
 "Groups" => "Gruppos",
 "Delete" => "Deler",
 "__language_name__" => "Interlingua",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 74f8e17c78273dc238207add79b43118af3a8581..4fc8dc5f64f3aaa17530816af5cc1b3c3ec9b0dd 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -66,7 +66,7 @@
 "Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Connettiti a questa istanza di ownCloud tramite HTTPS per abilitare o disabilitare la protezione SSL.",
 "Log" => "Log",
 "Log level" => "Livello di log",
-"More" => "Più",
+"More" => "Altro",
 "Less" => "Meno",
 "Version" => "Versione",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index fbb35baa742aa5cec0b4fdbf44353e400e7a5f4d..9f18bf472acddcd98607e77e7ca70bfcb31ee9e7 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
-"Authentication error" => "Autentikasjonsfeil",
+"Authentication error" => "Autentiseringsfeil",
+"Your display name has been changed." => "Ditt visningsnavn er blitt endret.",
+"Unable to change display name" => "Kunne ikke endre visningsnavn",
 "Group already exists" => "Gruppen finnes allerede",
 "Unable to add group" => "Kan ikke legge til gruppe",
 "Could not enable app. " => "Kan ikke aktivere app.",
@@ -10,53 +12,100 @@
 "Unable to delete user" => "Kan ikke slette bruker",
 "Language changed" => "Språk endret",
 "Invalid request" => "Ugyldig forespørsel",
+"Admins can't remove themself from the admin group" => "Admin kan ikke flytte seg selv fra admingruppen",
 "Unable to add user to group %s" => "Kan ikke legge bruker til gruppen %s",
 "Unable to remove user from group %s" => "Kan ikke slette bruker fra gruppen %s",
+"Couldn't update app." => "Kunne ikke oppdatere app.",
+"Update to {appversion}" => "Oppdater til {appversion}",
 "Disable" => "Slå avBehandle ",
 "Enable" => "Aktiver",
+"Please wait...." => "Vennligst vent...",
 "Error" => "Feil",
+"Updating...." => "Oppdaterer...",
+"Error while updating app" => "Feil ved oppdatering av app",
+"Updated" => "Oppdatert",
 "Saving..." => "Lagrer...",
 "deleted" => "slettet",
 "undo" => "angre",
+"Unable to remove user" => "Kunne ikke slette bruker",
 "Groups" => "Grupper",
 "Group Admin" => "Gruppeadministrator",
 "Delete" => "Slett",
+"add group" => "legg til gruppe",
+"A valid username must be provided" => "Oppgi et gyldig brukernavn",
+"Error creating user" => "Feil ved oppretting av bruker",
+"A valid password must be provided" => "Oppgi et gyldig passord",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Sikkerhetsadvarsel",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ditt data mappe og dine filer er sannsynligvis tilgjengelig fra internet. .htaccess filene som ownCloud bruker virker ikke. Du bør konfigurere din nettserver slik at data mappa ikke lenger er tilgjengelig eller flytt data mappe ut av nettserverens dokumentområde.",
+"Setup Warning" => "Installasjonsadvarsel",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
+"Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
+"Module 'fileinfo' missing" => "Modulen 'fileinfo' mangler",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
+"Locale not working" => "Språk virker ikke",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud serveren kan ikke sette systemspråk til %s. Det kan være problemer med visse tegn i filnavn. Vi foreslår at du installerer de nødvendige pakkene på ditt system for å støtte %s.",
+"Internet connection not working" => "Ingen internettilkopling",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Denne ownCloud serveren har ikke tilkopling til internett. Noen funksjoner som f.eks. tilkopling til ekstern lager, melgin om oppdatering og installasjon av tredjeparts apps vil ikke virke. Vi foreslår at du aktivere en internettilkopling til denne serveren hvis du vil bruke alle funksjonene i ownCloud.",
 "Cron" => "Cron",
+"Execute one task with each page loaded" => "Utfør en oppgave med hver side som blir lastet",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registrert som webcron-tjeneste. Kjør cron.php siden  i ownCloud rot hvert minutt vha http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Bruk systemets crontjeneste. Kjør cron.php filen i owncloud mappa vha systemets crontjeneste hver minutt.",
 "Sharing" => "Deling",
+"Enable Share API" => "Aktiver API for Deling",
+"Allow apps to use the Share API" => "Tillat apps å bruke API for Deling",
 "Allow links" => "Tillat lenker",
 "Allow users to share items to the public with links" => "Tillat brukere å dele filer med lenker",
+"Allow resharing" => "TIllat videredeling",
 "Allow users to share items shared with them again" => "Tillat brukere å dele filer som allerede har blitt delt med dem",
 "Allow users to share with anyone" => "Tillat brukere å dele med alle",
 "Allow users to only share with users in their groups" => "Tillat kun deling med andre brukere i samme gruppe",
+"Security" => "Sikkerhet",
+"Enforce HTTPS" => "Tving HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Tvinger klienter til å bruke ownCloud via kryptert tilkopling.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Vær vennlig, bruk denne ownCloud instansen via HTTPS for å aktivere eller deaktivere tvungen bruk av SSL.",
 "Log" => "Logg",
 "Log level" => "Loggnivå",
 "More" => "Mer",
 "Less" => "Mindre",
 "Version" => "Versjon",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utviklet av<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud sammfunnet</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Legg til din App",
 "More Apps" => "Flere Apps",
 "Select an App" => "Velg en app",
 "See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>",
 "Update" => "Oppdater",
 "User Documentation" => "Brukerdokumentasjon",
 "Administrator Documentation" => "Administratordokumentasjon",
+"Online Documentation" => "Online dokumentasjon",
+"Forum" => "Forum",
+"Bugtracker" => "Feilsporing",
 "Commercial Support" => "Kommersiell støtte",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
 "Get the apps to sync your files" => "Få dine apps til å synkronisere dine filer",
+"Show First Run Wizard again" => "Vis \"Førstegangs veiveiseren\" på nytt",
 "Password" => "Passord",
 "Your password was changed" => "Passord har blitt endret",
 "Unable to change your password" => "Kunne ikke endre passordet ditt",
 "Current password" => "Nåværende passord",
 "New password" => "Nytt passord",
 "Change password" => "Endre passord",
+"Display Name" => "Visningsnavn",
 "Email" => "Epost",
 "Your email address" => "Din e-postadresse",
 "Fill in an email address to enable password recovery" => "Oppi epostadressen du vil tilbakestille passordet for",
 "Language" => "Språk",
 "Help translate" => "Bidra til oversettelsen",
 "WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Bruk denne adressen for å kople til ownCloud i din filbehandler",
+"Login Name" => "Logginn navn",
 "Create" => "Opprett",
-"Other" => "Annet"
+"Default Storage" => "Standard lager",
+"Unlimited" => "Ubegrenset",
+"Other" => "Annet",
+"Storage" => "Lager",
+"change display name" => "endre visningsnavn",
+"set new password" => "sett nytt passord",
+"Default" => "Standard"
 );
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 0e4d0a66a1460b97ad1e831afcf7370c7b2dbaab..3008873c861c750ed7db5a7bccf76fb2de2d143c 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,21 +1,21 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Klarer ikkje å lasta inn liste fra app-butikken",
 "Authentication error" => "Autentiseringsfeil",
-"Your display name has been changed." => "Visningsnamnet ditt er endra.",
-"Unable to change display name" => "Klarte ikkje å endra visningsnamnet",
+"Your display name has been changed." => "Visingsnamnet ditt er endra.",
+"Unable to change display name" => "Klarte ikkje endra visingsnamnet",
 "Group already exists" => "Gruppa finst allereie",
-"Unable to add group" => "Klarte ikkje å leggja til gruppa",
-"Could not enable app. " => "Klarte ikkje å aktivera app-en.",
+"Unable to add group" => "Klarte ikkje leggja til gruppa",
+"Could not enable app. " => "Klarte ikkje slå på programmet.",
 "Email saved" => "E-postadresse lagra",
 "Invalid email" => "Ugyldig e-postadresse",
 "Unable to delete group" => "Klarte ikkje å sletta gruppa",
-"Unable to delete user" => "Klarte ikkje å sletta brukaren",
+"Unable to delete user" => "Klarte ikkje sletta brukaren",
 "Language changed" => "Språk endra",
 "Invalid request" => "Ugyldig førespurnad",
 "Admins can't remove themself from the admin group" => "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa",
-"Unable to add user to group %s" => "Klarte ikkje å leggja til brukaren til gruppa %s",
-"Unable to remove user from group %s" => "Klarte ikkje å fjerna brukaren frå gruppa %s",
-"Couldn't update app." => "Klarte ikkje å oppdatera app-en.",
+"Unable to add user to group %s" => "Klarte ikkje leggja til brukaren til gruppa %s",
+"Unable to remove user from group %s" => "Klarte ikkje fjerna brukaren frå gruppa %s",
+"Couldn't update app." => "Klarte ikkje oppdatera programmet.",
 "Update to {appversion}" => "Oppdater til {appversion}",
 "Disable" => "Slå av",
 "Enable" => "Slå på",
@@ -27,7 +27,7 @@
 "Saving..." => "Lagrar …",
 "deleted" => "sletta",
 "undo" => "angra",
-"Unable to remove user" => "Klarte ikkje å fjerna brukaren",
+"Unable to remove user" => "Klarte ikkje fjerna brukaren",
 "Groups" => "Grupper",
 "Group Admin" => "Gruppestyrar",
 "Delete" => "Slett",
@@ -42,17 +42,17 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
 "Please double check the <a href='%s'>installation guides</a>." => "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
 "Module 'fileinfo' missing" => "Modulen «fileinfo» manglar",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å skru på denne modulen for å best mogleg oppdaga MIME-typar.",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
 "Locale not working" => "Regionaldata fungerer ikkje",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som krevst for å støtta %s.",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som trengst for å støtta %s.",
 "Internet connection not working" => "Nettilkoplinga fungerer ikkje",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsapplikasjonar ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du skrur på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud.",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsprogram ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du slå på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Utfør éi oppgåve for kvar sidelasting",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registrert ved ei webcron-teneste. Last sida cron.php i ownCloud-rota ein gong i minuttet over http.",
 "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Bruk cron-tenesta til systemet. Køyr fila cron.php i ownCloud-mappa frå ein cron-jobb på systemet ein gong i minuttet.",
 "Sharing" => "Deling",
-"Enable Share API" => "Skru på API-et for deling",
+"Enable Share API" => "Slå på API-et for deling",
 "Allow apps to use the Share API" => "La app-ar bruka API-et til deling",
 "Allow links" => "Tillat lenkjer",
 "Allow users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer",
@@ -63,7 +63,7 @@
 "Security" => "Tryggleik",
 "Enforce HTTPS" => "Krev HTTPS",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "Krev at klientar koplar til ownCloud med ei kryptert tilkopling.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å skru av/på SSL-handhevinga.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å slå av/på SSL-handhevinga.",
 "Log" => "Logg",
 "Log level" => "Log nivå",
 "More" => "Meir",
@@ -72,8 +72,8 @@
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Legg til din app",
 "More Apps" => "Fleire app-ar",
-"Select an App" => "Vel ein applikasjon",
-"See application page at apps.owncloud.com" => "Sjå applikasjonssida på apps.owncloud.com",
+"Select an App" => "Vel eit program",
+"See application page at apps.owncloud.com" => "Sjå programsida på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>",
 "Update" => "Oppdater",
 "User Documentation" => "Brukardokumentasjon",
@@ -87,14 +87,14 @@
 "Show First Run Wizard again" => "Vis Oppstartvegvisaren igjen",
 "Password" => "Passord",
 "Your password was changed" => "Passordet ditt er endra",
-"Unable to change your password" => "Klarte ikkje å endra passordet",
+"Unable to change your password" => "Klarte ikkje endra passordet",
 "Current password" => "Passord",
 "New password" => "Nytt passord",
 "Change password" => "Endra passord",
-"Display Name" => "Visningsnamn",
+"Display Name" => "Visingsnamn",
 "Email" => "E-post",
 "Your email address" => "Di epost-adresse",
-"Fill in an email address to enable password recovery" => "Fyll inn e-postadressa di for å aktivera passordgjenoppretting",
+"Fill in an email address to enable password recovery" => "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg",
 "Language" => "Språk",
 "Help translate" => "Hjelp oss å omsetja",
 "WebDAV" => "WebDAV",
@@ -105,7 +105,7 @@
 "Unlimited" => "Ubegrensa",
 "Other" => "Anna",
 "Storage" => "Lagring",
-"change display name" => "endra visningsnamn",
+"change display name" => "endra visingsnamn",
 "set new password" => "lag nytt passord",
 "Default" => "Standard"
 );
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index e422601e2d800f8ecf522d5b08ec49c8d2ac6a95..810f8bf15ae4870e25ec43ae3e97809bcf65ddd3 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nie można wczytać listy aplikacji",
 "Authentication error" => "BÅ‚Ä…d uwierzytelniania",
+"Your display name has been changed." => "Twoje wyświetlana nazwa została zmieniona.",
 "Unable to change display name" => "Nie można zmienić wyświetlanej nazwy",
 "Group already exists" => "Grupa już istnieje",
 "Unable to add group" => "Nie można dodać grupy",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 3e49675f793e71f94905475e2c56ca1c9ca263c1..de32c3b1f025fd53bd6584f7c9bdc08acfa606ce 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
 "Authentication error" => "Erro na autenticação",
+"Your display name has been changed." => "O seu nome foi alterado",
 "Unable to change display name" => "Não foi possível alterar o nome",
 "Group already exists" => "O grupo já existe",
 "Unable to add group" => "Impossível acrescentar o grupo",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 88aa2c905abb4f3da611643c0aa223137aa15128..6f7db02781bc4619ac7e09a7445f2a188d0d4b1c 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Ошибка",
 "deleted" => "удалено"
 );
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..8e8c17f0d363a38963adce7c5b7acd6558bfb5d3
--- /dev/null
+++ b/settings/l10n/ug.php
@@ -0,0 +1,71 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "ئەپ بازىرىدىن تىزىمنى يۈكلىيەلمىدى",
+"Authentication error" => "سالاھىيەت دەلىللەش خاتالىقى",
+"Your display name has been changed." => "كۆرسىتىدىغان ئىسمىڭىز ئۆزگەردى.",
+"Unable to change display name" => "كۆرسىتىدىغان ئىسىمنى ئۆزگەرتكىلى بولمايدۇ",
+"Group already exists" => "گۇرۇپپا مەۋجۇت",
+"Unable to add group" => "گۇرۇپپا قوشقىلى بولمايدۇ",
+"Could not enable app. " => "ئەپنى قوزغىتالمىدى. ",
+"Email saved" => "تورخەت ساقلاندى",
+"Invalid email" => "ئىناۋەتسىز تورخەت",
+"Unable to delete group" => "گۇرۇپپىنى ئۆچۈرەلمىدى",
+"Unable to delete user" => "ئىشلەتكۈچىنى ئۆچۈرەلمىدى",
+"Language changed" => "تىل ئۆزگەردى",
+"Invalid request" => "ئىناۋەتسىز ئىلتىماس",
+"Unable to add user to group %s" => "ئىشلەتكۈچىنى %s گۇرۇپپىغا قوشالمايدۇ",
+"Unable to remove user from group %s" => "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەلمەيدۇ",
+"Couldn't update app." => "ئەپنى يېڭىلىيالمايدۇ.",
+"Update to {appversion}" => "{appversion} غا يېڭىلايدۇ",
+"Disable" => "چەكلە",
+"Enable" => "قوزغات",
+"Please wait...." => "سەل كۈتۈڭ…",
+"Error" => "خاتالىق",
+"Updating...." => "يېڭىلاۋاتىدۇ…",
+"Error while updating app" => "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى",
+"Updated" => "يېڭىلاندى",
+"Saving..." => "ساقلاۋاتىدۇ…",
+"deleted" => "ئۆچۈرۈلگەن",
+"undo" => "يېنىۋال",
+"Unable to remove user" => "ئىشلەتكۈچىنى چىقىرىۋېتەلمەيدۇ",
+"Groups" => "گۇرۇپپا",
+"Group Admin" => "گۇرۇپپا باشقۇرغۇچى",
+"Delete" => "ئۆچۈر",
+"add group" => "گۇرۇپپا قوش",
+"Sharing" => "ھەمبەھىر",
+"Security" => "بىخەتەرلىك",
+"Log" => "خاتىرە",
+"Log level" => "خاتىرە دەرىجىسى",
+"More" => "تېخىمۇ كۆپ",
+"Less" => "ئاز",
+"Version" => "نەشرى",
+"Add your App" => "ئەپىڭىزنى قوشۇڭ",
+"More Apps" => "تېخىمۇ كۆپ ئەپلەر",
+"Select an App" => "بىر ئەپ تاللاڭ",
+"Update" => "يېڭىلا",
+"User Documentation" => "ئىشلەتكۈچى قوللانمىسى",
+"Administrator Documentation" => "باشقۇرغۇچى قوللانمىسى",
+"Online Documentation" => "توردىكى قوللانما",
+"Forum" => "مۇنبەر",
+"Password" => "ئىم",
+"Your password was changed" => "ئىمىڭىز مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى",
+"Unable to change your password" => "ئىمنى ئۆزگەرتكىلى بولمايدۇ.",
+"Current password" => "نۆۋەتتىكى ئىم",
+"New password" => "يېڭى ئىم",
+"Change password" => "ئىم ئۆزگەرت",
+"Display Name" => "كۆرسىتىش ئىسمى",
+"Email" => "تورخەت",
+"Your email address" => "تورخەت ئادرېسىڭىز",
+"Fill in an email address to enable password recovery" => "ئىم ئەسلىگە كەلتۈرۈشتە ئىشلىتىدىغان تور خەت ئادرېسىنى تولدۇرۇڭ",
+"Language" => "تىل",
+"Help translate" => "تەرجىمىگە ياردەم",
+"WebDAV" => "WebDAV",
+"Login Name" => "تىزىمغا كىرىش ئاتى",
+"Create" => "قۇر",
+"Default Storage" => "كۆڭۈلدىكى ساقلىغۇچ",
+"Unlimited" => "چەكسىز",
+"Other" => "باشقا",
+"Storage" => "ساقلىغۇچ",
+"change display name" => "كۆرسىتىدىغان ئىسىمنى ئۆزگەرت",
+"set new password" => "يېڭى ئىم تەڭشە",
+"Default" => "كۆڭۈلدىكى"
+);
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 9ccc52f65f59bcf68804fb05e971ce456ddcde8b..1ec0b004c60d84ac985460979de533a1b8b21ed1 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "无法从应用商店载入列表",
 "Authentication error" => "认证出错",
+"Your display name has been changed." => "您的显示名字已经改变",
 "Unable to change display name" => "无法修改显示名称",
 "Group already exists" => "已存在该组",
 "Unable to add group" => "无法添加组",
diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index c25fbb434a706b03c75190ad0b2f67a7bf677e55..40213b3a7e5edca6f9a9a64bc6db9f417c247e7d 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -34,7 +34,7 @@ return array(
 'sr'=>'Српски',
 'sr@latin'=>'Srpski',
 'sv'=>'Svenska',
-'zh_CN'=>'中文',
+'zh_CN'=>'简体中文',
 'sk_SK'=>'Slovenčina',
 'hu_HU'=>'Magyar',
 'eu'=>'Euskara',
@@ -51,11 +51,11 @@ return array(
 'mk'=>'македонски',
 'uk'=>'Українська',
 'vi'=>'Tiếng Việt',
-'zh_TW'=>'臺灣話',
+'zh_TW'=>'正體中文（臺灣）',
 'af_ZA'=> 'Afrikaans',
 'bn_BD'=>'Bengali',
 'ta_LK'=>'தமிழ்',
-'zh_HK'=>'Chinese (Hong Kong)',
+'zh_HK'=>'繁體中文（香港）',
 'oc'=>'Occitan (post 1500)',
 'is'=>'Icelandic',
 'pl_PL'=>'Polski',
diff --git a/settings/personal.php b/settings/personal.php
index 57a7e4ee9cde2908227badaa22b68dcbbfb781eb..cab6e56dada3a43c1ccc19cec6e57b90d3fbf959 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -24,7 +24,7 @@ $languageCodes=OC_L10N::findAvailableLanguages();
 
 // array of common languages
 $commonlangcodes = array(
-	'en', 'es', 'fr', 'de', 'de_DE', 'ja_JP', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'zh_CN', 'ko'
+	'en', 'es', 'fr', 'de', 'de_DE', 'ja_JP', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'zh_CN', 'ko'
 );
 
 $languageNames=include 'languageCodes.php';
@@ -45,12 +45,14 @@ foreach($languageCodes as $lang) {
 	if ($lang === $userLang) {
 		$userLang = $ln;
 	} elseif (in_array($lang, $commonlangcodes)) {
-		$commonlanguages[]=$ln;
+		$commonlanguages[array_search($lang, $commonlangcodes)]=$ln;
 	} else {
 		$languages[]=$ln;
 	}
 }
 
+ksort($commonlanguages);
+
 // sort now by displayed language not the iso-code
 usort( $languages, function ($a, $b) {
 	return strcmp($a['name'], $b['name']);
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 666cb9d0b36c848d7e5eece6c54938fc0f6a1495..cfb45e99c4d4c8855cd5c3e89b076ec2683dc69b 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -38,7 +38,7 @@ if($_['passwordChangeSupported']) {
 		<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
 		<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
 		<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
-		<input type="password" id="pass2" name="new-password"
+		<input type="password" id="pass2" name="newpassword"
 			placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
 		<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
 		<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php
index e769bf3bcf6950e1ee043f3b6552a137e6f8eb57..0e7d606ccf678b9baf752ea3cd5d001e76ad54ea 100644
--- a/tests/lib/autoloader.php
+++ b/tests/lib/autoloader.php
@@ -6,14 +6,69 @@
  * See the COPYING-README file.
  */
 
-class Test_AutoLoader extends PHPUnit_Framework_TestCase {
+namespace Test;
 
-	public function testLeadingSlashOnClassName(){
-		$this->assertTrue(class_exists('\OC\Files\Storage\Local'));
+class AutoLoader extends \PHPUnit_Framework_TestCase {
+	/**
+	 * @var \OC\Autoloader $loader
+	 */
+	private $loader;
+
+	public function setUp() {
+		$this->loader = new \OC\AutoLoader();
+	}
+
+	public function testLeadingSlashOnClassName() {
+		$this->assertEquals(array('files/storage/local.php'), $this->loader->findClass('\OC\Files\Storage\Local'));
+	}
+
+	public function testNoLeadingSlashOnClassName() {
+		$this->assertEquals(array('files/storage/local.php'), $this->loader->findClass('OC\Files\Storage\Local'));
+	}
+
+	public function testLegacyPath() {
+		$this->assertEquals(array('legacy/files.php', 'files.php'), $this->loader->findClass('OC_Files'));
+	}
+
+	public function testClassPath() {
+		$this->loader->registerClass('Foo\Bar', 'foobar.php');
+		$this->assertEquals(array('foobar.php'), $this->loader->findClass('Foo\Bar'));
+	}
+
+	public function testPrefixNamespace() {
+		$this->loader->registerPrefix('Foo', 'foo');
+		$this->assertEquals(array('foo/Foo/Bar.php'), $this->loader->findClass('Foo\Bar'));
 	}
 
-	public function testNoLeadingSlashOnClassName(){
-		$this->assertTrue(class_exists('OC\Files\Storage\Local'));
+	public function testPrefix() {
+		$this->loader->registerPrefix('Foo_', 'foo');
+		$this->assertEquals(array('foo/Foo/Bar.php'), $this->loader->findClass('Foo_Bar'));
 	}
 
+	public function testLoadTestNamespace() {
+		$this->assertEquals(array('tests/lib/foo/bar.php'), $this->loader->findClass('Test\Foo\Bar'));
+	}
+
+	public function testLoadTest() {
+		$this->assertEquals(array('tests/lib/foo/bar.php'), $this->loader->findClass('Test_Foo_Bar'));
+	}
+
+	public function testLoadCoreNamespace() {
+		$this->assertEquals(array('foo/bar.php'), $this->loader->findClass('OC\Foo\Bar'));
+	}
+
+	public function testLoadCore() {
+		$this->assertEquals(array('legacy/foo/bar.php', 'foo/bar.php'), $this->loader->findClass('OC_Foo_Bar'));
+	}
+
+	public function testLoadPublicNamespace() {
+		$this->assertEquals(array('public/foo/bar.php'), $this->loader->findClass('OCP\Foo\Bar'));
+	}
+
+	public function testLoadAppNamespace() {
+		$result = $this->loader->findClass('OCA\Files\Foobar');
+		$this->assertEquals(2, count($result));
+		$this->assertStringEndsWith('apps/files/foobar.php', $result[0]);
+		$this->assertStringEndsWith('apps/files/lib/foobar.php', $result[1]);
+	}
 }
diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index 250842805e5d32072fc253a5c6fc892baf008594..4051a6e234b4177e5d041a73e0f783dbbb4d7603 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -162,10 +162,11 @@ class Cache extends \PHPUnit_Framework_TestCase {
 		$file4 = 'folder/foo/1';
 		$file5 = 'folder/foo/2';
 		$data = array('size' => 100, 'mtime' => 50, 'mimetype' => 'foo/bar');
+		$folderData = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
 
-		$this->cache->put($file1, $data);
-		$this->cache->put($file2, $data);
-		$this->cache->put($file3, $data);
+		$this->cache->put($file1, $folderData);
+		$this->cache->put($file2, $folderData);
+		$this->cache->put($file3, $folderData);
 		$this->cache->put($file4, $data);
 		$this->cache->put($file5, $data);
 
diff --git a/tests/lib/files/cache/permissions.php b/tests/lib/files/cache/permissions.php
index 56dbbc4518ef3627d6f8b5964939822e794d92d2..7e6e11e2eb29c09e6fe9a5fdcf2dd293f7e82c98 100644
--- a/tests/lib/files/cache/permissions.php
+++ b/tests/lib/files/cache/permissions.php
@@ -14,8 +14,8 @@ class Permissions extends \PHPUnit_Framework_TestCase {
 	 */
 	private $permissionsCache;
 
-	function setUp(){
-		$this->permissionsCache=new \OC\Files\Cache\Permissions('dummy');
+	function setUp() {
+		$this->permissionsCache = new \OC\Files\Cache\Permissions('dummy');
 	}
 
 	function testSimple() {
@@ -23,8 +23,10 @@ class Permissions extends \PHPUnit_Framework_TestCase {
 		$user = uniqid();
 
 		$this->assertEquals(-1, $this->permissionsCache->get(1, $user));
+		$this->assertNotContains($user, $this->permissionsCache->getUsers(1));
 		$this->permissionsCache->set(1, $user, 1);
 		$this->assertEquals(1, $this->permissionsCache->get(1, $user));
+		$this->assertContains($user, $this->permissionsCache->getUsers(1));
 		$this->assertEquals(-1, $this->permissionsCache->get(2, $user));
 		$this->assertEquals(-1, $this->permissionsCache->get(1, $user . '2'));
 
diff --git a/tests/lib/public/contacts.php b/tests/lib/public/contacts.php
index ce5d762226b540c0a7ba06d4536886dea40f3a68..d6008876a0042094d3e1b1bbd3aa87a7f86cff58 100644
--- a/tests/lib/public/contacts.php
+++ b/tests/lib/public/contacts.php
@@ -19,8 +19,6 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-OC::autoload('OCP\Contacts');
-
 class Test_Contacts extends PHPUnit_Framework_TestCase
 {
 
diff --git a/tests/lib/template.php b/tests/lib/template.php
index 6e88d4c07fc0218479a19fd2696159169080f40a..fd12119da580aa5ed241a0784cdd4de389c27ae6 100644
--- a/tests/lib/template.php
+++ b/tests/lib/template.php
@@ -20,10 +20,13 @@
 *
 */
 
-OC::autoload('OC_Template');
-
 class Test_TemplateFunctions extends PHPUnit_Framework_TestCase {
 
+	public function setUp() {
+		$loader = new \OC\Autoloader();
+		$loader->load('OC_Template');
+	}
+
 	public function testP() {
 		// FIXME: do we need more testcases?
 		$htmlString = "<script>alert('xss');</script>";
diff --git a/tests/lib/vcategories.php b/tests/lib/vcategories.php
index e79dd49870c89f33b5ef1f309b5a5cc41c5d4233..df5f600f20da3a479daacea277dbb8fe953498f9 100644
--- a/tests/lib/vcategories.php
+++ b/tests/lib/vcategories.php
@@ -81,6 +81,17 @@ class Test_VCategories extends PHPUnit_Framework_TestCase {
 
 	}
 
+	public function testrenameCategory() {
+		$defcategories = array('Friends', 'Family', 'Wrok', 'Other');
+		$catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories);
+
+		$this->assertTrue($catmgr->rename('Wrok', 'Work'));
+		$this->assertTrue($catmgr->hasCategory('Work'));
+		$this->assertFalse($catmgr->hasCategory('Wrok'));
+		$this->assertFalse($catmgr->rename('Wrok', 'Work'));
+
+	}
+
 	public function testAddToCategory() {
 		$objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9);
 
diff --git a/tests/lib/vobject.php b/tests/lib/vobject.php
index 1103a4b3297084479b082bc42bb0e3f56e0bc881..f28d22a1fcdb3f0d4b4036348d23d339fc0742b6 100644
--- a/tests/lib/vobject.php
+++ b/tests/lib/vobject.php
@@ -10,10 +10,29 @@ class Test_VObject extends PHPUnit_Framework_TestCase {
 
 	public function setUp() {
 		Sabre\VObject\Property::$classMap['SUMMARY'] = 'OC\VObject\StringProperty';
+		Sabre\VObject\Property::$classMap['ORG'] = 'OC\VObject\CompoundProperty';
 	}
 
 	function testStringProperty() {
 		$property = Sabre\VObject\Property::create('SUMMARY', 'Escape;this,please');
 		$this->assertEquals("SUMMARY:Escape\;this\,please\r\n", $property->serialize());
 	}
+
+	function testCompoundProperty() {
+
+		$arr = array(
+			'ABC, Inc.',
+			'North American Division',
+			'Marketing;Sales',
+		);
+
+		$property = Sabre\VObject\Property::create('ORG');
+		$property->setParts($arr);
+
+		$this->assertEquals('ABC\, Inc.;North American Division;Marketing\;Sales', $property->value);
+		$this->assertEquals('ORG:ABC\, Inc.;North American Division;Marketing\;Sales' . "\r\n", $property->serialize());
+		$this->assertEquals(3, count($property->getParts()));
+		$parts = $property->getParts();
+		$this->assertEquals('Marketing;Sales', $parts[2]);
+	}
 }
\ No newline at end of file